authorgravatar for nmarks413@gmail.comNatalie Marks <nmarks413@gmail.com> 2025-08-01 20:07:24-07:00
committergravatar for nmarks413@gmail.comNatalie Marks <nmarks413@gmail.com> 2025-08-01 20:07:24-07:00
loga58f16e18b7e9161012dcfd90075e7b72e4f50cf
tree9cc37bfac7af35d08c5b0cda2b88bca3a264c741
parenta040cebe8e4f9dea894aa27b8982225b673fd6d2
signature Commit is signed but in an unrecognized format.

migrate to nvf v0.8

4 files changed, 42 insertions(+), 68 deletions(-)

flake.lock+34-28
...@@ -50,22 +50,6 @@...@@ -50,22 +50,6 @@
50 }50 }
51 },51 },
52 "flake-compat": {52 "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": {
69 "flake": false,53 "flake": false,
70 "locked": {54 "locked": {
71 "lastModified": 1696426674,55 "lastModified": 1696426674,
...@@ -81,7 +65,7 @@...@@ -81,7 +65,7 @@
81 "type": "github"65 "type": "github"
82 }66 }
83 },67 },
84 "flake-compat_3": {68 "flake-compat_2": {
85 "flake": false,69 "flake": false,
86 "locked": {70 "locked": {
87 "lastModified": 1696426674,71 "lastModified": 1696426674,
...@@ -155,6 +139,27 @@...@@ -155,6 +139,27 @@
155 }139 }
156 },140 },
157 "flake-utils_3": {141 "flake-utils_3": {
142 "inputs": {
143 "systems": [
144 "nvf",
145 "systems"
146 ]
147 },
148 "locked": {
149 "lastModified": 1731533236,
150 "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
151 "owner": "numtide",
152 "repo": "flake-utils",
153 "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
154 "type": "github"
155 },
156 "original": {
157 "owner": "numtide",
158 "repo": "flake-utils",
159 "type": "github"
160 }
161 },
162 "flake-utils_4": {
158 "inputs": {163 "inputs": {
159 "systems": "systems_4"164 "systems": "systems_4"
160 },165 },
...@@ -172,7 +177,7 @@...@@ -172,7 +177,7 @@
172 "type": "github"177 "type": "github"
173 }178 }
174 },179 },
175 "flake-utils_4": {180 "flake-utils_5": {
176 "inputs": {181 "inputs": {
177 "systems": "systems_5"182 "systems": "systems_5"
178 },183 },
...@@ -190,7 +195,7 @@...@@ -190,7 +195,7 @@
190 "type": "github"195 "type": "github"
191 }196 }
192 },197 },
193 "flake-utils_5": {198 "flake-utils_6": {
194 "inputs": {199 "inputs": {
195 "systems": "systems_6"200 "systems": "systems_6"
196 },201 },
...@@ -419,8 +424,8 @@...@@ -419,8 +424,8 @@
419 },424 },
420 "nvf": {425 "nvf": {
421 "inputs": {426 "inputs": {
422 "flake-compat": "flake-compat",
423 "flake-parts": "flake-parts",427 "flake-parts": "flake-parts",
428 "flake-utils": "flake-utils_3",
424 "mnw": "mnw",429 "mnw": "mnw",
425 "nixpkgs": [430 "nixpkgs": [
426 "nixpkgs"431 "nixpkgs"
...@@ -428,15 +433,16 @@...@@ -428,15 +433,16 @@
428 "systems": "systems_3"433 "systems": "systems_3"
429 },434 },
430 "locked": {435 "locked": {
431 "lastModified": 1753878721,436 "lastModified": 1754043154,
432 "narHash": "sha256-Y+Kr6FTHggnZ31nhaiOhIboIi+dhnLmQ9p0xf0wwnDc=",437 "narHash": "sha256-Q47BVxwocPZ1GEDs6gKGH00eso74i0gTEPNuF8Kj0T8=",
433 "owner": "notashelf",438 "owner": "notashelf",
434 "repo": "nvf",439 "repo": "nvf",
435 "rev": "e35a74c44a35b28fd09f136dd3c0dbe9f300258f",440 "rev": "69659e078b6531698255deda280c9407b34e29ea",
436 "type": "github"441 "type": "github"
437 },442 },
438 "original": {443 "original": {
439 "owner": "notashelf",444 "owner": "notashelf",
445 "ref": "v0.8",
440 "repo": "nvf",446 "repo": "nvf",
441 "type": "github"447 "type": "github"
442 }448 }
...@@ -685,8 +691,8 @@...@@ -685,8 +691,8 @@
685 },691 },
686 "zig": {692 "zig": {
687 "inputs": {693 "inputs": {
688 "flake-compat": "flake-compat_2",694 "flake-compat": "flake-compat",
689 "flake-utils": "flake-utils_3",695 "flake-utils": "flake-utils_4",
690 "nixpkgs": "nixpkgs_3"696 "nixpkgs": "nixpkgs_3"
691 },697 },
692 "locked": {698 "locked": {
...@@ -705,8 +711,8 @@...@@ -705,8 +711,8 @@
705 },711 },
706 "zig-overlay": {712 "zig-overlay": {
707 "inputs": {713 "inputs": {
708 "flake-compat": "flake-compat_3",714 "flake-compat": "flake-compat_2",
709 "flake-utils": "flake-utils_5",715 "flake-utils": "flake-utils_6",
710 "nixpkgs": [716 "nixpkgs": [
711 "zls",717 "zls",
712 "nixpkgs"718 "nixpkgs"
...@@ -728,7 +734,7 @@...@@ -728,7 +734,7 @@
728 },734 },
729 "zls": {735 "zls": {
730 "inputs": {736 "inputs": {
731 "flake-utils": "flake-utils_4",737 "flake-utils": "flake-utils_5",
732 "gitignore": "gitignore_2",738 "gitignore": "gitignore_2",
733 "langref": "langref",739 "langref": "langref",
734 "nixpkgs": "nixpkgs_4",740 "nixpkgs": "nixpkgs_4",
flake.nix+1-1
...@@ -12,7 +12,7 @@...@@ -12,7 +12,7 @@
12 apple-fonts.url = "github:Lyndeno/apple-fonts.nix";12 apple-fonts.url = "github:Lyndeno/apple-fonts.nix";
13 apple-fonts.inputs.nixpkgs.follows = "nixpkgs";13 apple-fonts.inputs.nixpkgs.follows = "nixpkgs";
1414
15 nvf.url = "github:notashelf/nvf";15 nvf.url = "github:notashelf/nvf/v0.8";
16 nvf.inputs.nixpkgs.follows = "nixpkgs";16 nvf.inputs.nixpkgs.follows = "nixpkgs";
1717
18 darwin.url = "github:lnl7/nix-darwin/master";18 darwin.url = "github:lnl7/nix-darwin/master";
modules/neovim/default.nix+1-1
...@@ -69,6 +69,7 @@...@@ -69,6 +69,7 @@
69 signatureHelp = null;69 signatureHelp = null;
70 toggleFormatOnSave = null;70 toggleFormatOnSave = null;
71 };71 };
72 servers.nixd.init_options.autoArchive = true;
72 };73 };
73 treesitter = {74 treesitter = {
74 enable = true;75 enable = true;
...@@ -105,7 +106,6 @@...@@ -105,7 +106,6 @@
105 nix = {106 nix = {
106 enable = true;107 enable = true;
107 format.type = "nixfmt"; # looks so much nicer108 format.type = "nixfmt"; # looks so much nicer
108 lsp.options.autoArchive = true;
109 };109 };
110 };110 };
111 formatter.conform-nvim = {111 formatter.conform-nvim = {
users/natalie/vim/languages.nix+6-38
...@@ -9,44 +9,7 @@...@@ -9,44 +9,7 @@
9 vim = {9 vim = {
10 extraPackages = with pkgs; [10 extraPackages = with pkgs; [
11 python312Packages.pylatexenc11 python312Packages.pylatexenc
12 nixd
13 ];12 ];
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 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 [ ]'';
32 };
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 };
46 };
47 };
48 };
49 };
50 languages = {13 languages = {
51 python = {14 python = {
52 format.type = "ruff";15 format.type = "ruff";
...@@ -57,7 +20,12 @@...@@ -57,7 +20,12 @@
57 enable = true;20 enable = true;
58 };21 };
59 };22 };
60 nix.format.enable = true;23 nix = {
24 lsp.servers = [
25 "nil"
26 "nixd"
27 ];
28 };
61 };29 };
6230
63 formatter.conform-nvim = {31 formatter.conform-nvim = {