Organize lines

.config/atuin/config.toml

@@ -0,0 +1,4 @@
+auto_sync = false
+sync_address = ""
+
+search_mode = "fuzzy"

.config/fish/config.fish

@@ -11,13 +11,10 @@ if status is-interactive
     zoxide init fish | source
     ## Starship
     starship init fish | source
-    ## McFly
-    set -gx MCFLY_KEY_SCHEME vim
-    set -gx MCFLY_RESULTS 25
-    set -gx MCFLY_INTERFACE_VIEW BOTTOM
-    set -gx MCFLY_RESULTS_SORT LAST_RUN
-    set -gx MCFLY_HISTORY_LIMIT 10000
-    mcfly init fish | source
+    ## Atuin
+    set -gx ATUIN_NOBIND true
+    atuin init fish | source
+    bind \cr _atuin_search
 
     # Abbreviations
     ## Replacements

.config/kitty/kitty.conf

@@ -1,27 +1,12 @@
-shell /usr/bin/fish
+shell /home/mo/.cargo/bin/zellij a -c --index 0
 
-scrollback_lines 1000000
+scrollback_lines 100000
 
-wayland_titlebar_color black
+hide_window_decorations yes
 
 font_family JetBrainsMono Nerd Font Mono
-font_size 14.0
+font_size 12.5
 
 enable_audio_bell no
 
 update_check_interval 0
-
-map ctrl+shift+k next_window
-map ctrl+shift+j previous_window
-
-map ctrl+shift+o next_tab
-map ctrl+shift+i previous_tab
-
-map ctrl+shift+enter new_window_with_cwd
-map ctrl+shift+w new_window
-map ctrl+shift+t new_tab_with_cwd
-map ctrl+shift+b new_tab
-
-map ctrl+shift+m detach_window ask
-
-enabled_layouts tall,fat,grid,horizontal,vertical

.config/nvim/ftplugin/asciidoc.lua

@@ -1,13 +0,0 @@
-local set = vim.keymap.set
-
--- Soft wrap
-vim.wo.wrap = true
-
--- For navigation with soft wrap
-local opts = {
-	buffer = true,
-	silent = true,
-	expr = true,
-}
-set("n", "j", "v:count == 0 ? 'gj' : 'j'", opts)
-set("n", "k", "v:count == 0 ? 'gk' : 'k'", opts)

.config/nvim/ftplugin/asciidoc.lua

@@ -0,0 +1 @@
+text.lua

.config/nvim/ftplugin/markdown.lua

@@ -1 +1 @@
-asciidoc.lua
+text.lua

.config/nvim/ftplugin/text.lua

@@ -0,0 +1,13 @@
+local set = vim.keymap.set
+
+-- Soft wrap
+vim.wo.wrap = true
+
+-- Navigation with soft wrap
+local opts = {
+	buffer = true,
+	silent = true,
+	expr = true,
+}
+set("n", "j", "v:count == 0 ? 'gj' : 'j'", opts)
+set("n", "k", "v:count == 0 ? 'gk' : 'k'", opts)

.config/nvim/lua/keybindings.lua

@@ -16,11 +16,6 @@ vim.g.maplocalleader = " "
 
 --
 
-set("n", "<C-k>", cmd("BufferLineCycleNext"), opts)
-set("n", "<C-j>", cmd("BufferLineCyclePrev"), opts)
-
-set("n", "<C-b>", cmd("NvimTreeToggle"), opts)
-
 set("n", "<space>l", cmd("noh"), opts)
 
 set("v", ">", ">gv", opts)
@@ -28,6 +23,13 @@ set("v", "<", "<gv", opts)
 
 set("n", "<C-d>", cmd("bd"), opts)
 
+--
+
+set("n", "<C-k>", cmd("BufferLineCycleNext"), opts)
+set("n", "<C-j>", cmd("BufferLineCyclePrev"), opts)
+
+set("n", "<C-b>", cmd("NvimTreeToggle"), opts)
+
 -- Telescope
 local telescope_custom = require("plugins.telescope")
 local telescope_builtin = require("telescope.builtin")

.config/nvim/lua/options.lua

@@ -43,6 +43,8 @@ o.laststatus = 3
 
 o.pumblend = 10
 
+--
+
 o.guifont = "JetBrainsMono Nerd Font Mono"
 
 o.shortmess = o.shortmess .. "S"

.config/nvim/lua/plugins.lua

@@ -1,5 +1,5 @@
 return require("packer").startup({
-	function()
+	function(use)
 		-- Plugin manager
 		use("wbthomason/packer.nvim")
 

.config/nvim/lua/plugins/lsp-cmp.lua

@@ -87,7 +87,6 @@ null_ls.setup({
 		null_ls.builtins.formatting.prettier.with({
 			disabled_filetypes = { "markdown" },
 		}),
-		null_ls.builtins.formatting.shellharden,
 		null_ls.builtins.formatting.stylua,
 		null_ls.builtins.formatting.taplo,
 	},

.config/zellij/config.yaml

@@ -0,0 +1,128 @@
+---
+default_shell: fish
+
+default_layout: default
+
+pane_frames: false
+
+scroll_buffer_size: 100000
+
+scrollback_editor: /home/mo/bin/nvim/bin/nvim
+
+keybinds:
+    unbind: true
+    normal:
+        - action: [SwitchToMode: Locked]
+          key: [Alt: "L"]
+        - action: [SwitchToMode: Pane]
+          key: [Alt: "p"]
+        - action: [SwitchToMode: Resize]
+          key: [Alt: "r"]
+        - action: [SwitchToMode: Tab]
+          key: [Alt: "b"]
+        - action: [SwitchToMode: Scroll]
+          key: [Alt: "s"]
+        - action: [SwitchToMode: Move]
+          key: [Alt: "m"]
+        - action: [NewPane: ,]
+          key: [Alt: "n"]
+        - action: [Resize: Increase]
+          key: [Alt: "+"]
+        - action: [Resize: Decrease]
+          key: [Alt: "-"]
+        - action: [GoToNextTab]
+          key: [Alt: "o"]
+        - action: [GoToPreviousTab]
+          key: [Alt: "i"]
+        - action: [NewTab: ,]
+          key: [Alt: "t"]
+        - action: [FocusNextPane]
+          key: [Alt: "k"]
+        - action: [FocusPreviousPane]
+          key: [Alt: "j"]
+        - action: [Detach]
+          key: [Alt: "D"]
+    locked:
+        - action: [SwitchToMode: Normal]
+          key: [Alt: "l"]
+    resize:
+        - action: [SwitchToMode: Normal]
+          key: [Char: "\n", Esc]
+        - action: [Resize: Left]
+          key: [Char: "h"]
+        - action: [Resize: Down]
+          key: [Char: "j"]
+        - action: [Resize: Up]
+          key: [Char: "k"]
+        - action: [Resize: Right]
+          key: [Char: "l"]
+        - action: [Resize: Increase]
+          key: [Char: "+"]
+        - action: [Resize: Decrease]
+          key: [Char: "-"]
+        - action: [Resize: Increase]
+          key: [Alt: "+"]
+        - action: [Resize: Decrease]
+          key: [Alt: "-"]
+    pane:
+        - action: [SwitchToMode: Normal]
+          key: [Char: "\n", Esc]
+        - action: [MoveFocus: Left]
+          key: [Char: "h"]
+        - action: [MoveFocus: Right]
+          key: [Char: "l"]
+        - action: [MoveFocus: Down]
+          key: [Char: "j"]
+        - action: [MoveFocus: Up]
+          key: [Char: "k"]
+        - action: [NewPane: Down, SwitchToMode: Normal]
+          key: [Char: "d"]
+        - action: [NewPane: Right, SwitchToMode: Normal]
+          key: [Char: "r"]
+        - action: [CloseFocus, SwitchToMode: Normal]
+          key: [Char: "x"]
+        - action: [ToggleFocusFullscreen, SwitchToMode: Normal]
+          key: [Char: "f"]
+        - action: [ToggleFloatingPanes, SwitchToMode: Normal]
+          key: [Char: "w"]
+        - action: [TogglePaneEmbedOrFloating, SwitchToMode: Normal]
+          key: [Char: "e"]
+        - action: [Resize: Increase]
+          key: [Alt: "+"]
+        - action: [Resize: Decrease]
+          key: [Alt: "-"]
+    move:
+        - action: [SwitchToMode: Normal]
+          key: [Char: "\n", Esc]
+        - action: [MovePane: Left]
+          key: [Char: "h"]
+        - action: [MovePane: Down]
+          key: [Char: "j"]
+        - action: [MovePane: Up]
+          key: [Char: "k"]
+        - action: [MovePane: Right]
+          key: [Char: "l"]
+    tab:
+        - action: [SwitchToMode: Normal]
+          key: [Char: "\n", Esc]
+        - action: [GoToPreviousTab]
+          key: [Char: "h", Char: "k"]
+        - action: [GoToNextTab]
+          key: [Char: "l", Char: "j"]
+        - action: [CloseTab, SwitchToMode: Normal]
+          key: [Char: "x"]
+        - action: [ToggleActiveSyncTab, SwitchToMode: Normal]
+          key: [Char: "s"]
+    scroll:
+        - action: [EditScrollback, SwitchToMode: Normal]
+          key: [Char: "e"]
+        - action: [SwitchToMode: Normal]
+          key: [Char: "\n", Esc]
+        - action: [ScrollDown]
+          key: [Char: "j"]
+        - action: [ScrollUp]
+          key: [Char: "k"]
+        - action: [PageScrollDown]
+          key: [Char: "l"]
+        - action: [PageScrollUp]
+          key: [Char: "h"]