removed home-manager.useGlobalPkgs
This commit is contained in:
		
							parent
							
								
									bc71cc2a63
								
							
						
					
					
						commit
						c851a1baeb
					
				
					 5 changed files with 63 additions and 64 deletions
				
			
		|  | @ -6,71 +6,71 @@ | ||||||
| }: let | }: let | ||||||
|   userConfig = osConfig.host.users.eve; |   userConfig = osConfig.host.users.eve; | ||||||
| in { | in { | ||||||
|   imports = []; |   nixpkgs.config = { | ||||||
|  |     allowUnfree = true; | ||||||
|  |   }; | ||||||
| 
 | 
 | ||||||
|   config = { |   home = { | ||||||
|     home = { |     username = userConfig.name; | ||||||
|       username = userConfig.name; |     homeDirectory = osConfig.users.users.eve.home; | ||||||
|       homeDirectory = osConfig.users.users.eve.home; |  | ||||||
| 
 | 
 | ||||||
|       # This value determines the Home Manager release that your configuration is |     # This value determines the Home Manager release that your configuration is | ||||||
|       # compatible with. This helps avoid breakage when a new Home Manager release |     # compatible with. This helps avoid breakage when a new Home Manager release | ||||||
|       # introduces backwards incompatible changes. |     # introduces backwards incompatible changes. | ||||||
|       # |     # | ||||||
|       # You should not change this value, even if you update Home Manager. If you do |     # You should not change this value, even if you update Home Manager. If you do | ||||||
|       # want to update the value, then make sure to first check the Home Manager |     # want to update the value, then make sure to first check the Home Manager | ||||||
|       # release notes. |     # release notes. | ||||||
|       stateVersion = "23.11"; # Please read the comment before changing. |     stateVersion = "23.11"; # Please read the comment before changing. | ||||||
| 
 | 
 | ||||||
|       # Home Manager is pretty good at managing dotfiles. The primary way to manage |     # Home Manager is pretty good at managing dotfiles. The primary way to manage | ||||||
|       # plain files is through 'home.file'. |     # plain files is through 'home.file'. | ||||||
|       file = { |     file = { | ||||||
|         # # Building this configuration will create a copy of 'dotfiles/screenrc' in |       # # Building this configuration will create a copy of 'dotfiles/screenrc' in | ||||||
|         # # the Nix store. Activating the configuration will then make '~/.screenrc' a |       # # the Nix store. Activating the configuration will then make '~/.screenrc' a | ||||||
|         # # symlink to the Nix store copy. |       # # symlink to the Nix store copy. | ||||||
|         # ".screenrc".source = dotfiles/screenrc; |       # ".screenrc".source = dotfiles/screenrc; | ||||||
| 
 | 
 | ||||||
|         # # You can also set the file content immediately. |       # # You can also set the file content immediately. | ||||||
|         # ".gradle/gradle.properties".text = '' |       # ".gradle/gradle.properties".text = '' | ||||||
|         #   org.gradle.console=verbose |       #   org.gradle.console=verbose | ||||||
|         #   org.gradle.daemon.idletimeout=3600000 |       #   org.gradle.daemon.idletimeout=3600000 | ||||||
|         # ''; |       # ''; | ||||||
|       }; |  | ||||||
| 
 |  | ||||||
|       # Home Manager can also manage your environment variables through |  | ||||||
|       # 'home.sessionVariables'. If you don't want to manage your shell through Home |  | ||||||
|       # Manager then you have to manually source 'hm-session-vars.sh' located at |  | ||||||
|       # either |  | ||||||
|       # |  | ||||||
|       #  ~/.nix-profile/etc/profile.d/hm-session-vars.sh |  | ||||||
|       # |  | ||||||
|       # or |  | ||||||
|       # |  | ||||||
|       #  ~/.local/state/nix/profiles/profile/etc/profile.d/hm-session-vars.sh |  | ||||||
|       # |  | ||||||
|       # or |  | ||||||
|       # |  | ||||||
|       #  /etc/profiles/per-user/leyla/etc/profile.d/hm-session-vars.sh |  | ||||||
|       # |  | ||||||
|       sessionVariables = { |  | ||||||
|         # EDITOR = "emacs"; |  | ||||||
|       }; |  | ||||||
| 
 |  | ||||||
|       packages = lib.lists.optionals userConfig.isDesktopUser ( |  | ||||||
|         with pkgs; [ |  | ||||||
|           firefox |  | ||||||
|           bitwarden |  | ||||||
|           discord |  | ||||||
|           makemkv |  | ||||||
|           signal-desktop |  | ||||||
|           ungoogled-chromium |  | ||||||
|         ] |  | ||||||
|       ); |  | ||||||
|     }; |     }; | ||||||
| 
 | 
 | ||||||
|     programs = { |     # Home Manager can also manage your environment variables through | ||||||
|       # Let Home Manager install and manage itself. |     # 'home.sessionVariables'. If you don't want to manage your shell through Home | ||||||
|       home-manager.enable = true; |     # Manager then you have to manually source 'hm-session-vars.sh' located at | ||||||
|  |     # either | ||||||
|  |     # | ||||||
|  |     #  ~/.nix-profile/etc/profile.d/hm-session-vars.sh | ||||||
|  |     # | ||||||
|  |     # or | ||||||
|  |     # | ||||||
|  |     #  ~/.local/state/nix/profiles/profile/etc/profile.d/hm-session-vars.sh | ||||||
|  |     # | ||||||
|  |     # or | ||||||
|  |     # | ||||||
|  |     #  /etc/profiles/per-user/leyla/etc/profile.d/hm-session-vars.sh | ||||||
|  |     # | ||||||
|  |     sessionVariables = { | ||||||
|  |       # EDITOR = "emacs"; | ||||||
|     }; |     }; | ||||||
|  | 
 | ||||||
|  |     packages = lib.lists.optionals userConfig.isDesktopUser ( | ||||||
|  |       with pkgs; [ | ||||||
|  |         firefox | ||||||
|  |         bitwarden | ||||||
|  |         discord | ||||||
|  |         makemkv | ||||||
|  |         signal-desktop | ||||||
|  |         ungoogled-chromium | ||||||
|  |       ] | ||||||
|  |     ); | ||||||
|  |   }; | ||||||
|  | 
 | ||||||
|  |   programs = { | ||||||
|  |     # Let Home Manager install and manage itself. | ||||||
|  |     home-manager.enable = true; | ||||||
|   }; |   }; | ||||||
| } | } | ||||||
|  |  | ||||||
|  | @ -12,6 +12,10 @@ in { | ||||||
|     ./firefox.nix |     ./firefox.nix | ||||||
|   ]; |   ]; | ||||||
| 
 | 
 | ||||||
