authorgravatar for nmarks413@gmail.comNatalie Marks <nmarks413@gmail.com> 2025-08-01 19:21:02-07:00
committergravatar for nmarks413@gmail.comNatalie Marks <nmarks413@gmail.com> 2025-08-01 19:21:02-07:00
loga040cebe8e4f9dea894aa27b8982225b673fd6d2
treeae059123b5000cf2ef95a2f222fbc5a8c2c93a6c
parent5dc2d9d1daf45712c60239be1e4387d2b47e9b82
signature Commit is signed but in an unrecognized format.

various changes

7 files changed, 88 insertions(+), 162 deletions(-)

flake.lock+65-115
......@@ -15,11 +15,11 @@
1515 "sf-pro": "sf-pro"
1616 },
1717 "locked": {
18 "lastModified": 1748299691,
19 "narHash": "sha256-HMlx5HzeOOhpewq3y9UaSMP9AkhEo+AFJHZIWLQvJGw=",
18 "lastModified": 1752383772,
19 "narHash": "sha256-I5Y0gUJS85lGEuuKr+tKSRUpJWeKavE+WmiAHRcyBaU=",
2020 "owner": "Lyndeno",
2121 "repo": "apple-fonts.nix",
22 "rev": "ec51ae2e8ba89adbb5188c40aa262a7418c48b00",
22 "rev": "875c694d7f0ec2020d7511264907a1f0e3262931",
2323 "type": "github"
2424 },
2525 "original": {
......@@ -50,6 +50,22 @@
5050 }
5151 },
5252 "flake-compat": {
53 "flake": false,
54 "locked": {
55 "lastModified": 1751685974,
56 "narHash": "sha256-NKw96t+BgHIYzHUjkTK95FqYRVKB8DHpVhefWSz/kTw=",
57 "ref": "refs/heads/main",
58 "rev": "549f2762aebeff29a2e5ece7a7dc0f955281a1d1",
59 "revCount": 92,
60 "type": "git",
61 "url": "https://git.lix.systems/lix-project/flake-compat.git"
62 },
63 "original": {
64 "type": "git",
65 "url": "https://git.lix.systems/lix-project/flake-compat.git"
66 }
67 },
68 "flake-compat_2": {
5369 "flake": false,
5470 "locked": {
5571 "lastModified": 1696426674,
......@@ -65,7 +81,7 @@
6581 "type": "github"
6682 }
6783 },
68 "flake-compat_2": {
84 "flake-compat_3": {
6985 "flake": false,
7086 "locked": {
7187 "lastModified": 1696426674,
......@@ -83,14 +99,17 @@
8399 },
84100 "flake-parts": {
85101 "inputs": {
86 "nixpkgs-lib": "nixpkgs-lib"
102 "nixpkgs-lib": [
103 "nvf",
104 "nixpkgs"
105 ]
87106 },
88107 "locked": {
89 "lastModified": 1749398372,
90 "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=",
108 "lastModified": 1753121425,
109 "narHash": "sha256-TVcTNvOeWWk1DXljFxVRp+E0tzG1LhrVjOGGoMHuXio=",
91110 "owner": "hercules-ci",
92111 "repo": "flake-parts",
93 "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569",
112 "rev": "644e0fc48951a860279da645ba77fe4a6e814c5e",
94113 "type": "github"
95114 },
96115 "original": {
......@@ -137,25 +156,7 @@
137156 },
138157 "flake-utils_3": {
139158 "inputs": {
140 "systems": "systems_3"
141 },
142 "locked": {
143 "lastModified": 1731533236,
144 "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
145 "owner": "numtide",
146 "repo": "flake-utils",
147 "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
148 "type": "github"
149 },
150 "original": {
151 "owner": "numtide",
152 "repo": "flake-utils",
153 "type": "github"
154 }
155 },
156 "flake-utils_4": {
157 "inputs": {
158 "systems": "systems_5"
159 "systems": "systems_4"
159160 },
160161 "locked": {
161162 "lastModified": 1705309234,
......@@ -171,9 +172,9 @@
171172 "type": "github"
172173 }
173174 },
174 "flake-utils_5": {
175 "flake-utils_4": {
175176 "inputs": {
176 "systems": "systems_6"
177 "systems": "systems_5"
177178 },
178179 "locked": {
179180 "lastModified": 1710146030,
......@@ -189,9 +190,9 @@
189190 "type": "github"
190191 }
191192 },
192 "flake-utils_6": {
193 "flake-utils_5": {
193194 "inputs": {
194 "systems": "systems_7"
195 "systems": "systems_6"
195196 },
196197 "locked": {
197198 "lastModified": 1705309234,
......@@ -251,11 +252,11 @@
251252 ]
252253 },
253254 "locked": {
254 "lastModified": 1752093218,
255 "narHash": "sha256-+3rXu8ewcNDi65/2mKkdSGrivQs5zEZVp5aYszXC0d0=",
255 "lastModified": 1753943136,
256 "narHash": "sha256-eiEE5SabVcIlGSTRcRyBjmJMaYAV95SJnjy8YSsVeW4=",
256257 "owner": "nix-community",
257258 "repo": "home-manager",
258 "rev": "206ed3c71418b52e176f16f58805c96e84555320",
259 "rev": "bd82507edd860c453471c46957cbbe3c9fd01b5c",
259260 "type": "github"
260261 },
261262 "original": {
......@@ -300,11 +301,11 @@
300301 ]
301302 },
302303 "locked": {
303 "lastModified": 1752099881,
304 "narHash": "sha256-mn6f4ci5C2jkyxgmBHQ4dI9V0/20DlyS6EbQz4w7znc=",
304 "lastModified": 1753293216,
305 "narHash": "sha256-4hAm9PYNHAsR3MxH8MhSZt7mTiR8MlhyQilLJEPdaZs=",
305306 "owner": "moonlight-mod",
306307 "repo": "moonlight",
307 "rev": "dbef0c38e1c0066de5ec35a4d4219026b1bd7010",
308 "rev": "297a1b57c14ff18890382b2fe89f493ba349a730",
308309 "type": "github"
309310 },
310311 "original": {
......@@ -313,26 +314,6 @@
313314 "type": "github"
314315 }
315316 },
316 "nh": {
317 "inputs": {
318 "nixpkgs": [
319 "nixpkgs"
320 ]
321 },
322 "locked": {
323 "lastModified": 1751375534,
324 "narHash": "sha256-9z1W64dDVtVxqgPzUbjIQqRfygg1hdivUOZ6d/H+yFg=",
325 "owner": "viperML",
326 "repo": "nh",
327 "rev": "d0abb8eebe32f79ce4659e68dd777cf497a5d3d2",
328 "type": "github"
329 },
330 "original": {
331 "owner": "viperML",
332 "repo": "nh",
333 "type": "github"
334 }
335 },
336317 "nix-index-database": {
337318 "inputs": {
338319 "nixpkgs": [
......@@ -340,11 +321,11 @@
340321 ]
341322 },
342323 "locked": {
343 "lastModified": 1751774635,
344 "narHash": "sha256-DuOznGdgMxeSlPpUu6Wkq0ZD5e2Cfv9XRZeZlHWMd1s=",
324 "lastModified": 1753589988,
325 "narHash": "sha256-y1JlcMB2dKFkrr6g+Ucmj8L//IY09BtSKTH/A7OU7mU=",
345326 "owner": "nix-community",
346327 "repo": "nix-index-database",
347 "rev": "85686025ba6d18df31cc651a91d5adef63378978",
328 "rev": "f0736b09c43028fd726fb70c3eb3d1f0795454cf",
348329 "type": "github"
349330 },
350331 "original": {
......@@ -389,28 +370,13 @@
389370 "type": "github"
390371 }
391372 },
392 "nixpkgs-lib": {
393 "locked": {
394 "lastModified": 1748740939,
395 "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=",
396 "owner": "nix-community",
397 "repo": "nixpkgs.lib",
398 "rev": "656a64127e9d791a334452c6b6606d17539476e2",
399 "type": "github"
400 },
401 "original": {
402 "owner": "nix-community",
403 "repo": "nixpkgs.lib",
404 "type": "github"
405 }
406 },
407373 "nixpkgs_2": {
408374 "locked": {
409 "lastModified": 1751984180,
410 "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=",
375 "lastModified": 1753694789,
376 "narHash": "sha256-cKgvtz6fKuK1Xr5LQW/zOUiAC0oSQoA9nOISB0pJZqM=",
411377 "owner": "NixOS",
412378 "repo": "nixpkgs",
413 "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0",
379 "rev": "dc9637876d0dcc8c9e5e22986b857632effeb727",
414380 "type": "github"
415381 },
416382 "original": {
......@@ -453,20 +419,20 @@
453419 },
454420 "nvf": {
455421 "inputs": {
422 "flake-compat": "flake-compat",
456423 "flake-parts": "flake-parts",
457 "flake-utils": "flake-utils_3",
458424 "mnw": "mnw",
459425 "nixpkgs": [
460426 "nixpkgs"
461427 ],
462 "systems": "systems_4"
428 "systems": "systems_3"
463429 },
464430 "locked": {
465 "lastModified": 1752075018,
466 "narHash": "sha256-RJnQJooI1Jc7U4gvEKErbiIcgqGtEeUWddvxIjQfP58=",
431 "lastModified": 1753878721,
432 "narHash": "sha256-Y+Kr6FTHggnZ31nhaiOhIboIi+dhnLmQ9p0xf0wwnDc=",
467433 "owner": "notashelf",
468434 "repo": "nvf",
469 "rev": "9aa90885640d19b1375e6dec75c6cb125ac0f0c2",
435 "rev": "e35a74c44a35b28fd09f136dd3c0dbe9f300258f",
470436 "type": "github"
471437 },
472438 "original": {
......@@ -493,7 +459,6 @@
493459 "darwin": "darwin",
494460 "home-manager": "home-manager",
495461 "moonlight": "moonlight",
496 "nh": "nh",
497462 "nix-index-database": "nix-index-database",
498463 "nix-options-search": "nix-options-search",
499464 "nixpkgs": "nixpkgs_2",
......@@ -511,11 +476,11 @@
511476 ]
512477 },
513478 "locked": {
514 "lastModified": 1752028888,
515 "narHash": "sha256-LRj3/PUpII6taWOrX1w/OeI6f1ncND02PP/kEHvPCqU=",
479 "lastModified": 1753930086,
480 "narHash": "sha256-Os6Ta5zamfAllmQNlvkbGZLHn06zJy3hVXRk+Dy2yMo=",
516481 "owner": "oxalica",
517482 "repo": "rust-overlay",
518 "rev": "a0f1c656e053463b47639234b151a05e4441bb19",
483 "rev": "17b672c10c1798696a516cb879edbc2ebd0f58a4",
519484 "type": "github"
520485 },
521486 "original": {
......@@ -551,7 +516,7 @@
551516 "sf-compact": {
552517 "flake": false,
553518 "locked": {
554 "narHash": "sha256-J72Lyt2wy83E46wN8w6/Rih9kilM9wEjtY6KnbF0DsA=",
519 "narHash": "sha256-VMCf2Mhmx/qhLRQxlTAsQWxtonS27kPW+oTYBBRWHMg=",
555520 "type": "file",
556521 "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Compact.dmg"
557522 },
......@@ -599,7 +564,7 @@
599564 "sf-pro": {
600565 "flake": false,
601566 "locked": {
602 "narHash": "sha256-Q/pOQ4MGhW/ZtLka+UUQcwSoZFDWW34XvutxL4GvzUY=",
567 "narHash": "sha256-RX6X2ltVE88Hp1g9tpSywMT3UfdLpRxgw92KRpiAues=",
603568 "type": "file",
604569 "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg"
605570 },
......@@ -698,21 +663,6 @@
698663 "type": "github"
699664 }
700665 },
701 "systems_7": {
702 "locked": {
703 "lastModified": 1681028828,
704 "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
705 "owner": "nix-systems",
706 "repo": "default",
707 "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
708 "type": "github"
709 },
710 "original": {
711 "owner": "nix-systems",
712 "repo": "default",
713 "type": "github"
714 }
715 },
716666 "zen-browser": {
717667 "inputs": {
718668 "nixpkgs": [
......@@ -720,11 +670,11 @@
720670 ]
721671 },
722672 "locked": {
723 "lastModified": 1751688498,
724 "narHash": "sha256-6kYe6ozYDvsHAxV1zbSxg0oRWF4TzTfOUUJsR6MJlYY=",
673 "lastModified": 1753676490,
674 "narHash": "sha256-XeifEftxYGP/gzp6O1yO1S1W+MEx4Xvrgeu84ryRPNQ=",
725675 "owner": "youwen5",
726676 "repo": "zen-browser-flake",
727 "rev": "b5d422dc2b28eb77a21fbdf60aca9a6e63d5a1ab",
677 "rev": "77024f4557204bb4d526893d42db2e6f50727fab",
728678 "type": "github"
729679 },
730680 "original": {
......@@ -735,16 +685,16 @@
735685 },
736686 "zig": {
737687 "inputs": {
738 "flake-compat": "flake-compat",
739 "flake-utils": "flake-utils_4",
688 "flake-compat": "flake-compat_2",
689 "flake-utils": "flake-utils_3",
740690 "nixpkgs": "nixpkgs_3"
741691 },
742692 "locked": {
743 "lastModified": 1752063248,
744 "narHash": "sha256-albe9Q066T4IesTRfaNpEcNQ09ABwU6esFUDyfb472U=",
693 "lastModified": 1753963984,
694 "narHash": "sha256-JPiCLZHuNk11XYYCqoLoKYIgdUu2WpNccTzl4ljycTQ=",
745695 "owner": "mitchellh",
746696 "repo": "zig-overlay",
747 "rev": "6f9a3c160daca2a701a638a7ea7b0e675c1a1848",
697 "rev": "45772b76cdb103bd300abac4a85a34518dee65a0",
748698 "type": "github"
749699 },
750700 "original": {
......@@ -755,8 +705,8 @@
755705 },
756706 "zig-overlay": {
757707 "inputs": {
758 "flake-compat": "flake-compat_2",
759 "flake-utils": "flake-utils_6",
708 "flake-compat": "flake-compat_3",
709 "flake-utils": "flake-utils_5",
760710 "nixpkgs": [
761711 "zls",
762712 "nixpkgs"
......@@ -778,7 +728,7 @@
778728 },
779729 "zls": {
780730 "inputs": {
781 "flake-utils": "flake-utils_5",
731 "flake-utils": "flake-utils_4",
782732 "gitignore": "gitignore_2",
783733 "langref": "langref",
784734 "nixpkgs": "nixpkgs_4",
flake.nix-4
......@@ -28,8 +28,6 @@
2828 url = "github:youwen5/zen-browser-flake";
2929 inputs.nixpkgs.follows = "nixpkgs";
3030 };
31 nh.url = "github:viperML/nh";
32 nh.inputs.nixpkgs.follows = "nixpkgs";
3331
3432 nix-options-search.url = "github:madsbv/nix-options-search";
3533
......@@ -49,8 +47,6 @@
4947 overlays = [
5048 inputs.zig.overlays.default
5149 inputs.rust-overlay.overlays.default
52 inputs.nh.overlays.default
53 inputs.moonlight.overlays.default
5450
5551 # https://github.com/LnL7/nix-darwin/issues/1041
5652 (_: prev: {
users/natalie/laptop/configuration.nix+1
......@@ -28,6 +28,7 @@
2828 fi
2929 '';
3030 };
31 programs.fish.enable = true;
3132
3233 # Use homebrew to install casks
3334 homebrew = {
users/natalie/packages.nix+2-7
......@@ -26,7 +26,6 @@ with pkgs;
2626 qemu
2727 podman
2828 docker
29 devenv
3029
3130 #productivity
3231 glance
......@@ -59,10 +58,7 @@ with pkgs;
5958 imagemagick
6059
6160 #chatting apps
62 discord
63 # (discord.override {
64 # withMoonlight = true;
65 # })
61 (discord.override { withMoonlight = true; })
6662 vesktop
6763
6864 #media
......@@ -90,9 +86,8 @@ with pkgs;
9086 #programming languages
9187 deno
9288 ruby
93 nodePackages.npm
89 # nodePackages.npm
9490 go
95 coq
9691 elan
9792
9893 #browsers
users/natalie/vim/coq.nix deleted-16
......@@ -1,16 +0,0 @@
1{ pkgs, ... }:
2{
3
4 vim = {
5 # extraPackages = with pkgs; [
6 # coq_8_20
7 # coqPackages_8_20.stdlib
8 # ];
9 extraPlugins.Coqtail = {
10 # enabled = true;
11 package = pkgs.vimPlugins.Coqtail;
12 # lazy = true;
13 # ft = "coq";
14 };
15 };
16}
users/natalie/vim/default.nix-1
......@@ -5,7 +5,6 @@
55 ./languages.nix
66 ./latex.nix
77 ./lean.nix
8 ./coq.nix
98 ./visuals.nix
109 ./mini.nix
1110 ];
users/natalie/vim/languages.nix+20-19
......@@ -25,31 +25,32 @@
2525 settings.nixd = {
2626 nixpkgs.expr = ''import "${flake.inputs.nixpkgs}" { }'';
2727
28 options =
29 {
30 home-manager = {
31 expr = ''(let pkgs = import "${flake.inputs.nixpkgs}" { }; lib = import "${flake.inputs.home-manager}/modules/lib/stdlib-extended.nix" pkgs.lib; in (lib.evalModules { modules = (import "${flake.inputs.home-manager}/modules/modules.nix") { inherit lib pkgs;check = false;}; })).options'';
32 # (builtins.getFlake "${flakePath}").${darwin}Configurations.${hostname}.options.home-manager.users.type.getSubOptions [ ]'';
33 };
34 }
35 // pkgs.lib.optionalAttrs host.darwin {
36 nix-darwin = {
37 expr = ''(let pkgs = import "${flake.inputs.nixpkgs}" { }; in (pkgs.lib.evalModules { modules = (import "${flake.inputs.darwin}/modules/module-list.nix"); check = false;})).options'';
38 # (builtins.getFlake "${flakePath}").darwinConfigurations.${hostname}.options'';
39 };
40 }
41 // pkgs.lib.optionalAttrs host.linux {
42 nixos = {
43 expr = ''(let pkgs = import "${flake.inputs.nixpkgs}" { }; in (pkgs.lib.evalModules { modules = (import "${flake.inputs.nixpkgs}/nixos/modules/module-list.nix"); check = false;})).options'';
44 # (builtins.getFlake "${flakePath}").nixosConfigurations.${hostname}.options'';
45 };
28 options = {
29 home-manager = {
30 expr = ''(let pkgs = import "${flake.inputs.nixpkgs}" { }; lib = import "${flake.inputs.home-manager}/modules/lib/stdlib-extended.nix" pkgs.lib; in (lib.evalModules { modules = (import "${flake.inputs.home-manager}/modules/modules.nix") { inherit lib pkgs;check = false;}; })).options'';
31 # (builtins.getFlake "${flakePath}").${darwin}Configurations.${hostname}.options.home-manager.users.type.getSubOptions [ ]'';
4632 };
33 }
34 // pkgs.lib.optionalAttrs host.darwin {
35 nix-darwin = {
36 expr = ''(let pkgs = import "${flake.inputs.nixpkgs}" { }; in (pkgs.lib.evalModules { modules = (import "${flake.inputs.darwin}/modules/module-list.nix"); check = false;})).options'';
37 # (builtins.getFlake "${flakePath}").darwinConfigurations.${hostname}.options'';
38 };
39 }
40 // pkgs.lib.optionalAttrs host.linux {
41 nixos = {
42 expr = ''(let pkgs = import "${flake.inputs.nixpkgs}" { }; in (pkgs.lib.evalModules { modules = (import "${flake.inputs.nixpkgs}/nixos/modules/module-list.nix"); check = false;})).options'';
43 # (builtins.getFlake "${flakePath}").nixosConfigurations.${hostname}.options'';
44 };
45 };
4746 };
4847 };
4948 };
5049 };
5150 languages = {
52 python.format.type = "ruff";
51 python = {
52 format.type = "ruff";
53 };
5354 markdown = {
5455 enable = true;
5556 extensions.render-markdown-nvim = {