diff --git a/flake.lock b/flake.lock index aeda855..ede0a2e 100644 --- a/flake.lock +++ b/flake.lock @@ -99,11 +99,11 @@ ] }, "locked": { - "lastModified": 1745459952, - "narHash": "sha256-DqfNL28ny9M13s4Ae0PmdYdcu+CXQ0U9pM+3z/vGRDI=", + "lastModified": 1746097297, + "narHash": "sha256-5p+V4mfNhVqDBsGdxIEQzigJh34Nwdhb/6pN+tQ8Vio=", "owner": "k3d3", "repo": "claude-desktop-linux-flake", - "rev": "467706b81668e2c59f118d9a469455d193489531", + "rev": "83401cf9c8a45458ba102dc9753a51be405162b9", "type": "github" }, "original": { @@ -162,11 +162,11 @@ ] }, "locked": { - "lastModified": 1745812220, - "narHash": "sha256-hotBG0EJ9VmAHJYF0yhWuTVZpENHvwcJ2SxvIPrXm+g=", + "lastModified": 1746411114, + "narHash": "sha256-mLlkVX1kKbAa/Ns5u26wDYw4YW4ziMFM21fhtRmfirU=", "owner": "nix-community", "repo": "disko", - "rev": "d0c543d740fad42fe2c035b43c9d41127e073c78", + "rev": "b5d1320ebc2f34dbea4655f95167f55e2130cdb3", "type": "github" }, "original": { @@ -294,24 +294,6 @@ "type": "github" } }, - "flake-parts_5": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_2" - }, - "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems_2" @@ -348,24 +330,6 @@ "type": "github" } }, - "flake-utils_3": { - "inputs": { - "systems": "systems_4" - }, - "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" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -416,11 +380,11 @@ ] }, "locked": { - "lastModified": 1745557122, - "narHash": "sha256-eqSo9ugzsqhFgaDFYUZj943nurlX4L6f+AW0skJ4W+M=", + "lastModified": 1746171682, + "narHash": "sha256-EyXUNSa+H+YvGVuQJP1nZskXAowxKYp79RNUsNdQTj4=", "owner": "nix-community", "repo": "home-manager", - "rev": "dd26f75fb4ec1c731d4b1396eaf4439ce40a91c1", + "rev": "50eee705bbdbac942074a8c120e8194185633675", "type": "github" }, "original": { @@ -430,47 +394,6 @@ "type": "github" } }, - "mnw": { - "locked": { - "lastModified": 1745705214, - "narHash": "sha256-XGfaHbFI4vvDuaoVO3IFYZKezXIO8rhUaMCGcjY71Ac=", - "owner": "Gerg-L", - "repo": "mnw", - "rev": "c1f4587db4c53dcefa432c46c7a899a116d8e924", - "type": "github" - }, - "original": { - "owner": "Gerg-L", - "repo": "mnw", - "type": "github" - } - }, - "nil": { - "inputs": { - "flake-utils": [ - "nvf", - "flake-utils" - ], - "nixpkgs": [ - "nvf", - "nixpkgs" - ], - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1741118843, - "narHash": "sha256-ggXU3RHv6NgWw+vc+HO4/9n0GPufhTIUjVuLci8Za8c=", - "owner": "oxalica", - "repo": "nil", - "rev": "577d160da311cc7f5042038456a0713e9863d09e", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "nil", - "type": "github" - } - }, "niri": { "inputs": { "niri-stable": "niri-stable", @@ -483,11 +406,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1745917205, - "narHash": "sha256-o31wA3qHEf5KrVeKpoOZnDuaW3F5/BhFimZaA5V7wmI=", + "lastModified": 1746142190, + "narHash": "sha256-t36K3TWLMRWoGyjYyo+H8bBquDcp4orZqNZVagWNjwY=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "93f94e630a61b2b8c2d50c64ac213bfe7fc1775a", + "rev": "af701c1c16c289b1b14f333d844b4f756308d244", "type": "github" }, "original": { @@ -516,11 +439,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1745913113, - "narHash": "sha256-/Iph65fWHox7tVyfzw0+AGyCqL2FGuHSt+xjFUsxbOk=", + "lastModified": 1746124654, + "narHash": "sha256-LmhkAt2KLvf8lp+kEUQuTFmmv7iXO8IkwwSaPasfXJw=", "owner": "YaLTeR", "repo": "niri", - "rev": "5f117c61dc4dd91564e02b32836e98dd0e648246", + "rev": "6c9705dd4b2eaba25f024d1a3efd7943fd393632", "type": "github" }, "original": { @@ -536,11 +459,11 @@ ] }, "locked": { - "lastModified": 1745725746, - "narHash": "sha256-iR+idGZJ191cY6NBXyVjh9QH8GVWTkvZw/w+1Igy45A=", + "lastModified": 1746330942, + "narHash": "sha256-ShizFaJCAST23tSrHHtFFGF0fwd72AG+KhPZFFQX/0o=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "187524713d0d9b2d2c6f688b81835114d4c2a7c6", + "rev": "137fd2bd726fff343874f85601b51769b48685cc", "type": "github" }, "original": { @@ -555,11 +478,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1745891836, - "narHash": "sha256-UJpwh09VKotfAoZRz6NNYZ1mepbhlkvYuoUSnMdUXCs=", + "lastModified": 1746496684, + "narHash": "sha256-LwlZHnH65CZQUF9xAtKan4gHvZDVFf8qYfm7EmuVEHw=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "7387c46187fb2bbeb8bd1c94368a666e7bbd60c6", + "rev": "4511026b2fd29242372ea3936e2193062bf18705", "type": "github" }, "original": { @@ -647,28 +570,13 @@ "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz" } }, - "nixpkgs-lib_2": { - "locked": { - "lastModified": 1743296961, - "narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, "nixpkgs-stable": { "locked": { - "lastModified": 1745742390, - "narHash": "sha256-1rqa/XPSJqJg21BKWjzJZC7yU0l/YTVtjRi0RJmipus=", + "lastModified": 1746055187, + "narHash": "sha256-3dqArYSMP9hM7Qpy5YWhnSjiqniSaT2uc5h2Po7tmg0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "26245db0cb552047418cfcef9a25da91b222d6c7", + "rev": "3e362ce63e16b9572d8c2297c04f7c19ab6725a5", "type": "github" }, "original": { @@ -680,11 +588,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1745794561, - "narHash": "sha256-T36rUZHUART00h3dW4sV5tv4MrXKT7aWjNfHiZz7OHg=", + "lastModified": 1746461020, + "narHash": "sha256-7+pG1I9jvxNlmln4YgnlW4o+w0TZX24k688mibiFDUE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5461b7fa65f3ca74cef60be837fd559a8918eaa0", + "rev": "3730d8a308f94996a9ba7c7138ede69c1b9ac4ae", "type": "github" }, "original": { @@ -712,11 +620,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1745868005, - "narHash": "sha256-hZScOyQphT4RUmSEJX+2OxjIlGgLwSd8iW1LNtAWIOs=", + "lastModified": 1746422338, + "narHash": "sha256-NTtKOTLQv6dPfRe00OGSywg37A1FYqldS6xiNmqBUYc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "330d0a4167924b43f31cc9406df363f71b768a02", + "rev": "5b35d248e9206c1f3baf8de6a7683fee126364aa", "type": "github" }, "original": { @@ -751,11 +659,11 @@ "treefmt-nix": "treefmt-nix_3" }, "locked": { - "lastModified": 1745923935, - "narHash": "sha256-O+lastqhhCh3tkB/9qS6VxBz0FLHLe5kOCyZKPqSQNY=", + "lastModified": 1746553635, + "narHash": "sha256-Q3USleee16YdxP3QxHmUAHVxriYLVstbSh5IRqNduW8=", "owner": "nix-community", "repo": "NUR", - "rev": "6d43c068f3ec3991c0bec154dd44f98ec9d4660f", + "rev": "5b5b8098d5dc4df06c7294f9257efefa62cc536f", "type": "github" }, "original": { @@ -764,31 +672,6 @@ "type": "github" } }, - "nvf": { - "inputs": { - "flake-parts": "flake-parts_5", - "flake-utils": "flake-utils_3", - "mnw": "mnw", - "nil": "nil", - "nixpkgs": [ - "nixpkgs" - ], - "systems": "systems_5" - }, - "locked": { - "lastModified": 1745819184, - "narHash": "sha256-+v+MOVFYDQCJdP67gLrIdrLGKqBUp37KGhvcqd9ZFqA=", - "owner": "notashelf", - "repo": "nvf", - "rev": "efa859381f60132db976d2501bfdb4e6f8d5a8c5", - "type": "github" - }, - "original": { - "owner": "notashelf", - "repo": "nvf", - "type": "github" - } - }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat", @@ -829,32 +712,9 @@ "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable", "nur": "nur", - "nvf": "nvf", "treefmt-nix": "treefmt-nix_4" } }, - "rust-overlay": { - "inputs": { - "nixpkgs": [ - "nvf", - "nil", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1741055476, - "narHash": "sha256-52vwEV0oS2lCnx3c/alOFGglujZTLmObit7K8VblnS8=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "aefb7017d710f150970299685e8d8b549d653649", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, @@ -900,36 +760,6 @@ "type": "github" } }, - "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_5": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -995,11 +825,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1745848521, - "narHash": "sha256-gNrTO3pEjmu3WiuYrUHJrTGCFw9v+qZXCFmX/Vjf5WI=", + "lastModified": 1746216483, + "narHash": "sha256-4h3s1L/kKqt3gMDcVfN8/4v2jqHrgLIe4qok4ApH5x4=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "763f1ce0dd12fe44ce6a5c6ea3f159d438571874", + "rev": "29ec5026372e0dec56f890e50dbe4f45930320fd", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 14e3750..e8fa5de 100644 --- a/flake.nix +++ b/flake.nix @@ -70,9 +70,6 @@ nix-vscode-extensions.url = "github:nix-community/nix-vscode-extensions"; - nvf.url = "github:notashelf/nvf"; - nvf.inputs.nixpkgs.follows = "nixpkgs"; - claude-desktop.url = "github:k3d3/claude-desktop-linux-flake"; claude-desktop.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/hosts/default.nix b/hosts/default.nix index 71ab1a8..fa4a3e3 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -44,7 +44,6 @@ with lib; let inputs.nix-index-database.nixosModules.nix-index inputs.nixos-facter-modules.nixosModules.facter inputs.fireproof-shell.nixosModules.default - inputs.nvf.nixosModules.default inputs.niri.nixosModules.niri ../modules/base/user.nix (mkSystemImports hostname) diff --git a/modules/shell/neovim.nix b/modules/shell/neovim.nix index b457e6d..d1d36c0 100644 --- a/modules/shell/neovim.nix +++ b/modules/shell/neovim.nix @@ -5,57 +5,5 @@ _: { vimAlias = true; defaultEditor = true; }; - - programs.nvf = { - enable = true; - - settings.vim = { - viAlias = true; - vimAlias = true; - - lineNumberMode = "number"; - - lsp = { - enable = true; - lightbulb.enable = true; - }; - - languages = { - enableLSP = true; - enableFormat = true; - enableTreesitter = true; - - nix.enable = true; - markdown.enable = true; - rust.enable = true; - sql.enable = true; - ts.enable = true; - html.enable = true; - python.enable = true; - }; - - git.enable = true; - - telescope.enable = true; - autopairs.nvim-autopairs.enable = true; - autocomplete.blink-cmp.enable = true; - statusline.lualine.enable = true; - - utility = { - ccc.enable = false; - vim-wakatime.enable = false; - icon-picker.enable = false; - motion.leap.enable = true; - }; - ui = { - borders.enable = true; - colorizer.enable = true; - }; - - binds = { - whichKey.enable = true; - }; - }; - }; }; }