treewide: remove variables from pkgs
This commit is contained in:
		
							parent
							
								
									741d67c4ec
								
							
						
					
					
						commit
						0f4ac759c6
					
				
					 38 changed files with 60 additions and 64 deletions
				
			
		| 
						 | 
				
			
			@ -43,7 +43,7 @@
 | 
			
		|||
    };
 | 
			
		||||
    plymouth = {
 | 
			
		||||
      enable = true;
 | 
			
		||||
      theme = lib.mkIf (pkgs.uservars.desktop == "sway") "red_loader";
 | 
			
		||||
      theme = lib.mkIf (config.my.desktop == "sway") "red_loader";
 | 
			
		||||
      themePackages = with pkgs; [
 | 
			
		||||
        (adi1090x-plymouth-themes.override { selected_themes = [ "red_loader" ]; })
 | 
			
		||||
      ];
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -22,8 +22,11 @@
 | 
			
		|||
    ./users.nix
 | 
			
		||||
    ./containers.nix
 | 
			
		||||
    ./network.nix
 | 
			
		||||
    ../settings
 | 
			
		||||
  ];
 | 
			
		||||
 | 
			
		||||
  my = import ../user/variables.nix;
 | 
			
		||||
 | 
			
		||||
  zramSwap.enable = true;
 | 
			
		||||
 | 
			
		||||
  programs.adb.enable = true;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -5,7 +5,7 @@
 | 
			
		|||
  ...
 | 
			
		||||
}:
 | 
			
		||||
let
 | 
			
		||||
  inherit (pkgs.uservars)
 | 
			
		||||
  inherit (config.my)
 | 
			
		||||
    key
 | 
			
		||||
    accent
 | 
			
		||||
    font
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue