nvim ftplugin bugfixes

CONFIG/gtk-3.0/settings.ini

@@ -1,9 +1,9 @@
 [Settings]
-gtk-theme-name=Adwaita-dark
-gtk-icon-theme-name=Qogir-dark
+gtk-theme-name=Arc-Dark
+gtk-icon-theme-name=Qogir-Dark
 gtk-font-name=Noto Sans 10
-gtk-cursor-theme-name=Qogir-dark
-gtk-cursor-theme-size=0
+gtk-cursor-theme-name=Qogir-Dark
+gtk-cursor-theme-size=20
 gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ
 gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
 gtk-button-images=0
@@ -12,5 +12,6 @@ gtk-enable-event-sounds=0
 gtk-enable-input-feedback-sounds=0
 gtk-xft-antialias=1
 gtk-xft-hinting=1
-gtk-xft-hintstyle=hintmedium
+gtk-xft-hintstyle=hintslight
 gtk-xft-rgba=rgb
+gtk-application-prefer-dark-theme=1

CONFIG/nvim/after/ftplugin/javascript.lua

@@ -0,0 +1,11 @@
+-- Indentation & Layout
+vim.opt_local.colorcolumn = "100"
+vim.opt_local.textwidth = 100
+vim.opt_local.tabstop = 4
+vim.opt_local.shiftwidth = 4
+vim.opt_local.softtabstop = 4
+vim.opt_local.expandtab = true
+
+-- Formatting Behavior
+vim.opt_local.formatoptions:remove("t") -- Don't autowrap while typing
+vim.opt_local.formatoptions:append("j") -- Remove comment markers when joining lines

CONFIG/nvim/after/ftplugin/lua.lua

@@ -0,0 +1,11 @@
+-- Indentation & Layout
+vim.opt_local.colorcolumn = "120"
+vim.opt_local.textwidth = 120
+vim.opt_local.tabstop = 4
+vim.opt_local.shiftwidth = 4
+vim.opt_local.softtabstop = 4
+vim.opt_local.expandtab = true
+
+-- Formatting Behavior
+vim.opt_local.formatoptions:remove("t") -- Don't autowrap while typing
+vim.opt_local.formatoptions:append("j") -- Remove comment markers when joining lines

CONFIG/nvim/after/ftplugin/markdown.lua

@@ -0,0 +1,21 @@
+local bufname = vim.api.nvim_buf_get_name(0)
+local filename_arg = bufname ~= "" and (" --stdin-filepath " .. vim.fn.shellescape(bufname)) or ""
+
+-- Indentation & Layout
+vim.opt_local.colorcolumn = ""
+vim.opt_local.wrap = true
+vim.opt_local.textwidth = 80
+vim.opt_local.tabstop = 2
+vim.opt_local.shiftwidth = 2
+vim.opt_local.softtabstop = 2
+vim.opt_local.expandtab = true
+
+-- Formatting Behavior: wrap text, keep comment/quote headers, parse lists
+vim.opt_local.formatoptions:append("tqn")
+
+-- gq Formatter: Prettier handles links/parentheses cleanly; par as fallback
+if vim.fn.executable("prettier") == 1 then
+    vim.bo.formatprg = "prettier --parser markdown" .. filename_arg
+elseif vim.fn.executable("par") == 1 then
+    vim.bo.formatprg = "par -w80req"
+end

CONFIG/nvim/after/ftplugin/python.lua

@@ -0,0 +1,11 @@
+-- Indentation & Layout
+vim.opt_local.colorcolumn = "100"
+vim.opt_local.textwidth = 100
+vim.opt_local.tabstop = 4
+vim.opt_local.shiftwidth = 4
+vim.opt_local.softtabstop = 4
+vim.opt_local.expandtab = true
+
+-- Formatting Behavior
+vim.opt_local.formatoptions:remove("t") -- Don't autowrap while typing
+vim.opt_local.formatoptions:append("j") -- Remove comment markers when joining lines

CONFIG/nvim/ftplugin/javascript.lua

@@ -1,4 +0,0 @@
-vim.opt_local.colorcolumn = "100"
-vim.opt_local.tabstop = 4
-vim.opt_local.shiftwidth = 4
-vim.opt_local.softtabstop = 4

CONFIG/nvim/ftplugin/lua.lua

@@ -1,4 +0,0 @@
-vim.opt_local.colorcolumn = "120"
-vim.opt_local.tabstop = 4
-vim.opt_local.shiftwidth = 4
-vim.opt_local.softtabstop = 4

CONFIG/nvim/ftplugin/markdown.lua

@@ -1,5 +0,0 @@
-vim.opt_local.colorcolumn = ""
-vim.opt_local.wrap = true
-vim.opt_local.tabstop = 2
-vim.opt_local.shiftwidth = 2
-vim.opt_local.softtabstop = 2

CONFIG/nvim/ftplugin/python.lua

@@ -1,4 +0,0 @@
-vim.opt_local.colorcolumn = "100"
-vim.opt_local.tabstop = 4
-vim.opt_local.shiftwidth = 4
-vim.opt_local.softtabstop = 4

CONFIG/nvim/init.lua

@@ -833,10 +833,7 @@ local function makespec_diffview()
             "DiffviewRefresh",
             "DiffviewFileHistory",
         },
-        keys = {
-            { "<leader>gd", "<cmd>DiffviewOpen<cr>", desc = "DiffView Tab" },
-            { "<leader>gh", "<cmd>DiffviewFileHistory<cr>", desc = "File History Tab" },
-        },
+        keys = {},
     }
 end
 local function makespec_fugitive()
@@ -884,6 +881,7 @@ local function makespec_gitsigns()
                 vim.cmd.normal({ "]c", bang = true })
             else
                 gs.nav_hunk("next")
+                vim.schedule(gs.preview_hunk_inline)
             end
         end
         local function prev_hunk()
@@ -891,14 +889,14 @@ local function makespec_gitsigns()
                 vim.cmd.normal({ "[c", bang = true })
             else
                 gs.nav_hunk("prev")
+                vim.schedule(gs.preview_hunk_inline)
             end
         end
-
         local function bmap(mode, l, r, desc) vim.keymap.set(mode, l, r, { buffer = bufnr, desc = desc }) end
 
         -- Navigation
-        bmap("n", "<M-,>", next_hunk, "Next Hunk")
-        bmap("n", "<M-.>", prev_hunk, "Prev Hunk")
+        bmap("n", "<M-,>", prev_hunk, "Prev Hunk")
+        bmap("n", "<M-.>", next_hunk, "Next Hunk")
         bmap("n", "[h", prev_hunk, "Prev Hunk")
         bmap("n", "]h", next_hunk, "Next Hunk")
 
@@ -909,6 +907,8 @@ local function makespec_gitsigns()
         -- Hunk
         bmap("n", "<leader>gi", gs.preview_hunk_inline, "Preview Hunk Inline")
         bmap("n", "<leader>gp", gs.preview_hunk, "Preview Hunk")
+        bmap("n", "<leader>gd", gs.diffthis, "Diff This (Index)")
+        bmap("n", "<leader>gD", function() gs.diffthis("~") end, "Diff This (HEAD~1)")
         bmap("n", "<leader>gq", gs.setqflist, "File Hunks to QuickFix")
         bmap("n", "<leader>gQ", function() gs.setqflist("all") end, "All Hunks to QuickFix")
         bmap("n", "<leader>gx", gs.reset_hunk, "Reset Hunk")
@@ -926,7 +926,7 @@ local function makespec_gitsigns()
         bmap("n", "<leader>gtb", gs.toggle_current_line_blame, "Toggle Line Blame")
         bmap("n", "<leader>gtd", gs.toggle_deleted, "Toggle Deleted")
 
