@@ -91,27 +91,6 @@ vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagn
9191-- or just use <C-\><C-n> to exit terminal mode
9292vim .keymap .set (' t' , ' <Esc><Esc>' , ' <C-\\ ><C-n>' , { desc = ' Exit terminal mode' })
9393
94- -- TIP: Disable arrow keys in normal mode
95- vim .keymap .set (' n' , ' <left>' , ' <cmd>echo "Use h to move!!"<CR>' )
96- vim .keymap .set (' n' , ' <right>' , ' <cmd>echo "Use l to move!!"<CR>' )
97- vim .keymap .set (' n' , ' <up>' , ' <cmd>echo "Use k to move!!"<CR>' )
98- vim .keymap .set (' n' , ' <down>' , ' <cmd>echo "Use j to move!!"<CR>' )
99-
100- vim .keymap .set (' i' , ' <left>' , ' <cmd>echo "Use h to move!!"<CR>' )
101- vim .keymap .set (' i' , ' <right>' , ' <cmd>echo "Use l to move!!"<CR>' )
102- vim .keymap .set (' i' , ' <up>' , ' <cmd>echo "Use k to move!!"<CR>' )
103- vim .keymap .set (' i' , ' <down>' , ' <cmd>echo "Use j to move!!"<CR>' )
104-
105- vim .keymap .set (' v' , ' <left>' , ' <cmd>echo "Use h to move!!"<CR>' )
106- vim .keymap .set (' v' , ' <right>' , ' <cmd>echo "Use l to move!!"<CR>' )
107- vim .keymap .set (' v' , ' <up>' , ' <cmd>echo "Use k to move!!"<CR>' )
108- vim .keymap .set (' v' , ' <down>' , ' <cmd>echo "Use j to move!!"<CR>' )
109-
110- vim .keymap .set (' c' , ' <left>' , ' <cmd>echo "Use h to move!!"<CR>' )
111- vim .keymap .set (' c' , ' <right>' , ' <cmd>echo "Use l to move!!"<CR>' )
112- vim .keymap .set (' c' , ' <up>' , ' <cmd>echo "Use k to move!!"<CR>' )
113- vim .keymap .set (' c' , ' <down>' , ' <cmd>echo "Use j to move!!"<CR>' )
114-
11594-- Keybinds to make split navigation easier.
11695-- Use CTRL+<hjkl> to switch between windows
11796--
@@ -130,9 +109,6 @@ vim.keymap.set('n', '<C-k>', '<C-w><C-k>', { desc = 'Move focus to the upper win
130109-- [[ Basic Autocommands ]]
131110-- See `:help lua-guide-autocommands`
132111
133- -- Highlight when yanking (copying) text
134- -- Try it with `yap` in normal mode
135- -- See `:help vim.highlight.on_yank()`
136112vim .api .nvim_create_autocmd (' TextYankPost' , {
137113 desc = ' Highlight when yanking (copying) text' ,
138114 group = vim .api .nvim_create_augroup (' kickstart-highlight-yank' , { clear = true }),
@@ -238,52 +214,37 @@ require('lazy').setup({
238214 ' folke/which-key.nvim' ,
239215 event = ' VimEnter' , -- Sets the loading event to 'VimEnter'
240216 opts = {
217+ theme = ' helix' ,
241218 -- delay between pressing a key and opening which-key (milliseconds)
242219 -- this setting is independent of vim.opt.timeoutlen
243220 delay = 0 ,
244- icons = {
245- mappings = false ,
246- keys = {
247- Up = ' <Up> ' ,
248- Down = ' <Down> ' ,
249- Left = ' <Left> ' ,
250- Right = ' <Right> ' ,
251- C = ' <C-…> ' ,
252- M = ' <M-…> ' ,
253- D = ' <D-…> ' ,
254- S = ' <S-…> ' ,
255- CR = ' <CR> ' ,
256- Esc = ' <Esc> ' ,
257- ScrollWheelDown = ' <ScrollWheelDown> ' ,
258- ScrollWheelUp = ' <ScrollWheelUp> ' ,
259- NL = ' <NL> ' ,
260- BS = ' <BS> ' ,
261- Space = ' <Space> ' ,
262- Tab = ' <Tab> ' ,
263- F1 = ' <F1>' ,
264- F2 = ' <F2>' ,
265- F3 = ' <F3>' ,
266- F4 = ' <F4>' ,
267- F5 = ' <F5>' ,
268- F6 = ' <F6>' ,
269- F7 = ' <F7>' ,
270- F8 = ' <F8>' ,
271- F9 = ' <F9>' ,
272- F10 = ' <F10>' ,
273- F11 = ' <F11>' ,
274- F12 = ' <F12>' ,
275- },
276- },
277-
278- -- Document existing key chains
279- spec = {
280- { ' <leader>s' , group = ' [S]earch' },
281- { ' <leader>t' , group = ' [T]oggle' },
282- { ' <leader>h' , group = ' Git [H]unk' , mode = { ' n' , ' v' } },
283- },
284221 },
285222 },
286-
223+ {
224+ ' greggh/claude-code.nvim' ,
225+ dependencies = {
226+ ' nvim-lua/plenary.nvim' , -- Required for git operations
227+ },
228+ config = function ()
229+ require (' claude-code' ).setup {
230+ window = {
231+ position = ' float' ,
232+ },
233+ keymaps = {
234+ toggle = {
235+ normal = ' <leader>c' , -- Normal mode keymap for toggling Claude Code, false to disable
236+ terminal = ' false' , -- Terminal mode keymap for toggling Claude Code, false to disable
237+ -- variants = {
238+ -- continue = "<leader>cC", -- Normal mode keymap for Claude Code with continue flag
239+ -- verbose = "<leader>cV", -- Normal mode keymap for Claude Code with verbose flag
240+ -- },
241+ },
242+ window_navigation = true , -- Enable window navigation keymaps (<C-h/j/k/l>)
243+ scrolling = true , -- Enable scrolling keymaps (<C-f/b>) for page up/down
244+ },
245+ }
246+ end ,
247+ },
287248 -- NOTE: Plugins can specify dependencies.
288249 --
289250 -- The dependencies are proper plugin specifications as well - anything
@@ -884,16 +845,25 @@ require('lazy').setup({
884845 -- vim.g.gruvbox_material_background = 'hard'
885846 -- vim.cmd.colorscheme 'gruvbox-material'
886847 -- end,
887- ' catppuccin/ nvim' ,
888- name = ' catppuccin ' ,
848+ ' webhooked/kanso. nvim' ,
849+ lazy = false ,
889850 priority = 1000 ,
890851 config = function ()
891- require (' catppuccin' ).setup {
892- flavour = ' mocha' ,
893- transparent_background = true ,
852+ require (' kanso' ).setup {
853+ transparent = false ,
894854 }
895- vim .cmd ' colorscheme catppuccin '
855+ vim .cmd ' colorscheme kanso '
896856 end ,
857+ -- 'catppuccin/nvim',
858+ -- name = 'catppuccin',
859+ -- priority = 1000,
860+ -- config = function()
861+ -- require('catppuccin').setup {
862+ -- flavour = 'mocha',
863+ -- transparent_background = true,
864+ -- }
865+ -- vim.cmd 'colorscheme catppuccin'
866+ -- end,
897867 -- 'rebelot/kanagawa.nvim',
898868 -- priority = 1000, -- Make sure to load this before all the other start plugins.
899869 -- name = 'kanagawa-dragon',
@@ -907,12 +877,12 @@ require('lazy').setup({
907877 -- vim.cmd 'colorscheme kanagawa-dragon'
908878 -- end,
909879 -- 'zenbones-theme/zenbones.nvim',
910- -- dependencies = 'rktjmp/lush.nvim',
911- -- lazy = false,
912- -- priority = 1000,
913- -- config = function()
914- -- vim.cmd 'colorscheme zenbones'
915- -- end,
880+ -- dependencies = 'rktjmp/lush.nvim',
881+ -- lazy = false,
882+ -- priority = 1000,
883+ -- config = function()
884+ -- vim.cmd 'colorscheme zenbones'
885+ -- end,
916886 -- 'vague2k/vague.nvim',
917887 -- priority = 1000,
918888 -- name = 'vague',
@@ -1006,72 +976,60 @@ require('lazy').setup({
1006976 }
1007977 end ,
1008978 },
1009- -- {
1010- -- 'mikavilpas/yazi.nvim',
1011- -- event = 'VeryLazy',
1012- -- dependencies = {
1013- -- 'folke/snacks.nvim',
1014- -- },
1015- -- keys = {
1016- -- -- 👇 in this section, choose your own keymappings!
1017- -- {
1018- -- '<leader>-',
1019- -- mode = { 'n', 'v' },
1020- -- '<cmd>Yazi<cr>',
1021- -- desc = 'Open yazi at the current file',
1022- -- },
1023- -- {
1024- -- -- Open in the current working directory
1025- -- '<leader>cw',
1026- -- '<cmd>Yazi cwd<cr>',
1027- -- desc = "Open the file manager in nvim's working directory",
1028- -- },
1029- -- {
1030- -- '<c-up>',
1031- -- '<cmd>Yazi toggle<cr>',
1032- -- desc = 'Resume the last yazi session',
1033- -- },
1034- -- },
1035- -- opts = {
1036- -- -- if you want to open yazi instead of netrw, see below for more info
1037- -- open_for_directories = false,
1038- -- keymaps = {
1039- -- show_help = '~',
1040- -- },
1041- -- },
1042- -- -- 👇 if you use `open_for_directories=true`, this is recommended
1043- -- init = function()
1044- -- -- More details: https://github.com/mikavilpas/yazi.nvim/issues/802
1045- -- -- vim.g.loaded_netrw = 1
1046- -- vim.g.loaded_netrwPlugin = 1
1047- -- end,
1048- -- },
1049- -- The following comments only work if you have downloaded the kickstart repo, not just copy pasted the
1050- -- init.lua. If you want these files, they are in the repository, so you can just download them and
1051- -- place them in the correct locations.
1052-
1053- -- NOTE: Next step on your Neovim journey: Add/Configure additional plugins for Kickstart
1054- --
1055- -- Here are some example plugins that I've included in the Kickstart repository.
1056- -- Uncomment any of the lines below to enable them (you will need to restart nvim).
1057- --
1058- -- require 'kickstart.plugins.debug',
1059- -- require 'kickstart.plugins.indent_line',
1060- -- require 'kickstart.plugins.lint',
1061- -- require 'kickstart.plugins.autopairs',
1062- -- require 'kickstart.plugins.neo-tree',
1063- -- require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps
1064-
1065- -- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua`
1066- -- This is the easiest way to modularize your config.
1067- --
1068- -- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going.
1069- -- { import = 'custom.plugins' },
1070- --
1071- -- For additional information with loading, sourcing and examples see `:help lazy.nvim-🔌-plugin-spec`
1072- -- Or use telescope!
1073- -- In normal mode type `<space>sh` then write `lazy.nvim-plugin`
1074- -- you can continue same window with `<space>sr` which resumes last telescope search
979+ -- {
980+ -- 'zbirenbaum/copilot.lua',
981+ -- requires = {
982+ -- 'copilotlsp-nvim/copilot-lsp',
983+ -- init = function()
984+ -- vim.g.copilot_nes_debounce = 500
985+ -- end,
986+ -- },
987+ -- cmd = 'Copilot',
988+ -- event = 'InsertEnter',
989+ -- config = function()
990+ -- require('copilot').setup {
991+ -- filetypes = {
992+ -- javascript = true,
993+ -- typescript = true,
994+ -- python = true,
995+ -- ['*'] = false, -- disable for all other filetypes and ignore default `filetypes`
996+ -- },
997+ -- suggestion = { enabled = false },
998+ -- panel = { enabled = false },
999+ -- nes = {
1000+ -- enabled = true, -- requires copilot-lsp as a dependency
1001+ -- auto_trigger = false,
1002+ -- keymap = {
1003+ -- accept_and_goto = '<tab>',
1004+ -- accept = false,
1005+ -- dismiss = '<Esc>',
1006+ -- },
1007+ -- },
1008+ -- }
1009+ -- end,
1010+ -- },
1011+ -- {
1012+ -- 'copilotlsp-nvim/copilot-lsp',
1013+ -- init = function()
1014+ -- vim.g.copilot_nes_debounce = 500
1015+ -- vim.lsp.enable 'copilot_ls'
1016+ -- vim.keymap.set('n', '<tab>', function()
1017+ -- local bufnr = vim.api.nvim_get_current_buf()
1018+ -- local state = vim.b[bufnr].nes_state
1019+ -- if state then
1020+ -- -- Try to jump to the start of the suggestion edit.
1021+ -- -- If already at the start, then apply the pending suggestion and jump to the end of the edit.
1022+ -- local _ = require('copilot-lsp.nes').walk_cursor_start_edit()
1023+ -- or (require('copilot-lsp.nes').apply_pending_nes() and require('copilot-lsp.nes').walk_cursor_end_edit())
1024+ -- return nil
1025+ -- else
1026+ -- -- Resolving the terminal's inability to distinguish between `TAB` and `<C-i>` in normal mode
1027+ -- return '<C-i>'
1028+ -- end
1029+ -- end, { desc = 'Accept Copilot NES suggestion', expr = true })
1030+ -- end,
1031+ -- },
1032+ -- { 'giuxtaposition/blink-cmp-copilot' },
10751033}, {
10761034 ui = {
10771035 icons = {
0 commit comments