terminal-life: reduce nvim config, switch to telescope

flake.nix

@@ -81,6 +81,7 @@
         devShells.default = pkgs.mkShell {
           packages = with pkgs; [
             nix
+            nixd
             agenix
             age-plugin-yubikey
             cachix
@@ -97,10 +98,12 @@
 
             deploy-rs
 
+						terraform-ls
             opentofu
             terraform-backend-git
 
             deno
+						denols
           ];
 
           shellHook = ''

modules/desktop-extended/default.nix

@@ -29,14 +29,6 @@ in {
     element-desktop
     element-b12f
     element-mezza
-
-    # Nix specific utilities
-    alejandra
-    manix
-    nix-index
-    nix-tree
-    nix-inspect
-    nvd
   ];
 
   fonts = {

modules/terminal-life/default.nix

@@ -22,13 +22,12 @@ in {
     programs.command-not-found.enable = false;
 
     users.users."${psCfg.user.name}".packages = with pkgs; [
-      ack
       asciinema
       bat
       blesh
       eza
       fd
-      jump
+			ripgrep
       (nnn.overrideAttrs (o: {
         patches =
           (o.patches or [])
@@ -39,9 +38,17 @@ in {
       p
       powerline
       screen
-      silver-searcher
       watson
-    ];
+			jump
+		] ++ (if cfg.full then [
+			# Nix specific utilities
+			alejandra
+			manix
+			nix-index
+			nix-tree
+			nix-inspect
+			nvd
+		] else []);
 
     home-manager.users."${psCfg.user.name}" = {
       xdg.dataFile."scripts/base16.sh".source = .local/share/scripts/base16.sh;
@@ -79,13 +86,11 @@ in {
         inherit pkgs;
         inherit lib;
       };
+
       # Ensure nvim backup directory gets created
       # Workaround for E510: Can't make backup file (add ! to override)
       xdg.dataFile."nvim/backup/.keep".text = "";
       xdg.dataFile."nvim/json-schemas/.keep".text = "";
-      # Generated with:
-      # docker run -it --name caddy-json-schema registry.greenbaum.cloud/gc/caddy-l4:2.5.2 caddy json-schema -output /srv/caddy_schema.json
-      xdg.dataFile."nvim/json-schemas/caddy_schema.json".source = .local/share/nvim/json-schemas/caddy_schema.json;
       xdg.dataFile."nvim/templates/.keep".text = "";
 
       programs.git = import ./git {};

modules/terminal-life/nvim/cmp.vim

@@ -0,0 +1,48 @@
+lua <<EOF
+
+local luasnip = require 'luasnip'
+
+local cmp = require 'cmp'
+cmp.setup {
+	snippet = {
+		expand = function(args)
+			require('luasnip').lsp_expand(args.body)
+		end,
+	},
+	mapping = {
+		['<C-p>'] = cmp.mapping.select_prev_item(),
+		['<C-n>'] = cmp.mapping.select_next_item(),
+		['<C-d>'] = cmp.mapping.scroll_docs(-4),
+		['<C-f>'] = cmp.mapping.scroll_docs(4),
+		['<C-Space>'] = cmp.mapping.complete(),
+		['<C-e>'] = cmp.mapping.close(),
+		['<CR>'] = cmp.mapping.confirm {
+			behavior = cmp.ConfirmBehavior.Replace,
+			select = true,
+		},
+		['<Tab>'] = function(fallback)
+			if cmp.visible() then
+				cmp.select_next_item()
+			elseif luasnip.expand_or_jumpable() then
+				luasnip.expand_or_jump()
+			else
+				fallback()
+			end
+		end,
+		['<S-Tab>'] = function(fallback)
+			if cmp.visible() then
+				cmp.select_prev_item()
+			elseif luasnip.jumpable(-1) then
+				luasnip.jump(-1)
+			else
+				fallback()
+			end
+		end,
+	},
+	sources = {
+		{ name = 'nvim_lsp' },
+		{ name = 'luasnip' },
+	},
+}
+
+EOF

modules/terminal-life/nvim/default.nix

@@ -7,8 +7,6 @@
   psCfg = config.pub-solar;
   cfg = config.pub-solar.terminal-life;
   xdg = config.home-manager.users."${psCfg.user.name}".xdg;
-
-  preview-file = pkgs.writeShellScriptBin "preview-file" (import ./preview-file.nix pkgs);
 in {
   enable = true;
 
@@ -20,49 +18,35 @@ in {
   withRuby = true;
   withPython3 = true;
 
-  extraPackages = with pkgs;
-    lib.mkIf (cfg.full) [
-      ansible-language-server
-      ccls
-      gopls
-      nixd
-      nodejs
-      nodePackages.bash-language-server
-      nodePackages.dockerfile-language-server-nodejs
-      nodePackages.svelte-language-server
-      nodePackages.typescript
-      nodePackages.typescript-language-server
-      nodePackages.vim-language-server
-      nodePackages.vue-language-server
-      nodePackages.vscode-langservers-extracted
-      nodePackages.yaml-language-server
-      python3Packages.python-lsp-server
-      python3Full
-      rust-analyzer
-      solargraph
-      terraform-ls
-      universal-ctags
-    ];
-
-  plugins = with pkgs.vimPlugins; lib.mkIf cfg.full [
-    pkgs.vimPlugins.nvim-treesitter.withAllGrammars
-
-    # Dependencies for nvim-lspconfig
-    nvim-cmp
-    cmp-nvim-lsp
-    cmp_luasnip
-    luasnip
-
-    # Quickstart configs for neovim LSP
-    lsp_extensions-nvim
-    nvim-lspconfig
-
-    # Collaborative editing in Neovim using built-in capabilities
-    instant-nvim-nvfetcher
-
-    # Search functionality behind :Ack
-    ack-vim
+  extraPackages = with pkgs; [
+		ripgrep
+		nixd
+		universal-ctags
+		# ansible-language-server
+		# clang-tools
+		# gopls
+		# nodePackages.bash-language-server
+		# nodePackages.svelte-language-server
+		# nodePackages.typescript
+		# nodePackages.typescript-language-server
+		# nodePackages.vue-language-server
+		# nodePackages.vscode-langservers-extracted
+		# nginx-language-server
+		# lua-language-server
+		# cmake-language-server
+		# vim-language-server
+		# yaml-language-server
+		# python3Packages.python-lsp-server
+		# nodePackages.dockerfile-language-server-nodejs
+		# docker-compose-language-service
+		# rust-analyzer
+		# cargo
+		# solargraph
+		# terraform-ls
+		# python3Full
+	];
 
+  plugins = with pkgs.vimPlugins; [
     # The status bar in the bottom of the screen with the mode indication and file location
     vim-airline
 
@@ -75,18 +59,9 @@ in {
     # Highlight characters when using f, F, t, and T
     quick-scope
 
-    # Get sudo in vim; :SudaWrite <optional filename>
-    vim-suda
-
     # Undo history etc. per project
     vim-workspace-nvfetcher
 
-    # JSON schemas
-    SchemaStore-nvim
-
-    # Work with tags files
-    vim-gutentags
-
     # Neovim colorschemes / themes
     sonokai
     vim-hybrid-material
@@ -103,9 +78,10 @@ in {
     # Ease your git workflow within Vim
     vimagit-nvfetcher
 
-    # FZF fuzzy finder
-    fzf-vim
-    fzfWrapper
+    # Telescope fuzzy finder
+		telescope-nvim
+		telescope-fzf-native-nvim
+
     # Make the yanked region apparent
     vim-highlightedyank
 
@@ -114,16 +90,33 @@ in {
 
     # Unload, delete or wipe a buffer without closing the window
     vim-bufkill
+
     # Defaults everyone can agree on
     vim-sensible
 
-    # emmet for vim: http://emmet.io/
-    emmet-vim
-    # Caddyfile syntax support for Vim
-    vim-caddyfile-nvfetcher
-  ];
+		# Work with tags files
+		vim-gutentags
+	] ++ (if cfg.full then [
+    nvim-treesitter.withAllGrammars
 
-  extraConfig = builtins.concatStringsSep "\n" [
+    # Dependencies for nvim-lspconfig
+    nvim-cmp
+    cmp-nvim-lsp
+    cmp_luasnip
+    luasnip
+
+    # Quickstart configs for neovim LSP
+    lsp_extensions-nvim
+    nvim-lspconfig
+
+    # Collaborative editing in Neovim using built-in capabilities
+    instant-nvim-nvfetcher
+
+    # JSON schemas
+    SchemaStore-nvim
+  ] else []);
+
+  extraConfig = builtins.concatStringsSep "\n" ([
     ''
       " Persistent undo
       set undofile
@@ -136,13 +129,9 @@ in {
     (builtins.readFile ./plugins.vim)
     (builtins.readFile ./clipboard.vim)
     (builtins.readFile ./ui.vim)
-    (builtins.readFile ./quickfixopenall.vim)
-    (builtins.readFile ./lsp.vim)
     (builtins.readFile ./filetypes.vim)
-    ''
-      " fzf with file preview
-      command! -bang -nargs=? -complete=dir Files
-          \ call fzf#vim#files(<q-args>, { 'options': ['--keep-right', '--cycle', '--layout', 'reverse', '--preview', '${preview-file}/bin/preview-file {}'] }, <bang>0)
-    ''
-  ];
+  ] ++ (if cfg.full then [
+    (builtins.readFile ./lsp.vim)
+    (builtins.readFile ./cmp.vim)
+	] else []));
 }

modules/terminal-life/nvim/init.vim

@@ -73,34 +73,13 @@ xnoremap p pgvy
 inoremap jj <Esc>
 
 " Open new buffer
-nmap <leader>T :enew<cr>
-
-" Move to the next buffer
+nmap <leader>bn :enew<cr>
 nmap <leader>l :bnext<CR>
-
-" Move to the previous buffer
+nmap <leader>bn :bnext<CR>
 nmap <leader>j :bprevious<CR>
-
-" Close the current buffer and move to the previous one
-" This replicates the idea of closing a tab
+nmap <leader>bp :bprevious<CR>
 nmap <leader>q :bp <BAR> bd #<CR>
-
-" Show all open buffers and their status
-nmap <leader>bl :ls<CR>
-
-" Mapping selecting mappings
-nmap <leader><tab> <plug>(fzf-maps-n)
-xmap <leader><tab> <plug>(fzf-maps-x)
-omap <leader><tab> <plug>(fzf-maps-o)
-
-nmap <c-p> :Files<CR>
-imap <c-p> <ESC>:Files<CR>
-
-" Insert mode completion
-imap <c-x><c-k> <plug>(fzf-complete-word)
-imap <c-x><c-f> <plug>(fzf-complete-path)
-imap <c-x><c-j> <plug>(fzf-complete-file)
-imap <c-x><c-l> <plug>(fzf-complete-line)
+nmap <leader>bq :bp <BAR> bd #<CR>
 
 " Clear quickfix shortcut
 nmap <Leader>c :ccl<CR>
@@ -110,7 +89,3 @@ nmap <Leader>c :ccl<CR>
 if has("autocmd")
   au BufReadPost * if line("'\"") > 1 && line("'\"") <= line("$") | exe "normal! g'\"" | endif
 endif
-
-nmap - :NnnPicker %<CR>
-nmap <leader>n :NnnPicker %<CR>
-nmap <leader>N :NnnPicker<CR>

modules/terminal-life/nvim/lsp.vim

@@ -1,258 +1,149 @@
-" Set completeopt to have a better completion experience
-" :help completeopt
-" menuone: popup even when there's only one match
-" noinsert: Do not insert text until a selection is made
-" noselect: Do not select, force user to select one from the menu
-set completeopt=menuone,noinsert,noselect
-
-" Avoid showing extra messages when using completion
-set shortmess+=c
-
-function AddTemplate(tmpl_file)
-    exe "0read " . a:tmpl_file
-    set nomodified
-    6
-endfunction
-
-autocmd BufNewFile shell.nix call AddTemplate("$XDG_DATA_HOME/nvim/templates/shell.nix.tmpl")
-
 " Configure neovim 0.6+ experimental LSPs
 " https://github.com/neovim/nvim-lspconfig
 " https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md
 " https://github.com/neovim/nvim-lspconfig/wiki/UI-Customization
 " https://gitlab.com/Iron_E/dotfiles/-/blob/master/.config/nvim/lua/_config/plugin/nvim_lsp.lua
+
 lua <<EOF
-  local nvim_lsp    = require('lspconfig')
 
-  -- Mappings (global)
-  -- See `:help vim.diagnostic.*` for documentation on any of the below functions
-  local opts = { noremap=true, silent=true }
-  vim.api.nvim_set_keymap('n', '<leader>e', '<cmd>lua vim.diagnostic.open_float()<CR>', opts)
-  vim.api.nvim_set_keymap('n', 'g[', '<cmd>lua vim.diagnostic.goto_prev()<CR>', opts)
-  vim.api.nvim_set_keymap('n', 'g]', '<cmd>lua vim.diagnostic.goto_next()<CR>', opts)
-  vim.api.nvim_set_keymap('n', '<leader>dq', '<cmd>lua vim.diagnostic.setloclist()<CR>', opts)
-  vim.api.nvim_set_keymap('n', '<leader>f', '<cmd>lua vim.lsp.buf.formatting()<CR>', opts)
+-- Set completeopt to have a better completion experience
+vim.o.completeopt = 'menuone,noselect,noinsert'
+vim.o.shortmess = vim.o.shortmess .. 'c'
+vim.o.signcolumn = 'yes:2'
 
-  -- 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 <c-x><c-o>
-    vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
+local lspconfig    = require('lspconfig')
 
-    -- Mappings (available if LSP is configured and attached to buffer)
-    -- See `:help vim.lsp.*` for documentation on any of the below functions
-    vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<CR>', opts)
-    vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>', opts)
-    vim.api.nvim_buf_set_keymap(bufnr, 'n', 'K', '<cmd>lua vim.lsp.buf.hover()<CR>', opts)
-    vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts)
-    vim.api.nvim_buf_set_keymap(bufnr, 'n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts)
-    vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>wa', '<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>', opts)
-    vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>wr', '<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>', opts)
-    vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>wl', '<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>', opts)
-    vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
-    vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
-    vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>ca', '<cmd>lua vim.lsp.buf.code_action()<CR>', opts)
-    vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts)
+-- Mappings (global)
+-- See `:help vim.diagnostic.*` for documentation on any of the below functions
+local opts = { noremap=true, silent=true }
+vim.api.nvim_set_keymap('n', '<leader>e', '<cmd>lua vim.diagnostic.open_float()<CR>', opts)
+vim.api.nvim_set_keymap('n', 'g[', '<cmd>lua vim.diagnostic.goto_prev()<CR>', opts)
+vim.api.nvim_set_keymap('n', 'g]', '<cmd>lua vim.diagnostic.goto_next()<CR>', opts)
+vim.api.nvim_set_keymap('n', '<leader>dq', '<cmd>lua vim.diagnostic.setloclist()<CR>', opts)
+vim.api.nvim_set_keymap('n', '<leader>f', '<cmd>lua vim.lsp.buf.formatting()<CR>', opts)
 
-    -- Show diagnostic popup on cursor hold
-    vim.api.nvim_create_autocmd("CursorHold", {
-      buffer = bufnr,
-      callback = function()
-        local opts = {
-          focusable = false,
-          close_events = { "BufLeave", "CursorMoved", "InsertEnter", "FocusLost" },
-          border = 'rounded',
-          source = 'always',
-          prefix = ' ',
-          scope = 'cursor',
-        }
-        vim.diagnostic.open_float(nil, opts)
-      end
-    })
+local on_attach = function(client, bufnr)
+	-- Enable completion triggered by <c-x><c-o>
+	vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
 
-  end
+	-- Mappings (available if LSP is configured and attached to buffer)
+	-- See `:help vim.lsp.*` for documentation on any of the below functions
+	vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<CR>', opts)
+	vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>', opts)
+	vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts)
+	vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts)
+	vim.api.nvim_buf_set_keymap(bufnr, 'n', 'K', '<cmd>lua vim.lsp.buf.hover()<CR>', opts)
+	vim.api.nvim_buf_set_keymap(bufnr, 'n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts)
+	vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>wa', '<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>', opts)
+	vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>wr', '<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>', opts)
+	vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>wl', '<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>', opts)
+	vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
+	vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
+	vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>ca', '<cmd>lua vim.lsp.buf.code_action()<CR>', opts)
 
-  -- Add additional capabilities supported by nvim-cmp
-  local capabilities = require('cmp_nvim_lsp').default_capabilities()
-  -- vscode HTML lsp needs this https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#html
-  capabilities.textDocument.completion.completionItem.snippetSupport = true
+	-- Show diagnostic popup on cursor hold
+	vim.api.nvim_create_autocmd("CursorHold", {
+		buffer = bufnr,
+		callback = function()
+			local opts = {
+				focusable = false,
+				close_events = { "BufLeave", "CursorMoved", "InsertEnter", "FocusLost" },
+				border = 'rounded',
+				source = 'always',
+				prefix = ' ',
+				scope = 'cursor',
+			}
+			vim.diagnostic.open_float(nil, opts)
+		end
+	})
 
-  -- vscode HTML lsp needs this https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#html
-  capabilities.textDocument.completion.completionItem.snippetSupport = true
+end
 
-  local use_denols_for_typescript = not(os.getenv('NVIM_USE_DENOLS') == nil)
+local lspconfig  = require 'lspconfig'
+-- Add additional capabilities supported by nvim-cmp
+local CAPABILITIES = require('cmp_nvim_lsp').default_capabilities()
 
-  for lsp_key, lsp_settings in pairs({
-        'ansiblels', ---------------------------- Ansible
-        'bashls', ------------------------------- Bash
-        'ccls', --------------------------------- C / C++ / Objective-C
-        'cssls', -------------------------------- CSS / SCSS / LESS
-        'dockerls', ----------------------------- Docker
-        ['gopls'] = { --------------------------- Go
-            ['settings'] = {
-                ['gopls'] = {
-                    ['analyses'] = {
-                        ['unusedparams'] = true,
-                    },
-                    ['staticcheck'] = true
-                },
-            },
-        },
-        'html', --------------------------------- HTML
-        ['jdtls'] = { --------------------------- Java
-            ['root_dir'] = nvim_lsp.util.root_pattern('.git', 'pom.xml', 'build.xml'),
-            ['init_options'] = {
-                ['jvm_args'] = {['java.format.settings.url'] = vim.fn.stdpath('config')..'/eclipse-formatter.xml'},
-                ['workspace'] = vim.fn.stdpath('cache')..'/java-workspaces'
-            }
-        },
-        ['jsonls'] = { -------------------------- JSON
-            ['settings'] = {
-                ['json'] = {
-                    ['schemas' ] = vim.list_extend(
-                      {
-                        {
-                          ['description'] = 'JSON schema for Caddy v2',
-                          ['fileMatch'] = { '*caddy*.json' },
-                          ['name'] = 'caddy_schema.json',
-                          ['url'] = vim.fn.stdpath('data')..'/json-schemas/caddy_schema.json',
-                        },
-                      },
-                      require('schemastore').json.schemas()
-                    ),
-                    ['validate'] = { ['enable'] = true }
-                }
-            }
-        },
-        'nixd', --------------------------------- Nix
-        'phpactor', ----------------------------- PHP
-        'pylsp', -------------------------------- Python
-        'solargraph', --------------------------- Ruby
-        'rust_analyzer', ------------------------ Rust
-        ['sqlls'] = {
-            ['cmd'] = {vim.fn.stdpath('data')..'/nvm/versions/node/v12.19.0/bin/sql-language-server', 'up', '--method', 'stdio'}
-        },
-        ['terraformls'] = { --------------------- Terraform
-            ['filetypes'] = { 'terraform', 'hcl', 'tf' }
-        },
+--- Event handlers
+local HANDLERS = {
+	-- TODO: replace with vim.lsp.protocol.Methods
+	["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, FLOAT_CONFIG),
+	["textDocument/signatureHelp"] = vim.lsp.with(vim.lsp.handlers.signature_help, FLOAT_CONFIG),
+}
 
-        -- The TS/JS server is chosen depending on an environment variable,
-        -- since denols is nicer for Deno based projects
-        ------------------------ Deno TS/JS
-        ------------------------------------ Typescript / JavaScript
-        (use_denols_for_typescript and 'denols' or 'tsserver'),
+-- vscode HTML lsp needs this https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#html
+CAPABILITIES.textDocument.completion.completionItem.snippetSupport = true
 
-        'vuels', -------------------------------- Vue
-        'svelte', ------------------------------- Svelte
-        ['yamlls'] = { -------------------------- YAML
-            ['settings'] = {
-                ['yaml'] = {
-                    ['schemas'] = {
-                        ['https://json.schemastore.org/github-workflow'] = '.github/workflows/*.{yml,yaml}',
-                        ['https://json.schemastore.org/github-action'] = '.github/action.{yml,yaml}',
-                        ['https://json.schemastore.org/drone'] = '*.drone.{yml,yaml}',
-                        ['https://json.schemastore.org/swagger-2.0'] = 'swagger.{yml,yaml}',
-                    }
-                }
-            }
-        }
-  }) do -- Setup all of the language servers. †
-    if type(lsp_key) == 'number' then -- Enable the LSP with defaults.
-      -- The `lsp` is an index in this case.
-      nvim_lsp[lsp_settings].setup{
-        on_attach = on_attach,
-        flags = {
-          debounce_text_changes = 150,
-        },
-        capabilities = capabilities,
-      }
-    else -- Use the LSP's configuration.
-      lsp_settings.on_attach = on_attach
-      lsp_settings.capabilities = capabilities
+local function setup(lsp, config)
+	if config == nil then
+		config = {}
+	end
 
-      nvim_lsp[lsp_key].setup(lsp_settings)
-    end
-  end -- ‡
+	config.capabilities = CAPABILITIES
+	config.handlers = HANDLERS
+	config.on_attach = on_attach
+	lspconfig[lsp].setup(config)
+end
 
-  -- configure floating diagnostics appearance, symbols
-  local signs = { Error = " ", Warn = " ", Hint = " ", Info = " " }
-  for type, icon in pairs(signs) do
-    local hl = "DiagnosticSign" .. type
-    vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = hl })
-  end
+setup('nixd')
+setup('bashls')
+setup('clangd')
+setup('cssls')
+setup('eslint')
+setup('tsserver')
+setup('denols')
+setup('vuels')
+setup('svelte')
+setup('html')
+setup('yamlls')
+setup('jsonls', {
+	json = {
+		schemas = require('schemastore').json.schemas(),
+		validate = {
+			enable = true
+		}
+	}
+})
+setup('gopls', {
+	settings = {
+		gopls = { semanticTokens = true }
+	}
+})
+setup('phpactor')
+setup('pylsp')
+setup('solargraph') -- ruby
+setup('rust_analyzer', {
+	settings = {
+		['rust-analyzer'] = {
+			checkOnSave = { extraArgs = { "--target-dir", "/tmp/rust-analyzer-check" } },
+			diagnostics = { disabled = { 'inactive-code' } },
+		},
+	}
+})
+setup('sqlls')
+setup('salt_ls')
+setup('ansiblels')
+setup('dockerls')
+setup('docker_compose_language_service')
+setup('terraformls')
 
-  -- Set completeopt to have a better completion experience
-  vim.o.completeopt = 'menuone,noselect'
+-- https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#denols
+vim.g.markdown_fenced_languages = {
+	"ts=typescript"
+}
 
-  -- luasnip setup
-  local luasnip = require 'luasnip'
+-- Configure diagnostics
+vim.diagnostic.config({
+	virtual_text = false,
+	signs = true,
+	underline = true,
+	update_in_insert = false,
+	severity_sort = false,
+})
 
-  -- nvim-cmp setup
-  local cmp = require 'cmp'
-  cmp.setup {
-    snippet = {
-      expand = function(args)
-        require('luasnip').lsp_expand(args.body)
-      end,
-    },
-    mapping = {
-      ['<C-p>'] = cmp.mapping.select_prev_item(),
-      ['<C-n>'] = cmp.mapping.select_next_item(),
-      ['<C-d>'] = cmp.mapping.scroll_docs(-4),
-      ['<C-f>'] = cmp.mapping.scroll_docs(4),
-      ['<C-Space>'] = cmp.mapping.complete(),
-      ['<C-e>'] = cmp.mapping.close(),
-      ['<CR>'] = cmp.mapping.confirm {
-        behavior = cmp.ConfirmBehavior.Replace,
-        select = true,
-      },
-      ['<Tab>'] = function(fallback)
-        if cmp.visible() then
-          cmp.select_next_item()
-        elseif luasnip.expand_or_jumpable() then
-          luasnip.expand_or_jump()
-        else
-          fallback()
-        end
-      end,
-      ['<S-Tab>'] = function(fallback)
-        if cmp.visible() then
-          cmp.select_prev_item()
-        elseif luasnip.jumpable(-1) then
-          luasnip.jump(-1)
-        else
-          fallback()
-        end
-      end,
-    },
-    sources = {
-      { name = 'nvim_lsp' },
-      { name = 'luasnip' },
-    },
-  }
-
-  -- https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#denols
-  vim.g.markdown_fenced_languages = {
-    "ts=typescript"
-  }
-
-  -- Configure diagnostics
-  vim.diagnostic.config({
-    virtual_text = false,
-    signs = true,
-    underline = true,
-    update_in_insert = false,
-    severity_sort = false,
-  })
-
-  -- Change diagnostic symbols in the sign column (gutter)
-  local signs = { Error = " ", Warn = " ", Hint = " ", Info = " " }
-  for type, icon in pairs(signs) do
-    local hl = "DiagnosticSign" .. type
-    vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = hl })
-  end
+-- Change diagnostic symbols in the sign column (gutter)
+local signs = { Error = "x ", Warn = "! ", Hint = "? ", Info = "i " }
+for type, icon in pairs(signs) do
+	local hl = "DiagnosticSign" .. type
+	vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = hl })
+end
 EOF
-
-" have a fixed column for the diagnostics to appear in
-" this removes the jitter when warnings/errors flow in
-set signcolumn=yes:2

modules/terminal-life/nvim/plugins.vim

@@ -4,29 +4,9 @@ autocmd FileType yaml setlocal ts=2 sts=2 sw=2 expandtab
 
 let g:gutentags_file_list_command = 'git ls-files'
 
-" quick-scope
 " https://github.com/unblevable/quick-scope
 let g:qs_highlight_on_keys = ['f', 'F', 't', 'T']
 
-" Golang
-" Go test, Def, Decls shortcut
-nmap <Leader>got :GoTest<CR>:botright copen<CR>
-autocmd FileType go nmap gd :GoDef<CR>
-autocmd FileType go nmap gD :GoDecls<CR>
-
-" Go formatting
-autocmd FileType go setlocal noexpandtab shiftwidth=4 tabstop=4 softtabstop=4 nolist
-
-" Caddyfile indentation
-autocmd FileType caddyfile setlocal noexpandtab shiftwidth=8 tabstop=8 softtabstop=8 nolist
-
-" vim-go disable text-objects
-let g:go_textobj_enabled = 0
-
-" disable vim-go :GoDef short cut (gd)
-" this is handled by LanguageClient [LC]
-let g:go_def_mapping_enabled = 0
-
 " GitGutter and vim Magit
 " inspired by: https://jakobgm.com/posts/vim/git-integration/
 " Don't map gitgutter keys automatically, set them ourselves
@@ -43,17 +23,11 @@ nmap <Leader>gu <Plug>(GitGutterUndoHunk)   " git undo (chunk)
 " Open vimagit pane
 nnoremap <leader>gs :Magit<CR>       " git status
 
-" Push to remote
-nnoremap <leader>gP :! git push<CR>  " git Push
-
 " Quick conflict resolution in git mergetool nvim
 " http://vimcasts.org/episodes/fugitive-vim-resolving-merge-conflicts-with-vimdiff/
 nmap <Leader>[ :diffget //2<CR>
 nmap <Leader>] :diffget //3<CR>
 
-" netrw
-let g:netrw_fastbrowse=0
-
 " Auto-FMT rust code on save
 let g:rustfmt_autosave = 1
 
@@ -66,22 +40,46 @@ let g:highlightedyank_highlight_duration = 200
 " Markdown options
 let g:vim_markdown_folding_disabled = 1
 
-" Haskell options
-let g:haskell_enable_quantification = 1   " to enable highlighting of `forall`
-let g:haskell_enable_recursivedo = 1      " to enable highlighting of `mdo` and `rec`
-let g:haskell_enable_arrowsyntax = 1      " to enable highlighting of `proc`
-let g:haskell_enable_pattern_synonyms = 1 " to enable highlighting of `pattern`
-let g:haskell_enable_typeroles = 1        " to enable highlighting of type roles
-let g:haskell_enable_static_pointers = 1  " to enable highlighting of `static`
-let g:haskell_backpack = 1                " to enable highlighting of backpack keywords
-
-" Emmet
-let g:user_emmet_leader_key='<c-n>'
-
-" Ack
-if executable('ag')
-  let g:ackprg = 'ag --hidden --vimgrep'
-endif
-
 " nnn
 let g:nnn#command = 'nnn -d -e -H -r'
+
+nmap - :NnnPicker %<CR>
+nmap <leader>n :NnnPicker %<CR>
+nmap <leader>N :NnnPicker<CR>
+
+lua <<EOF
+local actions = require("telescope.actions")
+local telescope = require("telescope")
+telescope.setup{
+  defaults = {
+    mappings = {
+      n = {
+				["k"] = actions.move_selection_next,
+				["i"] = actions.move_selection_previous,
+				["I"] = actions.move_to_top,
+				["K"] = actions.move_to_bottom,
+				["<C-c>"] = actions.close,
+      },
+    },
+  },
+  extensions = {
+    fzf = {
+      fuzzy = true,                    -- false will only do exact matching
+      override_generic_sorter = true,  -- override the generic sorter
+      override_file_sorter = true,     -- override the file sorter
+      case_mode = "smart_case",        -- or "ignore_case" or "respect_case"
+                                       -- the default case_mode is "smart_case"
+    }
+  }
+}
+
+telescope.load_extension('fzf')
+
+local builtin = require('telescope.builtin')
+vim.keymap.set('n', '<leader>ff', builtin.find_files, {})
+vim.keymap.set('n', '<leader>f/', builtin.live_grep, {})
+vim.keymap.set('n', '<leader>f?', builtin.builtin, {})
+vim.keymap.set('n', '<leader>fb', builtin.buffers, {})
+vim.keymap.set('n', '<leader>fc', builtin.commands, {})
+vim.keymap.set('n', '<leader>ft', builtin.treesitter, {})
+EOF

modules/terminal-life/nvim/preview-file.nix

@@ -1,36 +0,0 @@
-self:
-with self; ''
-  IFS=':' read -r -a INPUT <<< "$1"
-  FILE=''${INPUT[0]}
-  CENTER=''${INPUT[1]}
-
-  if [[ "$1" =~ ^[A-Za-z]:\\ ]]; then
-    FILE=$FILE:''${INPUT[1]}
-    CENTER=''${INPUT[2]}
-  fi
-
-  if [[ -n "$CENTER" && ! "$CENTER" =~ ^[0-9] ]]; then
-    exit 1
-  fi
-  CENTER=''${CENTER/[^0-9]*/}
-
-  FILE="''${FILE/#\~\//$HOME/}"
-  if [ ! -r "$FILE" ]; then
-    echo "File not found ''${FILE}"
-    exit 1
-  fi
-
-  if [ -z "$CENTER" ]; then
-    CENTER=0
-  fi
-
-  exec cat "$FILE" \
-    | sed -e '/[#|\/\/ ?]-- copyright/,/[#\/\/]++/c\\' \
-    | ${pkgs.coreutils}/bin/tr -s '\n' \
-    | ${pkgs.bat}/bin/bat \
-    --style="''${BAT_STYLE:-numbers}" \
-    --color=always \
-    --pager=never \
-    --file-name="''$FILE" \
-    --highlight-line=$CENTER
-''

modules/terminal-life/nvim/quickfixopenall.vim

@@ -1,20 +0,0 @@
-"Usage:
-"   1. Perform a vimgrep search
-"       :vimgrep /def/ *.rb
-"   2. Issue QuickFixOpenAll command
-"       :QuickFixOpenAll
-function!   QuickFixOpenAll()
-    if empty(getqflist())
-        return
-    endif
-    let s:prev_val = ""
-    for d in getqflist()
-        let s:curr_val = bufname(d.bufnr)
-        if (s:curr_val != s:prev_val)
-            exec "edit " . s:curr_val
-        endif
-        let s:prev_val = s:curr_val
-    endfor
-endfunction
-
-command! QuickFixOpenAll call QuickFixOpenAll()

modules/terminal-life/nvim/ui.vim

@@ -13,20 +13,3 @@ let g:airline#extensions#tabline#fnamemod = ':t' " Show just the filename
 let g:airline#extensions#tabline#formatter = 'unique_tail_improved'
 let g:airline_powerline_fonts = 1 " Use powerline fonts
 let g:airline_theme = 'sonokai'
-
-" Customize fzf colors to match your color scheme
-" - fzf#wrap translates this to a set of `--color` options
-let g:fzf_colors =
-\ { 'fg':      ['fg', 'Normal'],
-  \ 'bg':      ['bg', 'Normal'],
-  \ 'hl':      ['fg', 'Comment'],
-  \ 'fg+':     ['fg', 'CursorLine', 'CursorColumn', 'Normal'],
-  \ 'bg+':     ['bg', 'CursorLine', 'CursorColumn'],
-  \ 'hl+':     ['fg', 'Statement'],
-  \ 'info':    ['fg', 'PreProc'],
-  \ 'border':  ['fg', 'Ignore'],
-  \ 'prompt':  ['fg', 'Conditional'],
-  \ 'pointer': ['fg', 'Exception'],
-  \ 'marker':  ['fg', 'Keyword'],
-  \ 'spinner': ['fg', 'Label'],
-  \ 'header':  ['fg', 'Comment'] }

users/b12f/email.nix

@@ -14,7 +14,7 @@ with lib; let
 
   generateMailAccount = args@{ address, ... }: rec {
     inherit address;
-    realName = psCfg.user.fullName;
+    realName = if (args ? "fullName") then args.fullName else psCfg.user.fullName;
     signature = {
       showSignature = "append";
       text = if (args ? "emptysignature") then "" else builtins.readFile (./.config/neomutt + "/${builtins.replaceStrings ["@"] ["_"] address}.signature");
@@ -133,11 +133,13 @@ in {
           };
         }
         {
+					fullName = "mezza";
           address = mkEmailAddress "mail" "mezza.biz";
           host = "mail.mezza.biz";
 					emptysignature = true;
         }
         {
+					fullname = "hwd"+ "zz";
           address = mkEmailAddress "mail" "h" + "w" + "dz" + "z.net";
           host = "mail.h" + "w" + "dz" + "z.net";
 					emptysignature = true;