From 68ee7894a0dd1afe63588bc25bb6b2ecfdf9319e Mon Sep 17 00:00:00 2001 From: blake Date: Mon, 13 Oct 2025 15:04:14 -0500 Subject: [PATCH] add nvf --- flake.lock | 110 +++++++++++++++++++++++++--- flake.nix | 4 + users/blake/dots/neovim/default.nix | 32 ++++++++ users/blake/home.nix | 11 ++- 4 files changed, 146 insertions(+), 11 deletions(-) create mode 100644 users/blake/dots/neovim/default.nix diff --git a/flake.lock b/flake.lock index b30a008..cc42ea8 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,42 @@ { "nodes": { + "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-parts": { + "inputs": { + "nixpkgs-lib": [ + "nvf", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1759362264, + "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "758cf7296bee11f1706a574c77d072b8a7baa881", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -21,13 +58,28 @@ "type": "github" } }, + "mnw": { + "locked": { + "lastModified": 1758834834, + "narHash": "sha256-Y7IvY4F8vajZyp3WGf+KaiIVwondEkMFkt92Cr9NZmg=", + "owner": "Gerg-L", + "repo": "mnw", + "rev": "cfbc7d1cc832e318d0863a5fc91d940a96034001", + "type": "github" + }, + "original": { + "owner": "Gerg-L", + "repo": "mnw", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1759735786, - "narHash": "sha256-a0+h02lyP2KwSNrZz4wLJTu9ikujNsTWIC874Bv7IJ0=", + "lastModified": 1760139962, + "narHash": "sha256-4xggC56Rub3WInz5eD7EZWXuLXpNvJiUPahGtMkwtuc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "20c4598c84a671783f741e02bf05cbfaf4907cff", + "rev": "7e297ddff44a3cc93673bb38d0374df8d0ad73e4", "type": "github" }, "original": { @@ -38,11 +90,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1759831965, - "narHash": "sha256-vgPm2xjOmKdZ0xKA6yLXPJpjOtQPHfaZDRtH+47XEBo=", + "lastModified": 1760284886, + "narHash": "sha256-TK9Kr0BYBQ/1P5kAsnNQhmWWKgmZXwUQr4ZMjCzWf2c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c9b6fb798541223bbb396d287d16f43520250518", + "rev": "cf3f5c4def3c7b5f1fc012b3d839575dbe552d43", "type": "github" }, "original": { @@ -51,11 +103,36 @@ "type": "indirect" } }, + "nvf": { + "inputs": { + "flake-compat": "flake-compat", + "flake-parts": "flake-parts", + "mnw": "mnw", + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems" + }, + "locked": { + "lastModified": 1760153667, + "narHash": "sha256-F7KmXT/Izse6Q6CkD5GCImoGPaDJxl03Kd7eD+eY/bU=", + "owner": "NotAShelf", + "repo": "nvf", + "rev": "9df9d51fd9fc8f9a8fc377f984ea3b7ae796172d", + "type": "github" + }, + "original": { + "owner": "NotAShelf", + "repo": "nvf", + "type": "github" + } + }, "root": { "inputs": { "home-manager": "home-manager", "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable", + "nvf": "nvf", "sops-nix": "sops-nix", "vpn-confinement": "vpn-confinement" } @@ -67,11 +144,11 @@ ] }, "locked": { - "lastModified": 1759635238, - "narHash": "sha256-UvzKi02LMFP74csFfwLPAZ0mrE7k6EiYaKecplyX9Qk=", + "lastModified": 1760240450, + "narHash": "sha256-sa9bS9jSyc4vH0jSWrUsPGdqtMvDwmkLg971ntWOo2U=", "owner": "Mic92", "repo": "sops-nix", - "rev": "6e5a38e08a2c31ae687504196a230ae00ea95133", + "rev": "41fd1f7570c89f645ee0ada0be4e2d3c4b169549", "type": "github" }, "original": { @@ -80,6 +157,21 @@ "type": "github" } }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "vpn-confinement": { "locked": { "lastModified": 1759956062, diff --git a/flake.nix b/flake.nix index 745b7e9..04b8374 100644 --- a/flake.nix +++ b/flake.nix @@ -17,6 +17,10 @@ vpn-confinement = { url = "github:Maroka-chan/VPN-Confinement"; }; + nvf = { + url = "github:NotAShelf/nvf"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = { self, nixpkgs, nixpkgs-unstable, ... }@inputs: let diff --git a/users/blake/dots/neovim/default.nix b/users/blake/dots/neovim/default.nix new file mode 100644 index 0000000..a383264 --- /dev/null +++ b/users/blake/dots/neovim/default.nix @@ -0,0 +1,32 @@ +{ pkgs, config, lib, inputs, ... }: + +{ + imports = [ + inputs.nvf.homeManagerModules.default + ]; + + programs.nvf = { + enable = true; + settings = { + vim = { + vimAlias = true; + + statusline.lualine.enable = true; + telescope.enable = true; + autocomplete.nvim-cmp.enable = true; + + lsp = { + enable = true; + }; + + languages = { + enableTreesitter = true; + + nix.enable = true; + rust.enable = true; + lua.enable = true; + }; + }; + }; + }; +} diff --git a/users/blake/home.nix b/users/blake/home.nix index 848861a..3aebc9d 100644 --- a/users/blake/home.nix +++ b/users/blake/home.nix @@ -1,11 +1,17 @@ -{ config, pkgs, ... }: +{ config, lib, pkgs, inputs, ... }: { + + imports = [ + ./dots/neovim + ]; + # general config home.username = "blake"; home.homeDirectory = "/home/blake"; + + # stand alone packages home.packages = with pkgs; [ - git lf ripgrep btop @@ -54,6 +60,7 @@ recursive = true; }; + programs.gpg = { enable = true; };