nix refactor

nvim/config/lua/aerial-config.lua

@@ -0,0 +1,8 @@
+require('aerial').setup({
+  on_attach = function(bufnr)
+    vim.keymap.set('n', '{', '<cmd>AerialPrev<CR>', {buffer = bufnr})
+    vim.keymap.set('n', '}', '<cmd>AerialNext<CR>', {buffer = bufnr})
+  end
+})
+
+vim.keymap.set('n', '<leader>a', '<cmd>AerialToggle!<CR>')

nvim/config/lua/autopairs-config.lua

@@ -0,0 +1 @@
+require("nvim-autopairs").setup()

nvim/config/lua/base.lua

@@ -0,0 +1,50 @@
+-- Disable NetRW
+vim.g.loaded_netrw = 1
+vim.g.loaded_netrwPlugin = 1
+
+-- Set Term Colors
+vim.opt.termguicolors = true
+
+-- Synchronize with system clipboard
+vim.opt.clipboard = "unnamed"
+
+-- Always show the signcolumn
+vim.opt.signcolumn = "yes"
+
+-- Set nowrap, line numbers, hightlight search
+vim.opt.wrap = false
+vim.opt.nu = true
+vim.opt.hlsearch = true
+vim.opt.shiftwidth = 2
+
+-- Set fold settings
+vim.opt.foldmethod = "indent"
+vim.opt.foldnestmax = 10
+vim.opt.foldlevel = 2
+
+-- Lightline config
+vim.g['lightline'] = {
+  colorscheme = 'embark',
+  separator = {
+    left = "\u{e0b0}",
+    right = "\u{e0b2}"
+  },
+  subseparator = {
+    left = "\u{e0b1}",
+    right = "\u{e0b3}"
+  }
+}
+
+-- Set Color Scheme
+vim.cmd('colorscheme embark')
+vim.diagnostic.config({
+  virtual_text = false,
+})
+
+-- Mappings.
+-- See `:help vim.diagnostic.*` for documentation on any of the below functions
+local opts = { noremap=true, silent=true }
+vim.keymap.set('n', '<space>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', '<space>q', vim.diagnostic.setloclist, opts)

nvim/config/lua/cmp-config.lua

@@ -0,0 +1,49 @@
+local cmp = require'cmp'
+
+cmp.setup({
+  mapping = cmp.mapping.preset.insert({
+    ['<C-b>'] = cmp.mapping.scroll_docs(-4),
+    ['<C-f>'] = cmp.mapping.scroll_docs(4),
+    ['<C-Space>'] = cmp.mapping.complete(),
+    ['<C-e>'] = cmp.mapping.abort(),
+    ['<CR>'] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
+  }),
+  sources = cmp.config.sources({
+    { name = 'nvim_lsp' },
+  }, {
+    { name = 'buffer' },
+  })
+})
+
+-- Set configuration for specific filetype.
+cmp.setup.filetype('gitcommit', {
+  sources = cmp.config.sources({
+    { name = 'cmp_git' }, -- You can specify the `cmp_git` source if you were installed it.
+  }, {
+    { name = 'buffer' },
+  })
+})
+
+-- -- Use buffer source for `/` and `?` (if you enabled `native_menu`, this won't work anymore).
+cmp.setup.cmdline({ '/', '?' }, {
+  mapping = cmp.mapping.preset.cmdline(),
+  sources = {
+    { name = 'buffer' }
+  }
+})
+
+-- -- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore).
+cmp.setup.cmdline(':', {
+  mapping = cmp.mapping.preset.cmdline(),
+  sources = cmp.config.sources({
+    { name = 'path' }
+  }, {
+    { name = 'cmdline' }
+  })
+})
+
+local cmp_autopairs = require('nvim-autopairs.completion.cmp')
+cmp.event:on(
+  'confirm_done',
+  cmp_autopairs.on_confirm_done()
+)

nvim/config/lua/comment-config.lua

@@ -0,0 +1 @@
+require('Comment').setup()

nvim/config/lua/init.lua

@@ -0,0 +1,11 @@
+require('aerial-config')
+require('autopairs-config')
+require('base')
+require('cmp-config')
+require('comment-config')
+require('lsp-config')
+require('lsp-lines-config')
+require('noice-config')
+require('numb-config')
+require('nvim-tree-config')
+require('telescope-config')

nvim/config/lua/lsp-config.lua

@@ -0,0 +1,60 @@
+local nix_vars = require("nix-vars")
+local nvim_lsp = require('lspconfig')
+
+-- 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')
+
+  -- 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', '<C-k>', vim.lsp.buf.signature_help, bufopts)
+  vim.keymap.set('n', '<space>wa', vim.lsp.buf.add_workspace_folder, bufopts)
+  vim.keymap.set('n', '<space>wr', vim.lsp.buf.remove_workspace_folder, bufopts)
+  vim.keymap.set('n', '<space>wl', function()
+    print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
+  end, bufopts)
+  vim.keymap.set('n', '<space>D', vim.lsp.buf.type_definition, bufopts)
+  vim.keymap.set('n', '<space>rn', vim.lsp.buf.rename, bufopts)
+  vim.keymap.set('n', '<space>ca', vim.lsp.buf.code_action, bufopts)
+  vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts)
+  vim.keymap.set('n', '<space>f', function() vim.lsp.buf.format { async = true } end, bufopts)
+end
+
+local lsp_flags = {
+  debounce_text_changes = 150,
+}
+local capabilities = require('cmp_nvim_lsp').default_capabilities()
+nvim_lsp.pyright.setup{
+    on_attach = on_attach,
+    flags = lsp_flags,
+    capabilities = capabilities,
+}
+
+nvim_lsp.html.setup{
+    on_attach = on_attach,
+    flags = lsp_flags,
+    capabilities = capabilities,
+    cmd = {
+	nix_vars.htmlserver,
+	"--stdio",
+    }
+}
+
+nvim_lsp.tsserver.setup{
+    on_attach = on_attach,
+    flags = lsp_flags,
+    capabilities = capabilities,
+    cmd = {
+	nix_vars.tsserver,
+	"--stdio",
+	"--tsserver-path",
+	nix_vars.tslib,
+    }
+}

