treewide: remove variables from pkgs
This commit is contained in:
		
							parent
							
								
									741d67c4ec
								
							
						
					
					
						commit
						0f4ac759c6
					
				
					 38 changed files with 60 additions and 64 deletions
				
			
		| 
						 | 
				
			
			@ -5,7 +5,7 @@
 | 
			
		|||
  ...
 | 
			
		||||
}:
 | 
			
		||||
let
 | 
			
		||||
  inherit (pkgs.uservars)
 | 
			
		||||
  inherit (config.my)
 | 
			
		||||
    key
 | 
			
		||||
    accent
 | 
			
		||||
    font
 | 
			
		||||
| 
						 | 
				
			
			@ -24,7 +24,7 @@ in
 | 
			
		|||
    ./swaylock.nix
 | 
			
		||||
    ./theme.nix
 | 
			
		||||
  ];
 | 
			
		||||
  config = lib.mkIf (pkgs.uservars.desktop == "sway") {
 | 
			
		||||
  config = lib.mkIf (config.my.desktop == "sway") {
 | 
			
		||||
    services.mako.enable = true;
 | 
			
		||||
    services.swayidle.enable = true;
 | 
			
		||||
    services.kanshi.enable = true;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -5,7 +5,7 @@
 | 
			
		|||
  ...
 | 
			
		||||
}:
 | 
			
		||||
let
 | 
			
		||||
  inherit (pkgs.uservars)
 | 
			
		||||
  inherit (config.my)
 | 
			
		||||
    key
 | 
			
		||||
    accent
 | 
			
		||||
    font
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -5,7 +5,7 @@
 | 
			
		|||
  ...
 | 
			
		||||
}:
 | 
			
		||||
let
 | 
			
		||||
  inherit (pkgs.uservars)
 | 
			
		||||
  inherit (config.my)
 | 
			
		||||
    key
 | 
			
		||||
    accent
 | 
			
		||||
    font
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,7 +1,7 @@
 | 
			
		|||
{ config, pkgs, ... }:
 | 
			
		||||
let
 | 
			
		||||
in
 | 
			
		||||
# inherit (pkgs.uservars) key accent font theme;
 | 
			
		||||
# inherit (config.my) key accent font theme;
 | 
			
		||||
# inherit (theme) color;
 | 
			
		||||
# inherit (pkgs) lib;
 | 
			
		||||
# mod = "Mod4";
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,6 +1,6 @@
 | 
			
		|||
{ config, pkgs, ... }:
 | 
			
		||||
let
 | 
			
		||||
  inherit (pkgs.uservars)
 | 
			
		||||
  inherit (config.my)
 | 
			
		||||
    key
 | 
			
		||||
    accent
 | 
			
		||||
    font
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,6 +1,6 @@
 | 
			
		|||
{ config, pkgs, ... }:
 | 
			
		||||
let
 | 
			
		||||
  inherit (pkgs.uservars)
 | 
			
		||||
  inherit (config.my)
 | 
			
		||||
    key
 | 
			
		||||
    accent
 | 
			
		||||
    font
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -5,7 +5,7 @@
 | 
			
		|||
  ...
 | 
			
		||||
}:
 | 
			
		||||
let
 | 
			
		||||
  inherit (pkgs.uservars)
 | 
			
		||||
  inherit (config.my)
 | 
			
		||||
    key
 | 
			
		||||
    accent
 | 
			
		||||
    font
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -5,7 +5,7 @@
 | 
			
		|||
  ...
 | 
			
		||||
}:
 | 
			
		||||
let
 | 
			
		||||
  inherit (pkgs.uservars)
 | 
			
		||||
  inherit (config.my)
 | 
			
		||||
    key
 | 
			
		||||
    accent
 | 
			
		||||
    font
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -6,7 +6,7 @@
 | 
			
		|||
  ...
 | 
			
		||||
}:
 | 
			
		||||
let
 | 
			
		||||
  inherit (pkgs.uservars) theme font desktop;
 | 
			
		||||
  inherit (config.my) theme font desktop;
 | 
			
		||||
  inherit (theme)
 | 
			
		||||
    color
 | 
			
		||||
    gtk_theme
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue