Minor refactors
This commit is contained in:
		
							parent
							
								
									14e2aada30
								
							
						
					
					
						commit
						7e6c26fd9c
					
				|  | @ -20,9 +20,11 @@ in { | |||
|     nixpkgs.overlays = [ inputs.emacs-overlay.overlay ]; | ||||
| 
 | ||||
|     user.packages = with pkgs; [ | ||||
|       ## Doom dependencies | ||||
|       ## Emacs itself | ||||
|       binutils       # native-comp needs 'as', provided by this | ||||
|       emacsGcc       # 28 + native-comp | ||||
| 
 | ||||
|       ## Doom dependencies | ||||
|       git | ||||
|       (ripgrep.override {withPCRE2 = true;}) | ||||
|       gnutls              # for TLS connectivity | ||||
|  |  | |||
|  | @ -3,17 +3,17 @@ | |||
| with lib; | ||||
| with lib.my; | ||||
| { | ||||
|   options = { | ||||
|     user = mkOpt types.attrs {}; | ||||
|   options = with types; { | ||||
|     user = mkOpt attrs {}; | ||||
| 
 | ||||
|     home = with types; { | ||||
|     home = { | ||||
|       file       = mkOpt' attrs {} "Files to place directly in $HOME"; | ||||
|       configFile = mkOpt' attrs {} "Files to place in $XDG_CONFIG_HOME"; | ||||
|       dataFile   = mkOpt' attrs {} "Files to place in $XDG_DATA_HOME"; | ||||
|     }; | ||||
| 
 | ||||
|     env = mkOption { | ||||
|       type = with types; attrsOf (oneOf [ str path (listOf (either str path)) ]); | ||||
|       type = attrsOf (oneOf [ str path (listOf (either str path)) ]); | ||||
|       apply = mapAttrs | ||||
|         (n: v: if isList v | ||||
|                then concatMapStringsSep ":" (x: toString x) v | ||||
|  |  | |||
		Loading…
	
		Reference in a new issue