migrate over neovim config

.gitignore

@@ -0,0 +1 @@
+result

dotfiles/nvim/.neoconf.json

@@ -0,0 +1,15 @@
+{
+  "neodev": {
+    "library": {
+      "enabled": true,
+      "plugins": true
+    }
+  },
+  "neoconf": {
+    "plugins": {
+      "lua_ls": {
+        "enabled": true
+      }
+    }
+  }
+}

dotfiles/nvim/init.lua

@@ -0,0 +1 @@
+require("config.lazy")

dotfiles/nvim/lua/config/autocmds.lua

@@ -0,0 +1,3 @@
+-- Autocmds are automatically loaded on the VeryLazy event
+-- Default autocmds that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/autocmds.lua
+-- Add any additional autocmds here

dotfiles/nvim/lua/config/keymaps.lua

@@ -0,0 +1,3 @@
+-- Keymaps are automatically loaded on the VeryLazy event
+-- Default keymaps that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/keymaps.lua
+-- Add any additional keymaps here

dotfiles/nvim/lua/config/lazy.lua

@@ -0,0 +1,46 @@
+local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
+if not vim.loop.fs_stat(lazypath) then
+  -- bootstrap lazy.nvim
+  -- stylua: ignore
+  vim.fn.system({ "git", "clone", "--filter=blob:none", "https://github.com/folke/lazy.nvim.git", "--branch=stable", lazypath })
+end
+vim.opt.rtp:prepend(vim.env.LAZY or lazypath)
+
+require("lazy").setup({
+	spec = {
+		-- add LazyVim and import its plugins
+		{ "LazyVim/LazyVim", import = "lazyvim.plugins" },
+		-- import any extras modules here
+		{ import = "lazyvim.plugins.extras.editor.aerial" },
+		{ import = "lazyvim.plugins.extras.editor.leap" },
+		{ import = "lazyvim.plugins.extras.lang.typescript" },
+		{ import = "lazyvim.plugins.extras.lang.svelte" },
+		{ import = "lazyvim.plugins.extras.lang.rust" },
+		{ import = "lazyvim.plugins.extras.lang.haskell" },
+		{ import = "lazyvim.plugins.extras.formatting.prettier" },
+		{ import = "lazyvim.plugins.extras.util.chezmoi" },
+		-- import/override with your plugins
+		{ import = "plugins" },
+	},
+	defaults = {
+		lazy = false,
+		version = false, -- always use the latest git commit
+	},
+	install = { colorscheme = { "tokyonight", "habamax" } },
+	checker = { enabled = true }, -- automatically check for plugin updates
+	performance = {
+		rtp = {
+			-- disable some rtp plugins
+			disabled_plugins = {
+				"gzip",
+				-- "matchit",
+				-- "matchparen",
+				-- "netrwPlugin",
+				"tarPlugin",
+				"tohtml",
+				"tutor",
+				"zipPlugin",
+			},
+		},
+	},
+})

dotfiles/nvim/lua/config/options.lua

@@ -0,0 +1,22 @@
+-- Options are automatically loaded before lazy.nvim startup
+-- Default options that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/options.lua
+-- Add any additional options here
+
+-- Disable relative line numbers
+vim.o.relativenumber = false
+
+-- Change the default font
+-- Some of my machines have HDR displayed, meaning they need a smaller font size
+if vim.fn.hostname() == "enoko" then
+  vim.o.guifont = "JetBrainsMono NF:h12"
+else
+  vim.o.guifont = "JetBrainsMono NF:h14"
+end
+
+if vim.g.neovide then
+  -- Reduce neovide scroll animation length
+  vim.g.neovide_scroll_animation_length = 0.1
+end
+
+-- Prepend mise shims to path
+vim.env.PATH = vim.env.HOME .. ".local/share/mise/shims:" .. vim.env.PATH

dotfiles/nvim/lua/plugins/cmp.lua

@@ -0,0 +1,9 @@
+return {
+  "hrsh7th/nvim-cmp",
+  opts = function(_, opts)
+    opts.experimental = {
+      -- Disable ghost text because it pisses me off.
+      ghost_text = false,
+    }
+  end,
+}

dotfiles/nvim/lua/plugins/colorscheme.lua

@@ -0,0 +1,9 @@
+return {
+  { "navarasu/onedark.nvim" },
+  {
+    "LazyVim/LazyVim",
+    opts = {
+      colorscheme = "onedark",
+    },
+  },
+}

dotfiles/nvim/lua/plugins/dashboard.lua

