diff options
| -rw-r--r-- | flake.lock | 221 | ||||
| -rw-r--r-- | flake.nix | 13 | ||||
| -rw-r--r-- | lua/config/plugins/completion.lua | 2 | ||||
| -rw-r--r-- | lua/config/plugins/init.lua | 1 | ||||
| -rw-r--r-- | lua/config/plugins/lsp.lua | 1 |
5 files changed, 232 insertions, 6 deletions
@@ -1,5 +1,186 @@ { "nodes": { + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "neovim-nightly-overlay", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1740872218, + "narHash": "sha256-ZaMw0pdoUKigLpv9HiNDH2Pjnosg7NBYMJlHTIsHEUo=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "3876f6b87db82f33775b1ef5ea343986105db764", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "neovim-nightly-overlay", + "hercules-ci-effects", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1738453229, + "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", + "type": "github" + }, + "original": { + "id": "flake-parts", + "type": "indirect" + } + }, + "git-hooks": { + "inputs": { + "flake-compat": "flake-compat_2", + "gitignore": "gitignore", + "nixpkgs": [ + "neovim-nightly-overlay", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1740915799, + "narHash": "sha256-JvQvtaphZNmeeV+IpHgNdiNePsIpHD5U/7QN5AeY44A=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "42b1ba089d2034d910566bf6b40830af6b8ec732", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "neovim-nightly-overlay", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "hercules-ci-effects": { + "inputs": { + "flake-parts": "flake-parts_2", + "nixpkgs": [ + "neovim-nightly-overlay", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1739595404, + "narHash": "sha256-0CjCfbq0yHWexOrpO06e2WU1r5JAqR6ffy1zgM3NksI=", + "owner": "hercules-ci", + "repo": "hercules-ci-effects", + "rev": "06519cec8fb32d219006da6eacd255504a9996af", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "hercules-ci-effects", + "type": "github" + } + }, + "neovim-nightly-overlay": { + "inputs": { + "flake-compat": "flake-compat", + "flake-parts": "flake-parts", + "git-hooks": "git-hooks", + "hercules-ci-effects": "hercules-ci-effects", + "neovim-src": "neovim-src", + "nixpkgs": "nixpkgs", + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1741220969, + "narHash": "sha256-qX4d8ZLCx2MenmvxCSE+b9WMzgMdCgOFYxu1utsSLr4=", + "owner": "nix-community", + "repo": "neovim-nightly-overlay", + "rev": "7d7175e30c2a79483e1bf7dfd2ddc4c0bdd0e8af", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "neovim-nightly-overlay", + "type": "github" + } + }, + "neovim-src": { + "flake": false, + "locked": { + "lastModified": 1741217955, + "narHash": "sha256-NKXFdxXJDj6XoTafm2VqkYP2XQVlJ68/fz3xScO4oYA=", + "owner": "neovim", + "repo": "neovim", + "rev": "a261f602a067c7cb4de39fa6330053c08dcfd5e5", + "type": "github" + }, + "original": { + "owner": "neovim", + "repo": "neovim", + "type": "github" + } + }, "nixCats": { "locked": { "lastModified": 1740837766, @@ -19,6 +200,22 @@ "locked": { "lastModified": 1741037377, "narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "02032da4af073d0f6110540c8677f16d4be0117f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1741037377, + "narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=", "owner": "nixos", "repo": "nixpkgs", "rev": "02032da4af073d0f6110540c8677f16d4be0117f", @@ -49,10 +246,32 @@ }, "root": { "inputs": { + "neovim-nightly-overlay": "neovim-nightly-overlay", "nixCats": "nixCats", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "plugins-leap-spooky-nvim": "plugins-leap-spooky-nvim" } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "neovim-nightly-overlay", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1739829690, + "narHash": "sha256-mL1szCeIsjh6Khn3nH2cYtwO5YXG6gBiTw1A30iGeDU=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "3d0579f5cc93436052d94b73925b48973a104204", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } } }, "root": "root", @@ -24,9 +24,9 @@ nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; nixCats.url = "github:BirdeeHub/nixCats-nvim"; - # neovim-nightly-overlay = { - # url = "github:nix-community/neovim-nightly-overlay"; - # }; + neovim-nightly-overlay = { + url = "github:nix-community/neovim-nightly-overlay"; + }; # see :help nixCats.flake.inputs # If you want your plugin to be loaded by the standard overlay, @@ -111,6 +111,8 @@ general = with pkgs.vimPlugins; { always = [ lze lzextras ]; + + extra = [ nvim-web-devicons ]; }; theme = with pkgs.vimPlugins; (builtins.getAttr (categories.colorscheme or "catppuccin-mocha") { @@ -131,6 +133,9 @@ treesitter = [ nvim-treesitter.withAllGrammars nvim-treesitter-textobjects ]; completion = [ blink-cmp ]; + # NOTE: On NeoVim 0.11+ nvim-lspconfig is not required due to native API + # lsp = [ nvim-lspconfig mason-nvim mason-lspconfig-nvim ]; + lsp = []; extra = [ which-key-nvim ]; }; @@ -197,7 +202,7 @@ # IMPORTANT: # your alias may not conflict with your other packages. aliases = [ "vim" ]; - # neovim-unwrapped = inputs.neovim-nightly-overlay.packages.${pkgs.system}.neovim; + neovim-unwrapped = inputs.neovim-nightly-overlay.packages.${pkgs.system}.neovim; }; # and a set of categories that you want # (and other information to pass to lua) diff --git a/lua/config/plugins/completion.lua b/lua/config/plugins/completion.lua index 16454b1..7fd31c4 100644 --- a/lua/config/plugins/completion.lua +++ b/lua/config/plugins/completion.lua @@ -2,7 +2,7 @@ return { { "blink.cmp", event = "DeferredUIEnter", - after = function(plugin) + after = function(_) require("blink.cmp").setup({}) end, } diff --git a/lua/config/plugins/init.lua b/lua/config/plugins/init.lua index be14fa9..48da180 100644 --- a/lua/config/plugins/init.lua +++ b/lua/config/plugins/init.lua @@ -23,5 +23,6 @@ require("lze").load({ { import = "config.plugins.telescope" }, { import = "config.plugins.treesitter" }, { import = "config.plugins.completion" }, + { import = "config.plugins.lsp" }, { import = "config.plugins.extra" }, }) diff --git a/lua/config/plugins/lsp.lua b/lua/config/plugins/lsp.lua new file mode 100644 index 0000000..a564707 --- /dev/null +++ b/lua/config/plugins/lsp.lua @@ -0,0 +1 @@ +return {} |