diff --git a/kickstart/flake.nix b/kickstart/flake.nix index 5b6e7bf..e2fa0cd 100644 --- a/kickstart/flake.nix +++ b/kickstart/flake.nix @@ -174,6 +174,12 @@ nvim-web-devicons plenary-nvim ]; + custom-tmux-navigator = [ + vim-tmux-navigator + ]; + custom-undotree = [ + undotree + ]; }; # not loaded automatically at startup. @@ -265,6 +271,9 @@ # but we can still send the info from nix to lua that we want it! kickstart-gitsigns = true; + custom-tmux-navigator = true; + custom-undotree = true; + # we can pass whatever we want actually. have_nerd_font = false; diff --git a/kickstart/init.lua b/kickstart/init.lua index 079e51b..143bc7f 100644 --- a/kickstart/init.lua +++ b/kickstart/init.lua @@ -797,7 +797,8 @@ require('nixCatsUtils.lazyCat').setup(nixCats.pawsible { 'allPlugins', 'start', -- change the command in the config to whatever the name of that colorscheme is. -- -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`. - 'catppucchin/nvim', + 'catppuccin/nvim', + name = 'catppuccin-nvim', priority = 1000, -- Make sure to load this before all the other start plugins. init = function() -- Load the colorscheme here. @@ -903,6 +904,8 @@ require('nixCatsUtils.lazyCat').setup(nixCats.pawsible { 'allPlugins', 'start', require 'kickstart.plugins.autopairs', require 'kickstart.plugins.neo-tree', require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps + require 'custom.plugins.tmux_navigator', + require 'custom.plugins.undotree', -- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua` -- This is the easiest way to modularize your config. diff --git a/kickstart/lua/custom/plugins/tmux_navigator.lua b/kickstart/lua/custom/plugins/tmux_navigator.lua new file mode 100644 index 0000000..5885226 --- /dev/null +++ b/kickstart/lua/custom/plugins/tmux_navigator.lua @@ -0,0 +1,17 @@ +return { + 'christoomey/vim-tmux-navigator', + cmd = { + 'TmuxNavigateLeft', + 'TmuxNavigateDown', + 'TmuxNavigateUp', + 'TmuxNavigateRight', + 'TmuxNavigatePrevious', + }, + keys = { + { '', 'TmuxNavigateLeft' }, + { '', 'TmuxNavigateDown' }, + { '', 'TmuxNavigateUp' }, + { '', 'TmuxNavigateRight' }, + { '', 'TmuxNavigatePrevious' }, + }, +} diff --git a/kickstart/lua/custom/plugins/undotree.lua b/kickstart/lua/custom/plugins/undotree.lua new file mode 100644 index 0000000..2f2c16c --- /dev/null +++ b/kickstart/lua/custom/plugins/undotree.lua @@ -0,0 +1,6 @@ +return { + 'mbbill/undotree', + keys = { + { 'u', ' UndotreeToggle ', desc = 'Toggle [U]ndotree', mode = { 'n' } }, + }, +}