authorgravatar for nmarks413@gmail.comNatalie Marks <nmarks413@gmail.com> 2025-08-02 14:38:29-07:00
committergravatar for nmarks413@gmail.comNatalie Marks <nmarks413@gmail.com> 2025-08-02 14:38:29-07:00
logb0b81115da638eea16b4747229706cde7840b3de
tree65bacb661052ed8c488386fafe2766947f564713
parent866298a4f1e129b290d2fcfbdb5f53c7fc67af27
parent992f77e656d298463aedea1290604b9a72b2a488
signature Commit is signed but in an unrecognized format.

Merge branch 'main' of paperclover.dev:nix/config

12 files changed, 154 insertions(+), 188 deletions(-)

flake.lock+32-53
......@@ -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": {
......@@ -89,11 +89,11 @@
8989 ]
9090 },
9191 "locked": {
92 "lastModified": 1749398372,
93 "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=",
92 "lastModified": 1753121425,
93 "narHash": "sha256-TVcTNvOeWWk1DXljFxVRp+E0tzG1LhrVjOGGoMHuXio=",
9494 "owner": "hercules-ci",
9595 "repo": "flake-parts",
96 "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569",
96 "rev": "644e0fc48951a860279da645ba77fe4a6e814c5e",
9797 "type": "github"
9898 },
9999 "original": {
......@@ -257,11 +257,11 @@
257257 ]
258258 },
259259 "locked": {
260 "lastModified": 1752093218,
261 "narHash": "sha256-+3rXu8ewcNDi65/2mKkdSGrivQs5zEZVp5aYszXC0d0=",
260 "lastModified": 1753943136,
261 "narHash": "sha256-eiEE5SabVcIlGSTRcRyBjmJMaYAV95SJnjy8YSsVeW4=",
262262 "owner": "nix-community",
263263 "repo": "home-manager",
264 "rev": "206ed3c71418b52e176f16f58805c96e84555320",
264 "rev": "bd82507edd860c453471c46957cbbe3c9fd01b5c",
265265 "type": "github"
266266 },
267267 "original": {
......@@ -306,11 +306,11 @@
306306 ]
307307 },
308308 "locked": {
309 "lastModified": 1752099881,
310 "narHash": "sha256-mn6f4ci5C2jkyxgmBHQ4dI9V0/20DlyS6EbQz4w7znc=",
309 "lastModified": 1753293216,
310 "narHash": "sha256-4hAm9PYNHAsR3MxH8MhSZt7mTiR8MlhyQilLJEPdaZs=",
311311 "owner": "moonlight-mod",
312312 "repo": "moonlight",
313 "rev": "dbef0c38e1c0066de5ec35a4d4219026b1bd7010",
313 "rev": "297a1b57c14ff18890382b2fe89f493ba349a730",
314314 "type": "github"
315315 },
316316 "original": {
......@@ -319,26 +319,6 @@
319319 "type": "github"
320320 }
321321 },
322 "nh": {
323 "inputs": {
324 "nixpkgs": [
325 "nixpkgs"
326 ]
327 },
328 "locked": {
329 "lastModified": 1751375534,
330 "narHash": "sha256-9z1W64dDVtVxqgPzUbjIQqRfygg1hdivUOZ6d/H+yFg=",
331 "owner": "viperML",
332 "repo": "nh",
333 "rev": "d0abb8eebe32f79ce4659e68dd777cf497a5d3d2",
334 "type": "github"
335 },
336 "original": {
337 "owner": "viperML",
338 "repo": "nh",
339 "type": "github"
340 }
341 },
342322 "nix-index-database": {
343323 "inputs": {
344324 "nixpkgs": [
......@@ -346,11 +326,11 @@
346326 ]
347327 },
348328 "locked": {
349 "lastModified": 1751774635,
350 "narHash": "sha256-DuOznGdgMxeSlPpUu6Wkq0ZD5e2Cfv9XRZeZlHWMd1s=",
329 "lastModified": 1753589988,
330 "narHash": "sha256-y1JlcMB2dKFkrr6g+Ucmj8L//IY09BtSKTH/A7OU7mU=",
351331 "owner": "nix-community",
352332 "repo": "nix-index-database",
353 "rev": "85686025ba6d18df31cc651a91d5adef63378978",
333 "rev": "f0736b09c43028fd726fb70c3eb3d1f0795454cf",
354334 "type": "github"
355335 },
356336 "original": {
......@@ -397,11 +377,11 @@
397377 },
398378 "nixpkgs_2": {
399379 "locked": {
400 "lastModified": 1751984180,
401 "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=",
380 "lastModified": 1753694789,
381 "narHash": "sha256-cKgvtz6fKuK1Xr5LQW/zOUiAC0oSQoA9nOISB0pJZqM=",
402382 "owner": "NixOS",
403383 "repo": "nixpkgs",
404 "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0",
384 "rev": "dc9637876d0dcc8c9e5e22986b857632effeb727",
405385 "type": "github"
406386 },
407387 "original": {
......@@ -453,11 +433,11 @@
453433 "systems": "systems_3"
454434 },
455435 "locked": {
456 "lastModified": 1753085278,
457 "narHash": "sha256-jOGYaMh4KBhzTqer3G66ki17CL7e822PExkcgWiQoWE=",
436 "lastModified": 1754043154,
437 "narHash": "sha256-Q47BVxwocPZ1GEDs6gKGH00eso74i0gTEPNuF8Kj0T8=",
458438 "owner": "notashelf",
459439 "repo": "nvf",
460 "rev": "08991be77a9f641facbddeca619388727661427d",
440 "rev": "69659e078b6531698255deda280c9407b34e29ea",
461441 "type": "github"
462442 },
463443 "original": {
......@@ -485,7 +465,6 @@
485465 "darwin": "darwin",
486466 "home-manager": "home-manager",
487467 "moonlight": "moonlight",
488 "nh": "nh",
489468 "nix-index-database": "nix-index-database",
490469 "nix-options-search": "nix-options-search",
491470 "nixpkgs": "nixpkgs_2",
......@@ -503,11 +482,11 @@
503482 ]
504483 },
505484 "locked": {
506 "lastModified": 1752028888,
507 "narHash": "sha256-LRj3/PUpII6taWOrX1w/OeI6f1ncND02PP/kEHvPCqU=",
485 "lastModified": 1753930086,
486 "narHash": "sha256-Os6Ta5zamfAllmQNlvkbGZLHn06zJy3hVXRk+Dy2yMo=",
508487 "owner": "oxalica",
509488 "repo": "rust-overlay",
510 "rev": "a0f1c656e053463b47639234b151a05e4441bb19",
489 "rev": "17b672c10c1798696a516cb879edbc2ebd0f58a4",
511490 "type": "github"
512491 },
513492 "original": {
......@@ -543,7 +522,7 @@
543522 "sf-compact": {
544523 "flake": false,
545524 "locked": {
546 "narHash": "sha256-J72Lyt2wy83E46wN8w6/Rih9kilM9wEjtY6KnbF0DsA=",
525 "narHash": "sha256-VMCf2Mhmx/qhLRQxlTAsQWxtonS27kPW+oTYBBRWHMg=",
547526 "type": "file",
548527 "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Compact.dmg"
549528 },
......@@ -591,7 +570,7 @@
591570 "sf-pro": {
592571 "flake": false,
593572 "locked": {
594 "narHash": "sha256-Q/pOQ4MGhW/ZtLka+UUQcwSoZFDWW34XvutxL4GvzUY=",
573 "narHash": "sha256-RX6X2ltVE88Hp1g9tpSywMT3UfdLpRxgw92KRpiAues=",
595574 "type": "file",
596575 "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg"
597576 },
......@@ -697,11 +676,11 @@
697676 ]
698677 },
699678 "locked": {
700 "lastModified": 1751688498,
701 "narHash": "sha256-6kYe6ozYDvsHAxV1zbSxg0oRWF4TzTfOUUJsR6MJlYY=",
679 "lastModified": 1753676490,
680 "narHash": "sha256-XeifEftxYGP/gzp6O1yO1S1W+MEx4Xvrgeu84ryRPNQ=",
702681 "owner": "youwen5",
703682 "repo": "zen-browser-flake",
704 "rev": "b5d422dc2b28eb77a21fbdf60aca9a6e63d5a1ab",
683 "rev": "77024f4557204bb4d526893d42db2e6f50727fab",
705684 "type": "github"
706685 },
707686 "original": {
......@@ -717,11 +696,11 @@
717696 "nixpkgs": "nixpkgs_3"
718697 },
719698 "locked": {
720 "lastModified": 1752063248,
721 "narHash": "sha256-albe9Q066T4IesTRfaNpEcNQ09ABwU6esFUDyfb472U=",
699 "lastModified": 1753963984,
700 "narHash": "sha256-JPiCLZHuNk11XYYCqoLoKYIgdUu2WpNccTzl4ljycTQ=",
722701 "owner": "mitchellh",
723702 "repo": "zig-overlay",
724 "rev": "6f9a3c160daca2a701a638a7ea7b0e675c1a1848",
703 "rev": "45772b76cdb103bd300abac4a85a34518dee65a0",
725704 "type": "github"
726705 },
727706 "original": {
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: {
modules/home/default.nix+69-66
......@@ -23,82 +23,85 @@ in
2323 description = "set the ghostty shader, relative to 'files/ghostty'";
2424 };
2525 };
26 config.programs = {
27 home-manager.enable = true;
28 nix-index.enable = true;
29
30 direnv = {
31 enableZshIntegration = true;
32 nix-direnv.enable = config.programs.direnv.enable;
26 config = {
27 home.shell = {
28 enableShellIntegration = true;
3329 };
30 programs = {
31 home-manager.enable = true;
32 nix-index.enable = true;
3433
35 git = {
36 enable = true;
37 userName = lib.mkDefault user.name;
38 userEmail = lib.mkDefault user.email;
39 ignores = [
40 (lib.mkIf host.darwin ".DS_Store") # When using Finder
41 (lib.mkIf host.darwin "._*") # When using non-APFS drives
42 # ViM and Neovim
43 ".*.swp"
44 ".nvimlog"
45 ];
46 };
34 direnv = {
35 nix-direnv.enable = config.programs.direnv.enable;
36 };
4737
48 atuin = {
49 enableBashIntegration = true;
50 enableFishIntegration = true;
51 daemon.enable = cfg.atuin.enable;
52 };
53 bat = {
54 extraPackages = with pkgs.bat-extras; [
55 batdiff
56 batman
57 batgrep
58 batwatch
59 batpipe
60 prettybat
61 ];
62 };
63 hyfetch = {
64 settings = {
65 backend = "fastfetch";
66 preset = user.sexuality;
67 mode = "rgb";
68 light_dark = "dark";
69 lightness = {
70 };
71 color_align = {
72 mode = "horizontal";
38 git = {
39 enable = true;
40 userName = lib.mkDefault user.name;
41 userEmail = lib.mkDefault user.email;
42 ignores = [
43 (lib.mkIf host.darwin ".DS_Store") # When using Finder
44 (lib.mkIf host.darwin "._*") # When using non-APFS drives
45 # ViM and Neovim
46 ".*.swp"
47 ".nvimlog"
48 ];
49 };
50
51 atuin = {
52 daemon.enable = cfg.atuin.enable;
53 };
54
55 bat = {
56 extraPackages = with pkgs.bat-extras; [
57 batdiff
58 batman
59 batgrep
60 batwatch
61 batpipe
62 prettybat
63 ];
64 };
65 hyfetch = {
66 settings = {
67 backend = "fastfetch";
68 preset = user.sexuality;
69 mode = "rgb";
70 light_dark = "dark";
71 lightness = {
72 };
73 color_align = {
74 mode = "horizontal";
75 };
7376 };
7477 };
75 };
76 fastfetch.enable = cfg.hyfetch.enable;
78 fastfetch.enable = cfg.hyfetch.enable;
7779
78 fish = {
79 plugins = [
80 {
81 name = "tide";
82 inherit (pkgs.fishPlugins.tide) src;
80 fish = {
81 plugins = [
82 {
83 name = "tide";
84 inherit (pkgs.fishPlugins.tide) src;
85 }
86 {
87 name = "!!";
88 inherit (pkgs.fishPlugins.bang-bang) src;
89 }
90 ];
91 shellAliases = {
8392 }
84 {
85 name = "!!";
86 inherit (pkgs.fishPlugins.bang-bang) src;
87 }
88 ];
89 shellAliases =
90 { }
9193 // lib.optionalAttrs (!host.darwin) {
9294 reboot-windows = "sudo efibootmgr --bootnext 0000; sudo reboot -h now";
9395 };
94 shellInit = ''
95 batman --export-env | source
96 test -r '/Users/${user.username}/.opam/opam-init/init.fish' && source '/Users/${user.username}/.opam/opam-init/init.fish' > /dev/null 2> /dev/null; or true
97 '';
98 };
96 shellInit = ''
97 batman --export-env | source
98 test -r '/Users/${user.username}/.opam/opam-init/init.fish' && source '/Users/${user.username}/.opam/opam-init/init.fish' > /dev/null 2> /dev/null; or true
99 '';
100 };
99101
100 ghostty.settings.custom-shader = lib.mkIf (
101 cfg.ghostty.shader != null
102 ) "${../../files/ghostty}/${cfg.ghostty.shader}";
102 ghostty.settings.custom-shader = lib.mkIf (
103 cfg.ghostty.shader != null
104 ) "${../../files/ghostty}/${cfg.ghostty.shader}";
105 };
103106 };
104107}
modules/neovim/default.nix+1
......@@ -69,6 +69,7 @@
6969 signatureHelp = null;
7070 toggleFormatOnSave = null;
7171 };
72 servers.nixd.init_options.autoArchive = true;
7273 };
7374 treesitter = {
7475 enable = true;
modules/nixos/ld.nix+9-1
......@@ -63,7 +63,7 @@
6363 nss
6464 openssl
6565 pango
66 # pipewire
66 pipewire
6767 stdenv.cc.cc
6868 systemd
6969 vulkan-loader
......@@ -82,5 +82,13 @@
8282 xorg.libxkbfile
8383 xorg.libxshmfence
8484 zlib
85 libxslt
86
87 # Stolen from https://github.com/Mic92/dotfiles/blob/57cf7fdf8705a5362fc19114b8395cdbf7668e94/nixos/modules/nix-ld.nix#L6-L58
88 flite
89 gtk2
90 gtk2-x11
91 libsecret
92 xorg.libXinerama
8593 ];
8694}
users/chloe/vim.nix+30
......@@ -16,6 +16,36 @@ _: {
1616 };
1717 };
1818 };
19 autocomplete.blink-cmp = {
20 enable = true;
21 mappings = {
22 close = null;
23 complete = null;
24 confirm = null;
25 next = null;
26 previous = null;
27 scrollDocsDown = null;
28 scrollDocsUp = null;
29 };
30
31 setupOpts = {
32 keymap = {
33 preset = "super-tab";
34 };
35 completion = {
36 ghost_text.enabled = false;
37 list.selection.preselect = true;
38 trigger = {
39 show_in_snippet = true;
40 };
41 accept.auto_brackets.enabled = true;
42 };
43 signature = {
44 enabled = true;
45 };
46 };
47 };
48
1949 keymaps =
2050 let
2151 mkKeymap = mode: key: action: desc: {
users/natalie/home.nix+1
......@@ -12,6 +12,7 @@
1212 direnv.enable = true;
1313 fish.enable = true;
1414 man.generateCaches = false;
15 lsd.enable = true;
1516 # sort-lines:end
1617 };
1718
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+9-40
......@@ -9,54 +9,23 @@
99 vim = {
1010 extraPackages = with pkgs; [
1111 python312Packages.pylatexenc
12 nixd
1312 ];
14 lsp = {
15 servers = {
16 nil = {
17 settings.nil.nix.flake = {
18
19 autoArchive = true;
20 autoEvalInputs = true;
21
22 };
23 };
24 nixd = {
25 settings.nixd = {
26 nixpkgs.expr = ''import "${flake.inputs.nixpkgs}" { }'';
27
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 };
46 };
47 };
48 };
49 };
50 };
5113 languages = {
52 python.format.type = "ruff";
14 python = {
15 format.type = "ruff";
16 };
5317 markdown = {
5418 enable = true;
5519 extensions.render-markdown-nvim = {
5620 enable = true;
5721 };
5822 };
59 nix.format.enable = true;
23 nix = {
24 lsp.servers = [
25 "nil"
26 "nixd"
27 ];
28 };
6029 };
6130
6231 formatter.conform-nvim = {