Home

dotnix @main - refs - log -
-
https://git.jolheiser.com/dotnix.git
My nix dotfiles
tree log patch
let nixpkgs roam free Signed-off-by: jolheiser <git@jolheiser.com>
Signature
-----BEGIN SSH SIGNATURE----- U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgBTEvCQk6VqUAdN2RuH6bj1dNkY oOpbPWj+jw4ua1B1cAAAADZ2l0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5 AAAAQCeD/9FwO/sMYWVum2kSCnRDorUW/R5tsu6ew+EBG76auxPcwi2GPpDow95rFjZ45E SP1OczTiz/n7/YMS8MGgI= -----END SSH SIGNATURE-----
jolheiser <git@jolheiser.com>
3 months ago
3 changed files, 108 additions(+), 111 deletions(-)
flake.lockflake.nixmachines/common/nogui/default.nix
M flake.lockflake.lock
  1
  2
  3
  4
  5
  6
  7
  8
  9
 10
 11
 12
 13
 14
 15
 16
 17
 18
 19
 20
 21
 22
 23
 24
 25
 26
 27
 28
 29
 30
 31
 32
 33
 34
 35
 36
 37
 38
 39
 40
 41
 42
 43
 44
 45
 46
 47
 48
 49
 50
 51
 52
 53
 54
 55
 56
 57
 58
 59
 60
 61
 62
 63
 64
 65
 66
 67
 68
 69
 70
 71
 72
 73
 74
 75
 76
 77
 78
 79
 80
 81
 82
 83
 84
 85
 86
 87
 88
 89
 90
 91
 92
 93
 94
 95
 96
 97
 98
 99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