-        -- Text object, e.g. for dih to delete hunk
+        -- Text Object (e.g., 'dih' to delete hunk)
         bmap({ "o", "x" }, "ih", ":<C-U>Gitsigns select_hunk<CR>", "Select Hunk")
     end
 
@@ -934,11 +934,6 @@ local function makespec_gitsigns()
         "lewis6991/gitsigns.nvim",
         event = { "BufReadPre", "BufNewFile" },
         opts = {
-            signcolumn = true,
-            numhl = false,
-            linehl = false,
-            word_diff = false,
-            signs_staged_enable = false,
             on_attach = on_gitsigns_attach,
         },
     }
@@ -1101,8 +1096,8 @@ local function makespec_snacks()
             -- search
             { "<F1>", function() Snacks.picker.help() end, desc = "Help Pages" },
             { "<F9>", function() Snacks.picker.colorschemes() end, desc = "Colorschemes" },
-            { "<M-/>", function() Snacks.picker.git_grep({ ignorecase = true }) end, desc = "Grep Git Files" },
-            { "<leader>sg", function() Snacks.picker.git_grep({ ignorecase = true }) end, desc = "Grep Git Files" },
+            { "<M-/>", function() Snacks.picker.git_grep({ ignorecase = false }) end, desc = "Grep Git Files" },
+            { "<leader>sg", function() Snacks.picker.git_grep({ ignorecase = false }) end, desc = "Grep Git Files" },
             { "<leader>sa", function() Snacks.picker.grep({ untracked = true }) end, desc = "Grep Files" },
             { "<leader>*", function() Snacks.picker.grep_word() end, desc = "Visual selection or word", mode = { "n", "x" }, },
             { "<leader>/", function() Snacks.picker.search_history() end, desc = "Search History" },

CONFIG/qutebrowser/config.py

@@ -1,4 +1,5 @@
 from typing import TYPE_CHECKING
+import os
 
 if TYPE_CHECKING:
     from qutebrowser.config.config import ConfigContainer
@@ -6,7 +7,6 @@ if TYPE_CHECKING:
 
 c: "ConfigContainer" = c  # type: ignore # noqa: F821
 config: "ConfigAPI" = config  # type: ignore # noqa: F821
-from typing import TYPE_CHECKING
 
 config.load_autoconfig(True)
 config.bind("<", "tab-move -")
@@ -47,7 +47,6 @@ config.bind("tj", "back -t", mode="normal")
 config.bind("wj", "back -w", mode="normal")
 config.bind("tk", "forward -t", mode="normal")
 config.bind("wk", "forward -w", mode="normal")
-config.bind("ø", "cmd-set-text :")
 config.bind("m", 'cmd-set-text :quickmark-add {url:pretty} "', mode="normal")
 config.bind("D", "tab-close")
 config.bind(",m", "hint links spawn -d mpv {hint-url}", mode="normal")