@@ -0,0 +1,24 @@
+-- Various dashboard adjustments
+
+return {
+  "nvimdev/dashboard-nvim",
+  opts = function(_, opts)
+    -- Remove the original "config" button
+    table.remove(opts.config.center, 5)
+
+    -- Build a new button
+    local button = {
+      action = "Telescope find_files cwd=~/.local/share/chezmoi/",
+      desc = "Dotfiles",
+      icon = "⚙️  ",
+      key = "c",
+    }
+
+    button.desc = button.desc .. string.rep(" ", 43 - #button.desc)
+    button.key_format = "  %s"
+    table.insert(opts.config.center, 5, button)
+  end,
+  keys = {
+    { "<leader>qc", "<cmd>Telescope find_files cwd=~/.local/share/chezmoi<CR>", desc = "Find in dotfiles" },
+  },
+}

dotfiles/nvim/lua/plugins/elixir.lua

@@ -0,0 +1,17 @@
+-- Set up elixir-tools.nvim for better Elixir support
+
+return {
+  {
+    "elixir-tools/elixir-tools.nvim",
+    event = { "BufReadPre", "BufNewFile" },
+    config = function()
+      local elixir = require("elixir")
+
+      elixir.setup({
+        elixirls = {
+          enable = false, -- handle elixirls through mason
+        },
+      })
+    end,
+  },
+}

dotfiles/nvim/lua/plugins/example.lua

@@ -0,0 +1,265 @@
+-- since this is just an example spec, don't actually load anything here and return an empty spec
+-- stylua: ignore
+if true then return {} end
+
+-- every spec file under the "plugins" directory will be loaded automatically by lazy.nvim
+--
+-- In your plugin files, you can:
+-- * add extra plugins
+-- * disable/enabled LazyVim plugins
+-- * override the configuration of LazyVim plugins
+return {
+  -- add gruvbox
+  { "ellisonleao/gruvbox.nvim" },
+
+  -- Configure LazyVim to load gruvbox
+  {
+    "LazyVim/LazyVim",
+    opts = {
+      colorscheme = "gruvbox",
+    },
+  },
+
+  -- change trouble config
+  {
+    "folke/trouble.nvim",
+    -- opts will be merged with the parent spec
+    opts = { use_diagnostic_signs = true },
+  },
+
+  -- disable trouble
+  { "folke/trouble.nvim", enabled = false },
+
+  -- add symbols-outline
+  {
+    "simrat39/symbols-outline.nvim",
+    cmd = "SymbolsOutline",
+    keys = { { "<leader>cs", "<cmd>SymbolsOutline<cr>", desc = "Symbols Outline" } },
+    config = true,
+  },
+
+  -- override nvim-cmp and add cmp-emoji
+  {
+    "hrsh7th/nvim-cmp",
+    dependencies = { "hrsh7th/cmp-emoji" },
+    ---@param opts cmp.ConfigSchema
+    opts = function(_, opts)
+      table.insert(opts.sources, { name = "emoji" })
+    end,
+  },
+
+  -- change some telescope options and a keymap to browse plugin files
+  {
+    "nvim-telescope/telescope.nvim",
+    keys = {
+      -- add a keymap to browse plugin files
+      -- stylua: ignore
+      {
+        "<leader>fp",
+        function() require("telescope.builtin").find_files({ cwd = require("lazy.core.config").options.root }) end,
+        desc = "Find Plugin File",
+      },
+    },
+    -- change some options
+    opts = {
+      defaults = {
+        layout_strategy = "horizontal",
+        layout_config = { prompt_position = "top" },
+        sorting_strategy = "ascending",
+        winblend = 0,
+      },
+    },
+  },
+
+  -- add telescope-fzf-native
+  {
+    "telescope.nvim",
+    dependencies = {
+      "nvim-telescope/telescope-fzf-native.nvim",
+      build = "make",
+      config = function()
+        require("telescope").load_extension("fzf")
+      end,
+    },
+  },
+
+  -- add pyright to lspconfig
+  {
+    "neovim/nvim-lspconfig",
+    ---@class PluginLspOpts
+    opts = {
+      ---@type lspconfig.options
+      servers = {
+        -- pyright will be automatically installed with mason and loaded with lspconfig
+        pyright = {},
+      },
+    },
+  },
+
+  -- add tsserver and setup with typescript.nvim instead of lspconfig
+  {
+    "neovim/nvim-lspconfig",
+    dependencies = {
+      "jose-elias-alvarez/typescript.nvim",
+      init = function()
+        require("lazyvim.util").lsp.on_attach(function(_, buffer)
+          -- stylua: ignore
+          vim.keymap.set( "n", "<leader>co", "TypescriptOrganizeImports", { buffer = buffer, desc = "Organize Imports" })
+          vim.keymap.set("n", "<leader>cR", "TypescriptRenameFile", { desc = "Rename File", buffer = buffer })
+        end)
+      end,
+    },
+    ---@class PluginLspOpts
+    opts = {
+      ---@type lspconfig.options
+      servers = {
+        -- tsserver will be automatically installed with mason and loaded with lspconfig
+        tsserver = {},
+      },
+      -- you can do any additional lsp server setup here
+      -- return true if you don't want this server to be setup with lspconfig
+      ---@type table<string, fun(server:string, opts:_.lspconfig.options):boolean?>
+      setup = {
+        -- example to setup with typescript.nvim
+        tsserver = function(_, opts)
+          require("typescript").setup({ server = opts })
+          return true
+        end,
+        -- Specify * to use this function as a fallback for any server
+        -- ["*"] = function(server, opts) end,
+      },
+    },
+  },
+
+  -- for typescript, LazyVim also includes extra specs to properly setup lspconfig,
+  -- treesitter, mason and typescript.nvim. So instead of the above, you can use:
+  { import = "lazyvim.plugins.extras.lang.typescript" },
+
+  -- add more treesitter parsers
+  {
+    "nvim-treesitter/nvim-treesitter",
+    opts = {
+      ensure_installed = {
+        "bash",
+        "html",
+        "javascript",
+        "json",
+        "lua",
+        "markdown",
+        "markdown_inline",
+        "python",
+        "query",
+        "regex",
+        "tsx",
+        "typescript",
+        "vim",
+        "yaml",
+      },
+    },
+  },
+
+  -- since `vim.tbl_deep_extend`, can only merge tables and not lists, the code above
+  -- would overwrite `ensure_installed` with the new value.
+  -- If you'd rather extend the default config, use the code below instead:
+  {
+    "nvim-treesitter/nvim-treesitter",
+    opts = function(_, opts)
+      -- add tsx and treesitter
+      vim.list_extend(opts.ensure_installed, {
+        "tsx",
+        "typescript",
+      })
+    end,
+  },
+
+  -- the opts function can also be used to change the default opts:
+  {
+    "nvim-lualine/lualine.nvim",
+    event = "VeryLazy",
+    opts = function(_, opts)
+      table.insert(opts.sections.lualine_x, "😄")
+    end,
+  },
+
+  -- or you can return new options to override all the defaults
+  {
+    "nvim-lualine/lualine.nvim",
+    event = "VeryLazy",
+    opts = function()
+      return {
+        --[[add your custom lualine config here]]
+      }
+    end,
+  },
+
+  -- use mini.starter instead of alpha
+  { import = "lazyvim.plugins.extras.ui.mini-starter" },
+
+  -- add jsonls and schemastore packages, and setup treesitter for json, json5 and jsonc
+  { import = "lazyvim.plugins.extras.lang.json" },
+
+  -- add any tools you want to have installed below
+  {
+    "williamboman/mason.nvim",
+    opts = {
+      ensure_installed = {
+        "stylua",
+        "shellcheck",
+        "shfmt",
+        "flake8",
+      },
+    },
+  },
+
+  -- Use <tab> for completion and snippets (supertab)
+  -- first: disable default <tab> and <s-tab> behavior in LuaSnip
+  {
+    "L3MON4D3/LuaSnip",
+    keys = function()
+      return {}
+    end,
+  },
+  -- then: setup supertab in cmp
+  {
+    "hrsh7th/nvim-cmp",
+    dependencies = {
+      "hrsh7th/cmp-emoji",
+    },
+    ---@param opts cmp.ConfigSchema
+    opts = function(_, opts)
+      local has_words_before = function()
+        unpack = unpack or table.unpack
+        local line, col = unpack(vim.api.nvim_win_get_cursor(0))
+        return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil
+      end
+
+      local luasnip = require("luasnip")
+      local cmp = require("cmp")
+
+      opts.mapping = vim.tbl_extend("force", opts.mapping, {
+        ["<Tab>"] = cmp.mapping(function(fallback)
+          if cmp.visible() then
+            cmp.select_next_item()
+            -- You could replace the expand_or_jumpable() calls with expand_or_locally_jumpable()
+            -- this way you will only jump inside the snippet region
+          elseif luasnip.expand_or_jumpable() then
+            luasnip.expand_or_jump()
+          elseif has_words_before() then
+            cmp.complete()
+          else
+            fallback()
+          end
+        end, { "i", "s" }),
+        ["<S-Tab>"] = cmp.mapping(function(fallback)
+          if cmp.visible() then
+            cmp.select_prev_item()
+          elseif luasnip.jumpable(-1) then
+            luasnip.jump(-1)
+          else
+            fallback()
+          end
+        end, { "i", "s" }),
+      })
+    end,
+  },
+}

dotfiles/nvim/lua/plugins/keymaps.lua

@@ -0,0 +1,9 @@
+-- Override plugin keymaps
+
+return {
+  "nvim-telescope/telescope.nvim",
+  keys = {
+    { "<leader><space>", "<cmd>Telescope find_files<cr>", desc = "Find files" },
+    { "<leader>qc", "<cmd>Telescope chezmoi<cr>", desc = "Find in dotfiles" },
+  },
+}

dotfiles/nvim/lua/plugins/nushell.lua

@@ -0,0 +1,30 @@
+return {
+  {
+    "neovim/nvim-lspconfig",
+    opts = {
+      servers = {
+        nushell = {},
+      },
+    },
+  },
+  {
+    "nvim-treesitter/nvim-treesitter",
+    dependencies = {
+      { "nushell/tree-sitter-nu" },
+    },
+    opts = function(_, opts)
+      require("nvim-treesitter.parsers").get_parser_configs().nu = {
+        install_info = {
+          url = "https://github.com/nushell/tree-sitter-nu",
+          files = { "src/parser.c" },
+          branch = "main",
+        },
+        filetype = "nu",
+      }
+
+      if type(opts.ensure_installed) == "table" then
+        vim.list_extend(opts.ensure_installed, { "nu" })
+      end
+    end,
+  },
+}

dotfiles/nvim/lua/plugins/projects.lua

@@ -0,0 +1,42 @@
+-- Better project/cd support
+
+return {
+  {
+    "gnikdroy/projections.nvim",
+    config = function()
+      require("projections").setup({
+        workspaces = {
+          "~/Projects/Personal",
+        },
+      })
+      require("telescope").load_extension("projections")
+
+      -- Load project if started in a project directory
+      local switcher = require("projections.switcher")
+      vim.api.nvim_create_autocmd({ "VimEnter" }, {
+        callback = function()
+          if vim.fn.argc() == 0 then
+            switcher.switch(vim.loop.cwd())
+          end
+        end,
+      })
+    end,
+    keys = {
+      { "<leader>fp", "<cmd>Telescope projections<CR>", desc = "Search projects" },
+    },
+  },
+  {
+    "nvimdev/dashboard-nvim",
+    opts = function(_, opts)
+      local button = {
+        action = "Telescope projections",
+        desc = "Projects",
+        icon = "🕮  ",
+        key = "p",
+      }
+
+      button.key_format = "  %s"
+      table.insert(opts.config.center, 6, button)
+    end,
+  },
+}

dotfiles/nvim/lua/plugins/tmux.lua

@@ -0,0 +1,32 @@
+return {
+  {
+    "aserowy/tmux.nvim",
+    event = "VeryLazy",
+    config = function()
+      local tmux = require("tmux")
+      tmux.setup({
+        copy_sync = {
+          enable = false,
+        },
+        navigation = {
+          cycle_navigation = false,
+          enable_default_keybindings = false,
+          persist_zoom = true,
+        },
+        resize = {
+          enable_default_keybindings = false,
+        },
+      })
+    end,
+    keys = {
+      { "<c-h>",     mode = { "n", "t", "i" }, '<cmd>lua require("tmux").move_left()<cr>' },
+      { "<c-l>",     mode = { "n", "t", "i" }, '<cmd>lua require("tmux").move_right()<cr>' },
+      { "<c-j>",     mode = { "n", "t", "i" }, '<cmd>lua require("tmux").move_bottom()<cr>' },
+      { "<c-k>",     mode = { "n", "t", "i" }, '<cmd>lua require("tmux").move_top()<cr>' },
+      { "<c-left>",  mode = { "n", "t", "i" }, '<cmd>lua require("tmux").resize_left()<cr>' },
+      { "<c-down>",  mode = { "n", "t", "i" }, '<cmd>lua require("tmux").resize_bottom()<cr>' },
+      { "<c-up>",    mode = { "n", "t", "i" }, '<cmd>lua require("tmux").resize_top()<cr>' },
+      { "<c-right>", mode = { "n", "t", "i" }, '<cmd>lua require("tmux").resize_right()<cr>' },
+    },
+  },
+}

dotfiles/nvim/stylua.toml

@@ -0,0 +1,3 @@
+indent_type = "Spaces"
+indent_width = 2
+column_width = 120

home-manager/neovim.nix

@@ -13,109 +13,11 @@
     plugins = with pkgs.vimPlugins; [
       lazy-nvim
     ];
-
-    extraLuaConfig =
-      let
-        plugins = with pkgs.vimPlugins; [
-          # LazyVim
-          LazyVim
-          bufferline-nvim
-          cmp-buffer
-          cmp-nvim-lsp
-          cmp-path
-          cmp_luasnip
-          conform-nvim
-          dashboard-nvim
-          dressing-nvim
-          flash-nvim
-          friendly-snippets
-          gitsigns-nvim
-          indent-blankline-nvim
-          lualine-nvim
-          neo-tree-nvim
-          neoconf-nvim
-          neodev-nvim
-          noice-nvim
-          nui-nvim
-          nvim-cmp
-          nvim-lint
-          nvim-lspconfig
-          nvim-notify
-          nvim-spectre
-          nvim-treesitter
-          nvim-treesitter-context
-          nvim-treesitter-textobjects
-          nvim-ts-autotag
-          nvim-ts-context-commentstring
-          nvim-web-devicons
-          persistence-nvim
-          plenary-nvim
-          telescope-fzf-native-nvim
-          telescope-nvim
-          todo-comments-nvim
-          tokyonight-nvim
-          trouble-nvim
-          vim-illuminate
-          vim-startuptime
-          which-key-nvim
-          { name = "LuaSnip"; path = luasnip; }
-          { name = "catppuccin"; path = catppuccin-nvim; }
-          { name = "mini.ai"; path = mini-nvim; }
-          { name = "mini.bufremove"; path = mini-nvim; }
-          { name = "mini.comment"; path = mini-nvim; }
-          { name = "mini.indentscope"; path = mini-nvim; }
-          { name = "mini.pairs"; path = mini-nvim; }
-          { name = "mini.surround"; path = mini-nvim; }
-        ];
-        mkEntryFromDrv = drv:
-          if lib.isDerivation drv then
-            { name = "${lib.getName drv}"; path = drv; }
-          else
-            drv;
-        lazyPath = pkgs.linkFarm "lazy-plugins" (builtins.map mkEntryFromDrv plugins);
-      in
-      ''
-        require("lazy").setup({
-          defaults = {
-            lazy = true,
-          },
-          dev = {
-            -- reuse files from pkgs.vimPlugins.*
-            path = "${lazyPath}",
-            patterns = { "." },
-            -- fallback to download
-            fallback = true,
-          },
-          spec = {
-            { "LazyVim/LazyVim", import = "lazyvim.plugins" },
-            -- The following configs are needed for fixing lazyvim on nix
-            -- force enable telescope-fzf-native.nvim
-            { "nvim-telescope/telescope-fzf-native.nvim", enabled = true },
-            -- disable mason.nvim, use programs.neovim.extraPackages
-            { "williamboman/mason-lspconfig.nvim", enabled = false },
-            { "williamboman/mason.nvim", enabled = false },
-            -- import/override with your plugins
-            { import = "plugins" },
-            -- treesitter handled by xdg.configFile."nvim/parser", put this line at the end of spec to clear ensure_installed
-            { "nvim-treesitter/nvim-treesitter", opts = { ensure_installed = {} } },
-          },
-        })
-      '';
   };
 
-  # https://github.com/nvim-treesitter/nvim-treesitter#i-get-query-error-invalid-node-type-at-position
-  xdg.configFile."nvim/parser".source =
-    let
-      parsers = pkgs.symlinkJoin {
-        name = "treesitter-parsers";
-        paths = (pkgs.vimPlugins.nvim-treesitter.withPlugins (plugins: with plugins; [
-          c
-          lua
-        ])).dependencies;
-      };
-    in
-    "${parsers}/parser";
-
   # Normal LazyVim config here, see https://github.com/LazyVim/starter/tree/main/lua
-  xdg.configFile."nvim/lua".source = ./lua;
+  xdg.configFile."nvim/init.lua".source = ../dotfiles/nvim/init.lua;
+  xdg.configFile."nvim/stylua.toml".source = ../dotfiles/nvim/stylua.toml;
+  xdg.configFile."nvim/.neoconf.json".source = ../dotfiles/nvim/.neoconf.json;
+  xdg.configFile."nvim/lua".source = ../dotfiles/nvim/lua;
 }