diff --git a/configs/neovim.nix b/configs/neovim.nix index e93dc99..0c9d6a0 100644 --- a/configs/neovim.nix +++ b/configs/neovim.nix @@ -52,8 +52,8 @@ pkgs.nodePackages.typescript-language-server pkgs.lua-language-server pkgs.nodePackages.vscode-langservers-extracted - pkgs.lemminx - niveumPackages.jq-lsp + pkgs.lemminx # XML LSP + pkgs.jq-lsp pkgs.dhall-lsp-server ]; } diff --git a/configs/neovim.sync-conflict-20250130-092404-AJVBWR2.nix b/configs/neovim.sync-conflict-20250130-092404-AJVBWR2.nix deleted file mode 100644 index 88ef04f..0000000 --- a/configs/neovim.sync-conflict-20250130-092404-AJVBWR2.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ pkgs, niveumPackages, config, ... }: { - environment.variables.EDITOR = pkgs.lib.mkForce "nvim"; - environment.shellAliases.vi = "nvim"; - environment.shellAliases.vim = "nvim"; - environment.shellAliases.view = "nvim -R"; - - home-manager.users.me = { - editorconfig = { - enable = true; - settings = { - "*" = { - charset = "utf-8"; - end_of_line = "lf"; - trim_trailing_whitespace = true; - insert_final_newline = true; - indent_style = "space"; - indent_size = 2; - }; - "*.py" = { indent_size = 4; }; - Makefile = { indent_style = "tab"; }; - "*.md" = { trim_trailing_whitespace = false; }; - }; - }; - }; - - environment.systemPackages = [ - (pkgs.writers.writeDashBin "vim" ''neovim "$@"'') - (niveumPackages.vim.override { - stylixColors = config.lib.stylix.colors; - # colorscheme = "base16-gruvbox-dark-medium"; - }) - - # language servers - pkgs.pyright - pkgs.haskellPackages.haskell-language-server - pkgs.texlab - pkgs.nil - pkgs.rust-analyzer - pkgs.nodePackages.typescript-language-server - pkgs.lua-language-server - pkgs.nodePackages.vscode-langservers-extracted - pkgs.lemminx - niveumPackages.jq-lsp - pkgs.dhall-lsp-server - ]; -} diff --git a/flake.nix b/flake.nix index 3029059..4402ca4 100644 --- a/flake.nix +++ b/flake.nix @@ -363,7 +363,6 @@ gpt35 = pkgs.callPackage packages/gpt.nix {model = "gpt-3.5-turbo";}; gpt4 = pkgs.callPackage packages/gpt.nix {model = "gpt-4";}; hc = pkgs.callPackage packages/hc.nix {}; - jq-lsp = pkgs.callPackage packages/jq-lsp.nix {}; stardict-tools = pkgs.callPackage packages/stardict-tools.nix {}; heuretes = pkgs.callPackage packages/heuretes.nix {}; htgen = pkgs.callPackage packages/htgen.nix {}; diff --git a/packages/jq-lsp.nix b/packages/jq-lsp.nix deleted file mode 100644 index d593c16..0000000 --- a/packages/jq-lsp.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ - buildGoModule, - fetchFromGitHub, - lib, -}: -buildGoModule { - name = "jq-lsp"; - version = "unstable-2023-09-08"; - src = fetchFromGitHub { - owner = "wader"; - repo = "jq-lsp"; - rev = "85edf1adbe5e6c91b37c67b6a4bf85eda1e49f2f"; - hash = "sha256-ItLKRSbGZ8UqFEHCoh96KwhSpuKZ3l+2ZXnBkHEZL0M="; - }; - vendorHash = "sha256-ppQ81uERHBgOr/bm/CoDSWcK+IqHwvcL6RFi0DgoLuw="; -}