nix/config
2
0
Fork 0
Code Issues 5 Pull requests Projects Releases Packages Wiki Activity Actions

migrate to nvf v0.8

Browse source
This commit is contained in:
Natalie 2025-08-01 20:07:24 -07:00
parent a040cebe8e
commit a58f16e18b
No known key found for this signature in database
GPG key ID: 61F4EAEB0C9C3D5F
4 changed files with 42 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
flake.lock
View file

@ -50,22 +50,6 @@
}
},
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1751685974,
"narHash": "sha256-NKw96t+BgHIYzHUjkTK95FqYRVKB8DHpVhefWSz/kTw=",
"ref": "refs/heads/main",
"rev": "549f2762aebeff29a2e5ece7a7dc0f955281a1d1",
"revCount": 92,
"type": "git",
"url": "https://git.lix.systems/lix-project/flake-compat.git"
},
"original": {
"type": "git",
"url": "https://git.lix.systems/lix-project/flake-compat.git"
}
},
"flake-compat_2": {
"flake": false,
"locked": {
"lastModified": 1696426674,
@ -81,7 +65,7 @@
"type": "github"
}
},
"flake-compat_3": {
"flake-compat_2": {
"flake": false,
"locked": {
"lastModified": 1696426674,
@ -155,6 +139,27 @@
}
},
"flake-utils_3": {
"inputs": {
"systems": [
"nvf",
"systems"
]
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_4": {
"inputs": {
"systems": "systems_4"
},
@ -172,7 +177,7 @@
"type": "github"
}
},
"flake-utils_4": {
"flake-utils_5": {
"inputs": {
"systems": "systems_5"
},
@ -190,7 +195,7 @@
"type": "github"
}
},
"flake-utils_5": {
"flake-utils_6": {
"inputs": {
"systems": "systems_6"
},
@ -419,8 +424,8 @@
},
"nvf": {
"inputs": {
"flake-compat": "flake-compat",
"flake-parts": "flake-parts",
"flake-utils": "flake-utils_3",
"mnw": "mnw",
"nixpkgs": [
"nixpkgs"
@ -428,15 +433,16 @@
"systems": "systems_3"
},
"locked": {
"lastModified": 1753878721,
"narHash": "sha256-Y+Kr6FTHggnZ31nhaiOhIboIi+dhnLmQ9p0xf0wwnDc=",
"lastModified": 1754043154,
"narHash": "sha256-Q47BVxwocPZ1GEDs6gKGH00eso74i0gTEPNuF8Kj0T8=",
"owner": "notashelf",
"repo": "nvf",
"rev": "e35a74c44a35b28fd09f136dd3c0dbe9f300258f",
"rev": "69659e078b6531698255deda280c9407b34e29ea",
"type": "github"
},
"original": {
"owner": "notashelf",
"ref": "v0.8",
"repo": "nvf",
"type": "github"
}
@ -685,8 +691,8 @@
},
"zig": {
"inputs": {
"flake-compat": "flake-compat_2",
"flake-utils": "flake-utils_3",
"flake-compat": "flake-compat",
"flake-utils": "flake-utils_4",
"nixpkgs": "nixpkgs_3"
},
"locked": {
@ -705,8 +711,8 @@
},
"zig-overlay": {
"inputs": {
"flake-compat": "flake-compat_3",
"flake-utils": "flake-utils_5",
"flake-compat": "flake-compat_2",
"flake-utils": "flake-utils_6",
"nixpkgs": [
"zls",
"nixpkgs"
@ -728,7 +734,7 @@
},
"zls": {
"inputs": {
"flake-utils": "flake-utils_4",
"flake-utils": "flake-utils_5",
"gitignore": "gitignore_2",
"langref": "langref",
"nixpkgs": "nixpkgs_4",

2
flake.nix
View file

@ -12,7 +12,7 @@
apple-fonts.url = "github:Lyndeno/apple-fonts.nix";
apple-fonts.inputs.nixpkgs.follows = "nixpkgs";
nvf.url = "github:notashelf/nvf";
nvf.url = "github:notashelf/nvf/v0.8";
nvf.inputs.nixpkgs.follows = "nixpkgs";
darwin.url = "github:lnl7/nix-darwin/master";

2
modules/neovim/default.nix
View file

@ -69,6 +69,7 @@
signatureHelp = null;
toggleFormatOnSave = null;
};
servers.nixd.init_options.autoArchive = true;
};
treesitter = {
enable = true;
@ -105,7 +106,6 @@
nix = {
enable = true;
format.type = "nixfmt"; # looks so much nicer
lsp.options.autoArchive = true;
};
};
formatter.conform-nvim = {

44
users/natalie/vim/languages.nix
View file

@ -9,44 +9,7 @@
vim = {
extraPackages = with pkgs; [
python312Packages.pylatexenc
nixd
];
lsp = {
servers = {
nil = {
settings.nil.nix.flake = {
autoArchive = true;
autoEvalInputs = true;
};
};
nixd = {
settings.nixd = {
nixpkgs.expr = ''import "${flake.inputs.nixpkgs}" { }'';
options = {
home-manager = {
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'';
# (builtins.getFlake "${flakePath}").${darwin}Configurations.${hostname}.options.home-manager.users.type.getSubOptions [ ]'';
};
}
// pkgs.lib.optionalAttrs host.darwin {
nix-darwin = {
expr = ''(let pkgs = import "${flake.inputs.nixpkgs}" { }; in (pkgs.lib.evalModules { modules = (import "${flake.inputs.darwin}/modules/module-list.nix"); check = false;})).options'';
# (builtins.getFlake "${flakePath}").darwinConfigurations.${hostname}.options'';
};
}
// pkgs.lib.optionalAttrs host.linux {
nixos = {
expr = ''(let pkgs = import "${flake.inputs.nixpkgs}" { }; in (pkgs.lib.evalModules { modules = (import "${flake.inputs.nixpkgs}/nixos/modules/module-list.nix"); check = false;})).options'';
# (builtins.getFlake "${flakePath}").nixosConfigurations.${hostname}.options'';
};
};
};
};
};
};
languages = {
python = {
format.type = "ruff";
@ -57,7 +20,12 @@
enable = true;
};
};
nix.format.enable = true;
nix = {
lsp.servers = [
"nil"
"nixd"
];
};
};
formatter.conform-nvim = {