|  |   nixpkgs.config = { | ||||||
|  |     allowUnfree = true; | ||||||
|  |   }; | ||||||
|  | 
 | ||||||
|   home = { |   home = { | ||||||
|     packages = |     packages = | ||||||
|       lib.lists.optionals userConfig.isTerminalUser ( |       lib.lists.optionals userConfig.isTerminalUser ( | ||||||
|  |  | ||||||
|  | @ -1,7 +1,5 @@ | ||||||
| # server nas | # server nas | ||||||
| {pkgs, ...}: { | {pkgs, ...}: { | ||||||
|   nixpkgs.config.allowUnfree = true; |  | ||||||
| 
 |  | ||||||
|   host = { |   host = { | ||||||
|     users = { |     users = { | ||||||
|       leyla = { |       leyla = { | ||||||
|  |  | ||||||
|  | @ -7,8 +7,6 @@ | ||||||
|     inputs.nixos-hardware.nixosModules.framework-11th-gen-intel |     inputs.nixos-hardware.nixosModules.framework-11th-gen-intel | ||||||
|   ]; |   ]; | ||||||
| 
 | 
 | ||||||
|   nixpkgs.config.allowUnfree = true; |  | ||||||
| 
 |  | ||||||
|   host = { |   host = { | ||||||
|     users = { |     users = { | ||||||
|       leyla = { |       leyla = { | ||||||
|  |  | ||||||
|  | @ -33,7 +33,6 @@ | ||||||
|     ]; |     ]; | ||||||
| 
 | 
 | ||||||
|   home-manager-config = nixpkgs: { |   home-manager-config = nixpkgs: { | ||||||
|     home-manager.useGlobalPkgs = true; |  | ||||||
|     home-manager.useUserPackages = true; |     home-manager.useUserPackages = true; | ||||||
|     home-manager.backupFileExtension = "backup"; |     home-manager.backupFileExtension = "backup"; | ||||||
|     home-manager.extraSpecialArgs = {inherit inputs outputs util;}; |     home-manager.extraSpecialArgs = {inherit inputs outputs util;}; | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue