fix explorer ` key

.luarc.json

@@ -1,5 +1,9 @@
 {
     "diagnostics.globals": [
-        "vim"
+        "vim",
+        "Snacks"
+    ],
+    "diagnostics.disable": [
+        "undefined-doc-name"
     ]
 }

README.md

@@ -20,6 +20,7 @@ mise install
 ln -s "$(pwd)/nvim" ~/.config/nvim
 ln -s "$(pwd)/fish" ~/.config/fish
 ln -s "$(pwd)/kitty" ~/.config/kitty
+ln -s "$(pwd)/zellij" ~/.config/zellij
 ```
 
 

kitty/kitty.conf

@@ -1,6 +1,6 @@
 font_family VictorMono Nerd Font Mono
 font_size 19
-tab_bar_min_tabs            1
+tab_bar_min_tabs            2
 tab_bar_edge                bottom
 tab_bar_style               powerline
 tab_powerline_style         slanted

nvim/lazy-lock.json

@@ -7,6 +7,8 @@
   "cmp-path": { "branch": "main", "commit": "c6635aae33a50d6010bf1aa756ac2398a2d54c32" },
   "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
   "codestats.nvim": { "branch": "master", "commit": "041b315c4f82997186fcdb3fc2f687cc128a28f3" },
+  "edgy.nvim": { "branch": "main", "commit": "7e8dedc39abebe40c289b8012cc89b11c69aa7a0" },
+  "flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" },
   "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
   "hlargs.nvim": { "branch": "main", "commit": "ce8d705866dae44513ff48613d5e37e4da524d70" },
   "inc-rename.nvim": { "branch": "main", "commit": "a3e31af13844534c66041ce92f29af7745883875" },
@@ -36,6 +38,7 @@
   "rainbow-delimiters.nvim": { "branch": "master", "commit": "55ad4fb76ab68460f700599b7449385f0c4e858e" },
   "resession.nvim": { "branch": "master", "commit": "84c81e5fd8a94dc85a60b97089536174e558e288" },
   "smear-cursor.nvim": { "branch": "main", "commit": "1f90eb06eab82b5fe2ed708b94dcc325d6f5fb5a" },
+  "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" },
   "switch.vim": { "branch": "main", "commit": "14b28ec7bba51c734084bab5f73aef1883fb3786" },
   "symbols.nvim": { "branch": "main", "commit": "62cd4236b3eeabf3b970f225b1cc3379e11dc99c" },
   "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },

nvim/lua/config/keys.lua

@@ -1,6 +1,9 @@
 local map = vim.api.nvim_set_keymap
 local opts = { noremap = true, silent = true }
 
+-- F2 rename variable
+-- K inspect with LSP
+
 map('n', '<S-Tab>', '<Cmd>bp<CR>', opts)
 map('n', '<Tab>', '<Cmd>bn<CR>', opts)
 map('n', '<[b>', '<Cmd>bp<CR>', opts)
@@ -9,25 +12,9 @@ map('n', '<leader>w', '<Cmd>bd<CR>', opts)
 map('n', '<leader>s', '<Cmd>w<CR>', opts)
 map('n', '<leader>S', '<Cmd>w!<CR>', opts)
 map('n', '<Enter>', 'za<CR>', opts)
--- map('n', '`', '<Cmd>Neotree toggle<CR>', opts)
--- map('n', '~', '<Cmd>SymbolsToggle<CR>', opts)
--- map('n', '<leader>e', '<Cmd>Neotree toggle<CR>', opts)
--- map('n', '<leader>ff', "<Cmd>Telescope live_grep<CR>", opts)
--- map('n', '<leader>fq', "<Cmd>Telescope quickfix<CR>", opts)
--- map('n', '<leader>fr', "<Cmd>Telescope registers<CR>", opts)
--- map('n', '<leader>f/', "<Cmd>Telescope current_buffer_fuzzy_find<CR>", opts)
--- map('n', '<leader>flr', "<Cmd>Telescope lsp_references<CR>", opts)
--- map('n', '<leader>fls', "<Cmd>Telescope treesitter<CR>", opts)
--- map('n', '<leader>fld', "<Cmd>Telescope diagnostics<CR>", opts)
--- map('n', '<leader>fgs', "<Cmd>Telescope git_status<CR>", opts)
--- map('n', '<leader>fgb', "<Cmd>Telescope git_branches<CR>", opts)
--- map('n', '<leader>fgc', "<Cmd>Telescope git_commits<CR>", opts)
--- map('n', '<leader>fgC', "<Cmd>Telescope git_bcommits<CR>", opts)
 map('n', '<leader>t', "<Cmd>Switch<CR>", opts)
 map('n', '<leader>r', "<Cmd>Spectre<CR>", opts)
 map('n', '<Up>', "<C-a>", opts)
 map('n', '<Down>', "<C-x>", opts)
 map('n', '<Right>', "<Cmd>Switch<CR>", opts)
 map('n', '<Left>', "<Cmd>Switch<CR>", opts)
