felschr/nixos-config
1
1
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

feat: remove glsl-language-server

Browse source
This commit is contained in:
Felix Schröter 2023-04-19 13:32:46 +02:00
parent bc2c479485
commit 57395114d9
Signed by: felschr
GPG key ID: 671E39E6744C807D
4 changed files with 1 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
flake.lock
View file

@ -194,22 +194,6 @@
"type": "github" "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": { "nixpkgs-mullvad-browser": {
"locked": { "locked": {
"lastModified": 1681399935, "lastModified": 1681399935,
@ -310,7 +294,6 @@
"home-manager": "home-manager", "home-manager": "home-manager",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-glslls": "nixpkgs-glslls",
"nixpkgs-mullvad-browser": "nixpkgs-mullvad-browser", "nixpkgs-mullvad-browser": "nixpkgs-mullvad-browser",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"nur": "nur", "nur": "nur",

9
flake.nix
View file

@ -3,8 +3,6 @@
inputs.nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; 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.nixpkgs-mullvad-browser.url = "github:felschr/nixpkgs/mullvad-browser";
inputs.nixos-hardware.url = "github:NixOS/nixos-hardware/master"; inputs.nixos-hardware.url = "github:NixOS/nixos-hardware/master";
@ -44,7 +42,7 @@
outputs = { self, nixpkgs, nixpkgs-unstable, nixos-hardware, flake-utils outputs = { self, nixpkgs, nixpkgs-unstable, nixos-hardware, flake-utils
, home-manager, nur, agenix, deploy-rs, pre-commit-hooks , 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 let
nixpkgsConfig.allowUnfree = true; nixpkgsConfig.allowUnfree = true;
overlays = { overlays = {
@ -72,10 +70,6 @@
deconz = final: prev: { deconz = final: prev: {
deconz = final.qt5.callPackage ./pkgs/deconz { }; deconz = final.qt5.callPackage ./pkgs/deconz { };
}; };
glslls = final: prev: {
inherit (nixpkgs-glslls.legacyPackages.${final.system})
glsl-language-server;
};
mullvad-browser = final: prev: { mullvad-browser = final: prev: {
inherit (nixpkgs-mullvad-browser.legacyPackages.${final.system}) inherit (nixpkgs-mullvad-browser.legacyPackages.${final.system})
mullvad-browser; mullvad-browser;
@ -98,7 +92,6 @@
nur.overlay nur.overlay
neovim neovim
deconz deconz
glslls
mullvad-browser mullvad-browser
]; ];
}; };

1
home/editors/lsp.nix
View file

@ -19,7 +19,6 @@
haskellPackages.haskell-language-server haskellPackages.haskell-language-server
rust-analyzer rust-analyzer
sumneko-lua-language-server sumneko-lua-language-server
glsl-language-server
# linters & formatters # linters & formatters
shellcheck shellcheck

12
home/editors/neovim/lsp/lsp.lua
View file

@ -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) return git_root_sln or config.util.root_pattern(unpack(all_patterns))(f)
end 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() local capabilities = require("cmp_nvim_lsp").default_capabilities()
capabilities.textDocument.completion.completionItem.snippetSupport = true capabilities.textDocument.completion.completionItem.snippetSupport = true
@ -88,7 +77,6 @@ config.terraformls.setup(default_config)
config.hls.setup(default_config) config.hls.setup(default_config)
config.bufls.setup(default_config) config.bufls.setup(default_config)
config.vimls.setup(default_config) config.vimls.setup(default_config)
config.glslls.setup(default_config)
config.bashls.setup { config.bashls.setup {
on_attach = function(client, bufnr) on_attach = function(client, bufnr)