diff --git a/flake.lock b/flake.lock
index 048e2c76eccefc780452790cf1a39a27e057ebd5..440d199afc5b0cc166d5e50e1ad6af427a9047f5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -3,7 +3,9 @@   "nodes": {
     "agenix": {
       "inputs": {
         "darwin": [],
-        "home-manager": [],
+        "home-manager": [
+          "home-manager"
+        ],
         "nixpkgs": [
           "nixpkgs"
         ],
@@ -25,9 +27,7 @@       }
     },
     "cfg": {
       "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
+        "nixpkgs": "nixpkgs"
       },
       "locked": {
         "lastModified": 1729195705,
@@ -98,28 +98,10 @@         "repo": "flake-utils",
         "type": "github"
       }
     },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": "systems_3"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "ghostty": {
       "inputs": {
         "flake-compat": "flake-compat",
-        "flake-utils": "flake-utils_2",
+        "flake-utils": "flake-utils",
         "nixpkgs-stable": "nixpkgs-stable",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "zig": "zig",
@@ -141,9 +123,7 @@       }
     },
     "gomodinit": {
       "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
+        "nixpkgs": "nixpkgs_2"
       },
       "locked": {
         "lastModified": 1734153556,
@@ -163,6 +143,7 @@     "helix": {
       "inputs": {
         "jolheiser": "jolheiser",
         "nixpkgs": [
+          "helix",
           "jolheiser",
           "nixpkgs"
         ]
@@ -203,25 +184,7 @@       }
     },
     "jolheiser": {
       "inputs": {
-        "nixpkgs": "nixpkgs"
-      },
-      "locked": {
-        "lastModified": 1739904102,
-        "narHash": "sha256-Oh+ckGaUrnH5mMCsPvU9XViSAIfbigW7H0Rq/ZbbhlI=",
-        "ref": "refs/heads/main",
-        "rev": "0abadd849d3d36ca87fda7ea9ed637f25a0e9dae",
-        "revCount": 3,
-        "type": "git",
-        "url": "https://git.jolheiser.com/nixpkgs.git"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://git.jolheiser.com/nixpkgs.git"
-      }
-    },
-    "jolheiser_2": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs_3"
       },
       "locked": {
         "lastModified": 1739904102,
@@ -255,11 +218,11 @@       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1739736696,
-        "narHash": "sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb+P+R4S8Jsw=",
+        "lastModified": 1741246872,
+        "narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d74a2335ac9c133d6bbec9fc98d91a77f1604c1f",
+        "rev": "10069ef4cf863633f57238f179a0297de84bd8d3",
         "type": "github"
       },
       "original": {
@@ -303,6 +266,22 @@       }
     },
     "nixpkgs_2": {
       "locked": {
+        "lastModified": 1741037377,
+        "narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "02032da4af073d0f6110540c8677f16d4be0117f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
+      "locked": {
         "lastModified": 1739736696,
         "narHash": "sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb+P+R4S8Jsw=",
         "owner": "nixos",
@@ -317,22 +296,6 @@         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1734119587,
-        "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs_4": {
       "locked": {
         "lastModified": 1734119587,
@@ -351,6 +314,54 @@       }
     },
     "nixpkgs_5": {
       "locked": {
+        "lastModified": 1734119587,
+        "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_6": {
+      "locked": {
+        "lastModified": 1741037377,
+        "narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "02032da4af073d0f6110540c8677f16d4be0117f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_7": {
+      "locked": {
+        "lastModified": 1741246872,
+        "narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "10069ef4cf863633f57238f179a0297de84bd8d3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_8": {
+      "locked": {
         "lastModified": 1728888510,
         "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=",
         "owner": "NixOS",
@@ -367,7 +378,7 @@     },
     "nur": {
       "inputs": {
         "flake-parts": "flake-parts",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_5",
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
@@ -386,10 +397,7 @@       }
     },
     "pokego": {
       "inputs": {
-        "nixpkgs": [
-          "jolheiser",
-          "nixpkgs"
-        ]
+        "nixpkgs": "nixpkgs_6"
       },
       "locked": {
         "lastModified": 1741123315,
@@ -409,14 +417,12 @@     "root": {
       "inputs": {
         "agenix": "agenix",
         "cfg": "cfg",
-        "flake-utils": "flake-utils",
         "ghostty": "ghostty",
         "gomodinit": "gomodinit",
         "helix": "helix",
         "home-manager": "home-manager",
-        "jolheiser": "jolheiser_2",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_4",
         "nur": "nur",
         "pokego": "pokego",
         "spectre": "spectre",
@@ -425,9 +431,7 @@       }
     },
     "spectre": {
       "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
+        "nixpkgs": "nixpkgs_7"
       },
       "locked": {
         "lastModified": 1732207908,
@@ -490,10 +494,8 @@       }
     },
     "tclip": {
       "inputs": {
-        "nixpkgs": "nixpkgs_5",
-        "utils": [
-          "flake-utils"
-        ]
+        "nixpkgs": "nixpkgs_8",
+        "utils": "utils"
       },
       "locked": {
         "lastModified": 1733922802,
@@ -527,6 +529,24 @@       },
       "original": {
         "owner": "numtide",
         "repo": "treefmt-nix",
+        "type": "github"
+      }
+    },
+    "utils": {
+      "inputs": {
+        "systems": "systems_3"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
         "type": "github"
       }
     },
M flake.nixflake.nix
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
diff --git a/flake.nix b/flake.nix
index a761e2f50f707177460e3d78f222e751854a410c..a5e629ebc52b49b6164e7b60b6236a4fdfb9641f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,9 +3,6 @@   description = "jolheiser's nixos config";
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    jolheiser.url = "git+https://git.jolheiser.com/nixpkgs.git";
-    flake-utils.url = "github:numtide/flake-utils"; # Only expressed here to use for followers
-
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -13,40 +10,20 @@     };
     agenix = {
       url = "github:ryantm/agenix";
       inputs = {
-        nixpkgs.follows = "nixpkgs";
         darwin.follows = "";
-        home-manager.follows = "";
+        home-manager.follows = "home-manager";
+        nixpkgs.follows = "nixpkgs";
       };
     };
     nixos-hardware.url = "github:nixos/nixos-hardware/master";
     nur.url = "github:nix-community/NUR";
-    helix = {
-      url = "git+https://git.jolheiser.com/helix.drv.git";
-      inputs.nixpkgs.follows = "jolheiser/nixpkgs";
-    };
-    gomodinit = {
-      url = "git+https://git.jolheiser.com/gomodinit.git";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    cfg = {
-      url = "git+https://git.jolheiser.com/cfg.git";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    spectre = {
-      url = "git+https://git.jolheiser.com/go-spectre.git";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    pokego = {
-      url = "git+https://git.jolheiser.com/pokego.git";
-      inputs.nixpkgs.follows = "jolheiser/nixpkgs";
-    };
+    helix.url = "git+https://git.jolheiser.com/helix.drv.git";
+    gomodinit.url = "git+https://git.jolheiser.com/gomodinit.git";
+    cfg.url = "git+https://git.jolheiser.com/cfg.git";
+    spectre.url = "git+https://git.jolheiser.com/go-spectre.git";
+    pokego.url = "git+https://git.jolheiser.com/pokego.git";
     ghostty.url = "git+ssh://git@github.com/ghostty-org/ghostty";
-    tclip = {
-      url = "github:tailscale-dev/tclip";
-      inputs = {
-        utils.follows = "flake-utils";
-      };
-    };
+    tclip.url = "github:tailscale-dev/tclip";
   };
 
   outputs =
M machines/common/nogui/default.nixmachines/common/nogui/default.nix
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
diff --git a/machines/common/nogui/default.nix b/machines/common/nogui/default.nix
index 1a348a61a8a6ec070c47ba830f1a956127151440..d168dde1b0f9fafd683bd6e3a92986b2c2853e44 100644
--- a/machines/common/nogui/default.nix
+++ b/machines/common/nogui/default.nix
@@ -55,7 +55,7 @@       experimental-features = [
         "flakes"
         "nix-command"
       ];
-      auto-optimise-store = true;
+      optimise = true;
       warn-dirty = false;
       substituters = [ "https://jolheiser.cachix.org" ];
       trusted-public-keys = [ "jolheiser.cachix.org-1:fiKkfTuHFqDK5ZOVxcqb4InUkKsrTvtMLISid7XvuVg=" ];