-map('n', '<leader>r', ":IncRename ", opts)
-map('n', '<leader>l', "<cmd>lua vim.lsp.buf.hover()<CR>", opts)

nvim/lua/plugins/dash.lua

@@ -36,8 +36,8 @@ return {
     dashboard.section.footer.val = quotes[math.random(#quotes)]
     dashboard.section.buttons.val = {
       dashboard.button('`', '󰙅 Tree'),
-      dashboard.button('SPC SPC', '󰱽 Find file'),
-      dashboard.button('SPC f f', '󱝩 Live Grep'),
+      dashboard.button('SPC SPC', '󰱽 Find File'),
+      dashboard.button('SPC /', '󱝩 Live Grep'),
     }
     startify.file_icons.provider = "devicons"
     require("alpha").setup(

nvim/lua/plugins/lsp.lua

@@ -50,21 +50,8 @@ return {
         -- Diagnostics
         ---
 
-        local sign = function(opts)
-          vim.fn.sign_define(opts.name, {
-            texthl = opts.name,
-            text = opts.text,
-            numhl = ''
-          })
-        end
-
-        sign({ name = 'DiagnosticSignError', text = '✘' })
-        sign({ name = 'DiagnosticSignWarn', text = '▲' })
-        sign({ name = 'DiagnosticSignHint', text = '⚑' })
-        sign({ name = 'DiagnosticSignInfo', text = '' })
-
         vim.diagnostic.config({
-          virtual_text = false,
+          virtual_text = true,
           severity_sort = true,
           float = {
             border = 'rounded',

nvim/lua/plugins/pickers.lua

@@ -8,11 +8,29 @@ return {
         preset = "ivy",
       },
     },
+    terminal = {
+      win = {
+        position = "float",
+        border = "rounded",
+        height = 0.8,
+        width = 0.6,
+      }
+    },
   },
   keys = {
-    { "`",                function() Snacks.explorer() end,                    desc = "File Explorer" },
-
-    { "~",                function() Snacks.picker.lsp_symbols() end,          desc = "LSP Symbols" },
+    {
+      "`",
+      function()
+        Snacks.explorer(
+          {
+            auto_close = true,
+            layout = { preset = "sidebar", preview = "main" },
+          }
+        )
+      end,
+      desc = "File Explorer"
+    },
+    { "<leader>s",        function() Snacks.picker.lsp_symbols() end,          desc = "LSP Symbols" },
     { "gd",               function() Snacks.picker.lsp_definitions() end,      desc = "Goto Definition" },
     { "gD",               function() Snacks.picker.lsp_declarations() end,     desc = "Goto Declaration" },
     { "gr",               function() Snacks.picker.lsp_references() end,       nowait = true,                  desc = "References" },
@@ -33,5 +51,7 @@ return {
     { "<leader>gS",       function() Snacks.picker.git_stash() end,            desc = "Git Stash" },
     { "<leader>gd",       function() Snacks.picker.git_diff() end,             desc = "Git Diff (Hunks)" },
     { "<leader>gf",       function() Snacks.picker.git_log_file() end,         desc = "Git Log File" },
+
+    { "<F12>",            function() Snacks.terminal.toggle() end,             desc = "Terminal Toggle",       mode = { "n", "i", "t" } },
   }
 }

zellij/config.kdl

@@ -0,0 +1,140 @@
+simplified_ui true
+pane_frames false
+default_layout "default"
+
+ui {
+  pane_frames {
+    hide_session_name true
+    rounded_corners true
+  }
+}
+
+keybinds {
+    normal {
+        // uncomment this and adjust key if using copy_on_select=false
+        // bind "Alt c" { Copy; }
+    }
+    resize {
+        bind "Ctrl n" { SwitchToMode "Normal"; }
+        bind "h" "Left" { Resize "Increase Left"; }
+        bind "j" "Down" { Resize "Increase Down"; }
+        bind "k" "Up" { Resize "Increase Up"; }
+        bind "l" "Right" { Resize "Increase Right"; }
+        bind "H" { Resize "Decrease Left"; }
+        bind "J" { Resize "Decrease Down"; }
+        bind "K" { Resize "Decrease Up"; }
+        bind "L" { Resize "Decrease Right"; }
+        bind "=" "+" { Resize "Increase"; }
+        bind "-" { Resize "Decrease"; }
+    }
+    pane {
+        bind "Ctrl p" { SwitchToMode "Normal"; }
+        bind "h" "Left" { MoveFocus "Left"; }
+        bind "l" "Right" { MoveFocus "Right"; }
+        bind "j" "Down" { MoveFocus "Down"; }
+        bind "k" "Up" { MoveFocus "Up"; }
+        bind "p" { SwitchFocus; }
+        bind "n" { NewPane; SwitchToMode "Normal"; }
+        bind "d" { NewPane "Down"; SwitchToMode "Normal"; }
+        bind "r" { NewPane "Right"; SwitchToMode "Normal"; }
+        bind "x" { CloseFocus; SwitchToMode "Normal"; }
+        bind "f" { ToggleFocusFullscreen; SwitchToMode "Normal"; }
+        bind "z" { TogglePaneFrames; SwitchToMode "Normal"; }
+        bind "w" { ToggleFloatingPanes; SwitchToMode "Normal"; }
+        bind "e" { TogglePaneEmbedOrFloating; SwitchToMode "Normal"; }
+        bind "c" { SwitchToMode "RenamePane"; PaneNameInput 0;}
+    }
+    move {
+        bind "Ctrl h" { SwitchToMode "Normal"; }
+        bind "n" "Tab" { MovePane; }
+        bind "p" { MovePaneBackwards; }
+        bind "h" "Left" { MovePane "Left"; }
+        bind "j" "Down" { MovePane "Down"; }
+        bind "k" "Up" { MovePane "Up"; }
+        bind "l" "Right" { MovePane "Right"; }
+    }
+    tab {
+        bind "Ctrl t" { SwitchToMode "Normal"; }
+        bind "r" { SwitchToMode "RenameTab"; TabNameInput 0; }
+        bind "h" "Left" "Up" "k" { GoToPreviousTab; }
+        bind "l" "Right" "Down" "j" { GoToNextTab; }
+        bind "n" { NewTab; SwitchToMode "Normal"; }
+        bind "x" { CloseTab; SwitchToMode "Normal"; }
+        bind "s" { ToggleActiveSyncTab; SwitchToMode "Normal"; }
+        bind "b" { BreakPane; SwitchToMode "Normal"; }
+        bind "]" { BreakPaneRight; SwitchToMode "Normal"; }
+        bind "[" { BreakPaneLeft; SwitchToMode "Normal"; }
+        bind "1" { GoToTab 1; SwitchToMode "Normal"; }
+        bind "2" { GoToTab 2; SwitchToMode "Normal"; }
+        bind "3" { GoToTab 3; SwitchToMode "Normal"; }
+        bind "4" { GoToTab 4; SwitchToMode "Normal"; }
+        bind "5" { GoToTab 5; SwitchToMode "Normal"; }
+        bind "6" { GoToTab 6; SwitchToMode "Normal"; }
+        bind "7" { GoToTab 7; SwitchToMode "Normal"; }
+        bind "8" { GoToTab 8; SwitchToMode "Normal"; }
+        bind "9" { GoToTab 9; SwitchToMode "Normal"; }
+        bind "Tab" { ToggleTab; }
+    }
+    scroll {
+        bind "Ctrl s" { SwitchToMode "Normal"; }
+        bind "e" { EditScrollback; SwitchToMode "Normal"; }
+        bind "s" { SwitchToMode "EnterSearch"; SearchInput 0; }
+        bind "Ctrl c" { ScrollToBottom; SwitchToMode "Normal"; }
+        bind "j" "Down" { ScrollDown; }
+        bind "k" "Up" { ScrollUp; }
+        bind "Ctrl f" "PageDown" "Right" "l" { PageScrollDown; }
+        bind "Ctrl b" "PageUp" "Left" "h" { PageScrollUp; }
+        bind "d" { HalfPageScrollDown; }
+        bind "u" { HalfPageScrollUp; }
+        // uncomment this and adjust key if using copy_on_select=false
+        // bind "Alt c" { Copy; }
+    }
+    search {
+        bind "Ctrl s" { SwitchToMode "Normal"; }
+        bind "Ctrl c" { ScrollToBottom; SwitchToMode "Normal"; }
+        bind "j" "Down" { ScrollDown; }
+        bind "k" "Up" { ScrollUp; }
+        bind "Ctrl f" "PageDown" "Right" "l" { PageScrollDown; }
+        bind "Ctrl b" "PageUp" "Left" "h" { PageScrollUp; }
+        bind "d" { HalfPageScrollDown; }
+        bind "u" { HalfPageScrollUp; }
+        bind "n" { Search "down"; }
+        bind "p" { Search "up"; }
+        bind "c" { SearchToggleOption "CaseSensitivity"; }
+        bind "w" { SearchToggleOption "Wrap"; }
+        bind "o" { SearchToggleOption "WholeWord"; }
+    }
+    entersearch {
+        bind "Ctrl c" "Esc" { SwitchToMode "Scroll"; }
+        bind "Enter" { SwitchToMode "Search"; }
+    }
+    renametab {
+        bind "Ctrl c" { SwitchToMode "Normal"; }
+        bind "Esc" { UndoRenameTab; SwitchToMode "Tab"; }
+    }
+    renamepane {
+        bind "Ctrl c" { SwitchToMode "Normal"; }
+        bind "Esc" { UndoRenamePane; SwitchToMode "Pane"; }
+    }
+    session {
+        bind "Ctrl o" { SwitchToMode "Normal"; }
+        bind "Ctrl s" { SwitchToMode "Scroll"; }
+        bind "d" { Detach; }
+        bind "w" {
+            LaunchOrFocusPlugin "zellij:session-manager" {
+                floating true
+                move_to_focused_tab true
+            };
+            SwitchToMode "Normal"
+        }
+    }
+}
+
+plugins {
+    tab-bar { path "tab-bar"; }
+    status-bar { path "status-bar"; }
+    strider { path "strider"; }
+    compact-bar { path "compact-bar"; }
+}
+
+theme "catppuccin-mocha"

zellij/layouts/default.kdl

@@ -0,0 +1,6 @@
+layout {
+  pane size=1 borderless=true {
+    plugin location="zellij:compact-bar"
+  }
+  pane
+}

zellij/themes/catppuccin.kdl

@@ -0,0 +1,61 @@
+// Catppuccin Theme:
+// https://github.com/catppuccin/catppuccin
+
+themes {
+  catppuccin-latte {
+    bg "#acb0be" // Surface2
+    fg "#acb0be" // Surface2
+    red "#d20f39"
+    green "#40a02b"
+    blue "#1e66f5"
+    yellow "#df8e1d"
+    magenta "#ea76cb" // Pink
+    orange "#fe640b" // Peach
+    cyan "#04a5e5" // Sky
+    black "#dce0e8" // Crust
+    white "#4c4f69" // Text
+  }
+
+  catppuccin-frappe {
+    bg "#626880" // Surface2
+    fg "#c6d0f5"
+    red "#e78284"
+    green "#a6d189"
+    blue "#8caaee"
+    yellow "#e5c890"
+    magenta "#f4b8e4" // Pink
+    orange "#ef9f76" // Peach
+    cyan "#99d1db" // Sky
+    black "#292c3c" // Mantle
+    white "#c6d0f5"
+  }
+
+  catppuccin-macchiato {
+    bg "#5b6078" // Surface2
+    fg "#cad3f5"
+    red "#ed8796"
+    green "#a6da95"
+    blue "#8aadf4"
+    yellow "#eed49f"
+    magenta "#f5bde6" // Pink
+    orange "#f5a97f" // Peach
+    cyan "#91d7e3" // Sky
+    black "#1e2030" // Mantle
+    white "#cad3f5"
+  }
+
+  catppuccin-mocha {
+    bg "#585b70" // Surface2
+    fg "#cdd6f4"
+    red "#f38ba8"
+    green "#a6e3a1"
+    blue "#89b4fa"
+    yellow "#f9e2af"
+    magenta "#f5c2e7" // Pink
+    orange "#fab387" // Peach
+    cyan "#89dceb" // Sky
+    black "#181825" // Mantle
+    white "#cdd6f4"
+  }
+}
+