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 @@
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": {
6953 "flake": false,
7054 "locked": {
7155 "lastModified": 1696426674,
......@@ -81,7 +65,7 @@
8165 "type": "github"
8266 }
8367 },
84 "flake-compat_3": {
68 "flake-compat_2": {
8569 "flake": false,
8670 "locked": {
8771 "lastModified": 1696426674,
......@@ -155,6 +139,27 @@
155139 }
156140 },
157141 "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": {
158163 "inputs": {
159164 "systems": "systems_4"
160165 },
......@@ -172,7 +177,7 @@
172177 "type": "github"
173178 }
174179 },
175 "flake-utils_4": {
180 "flake-utils_5": {
176181 "inputs": {
177182 "systems": "systems_5"
178183 },
......@@ -190,7 +195,7 @@
190195 "type": "github"
191196 }
192197 },
193 "flake-utils_5": {
198 "flake-utils_6": {
194199 "inputs": {
195200 "systems": "systems_6"
196201 },
......@@ -419,8 +424,8 @@
419424 },
420425 "nvf": {
421426 "inputs": {
422 "flake-compat": "flake-compat",
423427 "flake-parts": "flake-parts",
428 "flake-utils": "flake-utils_3",
424429 "mnw": "mnw",
425430 "nixpkgs": [
426431 "nixpkgs"
......@@ -428,15 +433,16 @@
428433 "systems": "systems_3"
429434 },
430435 "locked": {
431 "lastModified": 1753878721,
432 "narHash": "sha256-Y+Kr6FTHggnZ31nhaiOhIboIi+dhnLmQ9p0xf0wwnDc=",
436 "lastModified": 1754043154,
437 "narHash": "sha256-Q47BVxwocPZ1GEDs6gKGH00eso74i0gTEPNuF8Kj0T8=",
433438 "owner": "notashelf",
434439 "repo": "nvf",
435 "rev": "e35a74c44a35b28fd09f136dd3c0dbe9f300258f",
440 "rev": "69659e078b6531698255deda280c9407b34e29ea",
436441 "type": "github"
437442 },
438443 "original": {
439444 "owner": "notashelf",
445 "ref": "v0.8",
440446 "repo": "nvf",
441447 "type": "github"
442448 }
......@@ -685,8 +691,8 @@
685691 },
686692 "zig": {
687693 "inputs": {
688 "flake-compat": "flake-compat_2",
689 "flake-utils": "flake-utils_3",
694 "flake-compat": "flake-compat",
695 "flake-utils": "flake-utils_4",
690696 "nixpkgs": "nixpkgs_3"
691697 },
692698 "locked": {
......@@ -705,8 +711,8 @@
705711 },
706712 "zig-overlay": {
707713 "inputs": {
708 "flake-compat": "flake-compat_3",
709 "flake-utils": "flake-utils_5",
714 "flake-compat": "flake-compat_2",
715 "flake-utils": "flake-utils_6",
710716 "nixpkgs": [
711717 "zls",
712718 "nixpkgs"
......@@ -728,7 +734,7 @@
728734 },
729735 "zls": {
730736 "inputs": {
731 "flake-utils": "flake-utils_4",
737 "flake-utils": "flake-utils_5",
732738 "gitignore": "gitignore_2",
733739 "langref": "langref",
734740 "nixpkgs": "nixpkgs_4",
flake.nix+1-1
......@@ -12,7 +12,7 @@
1212 apple-fonts.url = "github:Lyndeno/apple-fonts.nix";
1313 apple-fonts.inputs.nixpkgs.follows = "nixpkgs";
1414
15 nvf.url = "github:notashelf/nvf";
15 nvf.url = "github:notashelf/nvf/v0.8";
1616 nvf.inputs.nixpkgs.follows = "nixpkgs";
1717
1818 darwin.url = "github:lnl7/nix-darwin/master";
modules/neovim/default.nix+1-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;
......@@ -105,7 +106,6 @@
105106 nix = {
106107 enable = true;
107108 format.type = "nixfmt"; # looks so much nicer
108 lsp.options.autoArchive = true;
109109 };
110110 };
111111 formatter.conform-nvim = {
users/natalie/vim/languages.nix+6-38
......@@ -9,44 +9,7 @@
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 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 };
5013 languages = {
5114 python = {
5215 format.type = "ruff";
......@@ -57,7 +20,12 @@
5720 enable = true;
5821 };
5922 };
60 nix.format.enable = true;
23 nix = {
24 lsp.servers = [
25 "nil"
26 "nixd"
27 ];
28 };
6129 };
6230
6331 formatter.conform-nvim = {