authorgravatar for nmarks413@gmail.comNatalie Marks <nmarks413@gmail.com> 2025-05-21 11:55:34-07:00
committergravatar for nmarks413@gmail.comNatalie Marks <nmarks413@gmail.com> 2025-05-21 11:55:34-07:00
logfa17ce8f5b8e41f35c8367a1705a9c8369d2fff8
tree238ca313781963708f52376d33f8b47e50927d82
parent6fea0a1f4e10affd9f1a3fbdec86a1a82564570b
signature Commit is signed but in an unrecognized format.

update flake

4 files changed, 79 insertions(+), 97 deletions(-)

flake.lock+65-85
......@@ -33,11 +33,11 @@
3333 "fromYaml": "fromYaml"
3434 },
3535 "locked": {
36 "lastModified": 1745523430,
37 "narHash": "sha256-EAYWV+kXbwsH+8G/8UtmcunDeKwLwSOyfcmzZUkWE/c=",
36 "lastModified": 1746562888,
37 "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=",
3838 "owner": "SenchoPens",
3939 "repo": "base16.nix",
40 "rev": "58bfe2553d937d8af0564f79d5b950afbef69717",
40 "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89",
4141 "type": "github"
4242 },
4343 "original": {
......@@ -102,11 +102,11 @@
102102 ]
103103 },
104104 "locked": {
105 "lastModified": 1746254942,
106 "narHash": "sha256-Y062AuRx6l+TJNX8wxZcT59SSLsqD9EedAY0mqgTtQE=",
105 "lastModified": 1747820204,
106 "narHash": "sha256-oY/mH8K1LOd+YbO58sw9ORtOdTxy3rR9lvTzOJKVUtA=",
107107 "owner": "lnl7",
108108 "repo": "nix-darwin",
109 "rev": "760a11c87009155afa0140d55c40e7c336d62d7a",
109 "rev": "e2676937faf868111dcea6a4a9cf4b6549907c9d",
110110 "type": "github"
111111 },
112112 "original": {
......@@ -217,7 +217,6 @@
217217 "inputs": {
218218 "nixpkgs-lib": [
219219 "stylix",
220 "nur",
221220 "nixpkgs"
222221 ]
223222 },
......@@ -290,27 +289,6 @@
290289 }
291290 },
292291 "flake-utils_4": {
293 "inputs": {
294 "systems": [
295 "stylix",
296 "systems"
297 ]
298 },
299 "locked": {
300 "lastModified": 1731533236,
301 "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
302 "owner": "numtide",
303 "repo": "flake-utils",
304 "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
305 "type": "github"
306 },
307 "original": {
308 "owner": "numtide",
309 "repo": "flake-utils",
310 "type": "github"
311 }
312 },
313 "flake-utils_5": {
314292 "inputs": {
315293 "systems": "systems_6"
316294 },
......@@ -328,7 +306,7 @@
328306 "type": "github"
329307 }
330308 },
331 "flake-utils_6": {
309 "flake-utils_5": {
332310 "inputs": {
333311 "systems": "systems_7"
334312 },
......@@ -346,7 +324,7 @@
346324 "type": "github"
347325 }
348326 },
349 "flake-utils_7": {
327 "flake-utils_6": {
350328 "inputs": {
351329 "systems": "systems_8"
352330 },
......@@ -468,16 +446,16 @@
468446 "gnome-shell": {
469447 "flake": false,
470448 "locked": {
471 "lastModified": 1732369855,
472 "narHash": "sha256-JhUWbcYPjHO3Xs3x9/Z9RuqXbcp5yhPluGjwsdE2GMg=",
449 "lastModified": 1744584021,
450 "narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=",
473451 "owner": "GNOME",
474452 "repo": "gnome-shell",
475 "rev": "dadd58f630eeea41d645ee225a63f719390829dc",
453 "rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae",
476454 "type": "github"
477455 },
478456 "original": {
479457 "owner": "GNOME",
480 "ref": "47.2",
458 "ref": "48.1",
481459 "repo": "gnome-shell",
482460 "type": "github"
483461 }
......@@ -489,11 +467,11 @@
489467 ]
490468 },
491469 "locked": {
492 "lastModified": 1746632058,
493 "narHash": "sha256-Mp5Bbvb+YlFEZ76C/0wFS6C1lRfH3D60u465wFNlnS0=",
470 "lastModified": 1747834438,
471 "narHash": "sha256-AHJt79W8wADzur2htCx1U8FtEk4XjvrHb9/3iDfNedI=",
494472 "owner": "nix-community",
495473 "repo": "home-manager",
496 "rev": "708074ae6db9e0468e4f48477f856e8c2d059795",
474 "rev": "6c2eb1e24cd0e76d88bdd633ef4c50d6286586e0",
497475 "type": "github"
498476 },
499477 "original": {
......@@ -511,11 +489,11 @@
511489 ]
512490 },
513491 "locked": {
514 "lastModified": 1746369725,
515 "narHash": "sha256-m3ai7LLFYsymMK0uVywCceWfUhP0k3CALyFOfcJACqE=",
492 "lastModified": 1747763032,
493 "narHash": "sha256-9j3oCbemeH7bTVXJ3pDWxOptbxDx2SdK1jY2AHpjQiw=",
516494 "owner": "nix-community",
517495 "repo": "home-manager",
518 "rev": "1a1793f6d940d22c6e49753548c5b6cb7dc5545d",
496 "rev": "29dda415f5b2178278283856c6f9f7b48a2a4353",
519497 "type": "github"
520498 },
521499 "original": {
......@@ -538,11 +516,11 @@
538516 },
539517 "mnw": {
540518 "locked": {
541 "lastModified": 1746338991,
542 "narHash": "sha256-GbyoHjf14LOxZQc+0NFblI4xf/uwGrYo3W8lwE4HcwI=",
519 "lastModified": 1747499976,
520 "narHash": "sha256-YTiSI4WLbk0CleXeBheYmKZV6iqKyBpyoh1e+vcQzu4=",
543521 "owner": "Gerg-L",
544522 "repo": "mnw",
545 "rev": "c65407ee9387ef75985dad3e30f58c822c766ec1",
523 "rev": "72433a144c4ac16931e9148f78db4a0e4c147441",
546524 "type": "github"
547525 },
548526 "original": {
......@@ -559,11 +537,11 @@
559537 ]
560538 },
561539 "locked": {
562 "lastModified": 1745980935,
563 "narHash": "sha256-aLx/HDrnGTgcRZFs5kiiz173yi/RnARERDKIq+p4OJw=",
540 "lastModified": 1747413594,
541 "narHash": "sha256-cFsVYlIkSNEpGw4qT9Eea6sa1+dZyaCRZNrgQTc8wu4=",
564542 "owner": "moonlight-mod",
565543 "repo": "moonlight",
566 "rev": "f2395a937ca7e4e933a44e71eb38a4c621125595",
544 "rev": "fc7c0119e923d50ce8873ea654fa7542f60be27f",
567545 "type": "github"
568546 },
569547 "original": {
......@@ -579,11 +557,11 @@
579557 ]
580558 },
581559 "locked": {
582 "lastModified": 1746442382,
583 "narHash": "sha256-lFUHQdnDqnXXzigQn6Kd4aVrDDjg80HAb7DfThQNC/I=",
560 "lastModified": 1747847914,
561 "narHash": "sha256-Ut9RZVAaKUD4A3RrXP5RhNVZ+LVy5mL4mMmiTDWaQE8=",
584562 "owner": "viperML",
585563 "repo": "nh",
586 "rev": "4eb1941c2e30f3dabbf24619c7ca7303c448983d",
564 "rev": "45048d3e9f183f3f09fddf667841b7327c04ad8f",
587565 "type": "github"
588566 },
589567 "original": {
......@@ -625,11 +603,11 @@
625603 ]
626604 },
627605 "locked": {
628 "lastModified": 1746330942,
629 "narHash": "sha256-ShizFaJCAST23tSrHHtFFGF0fwd72AG+KhPZFFQX/0o=",
606 "lastModified": 1747540584,
607 "narHash": "sha256-cxCQ413JTUuRv9Ygd8DABJ1D6kuB/nTfQqC0Lu9C0ls=",
630608 "owner": "nix-community",
631609 "repo": "nix-index-database",
632 "rev": "137fd2bd726fff343874f85601b51769b48685cc",
610 "rev": "ec179dd13fb7b4c6844f55be91436f7857226dce",
633611 "type": "github"
634612 },
635613 "original": {
......@@ -668,11 +646,11 @@
668646 "rust-overlay": "rust-overlay"
669647 },
670648 "locked": {
671 "lastModified": 1746628701,
672 "narHash": "sha256-kyVvluIygGCuLDd/RTm4QVcVdhYuBuW5/RlUpiCYJMQ=",
649 "lastModified": 1747826251,
650 "narHash": "sha256-Fe4AXmnnAKnh/wIe1ao4Pv/8m6WGA1ujwp6VApgos30=",
673651 "owner": "lilyinstarlight",
674652 "repo": "nixos-cosmic",
675 "rev": "b8e92345fb75ed4c8b4a172a344c92f962593af7",
653 "rev": "9a67b4a289cd8994080398d40b57cfde8e8cfb0a",
676654 "type": "github"
677655 },
678656 "original": {
......@@ -714,11 +692,11 @@
714692 },
715693 "nixpkgs-stable": {
716694 "locked": {
717 "lastModified": 1746557022,
718 "narHash": "sha256-QkNoyEf6TbaTW5UZYX0OkwIJ/ZMeKSSoOMnSDPQuol0=",
695 "lastModified": 1747676747,
696 "narHash": "sha256-LXkWBVqilgx7Pohwqu/ABxDVw+Cmi5/Mj2S2mpUH0Fw=",
719697 "owner": "NixOS",
720698 "repo": "nixpkgs",
721 "rev": "1d3aeb5a193b9ff13f63f4d9cc169fb88129f860",
699 "rev": "72841a4a8761d1aed92ef6169a636872c986c76d",
722700 "type": "github"
723701 },
724702 "original": {
......@@ -745,11 +723,11 @@
745723 },
746724 "nixpkgs_2": {
747725 "locked": {
748 "lastModified": 1746461020,
749 "narHash": "sha256-7+pG1I9jvxNlmln4YgnlW4o+w0TZX24k688mibiFDUE=",
726 "lastModified": 1747744144,
727 "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=",
750728 "owner": "NixOS",
751729 "repo": "nixpkgs",
752 "rev": "3730d8a308f94996a9ba7c7138ede69c1b9ac4ae",
730 "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f",
753731 "type": "github"
754732 },
755733 "original": {
......@@ -792,7 +770,10 @@
792770 },
793771 "nur": {
794772 "inputs": {
795 "flake-parts": "flake-parts_2",
773 "flake-parts": [
774 "stylix",
775 "flake-parts"
776 ],
796777 "nixpkgs": [
797778 "stylix",
798779 "nixpkgs"
......@@ -825,11 +806,11 @@
825806 "systems": "systems_4"
826807 },
827808 "locked": {
828 "lastModified": 1746940940,
829 "narHash": "sha256-ASB3QVEoFK5//280uedYdt8jyDLhFa9zgj8qfc0S7Sk=",
809 "lastModified": 1747525582,
810 "narHash": "sha256-oEZ6DV4bPcNZIuwW5Kcd+/zT3PMkXse2kX/3jHoomGk=",
830811 "owner": "notashelf",
831812 "repo": "nvf",
832 "rev": "815ed49d3693346122ef61da6d7443cd3cc21752",
813 "rev": "d3a0e7029ac57eef1120225973247851c5b967b5",
833814 "type": "github"
834815 },
835816 "original": {
......@@ -877,11 +858,11 @@
877858 ]
878859 },
879860 "locked": {
880 "lastModified": 1746585402,
881 "narHash": "sha256-Pf+ufu6bYNA1+KQKHnGMNEfTwpD9ZIcAeLoE2yPWIP0=",
861 "lastModified": 1747795013,
862 "narHash": "sha256-c7i0xJ+xFhgjO9SWHYu5dF/7lq63RPDvwKAdjc6VCE4=",
882863 "owner": "oxalica",
883864 "repo": "rust-overlay",
884 "rev": "72dd969389583664f87aa348b3458f2813693617",
865 "rev": "6b1cf12374361859242a562e1933a7930649131a",
885866 "type": "github"
886867 },
887868 "original": {
......@@ -919,11 +900,11 @@
919900 ]
920901 },
921902 "locked": {
922 "lastModified": 1746585402,
923 "narHash": "sha256-Pf+ufu6bYNA1+KQKHnGMNEfTwpD9ZIcAeLoE2yPWIP0=",
903 "lastModified": 1747795013,
904 "narHash": "sha256-c7i0xJ+xFhgjO9SWHYu5dF/7lq63RPDvwKAdjc6VCE4=",
924905 "owner": "oxalica",
925906 "repo": "rust-overlay",
926 "rev": "72dd969389583664f87aa348b3458f2813693617",
907 "rev": "6b1cf12374361859242a562e1933a7930649131a",
927908 "type": "github"
928909 },
929910 "original": {
......@@ -1024,7 +1005,7 @@
10241005 "base16-vim": "base16-vim",
10251006 "firefox-gnome-theme": "firefox-gnome-theme",
10261007 "flake-compat": "flake-compat_2",
1027 "flake-utils": "flake-utils_4",
1008 "flake-parts": "flake-parts_2",
10281009 "git-hooks": "git-hooks",
10291010 "gnome-shell": "gnome-shell",
10301011 "home-manager": "home-manager_2",
......@@ -1040,11 +1021,11 @@
10401021 "tinted-zed": "tinted-zed"
10411022 },
10421023 "locked": {
1043 "lastModified": 1746575057,
1044 "narHash": "sha256-kBlPMNZXPzDG4HUmdqYpvjvVYkoDdDrVvO14cKgHaiU=",
1024 "lastModified": 1747847674,
1025 "narHash": "sha256-XYVaUKQrda7WOSonewDtpvm8tENIcwWrErobUYMTMoc=",
10451026 "owner": "danth",
10461027 "repo": "stylix",
1047 "rev": "685deb9bae2e4c463e953ff39bd54fd448feaf05",
1028 "rev": "4ce349da56e075f7e3456b48731cbbf5ae8b1eb8",
10481029 "type": "github"
10491030 },
10501031 "original": {
......@@ -1193,17 +1174,16 @@
11931174 "tinted-kitty": {
11941175 "flake": false,
11951176 "locked": {
1196 "lastModified": 1716423189,
1197 "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=",
1177 "lastModified": 1735730497,
1178 "narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=",
11981179 "owner": "tinted-theming",
11991180 "repo": "tinted-kitty",
1200 "rev": "eb39e141db14baef052893285df9f266df041ff8",
1181 "rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa",
12011182 "type": "github"
12021183 },
12031184 "original": {
12041185 "owner": "tinted-theming",
12051186 "repo": "tinted-kitty",
1206 "rev": "eb39e141db14baef052893285df9f266df041ff8",
12071187 "type": "github"
12081188 }
12091189 },
......@@ -1280,15 +1260,15 @@
12801260 "zig": {
12811261 "inputs": {
12821262 "flake-compat": "flake-compat_3",
1283 "flake-utils": "flake-utils_5",
1263 "flake-utils": "flake-utils_4",
12841264 "nixpkgs": "nixpkgs_3"
12851265 },
12861266 "locked": {
1287 "lastModified": 1746533648,
1288 "narHash": "sha256-tdYkRMWaPfF8EUTyZVFjhBA4m8vay2T0zRICsM/y1A4=",
1267 "lastModified": 1747829603,
1268 "narHash": "sha256-H8Vj7GSOyHgAUTDM/EkkdiTyEZg2C1UUlsp/fDSbxNQ=",
12891269 "owner": "mitchellh",
12901270 "repo": "zig-overlay",
1291 "rev": "3cf5310e0b70cd7c4d0fffc6d3e16bb8429d8da5",
1271 "rev": "53899a028ece2f77939c08c59d547416a59086c0",
12921272 "type": "github"
12931273 },
12941274 "original": {
......@@ -1300,7 +1280,7 @@
13001280 "zig-overlay": {
13011281 "inputs": {
13021282 "flake-compat": "flake-compat_4",
1303 "flake-utils": "flake-utils_7",
1283 "flake-utils": "flake-utils_6",
13041284 "nixpkgs": [
13051285 "zls",
13061286 "nixpkgs"
......@@ -1322,7 +1302,7 @@
13221302 },
13231303 "zls": {
13241304 "inputs": {
1325 "flake-utils": "flake-utils_6",
1305 "flake-utils": "flake-utils_5",
13261306 "gitignore": "gitignore_3",
13271307 "langref": "langref",
13281308 "nixpkgs": "nixpkgs_4",
modules/macos/system.nix+4-4
......@@ -1,13 +1,12 @@
11{
2 user,
23 config,
34 pkgs,
45 lib,
56 ...
6}:
7let
7}: let
88 tiling = config.shared.darwin.tiling.enable;
9in
10{
9in {
1110 # Use touchid or watch to activate sudo
1211 security.pam.services.sudo_local = {
1312 enable = true;
......@@ -17,6 +16,7 @@ in
1716
1817 # Set some OSX preferences that I always end up hunting down and changing.
1918 system = {
19 primaryUser = user.username;
2020 # Used for backwards compatibility, please read the changelog before changing.
2121 # $ darwin-rebuild changelog
2222 stateVersion = 6;
users/natalie/vim.nix+4-8
......@@ -10,17 +10,13 @@
1010 undofile = true;
1111 swapfile = false;
1212 showmode = false;
13 foldmethod = "expr";
14 foldexpr = "v:lua.vim.treesitter.foldexpr()";
13 foldlevel = 99;
14 foldcolumn = "1";
15 foldlevelstart = 99;
16 foldenable = true;
1517 };
1618
1719 autocmds = [
18 {
19 event = ["LspAttach"];
20 pattern = ["*"];
21 desc = "User: Set LSP folding if client supports it";
22 callback = pkgs.lib.generators.mkLuaInline ''function(ctx) local client = assert(vim.lsp.get_client_by_id(ctx.data.client_id)) if client:supports_method("textDocument/foldingRange") then local win = vim.api.nvim_get_current_win() vim.wo[win][0].foldexpr = "v:lua.vim.lsp.foldexpr()" end end'';
23 }
2420 ];
2521 theme = {
2622 name = "catppuccin";
users/natalie/vim/languages.nix+6
......@@ -132,6 +132,12 @@ in {
132132 };
133133 };
134134 };
135
136 ui = {
137 nvim-ufo = {
138 enable = true;
139 };
140 };
135141 autocomplete.blink-cmp = {
136142 enable = true;
137143 mappings = {