Add DOTFILES_BIN envvar
This commit is contained in:
		
							parent
							
								
									fcc7366f83
								
							
						
					
					
						commit
						3c8481307b
					
				|  | @ -32,19 +32,19 @@ super + e | ||||||
|     emacsclient --eval "(emacs-everywhere)" |     emacsclient --eval "(emacs-everywhere)" | ||||||
| 
 | 
 | ||||||
| super + space | super + space | ||||||
| 	$DOTFILES/bin/rofi/appmenu | 	$DOTFILES_BIN/rofi/appmenu | ||||||
| 
 | 
 | ||||||
| super + Tab | super + Tab | ||||||
| 	$DOTFILES/bin/rofi/windowmenu | 	$DOTFILES_BIN/rofi/windowmenu | ||||||
| 
 | 
 | ||||||
| super + p | super + p | ||||||
| 	$DOTFILES/bin/rofi/bwmenu | 	$DOTFILES_BIN/rofi/bwmenu | ||||||
| 
 | 
 | ||||||
| super + shift + p | super + shift + p | ||||||
| 	$DOTFILES/bin/rofi/bwmenu -r | 	$DOTFILES_BIN/rofi/bwmenu -r | ||||||
| 
 | 
 | ||||||
| super + slash | super + slash | ||||||
| 	$DOTFILES/bin/rofi/filemenu -x | 	$DOTFILES_BIN/rofi/filemenu -x | ||||||
| 
 | 
 | ||||||
| super + Escape | super + Escape | ||||||
| 	pkill -USR1 -x sxhkd | 	pkill -USR1 -x sxhkd | ||||||
|  | @ -59,11 +59,10 @@ super + {_,ctrl + }f | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| super + {_,ctrl +}{h,j,k,l} | super + {_,ctrl +}{h,j,k,l} | ||||||
| 	$DOTFILES/bin/bspwm/focus {_,-m }{west,south,north,east} | 	$DOTFILES_BIN/bspwm/focus {_,-m }{west,south,north,east} | ||||||
| 
 | 
 | ||||||
| super + shift + {_,ctrl +}{h,j,k,l} | super + shift + {_,ctrl +}{h,j,k,l} | ||||||
| 	$DOTFILES/bin/bspwm/swap {_,-m }{west,south,north,east} | 	$DOTFILES_BIN/bspwm/swap {_,-m }{west,south,north,east} | ||||||
| 
 |  | ||||||
| 
 | 
 | ||||||
| ## Resize by preselection | ## Resize by preselection | ||||||
| super + alt + {1-9} | super + alt + {1-9} | ||||||
|  |  | ||||||
|  | @ -11,7 +11,11 @@ with lib.my; | ||||||
| 
 | 
 | ||||||
|   # Common config for all nixos machines; and to ensure the flake operates |   # Common config for all nixos machines; and to ensure the flake operates | ||||||
|   # soundly |   # soundly | ||||||
|   environment.variables.DOTFILES = dotFilesDir; |   environment.variables.DOTFILES = findFirst pathExists dotFilesDir [ | ||||||
|  |     "${config.user.home}/.config/dotfiles" | ||||||
|  |     "/etc/dotfiles" | ||||||
|  |   ]; | ||||||
|  |   environment.variables.DOTFILES_BIN = "$DOTFILES/bin"; | ||||||
| 
 | 
 | ||||||
|   # Configure nix and nixpkgs |   # Configure nix and nixpkgs | ||||||
|   environment.variables.NIXPKGS_ALLOW_UNFREE = "1"; |   environment.variables.NIXPKGS_ALLOW_UNFREE = "1"; | ||||||
|  |  | ||||||
|  | @ -37,32 +37,32 @@ in { | ||||||
|         name = "rofi-browsermenu"; |         name = "rofi-browsermenu"; | ||||||
|         desktopName = "Open Bookmark in Browser"; |         desktopName = "Open Bookmark in Browser"; | ||||||
|         icon = "bookmark-new-symbolic"; |         icon = "bookmark-new-symbolic"; | ||||||
|         exec = "${binDir}/rofi/browsermenu"; |         exec = "$DOTFILES_BIN/rofi/browsermenu"; | ||||||
|       }) |       }) | ||||||
|       (makeDesktopItem { |       (makeDesktopItem { | ||||||
|         name = "rofi-browsermenu-history"; |         name = "rofi-browsermenu-history"; | ||||||
|         desktopName = "Open Browser History"; |         desktopName = "Open Browser History"; | ||||||
|         icon = "accessories-clock"; |         icon = "accessories-clock"; | ||||||
|         exec = "${binDir}/rofi/browsermenu history"; |         exec = "$DOTFILES_BIN/rofi/browsermenu history"; | ||||||
|       }) |       }) | ||||||
|       (makeDesktopItem { |       (makeDesktopItem { | ||||||
|         name = "rofi-filemenu"; |         name = "rofi-filemenu"; | ||||||
|         desktopName = "Open Directory in Terminal"; |         desktopName = "Open Directory in Terminal"; | ||||||
|         icon = "folder"; |         icon = "folder"; | ||||||
|         exec = "${binDir}/rofi/filemenu"; |         exec = "$DOTFILES_BIN/rofi/filemenu"; | ||||||
|       }) |       }) | ||||||
|       (makeDesktopItem { |       (makeDesktopItem { | ||||||
|         name = "rofi-filemenu-scratch"; |         name = "rofi-filemenu-scratch"; | ||||||
|         desktopName = "Open Directory in Scratch Terminal"; |         desktopName = "Open Directory in Scratch Terminal"; | ||||||
|         icon = "folder"; |         icon = "folder"; | ||||||
|         exec = "${binDir}/rofi/filemenu -x"; |         exec = "$DOTFILES_BIN/rofi/filemenu -x"; | ||||||
|       }) |       }) | ||||||
| 
 | 
 | ||||||
|       (makeDesktopItem { |       (makeDesktopItem { | ||||||
|         name = "lock-display"; |         name = "lock-display"; | ||||||
|         desktopName = "Lock screen"; |         desktopName = "Lock screen"; | ||||||
|         icon = "system-lock-screen"; |         icon = "system-lock-screen"; | ||||||
|         exec = "${binDir}/zzz"; |         exec = "$DOTFILES_BIN/zzz"; | ||||||
|       }) |       }) | ||||||
|     ]; |     ]; | ||||||
|   }; |   }; | ||||||
|  |  | ||||||
|  | @ -72,7 +72,7 @@ with lib.my; | ||||||
| 
 | 
 | ||||||
|     # must already begin with pre-existing PATH. Also, can't use binDir here, |     # must already begin with pre-existing PATH. Also, can't use binDir here, | ||||||
|     # because it contains a nix store path. |     # because it contains a nix store path. | ||||||
|     env.PATH = [ "$XDG_CONFIG_HOME/dotfiles/bin" "$XDG_BIN_HOME" "$PATH" ]; |     env.PATH = [ "$DOTFILES_BIN" "$XDG_BIN_HOME" "$PATH" ]; | ||||||
| 
 | 
 | ||||||
|     environment.extraInit = |     environment.extraInit = | ||||||
|       concatStringsSep "\n" |       concatStringsSep "\n" | ||||||
|  |  | ||||||
		Loading…
	
		Reference in a new issue