New nvim plugins, and change of maps. Added new maps on hypr for more vim like binds. Also added thefuck to fish

.config/fish/functions/fuck.fish

@@ -0,0 +1,9 @@
+function fuck -d "Correct your previous console command"
+    set -l fucked_up_command $history[1]
+    env TF_SHELL=fish TF_ALIAS=fuck PYTHONIOENCODING=utf-8 thefuck $fucked_up_command THEFUCK_ARGUMENT_PLACEHOLDER $argv | read -l unfucked_command
+    if [ "$unfucked_command" != "" ]
+        eval $unfucked_command
+        builtin history delete --exact --case-sensitive -- $fucked_up_command
+        builtin history merge
+    end
+end

.config/fish/functions/vi.fish

@@ -1,4 +1,3 @@
 function vi --wraps=nvim --description 'alias vi=nvim'
-  nvim $argv
-        
+    nvim $argv
 end

.config/fish/variables.fish

@@ -47,5 +47,7 @@ set -xg fzf_preview_dir_cmd eza --long --header --icons --all --color=always --g
 set -xg fzf_fd_opts --hidden --exclude=.git --color=always
 set -xg fzf_diff_highlighter delta --paging=never --width=20
 
+set -x THEFUCK_OVERRIDDEN_ALIASES 'vi, yarn, eza, vim, neofetch, onefetch, cat, tty-clock, dua i'
+
 set -xg LS_COLORS (vivid generate catppuccin-macchiato)
 set -xg BAT_THEME Catppuccin-macchiato

.config/hypr/keybinds/binds.conf

@@ -128,6 +128,9 @@ bind=SUPER,mouse_up,workspace,m+1
 bind=SUPERCTRL,LEFT,workspace,m-1
 bind=SUPERCTRL,RIGHT,workspace,m+1
 
+bind=SUPERCTRL,h,workspace,m-1
+bind=SUPERCTRL,l,workspace,m+1
+
 # Group control
 bind =SUPER, W, togglesplit
 bind=SUPER,S,togglegroup

.config/nvim/lua/plugins/better-escape.lua

@@ -0,0 +1,18 @@
+return {
+    {
+        "max397574/better-escape.nvim",
+        event = "VeryLazy",
+        config = function()
+            require("better_escape").setup({
+                mapping = { "jk", "jj", "kj", "jl" }, -- a table with mappings to use
+                timeout = vim.o.timeoutlen, -- the time in which the keys must be hit in ms. Use option timeoutlen by default
+                clear_empty_lines = false, -- clear line after escaping if there is only whitespace
+                keys = "<Esc>", -- keys used for escaping, if it is a function will use the result everytime
+                -- example(recommended)
+                -- keys = function()
+                --   return vim.api.nvim_win_get_cursor(0)[2] > 1 and '<esc>l' or '<esc>'
+                -- end,
+            })
+        end,
+    },
+}

.config/nvim/lua/plugins/lualine.lua

@@ -63,6 +63,12 @@ return {
                         },
                     },
                     lualine_y = {
+                        {
+                            function()
+                                local ok, m = pcall(require, "better_escape")
+                                return ok and m.waiting and "✺" or ""
+                            end,
+                        },
                         { "progress", separator = " ", padding = { left = 1, right = 0 } },
                         { "location", padding = { left = 0, right = 1 } },
                     },

.config/nvim/lua/plugins/neo-tree.lua

@@ -46,6 +46,7 @@ return {
             window = {
                 mappings = {
                     ["<space>"] = "none",
+                    ["e"] = "open",
                 },
             },
             default_component_configs = {

.config/nvim/lua/plugins/template-string.lua

@@ -0,0 +1,9 @@
+return {
+    {
+        "axelvc/template-string.nvim",
+        event = "BufRead",
+        config = function()
+            require("template-string").setup()
+        end,
+    },
+}

.config/nvim/lua/plugins/twilight.lua

@@ -2,5 +2,28 @@ return {
     {
         "folke/twilight.nvim",
         cmd = "Twilight",
+        keys = { { "<leader>ut", "<cmd>Twilight<cr>", desc = "Toggle Twilight" } },
+        opts = {
+            {
+                dimming = {
+                    alpha = 0.25, -- amount of dimming
+                    -- we try to get the foreground from the highlight groups or fallback color
+                    color = { "Normal", "#ffffff" },
+                    term_bg = "#000000", -- if guibg=NONE, this will be used to calculate text color
+                    inactive = false, -- when true, other windows will be fully dimmed (unless they contain the same buffer)
+                },
+                context = 20, -- amount of lines we will try to show around the current line
+                treesitter = true, -- use treesitter when available for the filetype
+                -- treesitter is used to automatically expand the visible text,
+                -- but you can further control the types of nodes that should always be fully expanded
+                expand = { -- for treesitter, we always try to expand to the top-most ancestor with these types
+                    "function",
+                    "method",
+                    "table",
+                    "if_statement",
+                },
+                exclude = {}, -- exclude these filetypes
+            },
+        },
     },
 }

.config/nvim/lua/plugins/zen-mode.lua

@@ -2,6 +2,7 @@ return {
     {
         "folke/zen-mode.nvim",
         cmd = "ZenMode",
+        keys = { { "<leader>uz", "<cmd>ZenMode<cr>", desc = "Zen Mode" } },
         opts = {
             plugins = {
                 scrollview = { enabled = false },