diff --git a/flake.lock b/flake.lock index 195a328d..5cabeb76 100644 --- a/flake.lock +++ b/flake.lock @@ -409,6 +409,24 @@ "type": "github" } }, + "flake-parts_8": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_5" + }, + "locked": { + "lastModified": 1683560683, + "narHash": "sha256-XAygPMN5Xnk/W2c1aW0jyEa6lfMDZWlQgiNtmHXytPc=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "006c75898cf814ef9497252b022e91c946ba8e17", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-root": { "locked": { "lastModified": 1671378805, @@ -1108,6 +1126,25 @@ "type": "github" } }, + "nixd": { + "inputs": { + "flake-parts": "flake-parts_8", + "nixpkgs": "nixpkgs_12" + }, + "locked": { + "lastModified": 1685818765, + "narHash": "sha256-80ZLrxhyDd1LJRKo2bJQojZqSateDluGLqs6yonZ/iQ=", + "owner": "nix-community", + "repo": "nixd", + "rev": "291d4d19e232006eb2d93f3e18915a665f7d7bb7", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixd", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1684668519, @@ -1196,6 +1233,24 @@ "type": "github" } }, + "nixpkgs-lib_5": { + "locked": { + "dir": "lib", + "lastModified": 1682879489, + "narHash": "sha256-sASwo8gBt7JDnOOstnps90K1wxmVfyhsTPPNTGBPjjg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "da45bf6ec7bbcc5d1e14d3795c025199f28e0de0", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-regression": { "locked": { "lastModified": 1643052045, @@ -1309,6 +1364,22 @@ } }, "nixpkgs_12": { + "locked": { + "lastModified": 1685317056, + "narHash": "sha256-XyG7iSSrgqsnT90GZOvWWbJheagWvSon4LOwjGGFq6c=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "6b554aae1cf48cb39d4a61a51f826859027a93e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_13": { "locked": { "lastModified": 1685168767, "narHash": "sha256-wQgnxz0PdqbyKKpsWl/RU8T8QhJQcHfeC6lh1xRUTfk=", @@ -1324,7 +1395,7 @@ "type": "github" } }, - "nixpkgs_13": { + "nixpkgs_14": { "locked": { "lastModified": 1675942811, "narHash": "sha256-/v4Z9mJmADTpXrdIlAjFa1e+gkpIIROR670UVDQFwIw=", @@ -1339,7 +1410,7 @@ "type": "indirect" } }, - "nixpkgs_14": { + "nixpkgs_15": { "locked": { "lastModified": 1681358109, "narHash": "sha256-eKyxW4OohHQx9Urxi7TQlFBTDWII+F+x2hklDOQPB50=", @@ -1355,7 +1426,7 @@ "type": "github" } }, - "nixpkgs_15": { + "nixpkgs_16": { "locked": { "lastModified": 1685012353, "narHash": "sha256-U3oOge4cHnav8OLGdRVhL45xoRj4Ppd+It6nPC9nNIU=", @@ -1371,7 +1442,7 @@ "type": "github" } }, - "nixpkgs_16": { + "nixpkgs_17": { "locked": { "lastModified": 1680945546, "narHash": "sha256-8FuaH5t/aVi/pR1XxnF0qi4WwMYC+YxlfdsA0V+TEuQ=", @@ -1533,7 +1604,7 @@ "picom": { "inputs": { "flake-utils": "flake-utils_8", - "nixpkgs": "nixpkgs_13" + "nixpkgs": "nixpkgs_14" }, "locked": { "lastModified": 1676292705, @@ -1654,7 +1725,8 @@ "mission-control": "mission-control_2", "neovim-nightly-overlay": "neovim-nightly-overlay", "nil": "nil", - "nixpkgs": "nixpkgs_12", + "nixd": "nixd", + "nixpkgs": "nixpkgs_13", "nur": "nur", "picom": "picom", "rust-overlay": "rust-overlay_2", @@ -1707,7 +1779,7 @@ "rust-overlay_2": { "inputs": { "flake-utils": "flake-utils_9", - "nixpkgs": "nixpkgs_14" + "nixpkgs": "nixpkgs_15" }, "locked": { "lastModified": 1685240871, @@ -1725,7 +1797,7 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_15", + "nixpkgs": "nixpkgs_16", "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { @@ -1843,7 +1915,7 @@ }, "treefmt-nix_3": { "inputs": { - "nixpkgs": "nixpkgs_16" + "nixpkgs": "nixpkgs_17" }, "locked": { "lastModified": 1684751370, diff --git a/flake.nix b/flake.nix index a193a14b..6729fb80 100644 --- a/flake.nix +++ b/flake.nix @@ -154,6 +154,7 @@ disko.url = "github:nix-community/disko"; emanote.url = "github:srid/emanote"; joshuto.url = "github:kamiyaa/joshuto"; + nixd.url = "github:nix-community/nixd"; }; } diff --git a/hosts/default.nix b/hosts/default.nix index db2fae50..7d0f1494 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -50,6 +50,7 @@ in inputs.picom.overlays.default inputs.nil.overlays.default inputs.joshuto.overlays.default + inputs.nixd.overlays.default (import inputs.emacs-overlay) ] ++ (import ../overlays); diff --git a/modules/editors/nvim/default.nix b/modules/editors/nvim/default.nix index b8b5545d..43812d12 100644 --- a/modules/editors/nvim/default.nix +++ b/modules/editors/nvim/default.nix @@ -28,6 +28,7 @@ nodePackages_latest.bash-language-server rnix-lsp nil + nixd lua-language-server gopls pyright diff --git a/modules/editors/nvim/lua/plugins/lsp.lua b/modules/editors/nvim/lua/plugins/lsp.lua index 51ba69a5..74860b1d 100644 --- a/modules/editors/nvim/lua/plugins/lsp.lua +++ b/modules/editors/nvim/lua/plugins/lsp.lua @@ -179,6 +179,10 @@ return { }, }, }) + nvim_lsp.nixd.setup({ + on_attach = on_attach, + settings = {}, + }) nvim_lsp.hls.setup({}) -- ebuild Syntastic(install dev-util/pkgcheck) diff --git a/scripts/flake-update.sh b/scripts/flake-update.sh index 3cd2837a..ef3838cd 100644 --- a/scripts/flake-update.sh +++ b/scripts/flake-update.sh @@ -26,6 +26,7 @@ flake_input=( treefmt-nix emanote joshuto + nixd ) for item in "${flake_input[@]}" do