my NixOS and nix-darwin config
.
+81
-32
+9
-9
flake.lock
+9
-9
flake.lock
···
26
26
"rust-overlay": "rust-overlay"
27
27
},
28
28
"locked": {
29
-
"lastModified": 1772550393,
30
-
"narHash": "sha256-m5+TRl4Vfc4lf/Z5PlrOgl0xuPLbGZzYIjNeCal7RYo=",
29
+
"lastModified": 1772653894,
30
+
"narHash": "sha256-/8hQLVH3X7I6Rr62V2cL01NkLYh3YHJ6kZB2fY6IysE=",
31
31
"owner": "helix-editor",
32
32
"repo": "helix",
33
-
"rev": "b22c117a2757552488fa0ff5ad63835f2a7fe449",
33
+
"rev": "51ec572a27a8c1267afbc07e6c1583585c6363dc",
34
34
"type": "github"
35
35
},
36
36
"original": {
···
46
46
]
47
47
},
48
48
"locked": {
49
-
"lastModified": 1772569491,
50
-
"narHash": "sha256-bdr6ueeXO1Xg91sFkuvaysYF0mVdwHBpdyhTjBEWv+s=",
49
+
"lastModified": 1772633327,
50
+
"narHash": "sha256-jl+DJB2DUx7EbWLRng+6HNWW/1/VQOnf0NsQB4PlA7I=",
51
51
"owner": "nix-community",
52
52
"repo": "home-manager",
53
-
"rev": "924e61f5c2aeab38504028078d7091077744ab17",
53
+
"rev": "5a75730e6f21ee624cbf86f4915c6e7489c74acc",
54
54
"type": "github"
55
55
},
56
56
"original": {
···
77
77
},
78
78
"nixpkgs_2": {
79
79
"locked": {
80
-
"lastModified": 1772542754,
81
-
"narHash": "sha256-WGV2hy+VIeQsYXpsLjdr4GvHv5eECMISX1zKLTedhdg=",
80
+
"lastModified": 1772624091,
81
+
"narHash": "sha256-QKyJ0QGWBn6r0invrMAK8dmJoBYWoOWy7lN+UHzW1jc=",
82
82
"owner": "nixos",
83
83
"repo": "nixpkgs",
84
-
"rev": "8c809a146a140c5c8806f13399592dbcb1bb5dc4",
84
+
"rev": "80bdc1e5ce51f56b19791b52b2901187931f5353",
85
85
"type": "github"
86
86
},
87
87
"original": {
+14
-1
modules/home/shells/fish/default.nix
+14
-1
modules/home/shells/fish/default.nix
···
28
28
eval (ssh-agent -c) &> /dev/null
29
29
ssh-add ~/.ssh/github &> /dev/null
30
30
ssh-add ~/.ssh/daedalus-tangled &> /dev/null
31
+
ssh-add ~/.ssh/signing_key &> /dev/null
31
32
ssh-add ~/.ssh/ucsc_gitlab &> /dev/null
32
33
33
34
eval "$(zoxide init fish)"
35
+
36
+
${lib.optionalString pkgs.stdenv.isDarwin ''
37
+
if test -f /opt/homebrew/bin/brew
38
+
eval (/opt/homebrew/bin/brew shellenv)
39
+
end
40
+
''}
41
+
34
42
35
43
direnv hook fish | source
36
44
set -g direnv_fish_mode eval_on_arrow
···
69
77
jjf = "jj file";
70
78
jjl = "jj log";
71
79
jjs = "jj squash";
80
+
jjst = "jj status";
81
+
jjc = "jj commit";
72
82
73
83
jju = "jj undo";
74
-
jjr = "jj redo";
84
+
jjr = "jj re";
75
85
76
86
jjrb = "jj rebase";
77
87
···
81
91
jjbm = "jj bookmark move";
82
92
jjbl = "jj bookmark list";
83
93
jjbt = "jj bookmark track";
94
+
jjbd = "jj bookmark delete";
95
+
jjbf = "jj bookmark forget";
84
96
85
97
jjgf = "jj git fetch";
86
98
jjgp = "jj git push";
99
+
jjgpa = "jj git push --all";
87
100
88
101
};
89
102
+44
-20
modules/home/term/ghostty/ghostty/config
+44
-20
modules/home/term/ghostty/ghostty/config
···
5
5
# font-family = ""
6
6
# font-family = "Monaspace Krypton SemiBold"
7
7
8
+
# TX-02
8
9
# font-family = "TX-02 Medium"
9
-
font-family = "TX-02 Medium SemiCondensed"
10
+
# font-family = "TX-02 Medium SemiCondensed"
10
11
11
12
# font-family = "TX-02 Bold"
12
-
font-family-bold = "TX-02 Bold SemiCondensed"
13
-
font-family-italic = "TX-02 Bold SemiCondensed Oblique"
14
-
font-family-bold-italic = "TX-02 ExtraBold SemiCondensed Oblique"
13
+
# font-family-bold = "TX-02 Bold SemiCondensed"
14
+
# font-family-italic = "TX-02 Bold SemiCondensed Oblique"
15
+
# font-family-bold-italic = "TX-02 ExtraBold SemiCondensed Oblique"
16
+
17
+
18
+
19
+
# maple mono
20
+
21
+
font-family = "Maple Mono NF CN"
22
+
23
+
font-family-bold = "Maple Mono NF CN SemiBold"
24
+
# font-family-italic = "Maple Mono NF CN Italic"
25
+
font-family-bold-italic = "Maple Mono NF CN SemiBold Italic"
15
26
16
27
# old font config, remember these have ligatures
17
28
# font-family = ""
···
19
30
# font-family-bold = "Monaspace Neon SemiBold"
20
31
# font-family-italic = "Monaspace Argon SemiBold"
21
32
# font-family-bold-italic = "Monaspace Neon SemiBold"
33
+
#
34
+
# Maple Mono
35
+
# Maple Mono Bold
36
+
# Maple Mono Bold Italic
37
+
# Maple Mono ExtraBold
38
+
# Maple Mono ExtraBold Italic
39
+
# Maple Mono ExtraLight
40
+
# Maple Mono ExtraLight Italic
41
+
# Maple Mono Italic
42
+
# Maple Mono Light
43
+
# Maple Mono Light Italic
44
+
# Maple Mono Medium
45
+
# Maple Mono Medium Italic
46
+
# Maple Mono Regular
47
+
# Maple Mono SemiBold
48
+
# Maple Mono SemiBold Italic
49
+
# Maple Mono Thin
50
+
# Maple Mono Thin Italic
51
+
#
22
52
23
-
# font-feature = "calt"
24
-
# font-feature = "clig"
25
-
# font-feature = "liga"
26
-
# font-feature = "dlig"
27
-
# font-feature = "ss01"
28
-
# font-feature = "ss02"
29
-
# font-feature = "ss03"
30
-
# font-feature = "ss04"
31
-
# font-feature = "ss05"
32
-
# font-feature = "ss06"
33
-
# font-feature = "ss07"
34
-
# font-feature = "ss08"
53
+
54
+
font-feature = calt
55
+
font-feature = liga
56
+
font-feature = dlig
57
+
58
+
35
59
36
60
# ligatures arent properly implemented in my version of the berkeley mono lol
37
-
font-feature = "-calt"
38
-
font-feature = "-liga"
39
-
font-feature = "-dlig"
61
+
# font-feature = "-calt"
62
+
# font-feature = "-liga"
63
+
# font-feature = "-dlig"
40
64
41
-
font-size = "16"
65
+
font-size = "15.5"
42
66
# font-size = "20"
43
67
# font-size = "15"
44
68
+10
modules/home/tools/default.nix
+10
modules/home/tools/default.nix
···
18
18
# home.sessionVariables.LIBRARY_PATH = "${
19
19
# lib.makeLibraryPath [ pkgs.libiconv ]
20
20
# }\${LIBRARY_PATH:+:$LIBRARY_PATH}";
21
+
#
21
22
22
23
home.packages = with pkgs; [
23
24
spicetify-cli
···
45
46
rustup
46
47
bun
47
48
nodejs
49
+
50
+
(pkgs.writeShellApplication {
51
+
name = "ns";
52
+
runtimeInputs = with pkgs; [
53
+
fzf
54
+
nix-search-tv
55
+
];
56
+
text = builtins.readFile "${pkgs.nix-search-tv.src}/nixpkgs.sh";
57
+
})
48
58
49
59
];
50
60
+1
modules/home/tools/helix/helix/ignore
+1
modules/home/tools/helix/helix/ignore