@@ -73,7 +72,7 @@ c.completion.open_categories = [
 c.content.register_protocol_handler = False
 c.content.blocking.enabled = True
 c.content.fullscreen.window = True
-c.content.blocking.method = "adblock"
+c.content.blocking.method = "auto"
 c.content.blocking.adblock.lists = [
     "https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters.txt",
     "https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/badware.txt",
@@ -150,13 +149,21 @@ c.input.insert_mode.plugins = True
 c.messages.timeout = 5000
 c.qt.force_platform = "wayland"
 c.qt.highdpi = True
-c.qt.args = [
+qt_args = [
     "disable-features=WebAuth",  # makes BankID work
-    "disable-gpu",  # Stops using the GPU for rendering
-    "disable-gpu-compositing",  # Forces CPU compositing
-    "disable-accelerated-2d-canvas",  # Offloads canvas drawing to CPU
-    "disable-accelerated-video-decode",  # Prevents VRAM usage for videos
 ]
+# Disable GPU by default (for AI training), unless QUTE_ENABLE_GPU is set
+if os.environ.get("QUTE_ENABLE_GPU") != "1":
+    qt_args.extend(
+        [
+            "disable-gpu",  # Stops using the GPU for rendering
+            "disable-gpu-compositing",  # Forces CPU compositing
+            "disable-accelerated-2d-canvas",  # Offloads canvas drawing to CPU
+            "disable-accelerated-video-decode",  # Prevents VRAM usage for videos
+        ]
+    )
+
+c.qt.args = qt_args
 c.scrolling.bar = "always"
 c.scrolling.smooth = False
 c.session.lazy_restore = False
@@ -190,16 +197,16 @@ c.tabs.undo_stack_size = 1000
 c.tabs.width = "15%"
 c.url.start_pages = "https://www.google.com/search?hl=en&source=hp"
 c.url.default_page = "https://www.google.com/search?hl=en&source=hp"
-c.url.searchengines = dict(
-    DEFAULT="https://www.google.com/search?hl=en&source=hp&q={}",
-    aw="https://wiki.archlinux.org/?search={}",
-    ap="https://www.archlinux.org/packages/?q={}",
-    gh="https://github.com/search?q={}&type=repositories",
-    ip="https://iplocation.io/ip/{}",
-    sh="https://explainshell.com/explain?cmd={}",
-    wi="https://en.wikipedia.org/w/index.php?search={}",
-    yt="https://yewtu.be/search?q={}",
-)
+c.url.searchengines = {
+    "DEFAULT": "https://www.google.com/search?hl=en&source=hp&q={}",
+    "aw": "https://wiki.archlinux.org/?search={}",
+    "ap": "https://www.archlinux.org/packages/?q={}",
+    "gh": "https://github.com/search?q={}&type=repositories",
+    "ip": "https://iplocation.io/ip/{}",
+    "sh": "https://explainshell.com/explain?cmd={}",
+    "wi": "https://en.wikipedia.org/w/index.php?search={}",
+    "yt": "https://yewtu.be/search?q={}",
+}
 c.zoom.default = "100%"
 
 # FONTS

CONFIG/sway/config

@@ -20,6 +20,9 @@ smart_borders on
 # Default Font
 font pango:Noto Sans Regular 10
 
+# Cursor
+seat seat0 xcursor_theme Adwaita 0
+
 # Title format for windows
 set $focus     #00E5FF
 set $unfocused #333333
@@ -182,8 +185,8 @@ bindsym --whole-window --border {
 # media keys
 bindsym {
     # Volume
-    XF86AudioRaiseVolume exec pamixer -ui 2
-    XF86AudioLowerVolume exec pamixer -ud 2
+    XF86AudioRaiseVolume exec pamixer --unmute -i 2
+    XF86AudioLowerVolume exec pamixer --unmute -d 2
     XF86AudioMute exec pamixer --toggle-mute
     Pause exec pamixer -ui 2
     Print exec pamixer -ud 2
@@ -251,6 +254,7 @@ bindsym {
 
     # Launch the browser
     $mod+i exec qutebrowser
+    $mod+Shift+i exec env QUTE_ENABLE_GPU=1 qutebrowser
 
     # Launch the file explorer
     $mod+o exec pcmanfm
@@ -291,10 +295,10 @@ exec systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CU
 exec hash dbus-update-activation-environment 2>/dev/null && \
      dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP
 
-# Start foot server
-exec systemctl --user enable --now foot-server.service
-
 exec {
+    # Start foot server
+    exec systemctl --user enable --now foot-server.service
+
     # Set wallpaper
     ~/.azotebg
 
@@ -309,27 +313,21 @@ exec {
 
     # night-time color shift
     wlsunset -l 59.91:10.76
+
+    # persist clipboard after close
+    wl-clip-persist --clipboard regular --all-mime-type-regex '(?i)^(?!image/x-inkscape-svg).+'
 }
 
 exec_always {
-    # Idle configuration
     pkill -x swayidle; exec swayidle -w \
-        timeout 1200 'gtklock' \
+        timeout 1200 'gtklock -d' \
         timeout 2400 'swaymsg "output * dpms off"' \
             resume 'swaymsg "output * dpms on"' \
-        before-sleep 'gtklock'
-        lock 'gtklock'
+        before-sleep 'gtklock -d' \
+        lock 'gtklock -d'
 
     # nwg-drawer
     nwg-drawer -r -c 7 -is 90 -mb 10 -ml 50 -mr 50 -mt 10
-
-    # persist clipboard after close
-    pkill -x wl-clip-persist
-    wl-clip-persist --clipboard regular --all-mime-type-regex '(?i)^(?!image/x-inkscape-svg).+'
-
-    # enable noisetorch
-    noisetorch -u
-    noisetorch -i
 }
 
 # ------------------------------------------
@@ -359,9 +357,8 @@ for_window [app_id="org.mozilla.Thunderbird" title="^((?!Mozilla Thunderbird).)*
 
 # steam
 # https://github.com/ValveSoftware/steam-for-linux/issues/1040
-for_window [app_id="^steam$"] floating enable
-for_window [app_id="^Steam$"] floating enable
-for_window [app_id="^steam$" title="^Steam$"] floating disable
+for_window [app_id="(?i)^steam$"] floating enable
+for_window [app_id="(?i)^steam$" title="^Steam$"] floating disable
 
 # Inhibit idle
 for_window [app_id="firefox"] inhibit_idle fullscreen

endos.py

@@ -96,7 +96,6 @@ installmap = dict(
         "gst-plugins-good",  # required deb
         # audio
         "pamixer",
-        "noisetorch",
     ),
     filebrowsers=(
         "yazi",
@@ -121,7 +120,7 @@ installmap = dict(
         "python-tldextract",
         "bitwarden-cli",  # for qutebrowser autofill
     ),
-    chat=("discordo-git", "gurk"),
+    chat=("discord", "gurk"),
     emailcalrss=(
         "khard",  # contacts
         "khal",  # calendar
@@ -332,6 +331,7 @@ def install_filebrowsers(overwrite: bool, reinstall: bool) -> None:
         "yazi-rs/plugins:toggle-pane",
         "ahkohd/eza-preview",
         "boydaihungst/file-extra-metadata",
+        "ya pkg add ndtoan96/ouch",
     ]:
         run(f"ya pkg add {plugin}".split())
     tgt = ".local/share/applications/userapp-file-roller.desktop"
@@ -347,7 +347,6 @@ def install_netbrowsers(overwrite: bool, reinstall: bool) -> None:
 
 def install_chat(overwrite: bool, reinstall: bool) -> None:
     helper_install(*installmap["chat"], reinstall=reinstall)
-    helper_clone_foldercontents(CFG_SRC, CFG_TGT, "discordo", overwrite)
     helper_clone_foldercontents(CFG_SRC, CFG_TGT, "gurk", overwrite)
 
 
@@ -409,12 +408,12 @@ def install_sway(overwrite: bool, reinstall: bool) -> None:
         helper_clone_foldercontents(CFG_SRC, CFG_TGT, sub, overwrite)
     helper_maybe_copy(CFG_SRC, CFG_TGT, "xdg-terminals.list", overwrite, symlink=True)
     helper_maybe_copy(CFG_SRC, CFG_TGT, "mimeapps.list", overwrite, symlink=True)
+    # swaync configs
+    helper_clone_foldercontents(CFG_SRC, CFG_TGT, "swaync", overwrite)
     # custom sway configs
     helper_clone_foldercontents(CUSTOM_SRC / "CONFIG", CFG_TGT, "sway", overwrite)
     # custom waybar configs
     helper_clone_foldercontents(CUSTOM_SRC / "CONFIG", CFG_TGT, "waybar", overwrite)
-    # custom swaync configs
-    helper_clone_foldercontents(CUSTOM_SRC / "CONFIG", CFG_TGT, "swaync", overwrite)
     # desktop entries
     helper_clone_foldercontents(
         HOME_SRC,