authorgravatar for git@paperclover.netclover caruso <git@paperclover.net> 2025-07-04 22:51:18-07:00
committergravatar for git@paperclover.netclover caruso <git@paperclover.net> 2025-07-04 22:51:18-07:00
log171bdea72d259200a21d02518ba6c5e654c9bb9d
tree14d938d9a6f321a1af86d4f73607363cfeb3139a
parent90fa812e6a8a7032ad4b95f7ba20802b4e1e124e

remove lix


4 files changed, 17 insertions(+), 115 deletions(-)

flake.lock+17-101
...@@ -103,24 +103,6 @@...@@ -103,24 +103,6 @@
103 "inputs": {103 "inputs": {
104 "systems": "systems"104 "systems": "systems"
105 },105 },
106 "locked": {
107 "lastModified": 1731533236,
108 "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
109 "owner": "numtide",
110 "repo": "flake-utils",
111 "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
112 "type": "github"
113 },
114 "original": {
115 "owner": "numtide",
116 "repo": "flake-utils",
117 "type": "github"
118 }
119 },
120 "flake-utils_2": {
121 "inputs": {
122 "systems": "systems_2"
123 },
124 "locked": {106 "locked": {
125 "lastModified": 1701680307,107 "lastModified": 1701680307,
126 "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",108 "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
...@@ -135,9 +117,9 @@...@@ -135,9 +117,9 @@
135 "type": "github"117 "type": "github"
136 }118 }
137 },119 },
138 "flake-utils_3": {120 "flake-utils_2": {
139 "inputs": {121 "inputs": {
140 "systems": "systems_3"122 "systems": "systems_2"
141 },123 },
142 "locked": {124 "locked": {
143 "lastModified": 1731533236,125 "lastModified": 1731533236,
...@@ -153,9 +135,9 @@...@@ -153,9 +135,9 @@
153 "type": "github"135 "type": "github"
154 }136 }
155 },137 },
156 "flake-utils_4": {138 "flake-utils_3": {
157 "inputs": {139 "inputs": {
158 "systems": "systems_4"140 "systems": "systems_3"
159 },141 },
160 "locked": {142 "locked": {
161 "lastModified": 1731533236,143 "lastModified": 1731533236,
...@@ -171,9 +153,9 @@...@@ -171,9 +153,9 @@
171 "type": "github"153 "type": "github"
172 }154 }
173 },155 },
174 "flake-utils_5": {156 "flake-utils_4": {
175 "inputs": {157 "inputs": {
176 "systems": "systems_6"158 "systems": "systems_5"
177 },159 },
178 "locked": {160 "locked": {
179 "lastModified": 1705309234,161 "lastModified": 1705309234,
...@@ -189,9 +171,9 @@...@@ -189,9 +171,9 @@
189 "type": "github"171 "type": "github"
190 }172 }
191 },173 },
192 "flake-utils_6": {174 "flake-utils_5": {
193 "inputs": {175 "inputs": {
194 "systems": "systems_7"176 "systems": "systems_6"
195 },177 },
196 "locked": {178 "locked": {
197 "lastModified": 1710146030,179 "lastModified": 1710146030,
...@@ -207,9 +189,9 @@...@@ -207,9 +189,9 @@
207 "type": "github"189 "type": "github"
208 }190 }
209 },191 },
210 "flake-utils_7": {192 "flake-utils_6": {
211 "inputs": {193 "inputs": {
212 "systems": "systems_8"194 "systems": "systems_7"
213 },195 },
214 "locked": {196 "locked": {
215 "lastModified": 1705309234,197 "lastModified": 1705309234,
...@@ -225,21 +207,6 @@...@@ -225,21 +207,6 @@
225 "type": "github"207 "type": "github"
226 }208 }
227 },209 },
228 "flakey-profile": {
229 "locked": {
230 "lastModified": 1712898590,
231 "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=",
232 "owner": "lf-",
233 "repo": "flakey-profile",
234 "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d",
235 "type": "github"
236 },
237 "original": {
238 "owner": "lf-",
239 "repo": "flakey-profile",
240 "type": "github"
241 }
242 },
243 "gitignore": {210 "gitignore": {
244 "flake": false,211 "flake": false,
245 "locked": {212 "locked": {
...@@ -310,41 +277,6 @@...@@ -310,41 +277,6 @@
310 "url": "https://raw.githubusercontent.com/ziglang/zig/0fb2015fd3422fc1df364995f9782dfe7255eccd/doc/langref.html.in"277 "url": "https://raw.githubusercontent.com/ziglang/zig/0fb2015fd3422fc1df364995f9782dfe7255eccd/doc/langref.html.in"
311 }278 }
312 },279 },
313 "lix": {
314 "flake": false,
315 "locked": {
316 "lastModified": 1746827285,
317 "narHash": "sha256-hsFe4Tsqqg4l+FfQWphDtjC79WzNCZbEFhHI8j2KJzw=",
318 "rev": "47aad376c87e2e65967f17099277428e4b3f8e5a",
319 "type": "tarball",
320 "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/47aad376c87e2e65967f17099277428e4b3f8e5a.tar.gz?rev=47aad376c87e2e65967f17099277428e4b3f8e5a"
321 },
322 "original": {
323 "type": "tarball",
324 "url": "https://git.lix.systems/lix-project/lix/archive/2.93.0.tar.gz"
325 }
326 },
327 "lix-module": {
328 "inputs": {
329 "flake-utils": "flake-utils",
330 "flakey-profile": "flakey-profile",
331 "lix": "lix",
332 "nixpkgs": [
333 "nixpkgs"
334 ]
335 },
336 "locked": {
337 "lastModified": 1746838955,
338 "narHash": "sha256-11R4K3iAx4tLXjUs+hQ5K90JwDABD/XHhsM9nkeS5N8=",
339 "rev": "cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc",
340 "type": "tarball",
341 "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc.tar.gz?rev=cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc"
342 },
343 "original": {
344 "type": "tarball",
345 "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz"
346 }
347 },
348 "mnw": {280 "mnw": {
349 "locked": {281 "locked": {
350 "lastModified": 1748710831,282 "lastModified": 1748710831,
...@@ -362,7 +294,7 @@...@@ -362,7 +294,7 @@
362 },294 },
363 "moonlight": {295 "moonlight": {
364 "inputs": {296 "inputs": {
365 "flake-utils": "flake-utils_2",297 "flake-utils": "flake-utils",
366 "nixpkgs": [298 "nixpkgs": [
367 "nixpkgs"299 "nixpkgs"
368 ]300 ]
...@@ -444,7 +376,7 @@...@@ -444,7 +376,7 @@
444 },376 },
445 "nix-options-search": {377 "nix-options-search": {
446 "inputs": {378 "inputs": {
447 "flake-utils": "flake-utils_3",379 "flake-utils": "flake-utils_2",
448 "gitignore": "gitignore",380 "gitignore": "gitignore",
449 "nixpkgs": "nixpkgs"381 "nixpkgs": "nixpkgs"
450 },382 },
...@@ -543,13 +475,13 @@...@@ -543,13 +475,13 @@
543 "nvf": {475 "nvf": {
544 "inputs": {476 "inputs": {
545 "flake-parts": "flake-parts",477 "flake-parts": "flake-parts",
546 "flake-utils": "flake-utils_4",478 "flake-utils": "flake-utils_3",
547 "mnw": "mnw",479 "mnw": "mnw",
548 "nil": "nil",480 "nil": "nil",
549 "nixpkgs": [481 "nixpkgs": [
550 "nixpkgs"482 "nixpkgs"
551 ],483 ],
552 "systems": "systems_5"484 "systems": "systems_4"
553 },485 },
554 "locked": {486 "locked": {
555 "lastModified": 1751186226,487 "lastModified": 1751186226,
...@@ -582,7 +514,6 @@...@@ -582,7 +514,6 @@
582 "apple-fonts": "apple-fonts",514 "apple-fonts": "apple-fonts",
583 "darwin": "darwin",515 "darwin": "darwin",
584 "home-manager": "home-manager",516 "home-manager": "home-manager",
585 "lix-module": "lix-module",
586 "moonlight": "moonlight",517 "moonlight": "moonlight",
587 "nh": "nh",518 "nh": "nh",
588 "nix-index-database": "nix-index-database",519 "nix-index-database": "nix-index-database",
...@@ -804,21 +735,6 @@...@@ -804,21 +735,6 @@
804 "type": "github"735 "type": "github"
805 }736 }
806 },737 },
807 "systems_8": {
808 "locked": {
809 "lastModified": 1681028828,
810 "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
811 "owner": "nix-systems",
812 "repo": "default",
813 "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
814 "type": "github"
815 },
816 "original": {
817 "owner": "nix-systems",
818 "repo": "default",
819 "type": "github"
820 }
821 },
822 "zen-browser": {738 "zen-browser": {
823 "inputs": {739 "inputs": {
824 "nixpkgs": [740 "nixpkgs": [
...@@ -842,7 +758,7 @@...@@ -842,7 +758,7 @@
842 "zig": {758 "zig": {
843 "inputs": {759 "inputs": {
844 "flake-compat": "flake-compat",760 "flake-compat": "flake-compat",
845 "flake-utils": "flake-utils_5",761 "flake-utils": "flake-utils_4",
846 "nixpkgs": "nixpkgs_3"762 "nixpkgs": "nixpkgs_3"
847 },763 },
848 "locked": {764 "locked": {
...@@ -862,7 +778,7 @@...@@ -862,7 +778,7 @@
862 "zig-overlay": {778 "zig-overlay": {
863 "inputs": {779 "inputs": {
864 "flake-compat": "flake-compat_2",780 "flake-compat": "flake-compat_2",
865 "flake-utils": "flake-utils_7",781 "flake-utils": "flake-utils_6",
866 "nixpkgs": [782 "nixpkgs": [
867 "zls",783 "zls",
868 "nixpkgs"784 "nixpkgs"
...@@ -884,7 +800,7 @@...@@ -884,7 +800,7 @@
884 },800 },
885 "zls": {801 "zls": {
886 "inputs": {802 "inputs": {
887 "flake-utils": "flake-utils_6",803 "flake-utils": "flake-utils_5",
888 "gitignore": "gitignore_2",804 "gitignore": "gitignore_2",
889 "langref": "langref",805 "langref": "langref",
890 "nixpkgs": "nixpkgs_4",806 "nixpkgs": "nixpkgs_4",
flake.nix-7
...@@ -3,11 +3,6 @@...@@ -3,11 +3,6 @@
3 inputs = {3 inputs = {
4 nixpkgs.url = "nixpkgs/nixos-unstable";4 nixpkgs.url = "nixpkgs/nixos-unstable";
55
6 lix-module = {
7 url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz";
8 inputs.nixpkgs.follows = "nixpkgs";
9 };
10
11 home-manager.url = "github:nix-community/home-manager/master";6 home-manager.url = "github:nix-community/home-manager/master";
12 home-manager.inputs.nixpkgs.follows = "nixpkgs";7 home-manager.inputs.nixpkgs.follows = "nixpkgs";
138
...@@ -45,7 +40,6 @@...@@ -45,7 +40,6 @@
45 {40 {
46 self,41 self,
47 nixpkgs,42 nixpkgs,
48 lix-module,
49 darwin,43 darwin,
50 ...44 ...
51 }@inputs:45 }@inputs:
...@@ -94,7 +88,6 @@...@@ -94,7 +88,6 @@
94 inherit88 inherit
95 overlays89 overlays
96 nixpkgs90 nixpkgs
97 lix-module
98 inputs91 inputs
99 mkNeovim92 mkNeovim
100 ;93 ;
lib/mkSystem.nix-6
...@@ -2,7 +2,6 @@...@@ -2,7 +2,6 @@
2# particular architecture.2# particular architecture.
3{3{
4 nixpkgs,4 nixpkgs,
5 lix-module,
6 overlays,5 overlays,
7 inputs,6 inputs,
8 mkNeovim,7 mkNeovim,
...@@ -87,11 +86,6 @@ systemFunc {...@@ -87,11 +86,6 @@ systemFunc {
87 # the overlays are available globally.86 # the overlays are available globally.
88 { nixpkgs.overlays = overlays; }87 { nixpkgs.overlays = overlays; }
8988
90 # Use lix (alternative nix implementation)
91 # https://lix.systems/add-to-config/#flake-based-configurations
92 lix-module.nixosModules.default
93 # (getInputModule "lix-module" "default")
94
95 # Modules shared between nix-darwin and NixOS89 # Modules shared between nix-darwin and NixOS
96 ../modules/shared90 ../modules/shared
97 # Modules for the specific OS91 # Modules for the specific OS
users/natalie/packages.nix-1
...@@ -35,7 +35,6 @@ with pkgs;...@@ -35,7 +35,6 @@ with pkgs;
35 #nix tools35 #nix tools
36 direnv36 direnv
37 nh37 nh
38 (lix.override { aws-sdk-cpp = null; })
3938
40 #terminal stuff39 #terminal stuff
41 (btop.override { cudaSupport = true; })40 (btop.override { cudaSupport = true; })