diff --git a/flake.lock b/flake.lock index cb55bc1..e476983 100644 --- a/flake.lock +++ b/flake.lock @@ -264,24 +264,6 @@ "type": "github" } }, - "flake-utils_4": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -396,28 +378,6 @@ "type": "github" } }, - "nil-lsp": { - "inputs": { - "flake-utils": "flake-utils_4", - "nixpkgs": [ - "nixpkgs-unstable" - ], - "rust-overlay": "rust-overlay_2" - }, - "locked": { - "lastModified": 1682748903, - "narHash": "sha256-G7YoOWf/dGfxqJUdwtG0HtHyT4kbZNqrLe5eFOT2u6k=", - "owner": "oxalica", - "repo": "nil", - "rev": "4dcb73894281644d4d29ffa337eff88d1d7ffd1a", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "nil", - "type": "github" - } - }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -544,7 +504,6 @@ "lipsum": "lipsum", "material-wifi-icons": "material-wifi-icons", "mullvad-with-completions": "mullvad-with-completions", - "nil-lsp": "nil-lsp", "nix-index-database": "nix-index-database", "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable", @@ -600,31 +559,6 @@ "type": "github" } }, - "rust-overlay_2": { - "inputs": { - "flake-utils": [ - "nil-lsp", - "flake-utils" - ], - "nixpkgs": [ - "nil-lsp", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1682043560, - "narHash": "sha256-ZsF4Yee9pQbvLtwSVGgYux+az4yFSLXrxPyGHm3ptJM=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "48037a6f8faeee138ede96bf607bc95c9dab9aec", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "sea-orm-cli": { "locked": { "lastModified": 1659947860, @@ -641,21 +575,6 @@ "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" - } - }, "utils": { "locked": { "lastModified": 1667395993, diff --git a/flake.nix b/flake.nix index 4718e85..180c485 100644 --- a/flake.nix +++ b/flake.nix @@ -38,9 +38,6 @@ sea-orm-cli.url = "github:lucperkins/nixpkgs/lperkins/sea-orm-cli"; mullvad-with-completions.url = "github:lelgenio/nixpkgs/mullvad-add-shell-completions"; - nil-lsp.url = "github:oxalica/nil"; - nil-lsp.inputs.nixpkgs.follows = "nixpkgs-unstable"; - plymouth-themes.url = "github:adi1090x/plymouth-themes"; plymouth-themes.flake = false; diff --git a/overlays/default.nix b/overlays/default.nix index da2a8a7..8752e2d 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -51,7 +51,6 @@ webcord = (prev.webcord or prev.unstable.webcord).overrideAttrs (old: { patches = (old.patches or [ ]) ++ [ ../patches/webcord/fix-reading-config.patch ]; }); - nil-lsp = inputs.nil-lsp.packages.${prev.system}.nil; mullvad = inputs.mullvad-with-completions.legacyPackages.${prev.system}.mullvad; }); diff --git a/user/home.nix b/user/home.nix index a3835ed..bd82d51 100644 --- a/user/home.nix +++ b/user/home.nix @@ -123,7 +123,7 @@ ninja flow # js lsp server - nil-lsp # nix lsp server + nil # nix lsp server clang-tools # c/c++ lsp server # cargo