updates with ec2

nixos/home.nix

@@ -9,8 +9,10 @@ in
 
 {
   home.packages = with pkgs; [
-    firefox
+    # firefox
     unzip
+    neovim
+    gcc # for tree-sitter
     # alacritty
     # unstable.neovim
     tmux
@@ -22,40 +24,40 @@ in
     sd
     jq
     tealdeer
-    unstable._1password-gui
+    /* unstable._1password-gui */
   ];
 
-  programs.alacritty = {
-    enable = true;
-    settings = {
-      window = {
-        dimensions = {
-          columns = 85;
-          lines = 30;
-        };
-        padding = {
-          x = 20;
-          y = 20;
-        };
-      };
-      scrolling.history = 10000;
-      font = {
-        size = 15.0;
-      };
-      key_bindings = [
-        {
-          key = "F";
-          mods = "Super";
-          action = "ToggleFullscreen";
-        }
-        {
-          key = "L";
-          mods = "Super";
-          chars = "\x1F";
-        }
-      ];
-    };
-  };
+  #programs.alacritty = {
+  #  enable = true;
+  #  settings = {
+  #    window = {
+  #      dimensions = {
+  #        columns = 85;
+  #        lines = 30;
+  #      };
+  #      padding = {
+  #        x = 20;
+  #        y = 20;
+  #      };
+  #    };
+  #    scrolling.history = 10000;
+  #    font = {
+  #      size = 15.0;
+  #    };
+  #    key_bindings = [
+  #      {
+  #        key = "F";
+  #        mods = "Super";
+  #        action = "ToggleFullscreen";
+  #      }
+  #      {
+  #        key = "L";
+  #        mods = "Super";
+  #        chars = "\x1F";
+  #      }
+  #    ];
+  #  };
+  #};
 
   programs.fish = {
     enable = true;
@@ -114,9 +116,9 @@ in
       grl = "gh run view --log";
 
       # Vim
-      v = "vim";
-      vl = "vim -c 'normal! `0'";
-      vll = "vim -c 'Hist'";
+      v = "nvim";
+      vl = "nvim -c 'normal! `0'";
+      vll = "nvim -c 'Hist'";
 
       # Notes
       qn = "quicknote";
@@ -127,6 +129,7 @@ in
       # Improved CLI Tools
       cat = "bat";          # Swap cat with bat
       h = "http -Fh --all"; # Curl site for headers
+      j = "just";
 
       # Fun CLI Tools
       weather = "curl wttr.in/$WEATHER_CITY";
@@ -191,7 +194,7 @@ in
   xdg.configFile = {
     "starship.toml".source = ../starship/starship.toml.configlink;
     #"alacritty/alacritty.yml".source = ../alacritty.configlink/alacritty.yml;
-    # "nvim/init.lua".source = ../nvim.configlink/init.lua;
+    "nvim/init.lua".source = ./init.lua;
   };
 
   # nixpkgs.overlays = [(
@@ -205,51 +208,26 @@ in
     }))
   ];
 
-  programs.neovim = {
-    enable = true;
-    package = pkgs.neovim-nightly;
-    vimAlias = true;
-    plugins = with pkgs.vimPlugins; [
-      fzf-vim
-      fzfWrapper
-      vim-eunuch
-      vim-vinegar
-      surround
-      commentary
-      repeat
-      gruvbox-nvim
-      nvim-lspconfig
-      lsp-colors-nvim
-      vim-vsnip
-      vim-vsnip-integ
-      nvim-compe
-      tabular
-      vimwiki
-      vim-rooter
-      lualine-nvim
-      nvim-web-devicons
-      nvim-treesitter
-      vim-fish
-      nginx-vim
-      vim-terraform
-      vim-toml
-      vim-helm
-      vim-nix
-      gitsigns-nvim
-      plenary-nvim
-      vim-hexokinase
-    ];
-    extraPackages = with pkgs; [
-      nodePackages.pyright
-      rust-analyzer
-      terraform-ls
-    ];
-    extraConfig = ''
-      lua << EOF
-        ${builtins.readFile ./init.lua}
-      EOF
-    '';
-  };
+  #programs.neovim = {
+  #  enable = true;
+  #  # package = pkgs.neovim-nightly;
+  #  vimAlias = true;
+  #  extraPackages = with pkgs; [
+  #    nodePackages.pyright
+  #    rust-analyzer
+  #    terraform-ls
+  #  ];
+  #  #extraConfig = builtins.concatStringsSep "\n" [
+  #  #  ''
+  #  #  luafile ${builtins.toString ./init.lua}
+  #  #  ''
+  #  #];
+  #  #extraConfig = ''
+  #  #  lua << EOF
+  #  #    ${builtins.readFile ./init.lua}
+  #  #  EOF
+  #  #'';
+  #};
 
   # # Neovim config
   # home.file = {

nixos/init.lua

@@ -1,169 +1,450 @@
--- LSP Settings
--- ============
+-- Bootstrap the Packer plugin manager
+local fn = vim.fn
+local install_path = fn.stdpath('data')..'/site/pack/packer/start/packer.nvim'
+if fn.empty(fn.glob(install_path)) > 0 then
+    packer_bootstrap = fn.system(
+        {
+            'git', 'clone', '--depth', '1',
+            'https://github.com/wbthomason/packer.nvim', install_path
+        }
+    )
+end
 
