modules/common/neovim/config/telescope.lua

@@ -45,7 +45,7 @@ end)
 vim.keymap.set("n", "<Leader>fz", require("telescope").extensions.zoxide.list)
 
 -- Project
-require("telescope").load_extension("projects")
+require("telescope").load_extension("project")
 vim.keymap.set("n", "<C-p>", function()
     local opts = require("telescope.themes").get_ivy({
         layout_config = {
@@ -54,7 +54,7 @@ vim.keymap.set("n", "<C-p>", function()
             },
         },
     })
-    require("telescope").extensions.projects.projects(opts)
+    require("telescope").extensions.project.project(opts)
 end)
 
 -- File browser

modules/common/neovim/config/telescope.nix

@@ -2,7 +2,7 @@
 
   plugins = [
     pkgs.vimPlugins.telescope-nvim
-    pkgs.vimPlugins.project-nvim
+    pkgs.vimPlugins.telescope-project-nvim
     pkgs.vimPlugins.telescope-fzy-native-nvim
     pkgs.vimPlugins.telescope-file-browser-nvim
     pkgs.vimPlugins.telescope-zoxide
@@ -25,11 +25,10 @@
     extensions = {
       fzy_native = { };
       zoxide = { };
+      project = { base_dirs = [ "~/dev" ]; };
     };
   };
 
-  setup.project_nvim = { };
-
   lua = builtins.readFile ./telescope.lua;
 
 }

modules/common/neovim/config/tree.nix

@@ -12,11 +12,9 @@
   setup.nvim-tree = {
     disable_netrw = true;
     hijack_netrw = true;
-    sync_root_with_cwd = true;
-    respect_buf_cwd = true;
     update_focused_file = {
       enable = true;
-      update_root = true;
+      update_cwd = true;
       ignore_list = { };
     };
     diagnostics = {

modules/common/neovim/lua/keybinds.lua

@@ -1,78 +0,0 @@
--- ===========================================================================
--- Key Mapping
--- ===========================================================================
-
--- Function to cut down config boilerplate
-local key = function(mode, key_sequence, action, params)
-    params = params or {}
-    vim.keymap.set(mode, key_sequence, action, params)
-end
-
--- Remap space as leader key
-key("", "<Space>", "<Nop>", { silent = true })
-vim.g.mapleader = " "
-vim.g.maplocalleader = " "
-
--- 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
-key("n", "<A-j>", ":m .+1<CR>==")
-key("n", "<A-k>", ":m .-2<CR>==")
-key("v", "<A-j>", ":m '>+1<CR>gv=gv")
-key("v", "<A-k>", ":m '<-2<CR>gv=gv")
-
--- Better window navigation
-key("n", "<C-h>", "<C-w>h")
-key("n", "<C-j>", "<C-w>j")
-key("n", "<C-k>", "<C-w>k")
-key("n", "<C-l>", "<C-w>l")
-
--- File commands
-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
-key("n", "<Leader>wv", ":vsplit<CR>")
-key("n", "<Leader>wh", ":split<CR>")
-key("n", "<Leader>wm", ":only<CR>")
-
--- Vimrc editing
-key("n", "<Leader>rr", ":luafile $HOME/.config/nvim/init.lua<CR>")
-key("n", "<Leader>rp", ":luafile $HOME/.config/nvim/init.lua<CR>:PackerInstall<CR>:")
-key("n", "<Leader>rc", ":luafile $HOME/.config/nvim/init.lua<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")
-
--- Resize with arrows
-key("n", "<C-Up>", ":resize +2<CR>", { silent = true })
-key("n", "<C-Down>", ":resize -2<CR>", { silent = true })
-key("n", "<C-Left>", ":vertical resize -2<CR>", { silent = true })
-key("n", "<C-Right>", ":vertical resize +2<CR>", { silent = true })
-
--- Other
-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
-key("x", "<Leader>p", '"_dP') --- Paste but keep register

modules/common/neovim/lua/settings.lua

@@ -1,17 +0,0 @@
--- ===========================================================================
--- Settings
--- ===========================================================================
-
-vim.filetype.add({
-    pattern = {
-        [".*%.tfvars"] = "hcl",
-        -- [".*%.tf"] = "hcl",
-    },
-})
-
-vim.api.nvim_create_autocmd("FileType", {
-    pattern = "*.eml",
-    callback = function()
-        vim.o.wrapmargin = 79 -- Wrap text automatically
-    end,
-})