Merge branch 'main' of https://git.snaile.de/luca/dotfiles

common/.config/lf/lfrc

@@ -31,7 +31,7 @@ cmd trash &{{
 
 cmd trash-restore ${{
     fileid=$(
-        trash-util list "$PWD" |
+        trash-util list -f null "$PWD" |
             fzf -d '\0' \
                 --with-nth=1 \
                 --nth=1 \

common/.config/lf/rifle.conf

@@ -18,8 +18,8 @@ ext x?html?, has w3m,       terminal = w3m "$@"
 #-------------------------------------------
 label editor, mime ^text|x-empty$                                = ${VISUAL:-$EDITOR} -- "$@"
 label pager,  mime ^text|x-empty$                                = $PAGER -- "$@"
-label editor, ext xml|json|csv|tex|py|pl|rb|rs|js|sh|php|dart = ${VISUAL:-$EDITOR} -- "$@"
-label pager,  ext xml|json|csv|tex|py|pl|rb|rs|js|sh|php|dart = $PAGER -- "$@"
+label editor, ext xml|json|csv|tex|py|pl|rb|rs|js|sh|php|dart|j2 = ${VISUAL:-$EDITOR} -- "$@"
+label pager,  ext xml|json|csv|tex|py|pl|rb|rs|js|sh|php|dart|j2 = $PAGER -- "$@"
 
 #--------------------------------------------
 # Audio without X

common/.config/nvim/init.lua

@@ -79,24 +79,3 @@ require("lazy").setup({
         },
     },
 })
-
-for _, autocmd in ipairs({
-    { -- Automatically change line numeration
-        { "BufEnter", "FocusGained", "InsertLeave", "WinEnter" },
-        { command = 'if &nu && mode() != "i" | set rnu | endif' },
-    },
-    { -- Automatically change line numeration
-        { "BufLeave", "FocusLost", "InsertEnter", "WinLeave" },
-        { command = "if &nu | set nornu | endif" },
-    },
-    { -- Trigger shortcuts script
-        "BufWritePost",
-        { pattern = { vim.fn.stdpath("config") .. "directories" }, command = "silent!!shortcuts" },
-    },
-    { -- Trigger xrdb
-        "BufWritePost",
-        { pattern = { "xresources" }, command = "silent!!xrdb %" },
-    },
-}) do
-    vim.api.nvim_create_autocmd(autocmd[1], autocmd[2])
-end

common/.config/nvim/lua/config/autocmds.lua

@@ -0,0 +1,26 @@
+for _, autocmd in ipairs({
+    { -- Automatically change line numeration
+        { "BufEnter", "FocusGained", "InsertLeave", "WinEnter" },
+        { command = 'if &nu && mode() != "i" | set rnu | endif' },
+    },
+    { -- Automatically change line numeration
+        { "BufLeave", "FocusLost", "InsertEnter", "WinLeave" },
+        { command = "if &nu | set nornu | endif" },
+    },
+    { -- Trigger shortcuts script
+        "BufWritePost",
+        { pattern = { "directories", "files" }, command = "silent!!shortcuts" },
+    },
+    { -- Trigger xrdb
+        "BufWritePost",
+        { pattern = { "xresources" }, command = "silent!!xrdb %" },
+    },
+}) do
+    vim.api.nvim_create_autocmd(autocmd[1], autocmd[2])
+end
+
+for _, augroup in ipairs({
+    "lazyvim_wrap_spell",
+}) do
+    vim.api.nvim_del_augroup_by_name(augroup)
+end

common/.config/nvim/lua/config/options.lua

@@ -9,10 +9,11 @@ o.shiftwidth = 4
 o.tabstop = 4
 o.scrolloff = 8
 o.conceallevel = 0
+o.smoothscroll = false
 
 g.lazyvim_php_lsp = "intelephense"
 g.lazyvim_python_lsp = "basedpyright"
-g.ai_cm = true
+g.ai_cmp = true
 g.autoformat = false
 g.snacks_animate = false
 g.zk_notebook_dir = os.getenv("HOME") .. "/Public/notes"

common/.config/nvim/lua/plugins/ai.lua

@@ -1,7 +1,7 @@
 return {
     {
         "yetone/avante.nvim",
-        event = "VeryLazy",
+        event = "BufReadPost",
         dependencies = {
             "stevearc/dressing.nvim",
             "ibhagwan/fzf-lua",
@@ -30,6 +30,9 @@ return {
                 provider_opts = {},
             },
         },
+        keys = {
+            { "<leader>aC", "<cmd>AvanteClear<cr>", desc = "avante: Clear" },
+        },
         build = "make",
     },
     {
@@ -87,20 +90,6 @@ return {
                 [""] = false,
             },
         },
-        keys = {
-            { "<leader>a", group = "ai" },
-            {
-                "<leader>aT",
-                "<CMD>Copilot toggle<CR>",
-                desc = "copilot: toggle",
-            },
-        },
-    },
-    { -- temporary fix
-        "nvim-lualine/lualine.nvim",
-        opts = function(_, opts)
-            table.remove(opts.sections.lualine_x, 2)
-        end,
     },
     {
         "folke/which-key.nvim",

common/.config/zsh/config/bindings.zsh

@@ -9,6 +9,7 @@ key_info=(
     'Escape'           "\e"
     'Meta'             "\M-"
     'Backspace'        "^?"
+    'ControlBackspace' "^H"
     'Delete'           "^[[3~"
     'F1'               "$terminfo[kf1]"
     'F2'               "$terminfo[kf2]"
@@ -57,7 +58,7 @@ global_keybinds=(
 
 local -A viins_keybinds
 viins_keybinds=(
-    "$key_info[Control]W"     backward-kill-word
+    "$key_info[ControlBackspace]" backward-kill-word
     "$key_info[Backspace]"        backward-delete-char
     "$key_info[ControlLeft]"      vi-backward-word
     "$key_info[ControlRight]"     vi-forward-word

common/.local/libexec/statusbar/libsb

@@ -23,7 +23,6 @@ export bggray="background='#414868$bgalpha'"
 export bgwhite="background='#C0CAF5$bgalpha'"
 
 meter_bar() {
-	# shellcheck disable=SC2194
 	case $1 in
 		9[0-9] | 100) color="$fgred" bar="▉" ;;
 		8[0-9]) color="$fgred" bar="█" ;;