-require('lspconfig').rust_analyzer.setup{}
-require('lspconfig').pyright.setup{
-    cmd = { "poetry", "run", "pyright-langserver", "--stdio" }
-}
-require'compe'.setup({
-    enabled = true,
-    source = {
-        path = true,
-        buffer = true,
-        nvim_lsp = true,
-    },
-})
-if require('lspconfig/util').has_bins('diagnostic-languageserver') then
-    require('lspconfig').diagnosticls.setup{
-        cmd = { "diagnostic-languageserver", "--stdio" },
-        filetypes = { "sh" },
-        on_attach = on_attach,
-        init_options = {
-            filetypes = {
-                sh = "shellcheck",
-            },
-            linters = {
-                shellcheck = {
-                    sourceName = "shellcheck",
-                    command = "shellcheck",
-                    debounce = 100,
-                    args = { "--format=gcc", "-" },
-                    offsetLine = 0,
-                    offsetColumn = 0,
-                    formatLines = 1,
-                    formatPattern = {
-                        "^[^:]+:(\\d+):(\\d+):\\s+([^:]+):\\s+(.*)$",
-                        {
-                            line = 1,
-                            column = 2,
-                            message = 4,
-                            security = 3
-                        }
+-- Packer plugin installations
+require('packer').startup(function(use)
+
+    -- Maintain plugin manager
+    use 'wbthomason/packer.nvim'
+
+    -- Startup speed hacks
+    use {
+        'lewis6991/impatient.nvim',
+        config = function()
+            require('impatient')
+        end
+    }
+
+    -- Important tweaks
+    use 'tpope/vim-surround'             --- Manipulate parentheses
+    use 'tpope/vim-commentary'           --- Use gc or gcc to add comments
+
+    -- Convenience tweaks
+    use 'tpope/vim-eunuch'               --- File manipulation in Vim
+    use 'tpope/vim-vinegar'              --- Fixes netrw file explorer
+    use 'tpope/vim-fugitive'             --- Git commands and syntax
+    use 'tpope/vim-repeat'               --- Actually repeat using .
+    use 'christoomey/vim-tmux-navigator' --- Hotkeys for tmux panes
+
+    -- Colorscheme
+    use {
+        'morhetz/gruvbox',
+        config = function()
+            vim.cmd[[colorscheme gruvbox]]
+        end
+    }
+
+    -- Git next to line numbers
+    use {
+        'lewis6991/gitsigns.nvim',
+        branch = 'main',
+        requires = {'nvim-lua/plenary.nvim'},
+        config = function()
+            require('gitsigns').setup()
+        end
+    }
+
+    -- Status bar
+    -- use {
+    --     'hoob3rt/lualine.nvim',
+    --     requires = { 'kyazdani42/nvim-web-devicons', opt = true },
+    --     config = function()
+    --         require('lualine').setup({
+    --             options = {
+    --                 theme = 'gruvbox',
+    --                 icons_enabled = true
+    --             }
+    --         })
+    --     end
+    -- }
+
+    -- Improve speed and filetype detection
+    use {
+        'nathom/filetype.nvim',
+        config = function()
+            -- Filetype for .env files
+            local envfiletype = function()
+                vim.bo.filetype = 'text'
+                vim.bo.syntax = 'sh'
+            end
+            -- Force filetype patterns that Vim doesn't know about
+            require('filetype').setup({
+                overrides = {
+                    extensions = {
+                        Brewfile = 'brewfile',
+                        muttrc = 'muttrc',
+                        hcl = 'terraform',
                     },
-                    securities = {
-                        error = "error",
-                        warning = "warning",
-                    }
-                },
+                    literal = {
+                        Caskfile = 'brewfile',
+                        [".gitignore"] = 'gitignore',
+                    },
+                    complex = {
+                        [".*git/config"] = "gitconfig",
+                        ["tmux.conf%..*link"] = "tmux",
+                        ["gitconfig%..*link"] = "gitconfig",
+                        [".*ignore%..*link"] = "gitignore",
+                        [".*%.toml%..*link"] = "toml",
+                    },
+                    function_extensions = {},
+                    function_literal = {
+                        [".envrc"] = envfiletype,
+                        [".env"] = envfiletype,
+                        [".env.dev"] = envfiletype,
+                        [".env.prod"] = envfiletype,
+                        [".env.example"] = envfiletype,
+                    },
+                }
+            })
+        end
+    }
+
+    -- Alignment tool
+    use 'godlygeek/tabular'
+
+    -- Markdown renderer / wiki notes
+    use 'vimwiki/vimwiki'
+
+    -- Markdown pretty view
+    use 'ellisonleao/glow.nvim'
+
+    -- Navigation
+    use {
+        'ggandor/lightspeed.nvim',
+        branch = 'smart-autojump'
+    }
+
+    -- Snippet engine
+    use 'L3MON4D3/LuaSnip'
+
+    -- =======================================================================
+    -- Language Server
+    -- =======================================================================
+
+    -- Language server engine
+    use {
+        'neovim/nvim-lspconfig',
+        requires = { 'hrsh7th/cmp-nvim-lsp' },
+        config = function()
+            local capabilities = require('cmp_nvim_lsp').update_capabilities(
+                vim.lsp.protocol.make_client_capabilities()
+            )
+            require('lspconfig').rust_analyzer.setup{ capabilities = capabilities }
+            require('lspconfig').tflint.setup{ capabilities = capabilities }
+            require('lspconfig').terraformls.setup{ capabilities = capabilities }
+            require('lspconfig').pyright.setup{
+                cmd = { "poetry", "run", "pyright-langserver", "--stdio" },
+                capabilities = capabilities,
             }
+            if require('lspconfig/util').has_bins('diagnostic-languageserver') then
+                require('lspconfig').diagnosticls.setup{
+                    cmd = { "diagnostic-languageserver", "--stdio" },
+                    filetypes = { "sh" },
+                    on_attach = on_attach,
+                    init_options = {
+                        filetypes = { sh = "shellcheck" },
+                        linters = {
+                            shellcheck = {
+                                sourceName = "shellcheck",
+                                command = "shellcheck",
+                                debounce = 100,
+                                args = { "--format=gcc", "-" },
+                                offsetLine = 0,
+                                offsetColumn = 0,
+                                formatLines = 1,
+                                formatPattern = {
+                                    "^[^:]+:(\\d+):(\\d+):\\s+([^:]+):\\s+(.*)$",
+                                    { line = 1, column = 2, message = 4, security = 3 }
+                                },
+                                securities = { error = "error", warning = "warning", }
+                            },
+                        }
+                    }
+                }
+            end
+        end
+    }
+
+    -- Pretty highlights
+    use 'folke/lsp-colors.nvim'
+
+    use {
+      'folke/trouble.nvim',
+      requires = 'kyazdani42/nvim-web-devicons',
+      config = function()
+        require("trouble").setup { }
+      end
+    }
+
+    -- =======================================================================
+    -- Completion System
+    -- =======================================================================
+
+    -- Completion sources
+    use 'hrsh7th/cmp-nvim-lsp'     --- Language server completion plugin
+    use 'hrsh7th/cmp-buffer'       --- Generic text completion
+    use 'hrsh7th/cmp-path'         --- Local file completion
+    use 'hrsh7th/cmp-cmdline'      --- Command line completion
+    use 'hrsh7th/cmp-nvim-lua'     --- Nvim lua api completion
+    use 'saadparwaiz1/cmp_luasnip' --- Luasnip completion
+    use 'lukas-reineke/cmp-rg'     --- Ripgrep completion
+
+    -- Completion engine
+    use {
+        'hrsh7th/nvim-cmp',
+        requires = { 'L3MON4D3/LuaSnip', },
+        config = function()
+            local cmp = require('cmp')
+            cmp.setup({
+                snippet = {
+                    expand = function(args)
+                       require('luasnip').lsp_expand(args.body)
+                    end,
+                },
+                mapping = {
+                    ['<C-d>'] = cmp.mapping(cmp.mapping.scroll_docs(-4), { 'i', 'c' }),
+                    ['<C-f>'] = cmp.mapping(cmp.mapping.scroll_docs(4), { 'i', 'c' }),
+                    ['<Esc>'] = function(fallback)
+                        cmp.mapping({
+                            i = cmp.mapping.abort(),
+                            c = cmp.mapping.close(),
+                        })
+                        vim.cmd('stopinsert') --- Abort and leave insert mode
+                    end,
+                    -- ['<Tab>'] = cmp.mapping(cmp.mapping.select_next_item(), { 'i', 's' }),
+                    -- ['<S-Tab>'] = cmp.mapping(cmp.mapping.select_prev_item(), { 'i', 's' }),
+                    ['<CR>'] = cmp.mapping.confirm({
+                        behavior = cmp.ConfirmBehavior.Insert,
+                        select = true,
+                    }),
+                    ['<C-r>'] = cmp.mapping.confirm({
+                        behavior = cmp.ConfirmBehavior.Replace,
+                        select = true,
+                    }),
+                    ['<C-l>'] = cmp.mapping(function(fallback)
+                        if require('luasnip').expand_or_jumpable() then
+                            require('luasnip').expand_or_jump()
+                        end
+                    end, {"i", "s"})
+                },
+                sources = {
+                    { name = 'nvim_lua' },
+                    { name = 'nvim_lsp' },
+                    { name = 'path' },
+                    { name = 'luasnip' },
+                    { name = 'buffer', keyword_length = 3, max_item_count = 10 },
+                    {
+                        name = 'rg', keyword_length = 6, max_item_count = 10,
+                        option = { additional_arguments = "--ignore-case" }
+                    },
+                },
+                experimental = {
+                    native_menu = false, --- Use cmp menu instead of Vim menu
+                    ghost_text = true,   --- Show preview auto-completion
+                },
+            })
+
+            -- Use buffer source for `/`
+            cmp.setup.cmdline('/', {
+                sources = {
+                    { name = 'buffer', keyword_length = 5 }
+                }
+            })
+
+            -- Use cmdline & path source for ':'
+            cmp.setup.cmdline(':', {
+                sources = cmp.config.sources({
+                    { name = 'path' }
+                }, {
+                    { name = 'cmdline' }
+                })
+            })
+        end
+    }
+
+    -- =======================================================================
+    -- Syntax
+    -- =======================================================================
+
+    -- Syntax engine
+    use {
+        'nvim-treesitter/nvim-treesitter',
+        run = ':TSUpdate',
+        config = function()
+            require('nvim-treesitter.configs').setup {
+                highlight = { enable = true },
+                indent = { enable = true },
+            }
+        end
+    }
+
+    -- Additional syntax sources
+    use 'bfontaine/Brewfile.vim' --- Brewfile syntax
+    use 'chr4/nginx.vim'         --- Nginx syntax
+    use 'hashivim/vim-terraform' --- Terraform formatting
+    use 'towolf/vim-helm'        --- Helm syntax
+    use 'rodjek/vim-puppet'      --- Puppet syntax
+    use 'blankname/vim-fish'     --- Better fish syntax
+
+    -- =======================================================================
+    -- Fuzzy Launcher
+    -- =======================================================================
+
+    use {
+        'nvim-telescope/telescope.nvim',
+        requires = { 'nvim-lua/plenary.nvim' },
+        config = function()
+            -- Telescope: quit instantly with escape
+            local actions = require("telescope.actions")
+            require("telescope").setup({
+                defaults = {
+                    mappings = {
+                        i = {
+                            ["<esc>"] = actions.close,
+                            ["<C-h>"] = "which_key",
+                        },
+                    },
+                },
+                pickers = {
+                    find_files = { theme = "ivy" },
+                    oldfiles = { theme = "ivy" },
+                    buffers = { theme = "dropdown" },
+                },
+                extensions = {
+                    fzy_native = {},
+                    tmux = {},
+                    zoxide = {},
+                    -- neoclip = {},
+                    project = {
+                        base_dirs = { '~/dev/work', },
+                    },
+                },
+            })
+        end
+    }
+
+    -- Faster sorting
+    use 'nvim-telescope/telescope-fzy-native.nvim'
+
+    -- Jump around tmux sessions
+    use 'camgraff/telescope-tmux.nvim'
+
+    -- Jump directories
+    use {
+        'jvgrootveld/telescope-zoxide',
+        requires = {'nvim-lua/popup.nvim'},
+    }
+
+    -- Jump projects
+    use {
+        'nvim-telescope/telescope-project.nvim',
+        requires = {'nvim-telescope/telescope.nvim'},
+        config = function()
+            require('telescope').load_extension('project')
+        end
+    }
+
+    -- Clipboard history
+    -- use {
+    --     "AckslD/nvim-neoclip.lua",
+    --     branch = 'main',
+    --     requires = {
+    --         {'tami5/sqlite.lua', module = 'sqlite'},
+    --         {'nvim-telescope/telescope.nvim'},
+    --     },
+    --     config = function()
+    --         require('neoclip').setup({
+    --             enable_persistant_history = true,
+    --             default_register = {'+', '"'},
+    --             keys = {
+    --                 i = { paste = '<c-v>' },
+    --             },
+    --         })
+    --         require('telescope').load_extension('neoclip')
+    --     end
+    -- }
+
+    -- Project bookmarks
+    use {
+        'ThePrimeagen/harpoon',
+        requires = {
+            'nvim-lua/plenary.nvim',
+            'nvim-telescope/telescope.nvim'
         }
     }
-end
 
--- Auto-complete
--- ====================
+    -- TLDR Lookup
+    use {
+        'mrjones2014/tldr.nvim',
+        requires = {'nvim-telescope/telescope.nvim'}
+    }
 
--- Auto-complete mapping
-local t = function(str)
-  return vim.api.nvim_replace_termcodes(str, true, true, true)
-end
+    -- =======================================================================
 
-local check_back_space = function()
-    local col = vim.fn.col('.') - 1
-    if col == 0 or vim.fn.getline('.'):sub(col, col):match('%s') then
-        return true
-    else
-        return false
+    -- Install on initial bootstrap
+    if packer_bootstrap then
+        require('packer').sync()
     end
-end
--- Use (s-)tab to:
---- move to prev/next item in completion menuone
---- jump to prev/next snippet's placeholder
-_G.tab_complete = function()
-  if vim.fn.pumvisible() == 1 then
-    return t "<C-n>"
-  elseif vim.fn.call("vsnip#available", {1}) == 1 then
-    return t "<Plug>(vsnip-expand-or-jump)"
-  elseif check_back_space() then
-    return t "<Tab>"
-  else
-    return vim.fn['compe#complete']()
-  end
-end
-_G.s_tab_complete = function()
-    if vim.fn.pumvisible() == 1 then
-        return t "<C-p>"
-    elseif vim.fn.call("vsnip#jumpable", {-1}) == 1 then
-        return t "<Plug>(vsnip-jump-prev)"
-    else
-        return t "<S-Tab>"
-    end
-end
-
--- Auto-complete keybinds
-vim.api.nvim_set_keymap("i", "<Tab>", "v:lua.tab_complete()", {expr = true})
-vim.api.nvim_set_keymap("s", "<Tab>", "v:lua.tab_complete()", {expr = true})
-vim.api.nvim_set_keymap("i", "<S-Tab>", "v:lua.s_tab_complete()", {expr = true})
-vim.api.nvim_set_keymap("s", "<S-Tab>", "v:lua.s_tab_complete()", {expr = true})
+end)
 
+-- ===========================================================================
 -- Settings
--- ========
+-- ===========================================================================
 
--- Basic Settings
-vim.o.termguicolors = true      -- Set to truecolor
-vim.cmd[[colorscheme gruvbox]]  -- Installed with a plugin
-vim.o.hidden = true             -- Don't unload buffers when leaving them
-vim.wo.number = true            -- Show line numbers
-vim.wo.relativenumber = true    -- Relative numbers instead of absolute
-vim.o.list = true               -- Reveal whitespace with dashes
-vim.o.expandtab = true          -- Tabs into spaces
-vim.o.shiftwidth = 4            -- Amount to shift with > key
-vim.o.softtabstop = 4           -- Amount to shift with <TAB> key
-vim.o.ignorecase = true         -- Ignore case when searching
-vim.o.smartcase = true          -- Check case when using capitals in search
-vim.o.infercase = true          -- Don't match cases when completing suggestions
-vim.o.incsearch = true          -- Search while typing
-vim.o.visualbell = true         -- No sounds
-vim.o.scrolljump = 1            -- Number of lines to scroll
-vim.o.scrolloff = 3             -- Margin of lines to see while scrolling
-vim.o.splitright = true         -- Vertical splits on the right side
-vim.o.splitbelow = true         -- Horizontal splits on the bottom side
-vim.o.pastetoggle = "<F3>"      -- Use F3 to enter raw paste mode
-vim.o.clipboard = "unnamedplus" -- Uses system clipboard for yanking
-vim.o.updatetime = 300          -- Faster diagnostics
-vim.o.mouse = "nv"              -- Mouse interaction / scrolling
+vim.o.termguicolors = true      --- Set to truecolor
+vim.o.hidden = true             --- Don't unload buffers when leaving them
+vim.wo.number = true            --- Show line numbers
+vim.wo.relativenumber = true    --- Relative numbers instead of absolute
+vim.o.list = true               --- Reveal whitespace with dashes
+vim.o.expandtab = true          --- Tabs into spaces
+vim.o.shiftwidth = 4            --- Amount to shift with > key
+vim.o.softtabstop = 4           --- Amount to shift with <TAB> key
+vim.o.ignorecase = true         --- Ignore case when searching
+vim.o.smartcase = true          --- Check case when using capitals in search
+vim.o.infercase = true          --- Don't match cases when completing suggestions
+vim.o.incsearch = true          --- Search while typing
+vim.o.visualbell = true         --- No sounds
+vim.o.scrolljump = 1            --- Number of lines to scroll
+vim.o.scrolloff = 3             --- Margin of lines to see while scrolling
+vim.o.splitright = true         --- Vertical splits on the right side
+vim.o.splitbelow = true         --- Horizontal splits on the bottom side
+vim.o.pastetoggle = "<F3>"      --- Use F3 to enter raw paste mode
+vim.o.clipboard = "unnamedplus" --- Uses system clipboard for yanking
+vim.o.updatetime = 300          --- Faster diagnostics
+vim.o.mouse = "nv"              --- Mouse interaction / scrolling
 
 -- Neovim features
-vim.o.inccommand = "split"             -- Live preview search and replace
-vim.o.completeopt = "menuone,noselect" -- Required for nvim-compe completion
+vim.o.inccommand = "split"                  --- Live preview search and replace
+vim.o.completeopt = "menu,menuone,noselect" --- Required for nvim-cmp completion
+-- Required until 0.6.0: do not source the default filetype.vim
+vim.g.did_load_filetypes = 1
 
 -- Remember last position when reopening file
 vim.api.nvim_exec([[
-    if has("autocmd")
-      au BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$") | exe "normal! g`\"" | endif
-    endif
+  au BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$") | exe "normal! g`\"" | endif
 ]], false)
 
 -- Better backup, swap and undo storage
-vim.o.backup = true                      -- Easier to recover and more secure
-vim.bo.swapfile = false                  -- Instead of swaps, create backups
-vim.bo.undofile = true                   -- Keeps undos after quit
+vim.o.backup = true     --- Easier to recover and more secure
+vim.bo.swapfile = false --- Instead of swaps, create backups
+vim.bo.undofile = true  --- Keeps undos after quit
 
 -- Create backup directories if they don't exist
+-- Should be fixed in 0.6 by https://github.com/neovim/neovim/pull/15433
+vim.o.backupdir = vim.fn.stdpath('cache') .. '/backup'
 vim.api.nvim_exec([[
-    set backupdir=~/.local/share/nvim/backup
-    set undodir=~/.local/share/nvim/undo
     if !isdirectory(&backupdir)
         call mkdir(&backupdir, "p")
     endif
-    if !isdirectory(&undodir)
-        call mkdir(&undodir, "p")
-    endif
-]], false)
-
--- Keep selection when tabbing
-vim.api.nvim_set_keymap("v", "<", "<gv", {noremap=true})
-vim.api.nvim_set_keymap("v", ">", ">gv", {noremap=true})
-
--- Force filetype patterns that Vim doesn't know about
-vim.api.nvim_exec([[
-    au BufRead,BufNewFile *.Brewfile setfiletype brewfile
-    au BufRead,BufNewFile tmux.conf* setfiletype tmux
-    au BufRead,BufNewFile *ignore.*link setfiletype gitignore
-    au BufRead,BufNewFile gitconfig.*link setfiletype gitconfig
-    au BufRead,BufNewFile *.toml.*link setfiletype toml
-    au BufRead,BufNewFile *.muttrc setfiletype muttrc
-    au BufRead,BufNewFile .env* set ft=text | set syntax=sh
 ]], false)
 
 -- LaTeX options
@@ -177,14 +458,6 @@ vim.api.nvim_exec([[
     au TextYankPost * silent! lua vim.highlight.on_yank { timeout = 250 }
 ]], false)
 
--- Rust stuff
--- vim.api.nvim_exec([[
---     au BufWritePost *.rs silent! execute "%! rustfmt"
--- ]], false)
-
--- Auto-pairs
-vim.g.AutoPairsFlyMode = 0
-
 -- Netrw
 vim.g.netrw_liststyle = 3    -- Change style to 'tree' view
 vim.g.netrw_banner = 0       -- Remove useless banner
@@ -192,7 +465,7 @@ vim.g.netrw_winsize = 15     -- Explore window takes % of page
 vim.g.netrw_browse_split = 4 -- Open in previous window
 vim.g.netrw_altv = 1         -- Always split left
 
--- Polyglot
+-- Formatting
 vim.g.terraform_fmt_on_save = 1 -- Formats with terraform plugin
 vim.g.rustfmt_autosave = 1      -- Formats with rust plugin
 
@@ -224,62 +497,184 @@ vim.api.nvim_exec([[
     command! AddTag call fzf#run({'source': 'rg "#[A-Za-z/]+[ |\$]" -o --no-filename --no-line-number | sort | uniq', 'sink': function('PInsert')})
 ]], false)
 
--- Status bar
-require('lualine').setup({
-    options = { theme = 'gruvbox' }
-})
+-- ===========================================================================
+-- Custom Functions
+-- ===========================================================================
+
+grep_notes = function()
+    local opts = {
+        prompt_title = "Search Notes",
+        cwd = '$NOTES_PATH',
+    }
+    require('telescope.builtin').live_grep(opts)
+end
+
+find_notes = function()
+    local opts = {
+        prompt_title = "Find Notes",
+        cwd = '$NOTES_PATH',
+    }
+    require('telescope.builtin').find_files(opts)
+end
+
+find_downloads = function()
+    local opts = {
+        prompt_title = "Find Downloads",
+        cwd = '~/Downloads',
+    }
+    require('telescope.builtin').file_browser(opts)
+end
+
+choose_project = function()
+    local opts = require("telescope.themes").get_ivy {
+        layout_config = {
+            bottom_pane = {
+                height = 10,
+            },
+        },
+    }
+    require('telescope').extensions.project.project(opts)
+end
+
+clipboard_history = function()
+    local opts = require("telescope.themes").get_cursor {
+        layout_config = {
+            cursor = {
+                width = 150,
+            },
+        },
+    }
+    require('telescope').extensions.neoclip.neoclip(opts)
+end
+
+command_history = function()
+    local opts = require("telescope.themes").get_ivy {
+        layout_config = {
+            bottom_pane = {
+                height = 15,
+            }
+        }
+    }
+    require('telescope.builtin').command_history(opts)
+end
+
+-- ===========================================================================
+-- Key Mapping
+-- ===========================================================================
+
+-- Function to cut down config boilerplate
+local key = function(mode, key_sequence, action, params)
+    params = params or {}
+    params["noremap"] = true
+    vim.api.nvim_set_keymap(mode, key_sequence, action, params)
+end
 
 -- Remap space as leader key
-vim.api.nvim_set_keymap("", "<Space>", "<Nop>", {noremap=true, silent=true})
+key("", "<Space>", "<Nop>", {silent=true})
 vim.g.mapleader = " "
 vim.g.maplocalleader = " "
 
--- Unset search pattern register
-vim.api.nvim_set_keymap("n", "<CR>", ":noh<CR><CR>", {noremap=true, silent=true})
+-- Keep selection when changing indentation
+key("v", "<", "<gv")
+key("v", ">", ">gv")
+
+-- Clear search register
+key("n", "<CR>", ":noh<CR><CR>", {silent=true})
 
 -- Shuffle lines around
-vim.api.nvim_set_keymap("n", "<A-j>", ":m .+1<CR>==", {noremap=true})
-vim.api.nvim_set_keymap("n", "<A-k>", ":m .-2<CR>==", {noremap=true})
-vim.api.nvim_set_keymap("i", "<A-j>", "<Esc>:m .+1<CR>==gi", {noremap=true})
-vim.api.nvim_set_keymap("i", "<A-k>", "<Esc>:m .-2<CR>==gi", {noremap=true})
-vim.api.nvim_set_keymap("v", "<A-j>", ":m '>+1<CR>gv=gv", {noremap=true})
-vim.api.nvim_set_keymap("v", "<A-k>", ":m '<-2<CR>gv=gv", {noremap=true})
+key("n", "<A-j>", ":m .+1<CR>==")
+key("n", "<A-k>", ":m .-2<CR>==")
+key("i", "<A-j>", "<Esc>:m .+1<CR>==gi")
+key("i", "<A-k>", "<Esc>:m .-2<CR>==gi")
+key("v", "<A-j>", ":m '>+1<CR>gv=gv")
+key("v", "<A-k>", ":m '<-2<CR>gv=gv")
 
--- Fzf (fuzzy finder)
-vim.api.nvim_set_keymap("n", "<Leader>/", ":Rg<CR>", {noremap=true})
-vim.api.nvim_set_keymap("n", "<Leader>ff", ":Files<CR>", {noremap=true})
-vim.api.nvim_set_keymap("n", "<Leader>fr", ":History<CR>", {noremap=true})
-vim.api.nvim_set_keymap("n", "<Leader>b", ":Buffers<CR>", {noremap=true})
-vim.api.nvim_set_keymap("n", "<Leader>s", ":BLines<CR>", {noremap=true})
+-- Telescope (fuzzy finder)
+key("n", "<Leader>k", ":Telescope keymaps<CR>")
+key("n", "<Leader>/", ":Telescope live_grep<CR>")
+key("n", "<Leader>ff", ":Telescope find_files<CR>")
+key("n", "<Leader>fp", ":Telescope git_files<CR>")
+key("n", "<Leader>fN", "<Cmd>lua find_notes()<CR>")
+key("n", "<Leader>N", "<Cmd>lua grep_notes()<CR>")
+key("n", "<Leader>fD", "<Cmd>lua find_downloads()<CR>")
+key("n", "<Leader>fa", ":Telescope file_browser<CR>")
+key("n", "<Leader>fw", ":Telescope grep_string<CR>")
+key("n", "<Leader>wt", ":Telescope tmux sessions<CR>")
+key("n", "<Leader>ww", ":Telescope tmux windows<CR>")
+key("n", "<Leader>w/", ":Telescope tmux pane_contents<CR>")
+key("n", "<Leader>fz", ":Telescope zoxide list<CR>")
+key("n", "<Leader>b", ":Telescope buffers<CR>")
+key("n", "<Leader>hh", ":Telescope help_tags<CR>")
+key("n", "<Leader>fr", ":Telescope oldfiles<CR>")
+key("n", "<Leader>cc", ":Telescope commands<CR>")
+key("n", "<Leader>cr", "<Cmd>lua command_history()<CR>")
+key("n", "<Leader>y", "<Cmd>lua clipboard_history()<CR>")
+key("i", "<c-y>", "<Cmd>lua clipboard_history()<CR>")
+key("n", "<Leader>s", ":Telescope current_buffer_fuzzy_find<CR>")
+key("n", "<Leader>gc", ":Telescope git_commits<CR>")
+key("n", "<Leader>gf", ":Telescope git_bcommits<CR>")
+key("n", "<Leader>gb", ":Telescope git_branches<CR>")
+key("n", "<Leader>gs", ":Telescope git_status<CR>")
+key("n", "<C-p>", "<Cmd>lua choose_project()<CR>")
+
+-- Harpoon
+key("n", "<Leader>m", "<Cmd>lua require('harpoon.mark').add_file()<CR><Esc>")
+key("n", "<Leader>`", "<Cmd>lua require('harpoon.ui').toggle_quick_menu()<CR><Esc>")
+key("n", "<Leader>1", "<Cmd>lua require('harpoon.ui').nav_file(1)<CR><Esc>")
+key("n", "<Leader>2", "<Cmd>lua require('harpoon.ui').nav_file(2)<CR><Esc>")
+key("n", "<Leader>3", "<Cmd>lua require('harpoon.ui').nav_file(3)<CR><Esc>")
+
+-- LSP
+key("n", "gd", "<Cmd>lua vim.lsp.buf.definition()<CR>", {silent=true})
+key("n", "gi", "<Cmd>lua vim.lsp.buf.implementation()<CR>", {silent=true})
+key("n", "gh", "<Cmd>lua vim.lsp.buf.hover()<CR>", {silent=true})
+key("n", "]e", "<Cmd>lua vim.lsp.diagnostic.goto_next()<CR>", {silent=true})
+key("n", "[e", "<Cmd>lua vim.lsp.diagnostic.goto_prev()<CR>", {silent=true})
+key("n", "<Leader>e", "<Cmd>lua vim.lsp.diagnostic.show_line_diagnostics()<CR>", {silent=true})
 
 -- File commands
-vim.api.nvim_set_keymap("n", "<Leader>q", ":quit<CR>", {noremap=true})
-vim.api.nvim_set_keymap("n", "<Leader>Q", ":quitall<CR>", {noremap=true})
-vim.api.nvim_set_keymap("n", "<Leader>fs", ":write<CR>", {noremap=true})
-vim.api.nvim_set_keymap("n", "<Leader>fe", ":!chmod 755 %<CR><CR>", {noremap=true})
-vim.api.nvim_set_keymap("n", "<Leader>fn", ":!chmod 644 %<CR><CR>", {noremap=true})
-vim.api.nvim_set_keymap("n", "<Leader>fd", ":lcd %:p:h<CR>", {silent=true, noremap=true})
-vim.api.nvim_set_keymap("n", "<Leader>fu", ":lcd ..<CR>", {silent=true, noremap=true})
-vim.api.nvim_set_keymap("n", "<Leader><Tab>", ":b#<CR>", {silent=true, noremap=true})
-vim.api.nvim_set_keymap("n", "<Leader>gr", ":!gh repo view -w<CR><CR>", {silent=true, noremap=true})
-vim.api.nvim_set_keymap("n", "<Leader>tt", [[<Cmd>exe 'edit ~/notes/journal/'.strftime("%Y-%m-%d_%a").'.md'<CR>]], {noremap=true})
+key("n", "<Leader>q", ":quit<CR>")
+key("n", "<Leader>Q", ":quitall<CR>")
+key("n", "<Leader>fs", ":write<CR>")
+key("n", "<Leader>fd", ":lcd %:p:h<CR>", {silent=true})
+key("n", "<Leader>fu", ":lcd ..<CR>", {silent=true})
+key("n", "<Leader><Tab>", ":b#<CR>", {silent=true})
+key("n", "<Leader>gr", ":!gh repo view -w<CR><CR>", {silent=true})
+key("n", "<Leader>tt",
+    [[<Cmd>exe 'edit $NOTES_PATH/journal/'.strftime("%Y-%m-%d_%a").'.md'<CR>]]
+)
+key("n", "<Leader>jj", ":!journal<CR>:e<CR>")
 
 -- Window commands
-vim.api.nvim_set_keymap("n", "<Leader>wv", ":vsplit<CR>", {noremap=true})
-vim.api.nvim_set_keymap("n", "<Leader>wh", ":split<CR>", {noremap=true})
-vim.api.nvim_set_keymap("n", "<Leader>wm", ":only<CR>", {noremap=true})
+key("n", "<Leader>wv", ":vsplit<CR>")
+key("n", "<Leader>wh", ":split<CR>")
+key("n", "<Leader>wm", ":only<CR>")
 
 -- Tabularize
-vim.api.nvim_set_keymap("", "<Leader>ta", ":Tabularize /", {noremap=true})
-vim.api.nvim_set_keymap("", "<Leader>t#", ":Tabularize /#<CR>", {noremap=true})
-vim.api.nvim_set_keymap("", "<Leader>t\"", ":Tabularize /\"<CR>", {noremap=true})
+key("", "<Leader>ta", ":Tabularize /")
+key("", "<Leader>t#", ":Tabularize /#<CR>")
+key("", "<Leader>tl", ":Tabularize /---<CR>")
 
--- Vimrc
-vim.api.nvim_set_keymap("n", "<Leader>fv", ":edit $MYVIMRC<CR>", {noremap=true})
-vim.api.nvim_set_keymap("n", "<Leader>rr", ":luafile $MYVIMRC<CR>", {noremap=true})
+-- Vimrc editing
+key("n", "<Leader>fv", ":edit $MYVIMRC<CR>")
+key("n", "<Leader>rr", ":luafile $MYVIMRC<CR>")
+key("n", "<Leader>rp", ":luafile $MYVIMRC<CR>:PackerInstall<CR>:")
+key("n", "<Leader>rc", ":luafile $MYVIMRC<CR>:PackerCompile<CR>")
+
+-- Keep cursor in place
+key("n", 'n', "nzz")
+key("n", 'N', "Nzz")
+key("n", 'J', "mzJ`z") --- Mark and jump back to it
+
+-- Add undo breakpoints
+key("i", ',', ",<C-g>u")
+key("i", '.', ".<C-g>u")
+key("i", '!', "!<C-g>u")
+key("i", '?', "?<C-g>u")
 
 -- Other
-vim.api.nvim_set_keymap("n", "<Leader><Space>", ":HopWord<CR>", {noremap=true})
-vim.api.nvim_set_keymap("t", "<A-CR>", "<C-\\><C-n>", {noremap=true}) -- Exit terminal mode
-vim.api.nvim_set_keymap("n", "<A-CR>", ":noh<CR>", {noremap=true, silent=true})
-vim.api.nvim_set_keymap('n', 'Y', 'y$', { noremap = true})
+key("t", "<A-CR>", "<C-\\><C-n>")                           --- Exit terminal mode
+key("n", "<A-CR>", ":noh<CR>", {silent=true})               --- Clear search in VimWiki
+key("n", "Y", "y$")                                         --- Copy to end of line
+key("v", "<C-r>", "y<Esc>:%s/<C-r>+//gc<left><left><left>") --- Substitute selected
+key("v", "D", "y'>gp")                                      --- Duplicate selected

nixos/justfile

@@ -2,6 +2,10 @@
 default:
   @just --list --list-heading $'Update NixOS config:\n'
 
+channel:
+  nix-channel --add https://nixos.org/channels/nixpkgs-unstable nixos-unstable
+  nix-channel --update
+
 # Update the system
 system:
   nixos-rebuild switch -I nixos-config=./configuration.nix