Compare commits
	
		
			3 commits
		
	
	
		
			603411fa64
			...
			1b3a130561
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 1b3a130561 | |||
| 62e5c673c5 | |||
| 5a8b5a29a2 | 
					 4 changed files with 9 additions and 7 deletions
				
			
		| 
						 | 
				
			
			@ -4,7 +4,6 @@
 | 
			
		|||
  imports = [ ../common/nix-settings.nix ];
 | 
			
		||||
  nix = {
 | 
			
		||||
    enable = true;
 | 
			
		||||
    package = pkgs.nixVersions.nix_2_25;
 | 
			
		||||
    settings = {
 | 
			
		||||
      trusted-users = [
 | 
			
		||||
        "os"
 | 
			
		||||
| 
						 | 
				
			
			@ -21,9 +20,6 @@
 | 
			
		|||
    };
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
  # Auto upgrade nix package and the daemon service.
 | 
			
		||||
  services.nix-daemon.enable = true;
 | 
			
		||||
 | 
			
		||||
  # List packages installed in system profile. To search by name, run:
 | 
			
		||||
  # $ nix-env -qaP | grep wget
 | 
			
		||||
  environment.systemPackages = [ pkgs.vim ];
 | 
			
		||||
| 
						 | 
				
			
			@ -38,6 +34,7 @@
 | 
			
		|||
  # system-wide SSH configuration, used by nix-daemon for remote builders
 | 
			
		||||
 | 
			
		||||
  # show hidden files
 | 
			
		||||
  system.primaryUser = "os";
 | 
			
		||||
  system.defaults.NSGlobalDomain.AppleShowAllFiles = true;
 | 
			
		||||
 | 
			
		||||
  # Used for backwards compatibility, please read the changelog before changing.
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -17,16 +17,19 @@ let
 | 
			
		|||
      inkscape
 | 
			
		||||
      darktable
 | 
			
		||||
      exiftool
 | 
			
		||||
      gimp3
 | 
			
		||||
    ]
 | 
			
		||||
    ++ (with gimp3Plugins; [
 | 
			
		||||
      #fourier  # broken
 | 
			
		||||
      #lqrPlugin  # broken
 | 
			
		||||
    ])
 | 
			
		||||
    ++ lib.optionals pkgs.stdenv.isLinux [
 | 
			
		||||
      gimp3
 | 
			
		||||
      hugin
 | 
			
		||||
      #luminanceHDR  # FIXME, build failure
 | 
			
		||||
      xournalpp
 | 
			
		||||
    ]
 | 
			
		||||
    ++ lib.optionals pkgs.stdenv.isLinux [
 | 
			
		||||
      gimp
 | 
			
		||||
    ];
 | 
			
		||||
 | 
			
		||||
  multimediaApps =
 | 
			
		||||
| 
						 | 
				
			
			@ -142,7 +145,6 @@ let
 | 
			
		|||
 | 
			
		||||
  desktopCommon = [
 | 
			
		||||
    keepassxc
 | 
			
		||||
    tigervnc
 | 
			
		||||
  ];
 | 
			
		||||
 | 
			
		||||
  desktopLinux = [
 | 
			
		||||
| 
						 | 
				
			
			@ -171,6 +173,7 @@ let
 | 
			
		|||
      mediaSupport = true;
 | 
			
		||||
      pulseaudioSupport = pkgs.stdenv.isLinux;
 | 
			
		||||
    })
 | 
			
		||||
    tigervnc
 | 
			
		||||
    pdfpc
 | 
			
		||||
    nheko
 | 
			
		||||
    gpxsee
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -33,4 +33,7 @@
 | 
			
		|||
  # servers. You should change this only after NixOS release notes say you
 | 
			
		||||
  # should.
 | 
			
		||||
  system.stateVersion = "18.09"; # Did you read the comment?
 | 
			
		||||
 | 
			
		||||
  # since 25.05, this broke and started to slow down system startup. tpm is currently not utilised on this host, so simply disable.
 | 
			
		||||
  security.tpm2.enable = false;
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -21,7 +21,6 @@
 | 
			
		|||
  boot.extraModulePackages = [ ];
 | 
			
		||||
 | 
			
		||||
  nix.settings.max-jobs = lib.mkDefault 4;
 | 
			
		||||
  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
 | 
			
		||||
 | 
			
		||||
  # modesetting is always better than intel (legacy)
 | 
			
		||||
  services.xserver.videoDrivers = [ "modesetting" ];
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue