From 17d483c8c8a96fad2200acaf802b7ef0b0eb494d Mon Sep 17 00:00:00 2001 From: Linnnus Date: Wed, 6 Sep 2023 08:18:38 +0200 Subject: =?UTF-8?q?hej=20g=C3=B8r=20lige=20mere?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- use-cases/development/neovim/default.nix | 29 ---------- use-cases/development/neovim/filetype.nix | 20 ------- use-cases/development/neovim/lsp.nix | 89 ------------------------------- 3 files changed, 138 deletions(-) delete mode 100644 use-cases/development/neovim/default.nix delete mode 100644 use-cases/development/neovim/filetype.nix delete mode 100644 use-cases/development/neovim/lsp.nix (limited to 'use-cases/development/neovim') diff --git a/use-cases/development/neovim/default.nix b/use-cases/development/neovim/default.nix deleted file mode 100644 index 5c265b8..0000000 --- a/use-cases/development/neovim/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -# This file contains the HM configuration options for Neovim. - -{ pkgs, lib, ... }: - -{ - imports = - [ - ./lsp.nix - ./filetype.nix - ]; - - programs.neovim = { - enable = true; - - # Typing `vi`, `vim`, or `vimdiff` will also run neovim. - viAlias = true; - vimAlias = true; - vimdiffAlias = true; - }; - - # Set Neovim as the default editor. - home.sessionVariables.EDITOR = "nvim"; - home.sessionVariables.VISUAL = "nvim"; - - # Use neovim as man pager. - home.sessionVariables.MANPAGER = "nvim +Man!"; -} - -# vi: foldmethod=marker diff --git a/use-cases/development/neovim/filetype.nix b/use-cases/development/neovim/filetype.nix deleted file mode 100644 index 66d5e68..0000000 --- a/use-cases/development/neovim/filetype.nix +++ /dev/null @@ -1,20 +0,0 @@ -# This module configures various syntax/filetype plugins for Neovim. - -{ pkgs, ... }: - -let - vim-noweb = pkgs.vimUtils.buildVimPlugin { - pname = "vim-noweb"; - version = "26-08-2023"; # day of retrieval - src = pkgs.fetchzip { - url = "https://metaed.com/papers/vim-noweb/vim-noweb.tgz"; - hash = "sha256-c5eUZiKIjAfjJ33l821h5DjozMpMf0CaK03QIkSUfxg="; - }; - }; -in -{ - programs.neovim.plugins = with pkgs.vimPlugins; [ - vim-nix - vim-noweb - ]; -} diff --git a/use-cases/development/neovim/lsp.nix b/use-cases/development/neovim/lsp.nix deleted file mode 100644 index 0c7321d..0000000 --- a/use-cases/development/neovim/lsp.nix +++ /dev/null @@ -1,89 +0,0 @@ -# This module sets up LSP server configurations for Neovim. It is waaay -# overcomplicated as it kind of turned into an experiment in generating Lua -# code from a Nix attrset. - -{ pkgs, lib, ... }: - -let - servers = { - pyright.cmd = [ "${pkgs.pyright}/bin/pyright-langserver" ]; - }; - defaultConfig = { - flags.debounce_text_changes = 150; - }; - combinedConfig = lib.mapAttrs (name: value: value // defaultConfig) servers; - - nixToLua = s: - if builtins.isAttrs s then - let - renderAttr = name: value: "[ [==========[" + name + "]==========] ] = " + (nixToLua value); - attrsList = map (name: renderAttr name s.${name}) (lib.attrNames s); - attrsListStr = lib.concatStringsSep ", " attrsList; - in - "{ ${attrsListStr} }" - else if builtins.isList s then - "{ " + (lib.concatStringsSep ", " (map nixToLua s)) + " }" - else if builtins.isString s then - # Oh boy I sure hope `s` doesn't contain "]==========]". - "[==========[" + s + "]==========]" - else if builtins.isInt s || builtins.isFloat s then - toString s - else - throw "Cannot convert ${builtins.typeOf s} to Lua value!"; - combinedConfigStr = nixToLua combinedConfig; -in -{ - programs.neovim.plugins = [ - { - plugin = pkgs.vimPlugins.nvim-lspconfig; - type = "lua"; - config = '' - local lspconfig = require("lspconfig") - local util = require("lspconfig.util") - - -- Mappings. - -- See `:help vim.diagnostic.*` for documentation on any of the below functions - local opts = { noremap=true, silent=true } - vim.keymap.set('n', 'e', vim.diagnostic.open_float, opts) - vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, opts) - vim.keymap.set('n', ']d', vim.diagnostic.goto_next, opts) - vim.keymap.set('n', 'q', vim.diagnostic.setloclist, opts) - - -- Use an on_attach function to only map the following keys - -- after the language server attaches to the current buffer - local on_attach = function(client, bufnr) - -- Enable completion triggered by - vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc') - - -- Mappings. - -- See `:help vim.lsp.*` for documentation on any of the below functions - local bufopts = { noremap=true, silent=true, buffer=bufnr } - vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, bufopts) - vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts) - vim.keymap.set('n', 'K', vim.lsp.buf.hover, bufopts) - vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, bufopts) - vim.keymap.set('n', '', vim.lsp.buf.signature_help, bufopts) - vim.keymap.set('n', 'wa', vim.lsp.buf.add_workspace_folder, bufopts) - vim.keymap.set('n', 'wr', vim.lsp.buf.remove_workspace_folder, bufopts) - vim.keymap.set('n', 'wl', function() - print(vim.inspect(vim.lsp.buf.list_workspace_folders())) - end, bufopts) - vim.keymap.set('n', 'D', vim.lsp.buf.type_definition, bufopts) - vim.keymap.set('n', 'rn', vim.lsp.buf.rename, bufopts) - vim.keymap.set('n', 'ca', vim.lsp.buf.code_action, bufopts) - vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts) - vim.keymap.set('n', 'f', function() vim.lsp.buf.format { async = true } end, bufopts) - vim.keymap.set('n', 's', function() vim.cmd[[ClangdSwitchSourceHeader]] end, bufopts) - end - - -- Use a loop to conveniently call 'setup' on multiple servers and - -- map buffer local keybindings when the language server attaches - local servers = ${combinedConfigStr}; - for server, config in pairs(servers) do - config.on_attach = on_attach; -- inject lua event handler; not elegant! - lspconfig[server].setup(config) - end - ''; - } - ]; -} -- cgit v1.2.3