File tree 5 files changed +22
-18
lines changed
5 files changed +22
-18
lines changed Original file line number Diff line number Diff line change 91
91
(setq flymake-start-syntax-check-on-newline nil )
92
92
(setq flycheck-check-syntax-automatically '(save mode-enabled))
93
93
94
+ ; ; nix
95
+ (use-package nix-mode
96
+ :mode " \\ .nix\\ '" )
97
+
94
98
; ; keybinds
95
99
(use-package evil
96
100
:ensure t
Original file line number Diff line number Diff line change @@ -10,3 +10,5 @@ ci="commit"
10
10
br = "branch"
11
11
[core ]
12
12
autocrlf = input
13
+ [pull ]
14
+ rebase = false
Original file line number Diff line number Diff line change 40
40
nix-shell -p $1 --run "$@"
41
41
}
42
42
43
+ showdrv() {
44
+ nix show-derivation "/nix/store/$1"
45
+ }
46
+
43
47
# Export the user created function names. -- t. mvdw
44
48
export BASH_FUNCTION_NAMES=$(declare -F | awk '{if (substr($3, 0, 1) != "_") print $3}')
Original file line number Diff line number Diff line change 3
3
# your system. Help is available in the configuration.nix(5) man page
4
4
# and in the NixOS manual (accessible by running ‘nixos-help’).
5
5
{ config , pkgs , ... } :
6
- rec {
7
-
8
- imports = [ ./home.nix ] ;
9
-
6
+ {
10
7
11
8
boot . tmpOnTmpfs = true ;
12
9
71
68
users . extraGroups . aigis . gid = 1001 ;
72
69
users . extraUsers = {
73
70
ngyj = {
74
- name = "ngyj" ;
75
71
createHome = true ;
76
72
home = "/home/ngyj" ;
77
73
description = "namigyj" ;
90
86
} ;
91
87
} ;
92
88
93
- home-cfgs = [
94
- { user = users . extraUsers . ngyj
95
- ; files = [
96
- "./foo.test"
97
- { src = "./foo.test" ; dst = "./bar.test" ; }
98
- ] ;
99
- }
100
- ] ;
101
-
102
89
nixpkgs . config = {
103
90
pulseaudio = true ;
104
91
allowUnfree = true ;
Original file line number Diff line number Diff line change @@ -31,26 +31,33 @@ let fileOptions = with types; submodule {
31
31
'' ;
32
32
} ;
33
33
34
- files = mkOption {
34
+ copy = mkOption {
35
35
default = [ ] ;
36
36
type = listOf ( either str fileOptions ) ;
37
37
description = ''
38
38
files to be copied
39
39
'' ;
40
40
} ;
41
+ flan = mkOption {
42
+ default = [ ] ;
43
+ type = listOf ( either str fileOptions ) ;
44
+ description = ''
45
+ files to be passed to flan
46
+ '' ;
47
+ } ;
41
48
} ;
42
49
} ) ;
43
50
} ;
44
51
} ;
45
52
46
53
config = let f = x : if isString x then { src = x ; dst = x ; } else x ;
47
54
scriptForEach = f : builtins . foldl' ( acc : x : f x + acc ) "" ;
48
- files = u : map f u . files ;
55
+ copies = u : map f u . copy ;
49
56
package = pkgs . stdenvNoCC . mkDerivation {
50
57
name = "home-cfg" ;
51
58
src = builtins . path {
52
59
path = ./. ;
53
- filter = ( path : type : path != . /.git) ;
60
+ filter = ( path : type : ! ( hasSuffix " /.git" path ) && ! ( hasSuffix ".nix" path ) ) ;
54
61
} ;
55
62
installPhase =
56
63
"mkdir -p $out\n "
@@ -60,7 +67,7 @@ let fileOptions = with types; submodule {
60
67
+ scriptForEach
61
68
( file :
62
69
"cp -r ${ file . src } $out/${ usr . user . name } /${ file . dst } \n " )
63
- ( files usr ) )
70
+ ( copies usr ) )
64
71
65
72
config . home-cfgs ;
66
73
} ;
You can’t perform that action at this time.
0 commit comments