diff --git a/flake.lock b/flake.lock index c936e51..9d89c59 100644 --- a/flake.lock +++ b/flake.lock @@ -194,22 +194,6 @@ "type": "github" } }, - "nixpkgs-glslls": { - "locked": { - "lastModified": 1649333979, - "narHash": "sha256-NN4povtqDoa8i6cWgwjOIq7M99d2+gAYzKNNqQP1h1o=", - "owner": "felschr", - "repo": "nixpkgs", - "rev": "e03c66c1ab447e03301a51b1d8b3a543658dacd0", - "type": "github" - }, - "original": { - "owner": "felschr", - "ref": "glsl-language-server", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-mullvad-browser": { "locked": { "lastModified": 1681399935, @@ -310,7 +294,6 @@ "home-manager": "home-manager", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", - "nixpkgs-glslls": "nixpkgs-glslls", "nixpkgs-mullvad-browser": "nixpkgs-mullvad-browser", "nixpkgs-unstable": "nixpkgs-unstable", "nur": "nur", diff --git a/flake.nix b/flake.nix index d4e31b2..61ee78d 100644 --- a/flake.nix +++ b/flake.nix @@ -3,8 +3,6 @@ inputs.nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; - inputs.nixpkgs-glslls.url = "github:felschr/nixpkgs/glsl-language-server"; - inputs.nixpkgs-mullvad-browser.url = "github:felschr/nixpkgs/mullvad-browser"; inputs.nixos-hardware.url = "github:NixOS/nixos-hardware/master"; @@ -44,7 +42,7 @@ outputs = { self, nixpkgs, nixpkgs-unstable, nixos-hardware, flake-utils , home-manager, nur, agenix, deploy-rs, pre-commit-hooks - , nvim-kitty-navigator, nixpkgs-glslls, nixpkgs-mullvad-browser }@inputs: + , nvim-kitty-navigator, nixpkgs-mullvad-browser }@inputs: let nixpkgsConfig.allowUnfree = true; overlays = { @@ -72,10 +70,6 @@ deconz = final: prev: { deconz = final.qt5.callPackage ./pkgs/deconz { }; }; - glslls = final: prev: { - inherit (nixpkgs-glslls.legacyPackages.${final.system}) - glsl-language-server; - }; mullvad-browser = final: prev: { inherit (nixpkgs-mullvad-browser.legacyPackages.${final.system}) mullvad-browser; @@ -98,7 +92,6 @@ nur.overlay neovim deconz - glslls mullvad-browser ]; }; diff --git a/home/editors/lsp.nix b/home/editors/lsp.nix index f5c3e95..2c2708a 100644 --- a/home/editors/lsp.nix +++ b/home/editors/lsp.nix @@ -19,7 +19,6 @@ haskellPackages.haskell-language-server rust-analyzer sumneko-lua-language-server - glsl-language-server # linters & formatters shellcheck diff --git a/home/editors/neovim/lsp/lsp.lua b/home/editors/neovim/lsp/lsp.lua index 396339e..8a5a40e 100644 --- a/home/editors/neovim/lsp/lsp.lua +++ b/home/editors/neovim/lsp/lsp.lua @@ -56,17 +56,6 @@ local monorepo_pattern = function(main_patterns, other_patterns, f) return git_root_sln or config.util.root_pattern(unpack(all_patterns))(f) end -if not configs.glslls then - configs.glslls = { - default_config = { - cmd = { "glslls", "--stdin" }; - filetypes = { "glsl" }; - root_dir = config.util.root_pattern("*.conf", ".git"); - settings = {}; - }; - } -end - local capabilities = require("cmp_nvim_lsp").default_capabilities() capabilities.textDocument.completion.completionItem.snippetSupport = true @@ -88,7 +77,6 @@ config.terraformls.setup(default_config) config.hls.setup(default_config) config.bufls.setup(default_config) config.vimls.setup(default_config) -config.glslls.setup(default_config) config.bashls.setup { on_attach = function(client, bufnr)