nvim/config/lua/lsp-lines-config.lua

@@ -0,0 +1 @@
+require("lsp_lines").setup()

nvim/config/lua/noice-config.lua

@@ -0,0 +1,17 @@
+require("noice").setup()
+require("noice").setup({
+  lsp = {
+    override = {
+      ["vim.lsp.util.convert_input_to_markdown_lines"] = true,
+      ["vim.lsp.util.stylize_markdown"] = true,
+      ["cmp.entry.get_documentation"] = true,
+    },
+  },
+  presets = {
+    -- bottom_search = false, -- use a classic bottom cmdline for search
+    command_palette = true, -- position the cmdline and popupmenu together
+    long_message_to_split = true, -- long messages will be sent to a split
+    inc_rename = false, -- enables an input dialog for inc-rename.nvim
+    lsp_doc_border = true, -- add a border to hover docs and signature help
+  },
+})

nvim/config/lua/numb-config.lua

@@ -0,0 +1 @@
+require('numb').setup()

nvim/config/lua/nvim-tree-config.lua

@@ -0,0 +1 @@
+require("nvim-tree").setup()

nvim/config/lua/telescope-config.lua

@@ -0,0 +1,7 @@
+require('telescope').setup()
+
+local builtin = require('telescope.builtin')
+vim.keymap.set('n', '<leader>ff', builtin.find_files, {})
+vim.keymap.set('n', '<leader>fg', builtin.live_grep, {})
+vim.keymap.set('n', '<leader>fb', builtin.buffers, {})
+vim.keymap.set('n', '<leader>fh', builtin.help_tags, {})

nvim/default.nix

@@ -0,0 +1,100 @@
+{ config, pkgs, ... }:
+
+{
+  programs.neovim = {
+    enable = true;
+    viAlias = true;
+    vimAlias = true;
+    withNodeJs = true;
+    withPython3 = true;
+
+    plugins = with pkgs.vimPlugins; [
+
+      # ------------------
+      # --- Completion ---
+      # ------------------
+      cmp-buffer      # Buffer Word Completion
+      cmp-cmdline     # Command Line Completion
+      cmp-nvim-lsp    # Main LSP
+      cmp-path        # Path Completion
+      cmp-vsnip       # Snippets
+      lsp_lines-nvim  # Inline Diagnostics
+      nvim-cmp        # Completions
+      nvim-lspconfig  # LSP Config
+
+      # ------------------
+      # ----- Helpers ----
+      # ------------------
+      aerial-nvim     # Code Outline
+      comment-nvim    # Code Comments
+      diffview-nvim   # Diff View
+      numb-nvim       # Peek / Jump to Lines
+      nvim-autopairs  # Automatically Close Pairs (),[],{}
+      nvim-tree-lua   # File Explorer
+      telescope-nvim  # Fuzzy Finder
+      vim-nix         # Nix Helpers
+
+      # ------------------
+      # --- Theme / UI ---
+      # ------------------
+      embark-vim        # Theme
+      lightline-vim     # Bottom Line
+      noice-nvim        # UI Tweaks
+      nvim-web-devicons # Dev Icons
+
+      # ------------------
+      # --- Treesitter ---
+      # ------------------
+      (
+        nvim-treesitter.withPlugins (
+          plugins: with pkgs.tree-sitter-grammars; [
+            # tree-sitter-bash            # Incompatibility (Prevents Noice Highlighting)
+            tree-sitter-lua
+            tree-sitter-markdown
+            tree-sitter-markdown-inline
+            tree-sitter-regex
+            tree-sitter-vim
+          ]
+        )
+      )
+
+    ];
+
+    extraPackages = with pkgs; [
+
+      # Telescope Dependencies
+      ripgrep
+      fd
+
+      # LSP Dependencies
+      nodePackages.pyright
+      nodePackages.typescript
+      nodePackages.typescript-language-server
+      nodePackages.vscode-html-languageserver-bin
+
+    ];
+
+    extraConfig = ":luafile ~/.config/nvim/lua/init.lua";
+  };
+
+
+  xdg.configFile = {
+
+    # Copy Configuration
+    nvim = {
+      source = ./config;
+      recursive = true;
+    };
+
+    # Generate Nix Vars
+    "nvim/lua/nix-vars.lua".text = ''
+      local nix_vars = {
+        htmlserver = "${pkgs.nodePackages.vscode-html-languageserver-bin}/bin/html-languageserver",
+        tsserver = "${pkgs.nodePackages.typescript-language-server}/bin/typescript-language-server",
+        tslib = "${pkgs.nodePackages.typescript}/lib/node_modules/typescript/lib/",
+      }
+      return nix_vars
+    '';
+
+  };
+}