Merge branch 'master' into arch-desktop

.gitignore

@@ -1,26 +1,20 @@
-config/.config/kak/al/rc/org.kak
-config/.config/kak/mru_files.txt
-config/.scripts/baraction.sh
-config/.scripts/brave.sh
-config/.scripts/tmux-change-dir.sh
-config/.config/dconf/
-config/.themes/
+config/.config/dconf/*
+config/.themes/*
 config/**/*.uuid
-config/.icons/
-config/.config/KDE/
-config/.config/falkon/
-config/.config/ghostty/iTerm2-Color-Schemes/
-config/.config/ghostty/themes/
-config/.config/helix/runtime/
-config/.config/kak/colors/
-config/.config/kak/plugins/
+config/.icons/*
+config/.config/KDE/*
+config/.config/falkon/*
+config/.config/ghostty/iTerm2-Color-Schemes/*
+config/.config/ghostty/themes/*
+config/.config/helix/runtime/*
+config/.config/kak/colors/*
+config/.config/kak/plugins/*
 config/.config/mutt/chalupmc@rose-hulman
 config/.config/mutt/mikecchalupiak@outlook
 config/.config/mutt/spamreciver1@outlook
-config/.config/nvim/lazy-lock.json
 config/.config/qt5ct/colors/*
 config/.config/qutebrowser/autoconfig.yml
-config/.config/qutebrowser/rosepine/
+config/.config/qutebrowser/rosepine/*
 config/.config/zathura/colors
 config/.doom.d/flycheck_config.el
 config/.scripts/kkse

config/.Xresources

@@ -1,5 +1,4 @@
 ! High DPI Settings for Window Managers
-Xft.dpi: 192
 ! #define background_opacity 80
 #include ".theme.xresources"
 ! .alpha: 0.2

config/.bash_profile

@@ -1,16 +1,11 @@
+export PATH="${PATH}:$HOME/.scripts"
 source ~/.profile
+source ~/.bashrc
+
 
 # Added by Toolbox App
 export PATH="$PATH:/home/mikec/.local/share/JetBrains/Toolbox/scripts"
 
-export PATH="${PATH}:$HOME/.scripts:$HOME/maple2022/bin:$HOME/intelFPGA_lite/18.1/quartus/bin:$HOME/intelFPGA_lite/18.1/modelsim_ase/bin"
-export _JAVA_AWT_WM_NONREPARENTING=1
-# export XDG_CURRENT_DESKTOP=sway
-source ~/.bashrc
-export QSYS_ROOTDIR="/home/mikec/intelFPGA_lite/18.1/quartus/sopc_builder/bin"
-export VERSION_CONTROL="never"
-
-# exec hilbish -S -l
 
 
 # BEGIN opam configuration
@@ -20,6 +15,8 @@ export VERSION_CONTROL="never"
 # This section can be safely removed at any time if needed.
 test -r '/home/mikec/.opam/opam-init/init.sh' && . '/home/mikec/.opam/opam-init/init.sh' > /dev/null 2> /dev/null || true
 # END opam configuration
-# if [ -z "$DISPLAY" ] && [ "$(tty)" = "/dev/tty1" ]; then
-  # exec river
-# fi
+if [ -z "$DISPLAY" ] && [ "$(tty)" = "/dev/tty1" ]; then
+  exec river
+fi
+
+. "/home/mikec/.local/share/bob/env/env.sh"

config/.config/bspwm/bspwmrc

@@ -21,12 +21,13 @@ picom &
 #nm-applet &
 
 ## Configure Monitors/Workspaces
-bspc monitor eDP-1 -d 1 2 3 4 5 6 7 8 9
+bspc monitor DisplayPort-1 -d 1 2 3 4 5 6 7 8 9
+bspc monitor DisplayPort-0 -d 1 2 3 4 5 6 7 8 9
 
 ## Theming
 bspc config border_width        1
 bspc config window_gap          10
-bspc config top_padding         36
+bspc config top_padding         20
 bspc config left_padding        0
 bspc config right_padding       0
 bspc config bottom_padding      0

config/.config/ghostty/config

@@ -22,17 +22,3 @@ theme = light:Dawnfox,dark:Carbonfox
 window-decoration = true
 shell-integration-features = true
 mouse-scroll-multiplier = 1
-
-# tmux style binds
-keybind = ctrl+a>c=new_tab
-keybind = ctrl+a>x=close_surface
-keybind = ctrl+a>n=next_tab
-keybind = ctrl+a>p=previous_tab
-keybind = ctrl+a>comma=prompt_tab_title
-keybind = ctrl+a>shift+5=new_split:right
-keybind = ctrl+a>shift+quote=new_split:down
-keybind = ctrl+a>o=goto_split:next
-keybind = ctrl+a>l=goto_split:right
-keybind = ctrl+a>h=goto_split:left
-keybind = ctrl+a>j=goto_split:down
-keybind = ctrl+a>k=goto_split:up

config/.config/kak/kakrc

@@ -111,38 +111,6 @@ add-highlighter global/ wrap -word -indent
 #             format
 #         }
 #     }
-#     hook global -group autofmt BufSetOption filetype=(javascript) %{
-#         set-option buffer formatcmd 'prettier --tab-width 4 --parser typescript'
-#
-#         hook -group autofmt buffer BufOpenFile .* %{
-#             format
-#         }
-#
-#         hook -group autofmt buffer BufWritePre .* %{
-#             format
-#         }
-#     }
-#
-#     hook global -group autofmt BufSetOption filetype=(go) %{
-#         set-option buffer formatcmd 'gofmt'
-#
-#         hook -group autofmt buffer BufOpenFile .* %{
-#             format
-#         }
-#
-#         hook -group autofmt buffer BufWritePre .* %{
-#             format
-#         }
-#     }
-# }
-#
-# define-command disable-autofmt -docstring 'disable autoformatting of buffer' %{
-#     remove-hooks global autofmt
-# }
-#
-# enable-autofmt
-#
-#
 
 ## Indentation ##
 set global tabstop 4

config/.config/kak/plugins/.build/kak-lsp/hooks

@@ -0,0 +1,4 @@
+
+set -e
+
+        cargo install --locked --force --path .

config/.config/kak/plugins/.build/kakoune-discord/config

@@ -0,0 +1,19 @@
+try %{ 
+
+      discord-presence-enable
+ } catch %{
+    echo -debug "Error while evaluating 'kakoune-discord' configuration: %val{error}"
+
+    set-option -add current plug_conf_errors "Error while evaluating 'kakoune-discord' configuration:"
+    set-option -add current plug_conf_errors %sh{ printf "\n    " }
+    set-option -add current plug_conf_errors %val{error}
+    set-option -add current plug_conf_errors %sh{ printf "\n\n" }
+
+    hook -once -group plug-conf-err global WinDisplay .* %{
+        info -style modal -title "plug.kak error" "%opt{plug_conf_errors}"
+        on-key %{
+            info -style modal
+            execute-keys -with-maps -with-hooks %val{key}
+        }
+    }
+}

config/.config/kak/plugins/.build/kakoune-discord/hooks

@@ -0,0 +1,2 @@
+
+ cargo install --path . --force 

config/.config/kak/plugins/.build/kakoune-rainbow/config

@@ -0,0 +1,23 @@
+try %{ 
+
+        require-module rainbow
+            # suggested mapping
+#     # map global user r ": rainbow<ret>" -docstring "rainbow brackets"
+#         # map global user R ": rmhl window/ranges_rainbow_specs<ret>" \
+#             #     -docstring "remove rainbow highlighter"
+ } catch %{
+    echo -debug "Error while evaluating 'kakoune-rainbow' configuration: %val{error}"
+
+    set-option -add current plug_conf_errors "Error while evaluating 'kakoune-rainbow' configuration:"
+    set-option -add current plug_conf_errors %sh{ printf "\n    " }
+    set-option -add current plug_conf_errors %val{error}
+    set-option -add current plug_conf_errors %sh{ printf "\n\n" }
+
+    hook -once -group plug-conf-err global WinDisplay .* %{
+        info -style modal -title "plug.kak error" "%opt{plug_conf_errors}"
+        on-key %{
+            info -style modal
+            execute-keys -with-maps -with-hooks %val{key}
+        }
+    }
+}

config/.config/kak/plugins/.build/kakoune-rainbow/domain

@@ -0,0 +1 @@
+gitlab.com

config/.config/kak/plugins/.build/luar/config

@@ -0,0 +1,21 @@
+try %{ 
+
+    plug "gustavo-hms/peneira" %{
+        require-module peneira
+    }
+ } catch %{
+    echo -debug "Error while evaluating 'luar' configuration: %val{error}"
+
+    set-option -add current plug_conf_errors "Error while evaluating 'luar' configuration:"
+    set-option -add current plug_conf_errors %sh{ printf "\n    " }
+    set-option -add current plug_conf_errors %val{error}
+    set-option -add current plug_conf_errors %sh{ printf "\n\n" }
+
+    hook -once -group plug-conf-err global WinDisplay .* %{
+        info -style modal -title "plug.kak error" "%opt{plug_conf_errors}"
+        on-key %{
+            info -style modal
+            execute-keys -with-maps -with-hooks %val{key}
+        }
+    }
+}

config/.config/kak/plugins/.build/pandoc.kak/config

@@ -0,0 +1,19 @@
+try %{ 
+
+        # your config
+ } catch %{
+    echo -debug "Error while evaluating 'pandoc.kak' configuration: %val{error}"
+
+    set-option -add current plug_conf_errors "Error while evaluating 'pandoc.kak' configuration:"
+    set-option -add current plug_conf_errors %sh{ printf "\n    " }
+    set-option -add current plug_conf_errors %val{error}
+    set-option -add current plug_conf_errors %sh{ printf "\n\n" }
+
+    hook -once -group plug-conf-err global WinDisplay .* %{
+        info -style modal -title "plug.kak error" "%opt{plug_conf_errors}"
+        on-key %{
+            info -style modal
+            execute-keys -with-maps -with-hooks %val{key}
+        }
+    }
+}

config/.config/kak/plugins/.build/peneira/config

@@ -0,0 +1,19 @@
+try %{ 
+
+        require-module peneira
+     } catch %{
+    echo -debug "Error while evaluating 'peneira' configuration: %val{error}"
+
+    set-option -add current plug_conf_errors "Error while evaluating 'peneira' configuration:"
+    set-option -add current plug_conf_errors %sh{ printf "\n    " }
+    set-option -add current plug_conf_errors %val{error}
+    set-option -add current plug_conf_errors %sh{ printf "\n\n" }
+
+    hook -once -group plug-conf-err global WinDisplay .* %{
+        info -style modal -title "plug.kak error" "%opt{plug_conf_errors}"
+        on-key %{
+            info -style modal
+            execute-keys -with-maps -with-hooks %val{key}
+        }
+    }
+}

config/.config/kak/plugins/.build/tagbar.kak/config

@@ -0,0 +1,25 @@
+try %{ 
+
+    # if you have wrap highlighter enamled in you configuration
+    # files it's better to turn it off for tagbar, using this hook:
+    hook global WinSetOption filetype=tagbar %{
+        remove-highlighter window/wrap
+        # you can also disable rendering whitespaces here, line numbers, and
+        # matching characters
+    }
+ } catch %{
+    echo -debug "Error while evaluating 'tagbar.kak' configuration: %val{error}"
+
+    set-option -add current plug_conf_errors "Error while evaluating 'tagbar.kak' configuration:"
+    set-option -add current plug_conf_errors %sh{ printf "\n    " }
+    set-option -add current plug_conf_errors %val{error}
+    set-option -add current plug_conf_errors %sh{ printf "\n\n" }
+
+    hook -once -group plug-conf-err global WinDisplay .* %{
+        info -style modal -title "plug.kak error" "%opt{plug_conf_errors}"
+        on-key %{
+            info -style modal
+            execute-keys -with-maps -with-hooks %val{key}
+        }
+    }
+}

config/.config/kde.org/UserFeedback.org.kde.discover.conf

@@ -26,5 +26,5 @@ dataSourceCommonSettings\activeState=true
 dataSourceCommonSettings\activeState=true
 
 [UserFeedback]
-ApplicationStartCount=137
-ApplicationTime=622
+ApplicationStartCount=141
+ApplicationTime=705

config/.config/kde.org/UserFeedback.org.kde.dolphin.conf

@@ -26,5 +26,5 @@ dataSourceCommonSettings\activeState=true
 dataSourceCommonSettings\activeState=true
 
 [UserFeedback]
-ApplicationStartCount=3
-ApplicationTime=35142
+ApplicationStartCount=72
+ApplicationTime=68724

config/.config/kde.org/UserFeedback.org.kde.kmail.conf

@@ -23,5 +23,5 @@ dataSourceCommonSettings\activeState=true
 dataSourceCommonSettings\activeState=true
 
 [UserFeedback]
-ApplicationStartCount=1
-ApplicationTime=14
+ApplicationStartCount=18
+ApplicationTime=16794

config/.config/kde.org/UserFeedback.org.kde.kmail2.conf

@@ -1,2 +1,2 @@
 [UserFeedback]
-ApplicationStartCount=1
+ApplicationStartCount=18

config/.config/kde.org/UserFeedback.org.kde.plasmashell.conf

@@ -26,6 +26,6 @@ dataSourceCommonSettings\activeState=true
 dataSourceCommonSettings\activeState=true
 
 [UserFeedback]
-ApplicationStartCount=210
-ApplicationTime=2008695
+ApplicationStartCount=260
+ApplicationTime=2430104
 LastEncouragement=@DateTime(\0\0\0\x10\0\0\0\0\0\0%\x87}\x4\n\x84\xab\0)

config/.config/nvim/lua/config/keymap.lua

@@ -4,44 +4,12 @@ local setnx = function(key, command, desc)
 end
 
 setnx('<leader>ff', Snacks.picker.files, 'Find files')
-setnx('<leader>fF', function() Snacks.picker.files({ dirs = { '.' }}) end, 'Find files in current dir')
 setnx('<leader>f/', Snacks.picker.grep_word, 'Search current word')
 setnx('<leader>fg', Snacks.picker.grep, 'Search in files')
 setnx('<leader>fr', Snacks.picker.recent, 'Find recent files')
 setnx('<leader>b', Snacks.picker.buffers, 'List buffers')
 setnx('<leader>h', Snacks.picker.help, 'Search help')
-setnx('<leader>P', '<CMD>Markview splitToggle<CR>', 'Open markview preview')
-setnx('<leader>z', Snacks.zen.zen, 'Toggle snacks zen mode')
-
-local setto = function(key, command, desc)
-    set({ 'x', 'o' }, key, command, { desc = desc })
-end
-local setton = function(key, command, desc)
-    set({ 'n', 'x', 'o' }, key, command, { desc = desc })
-end
-local select_to = function(query)
-    return function ()
-        require'nvim-treesitter-textobjects.select'.select_textobject(query, "textobjects")
-    end
-end
-local move_next_start = function(query)
-    return function ()
-        require'nvim-treesitter-textobjects.move'.goto_next_start(query, "textobjects")
-    end
-end
-local move_prev_start = function(query)
-    return function ()
-        require'nvim-treesitter-textobjects.move'.goto_previous_start(query, "textobjects")
-    end
-end
-
-setto('if', select_to("@function.inner"), 'Select inside function')
-setto('af', select_to("@function.outer"), 'Select around function')
-setto('ia', select_to("@parameter.inner"), 'Select inside parameter')
-setto('aa', select_to("@parameter.outer"), 'Select around parameter')
-setton(']p', move_next_start("@parameter.inner"), 'Goto next parameter')
-setton('[p', move_prev_start("@parameter.inner"), 'Goto previous parameter')
-
+setnx('<leader>X', require'hex'.toggle, 'Toggle hex editor')
 setnx('<leader>m', Snacks.picker.marks, 'Search marks')
 setnx('<leader>q', Snacks.picker.qflist, 'Search quickfix list')
 setnx('<leader>l', Snacks.picker.loclist, 'Search location list')
@@ -80,8 +48,8 @@ setnx('`', '\'', 'Goto mark without column')
 setnx('<leader>x', '<CMD>bd!<CR>', 'Close Current Buffer')
 
 setnx('grr', Snacks.picker.lsp_references, 'Search lsp references')
-setnx('grI', Snacks.picker.lsp_incoming_calls, 'Find incoming function calls')
-setnx('grO', Snacks.picker.lsp_outgoing_calls, 'Find outgoing function calls')
+-- setnx('grI', tele.lsp_incoming_calls, 'Find incoming function calls')
+-- setnx('grO', tele.lsp_outgoing_calls, 'Find outgoing function calls')
 setnx('grd', Snacks.picker.diagnostics, 'Show LSP diagnostics')
 setnx('grD', (function()
     local diag = true

config/.config/nvim/lua/config/lsp.lua

@@ -8,22 +8,41 @@ vim.api.nvim_create_autocmd('LspAttach', {
     end
 })
 
-vim.lsp.config('lua_ls', {
-    settings = {
-        Lua = {
-            workspace = {
-                library = vim.api.nvim_get_runtime_file("", true),
-                maxPreload = 100000,
-                preloadFileSize = 100000,
-            }
-        }
-    }
-})
-
-vim.lsp.config('tinymist', {
-    settings = {
-        exportPdf = "onType",
-    },
-})
-
-vim.diagnostic.config({ update_in_insert = true, float = true, virtual_lines = true})
+-- vim.lsp.config('rust-analyzer', {
+--     settings = {
+--         ["rust-analyzer"] = {
+--             inlayHints = {
+--                 bindingModeHints = {
+--                     enable = false,
+--                 },
+--                 chainingHints = {
+--                     enable = true,
+--                 },
+--                 closingBraceHints = {
+--                     enable = true,
+--                     minLines = 25,
+--                 },
+--                 closureReturnTypeHints = {
+--                     enable = "never",
+--                 },
+--                 lifetimeElisionHints = {
+--                     enable = "never",
+--                     useParameterNames = false,
+--                 },
+--                 maxLength = 25,
+--                 parameterHints = {
+--                     enable = true,
+--                 },
+--                 reborrowHints = {
+--                     enable = "never",
+--                 },
+--                 renderColons = true,
+--                 typeHints = {
+--                     enable = true,
+--                     hideClosureInitialization = false,
+--                     hideNamedConstructor = false,
+--                 },
+--             },
+--         }
+--     }
+-- })

config/.config/nvim/lua/config/set.lua

@@ -14,7 +14,6 @@ vim.opt.winborder = 'none'
 
 vim.opt.smartindent = true
 
-vim.opt.foldlevel = 9999
 -- vim.opt.spell = true
 vim.opt.spelllang = 'en_us'
 
@@ -83,6 +82,6 @@ vim.lsp.config('lua_ls', {
 vim.lsp.config('tinymist', {
     settings = {
         exportPdf = "onType",
-    }
+    },
 })
 vim.diagnostic.config({ update_in_insert = true, float = true, virtual_lines = true})

config/.config/nvim/lua/plugins/lsp.lua

@@ -21,6 +21,15 @@ return {
         },
     },
 
+    -- {
+    --     "MysticalDevil/inlay-hints.nvim",
+    --     event = "LspAttach",
+    --     dependencies = { "neovim/nvim-lspconfig" },
+    --     config = function()
+    --         require("inlay-hints").setup()
+    --     end
+    -- },
+    --
     {
         'saghen/blink.cmp',
         -- optional: provides snippets for the snippet source

config/.config/nvim/lua/plugins/treesitter.lua

@@ -1,39 +1,66 @@
 return {
     {
-        'neovim-treesitter/nvim-treesitter',
-        dependencies = { 'neovim-treesitter/treesitter-parser-registry' },
-        branch = 'main',
+        'nvim-treesitter/nvim-treesitter',
+        -- branch = 'main',
         version = false,
         lazy = false,
         build = ':TSUpdate',
         config = function()
-            local langs = require'nvim-treesitter'.get_installed('parsers')
-            vim.api.nvim_create_autocmd('FileType', {
-                pattern = langs,
-                callback = function()
-                    vim.treesitter.start()                                    -- highlighting
-                    vim.wo.foldexpr = 'v:lua.vim.treesitter.foldexpr()'     -- folds
-                    vim.wo.foldmethod = 'expr'
-                    vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()" -- indentation
-                end,
-            })
+            require'nvim-treesitter.configs'.setup {
+                textobjects = {
+                    select = {
+                        enable = true,
+                        lookahead = true,
+                        keymaps = {
+                            ["af"] = "@function.outer",
+                            ["if"] = "@function.inner",
+                        }
+                    },
+                    move = {
+                        enable = true,
+                        set_jumps = false,
+                        goto_next_start = {
+                            [']a'] = '@parameter.inner',
+                        },
+                        goto_previous_start = {
+                            ['[a'] = '@parameter.inner',
+                        }
+                    },
+                },
+                auto_install = true,
+                highlight = {
+                    enable = true,
+                },
+            }
         end
     },
 
     {
         'nvim-treesitter/nvim-treesitter-textobjects',
-        branch = 'main',
-        opts = {
-            select = {
-                lookahead = true,
-            }
-        }
     },
 
+    -- {
+    --     'folke/twilight.nvim',
+    --     dependencies = {
+    --         'nvim-treesitter/nvim-treesitter',
+    --     },
+    --     cmd = {
+    --         'Twilight',
+    --         'TwilightEnable',
+    --         'TwilightDisable',
+    --     },
+    -- },
+
+    -- {
+    --     'RRethy/vim-illuminate',
+    --     event = 'VeryLazy',
+    --     lazy = false,
+    -- },
+
     {
         '0oAstro/dim.lua',
         dependencies = {
-            'neovim-treesitter/nvim-treesitter',
+            'nvim-treesitter/nvim-treesitter',
             'neovim/nvim-lspconfig'
         },
         event = 'LspAttach',

config/.config/nvim/lua/plugins/ui.lua

@@ -5,12 +5,30 @@ return {
         event = 'VeryLazy',
     },
 
+    -- {
+    --     'lukas-reineke/indent-blankline.nvim',
+    --     event = 'VeryLazy',
+    --     config = function()
+    --         require'ibl'.setup{ scope = { enabled = false } }
+    --     end
+    -- },
+
     {
         'nvim-tree/nvim-web-devicons',
         -- event = 'VeryLazy',
         lazy = true,
     },
 
+    -- {
+    --     'goolord/alpha-nvim',
+    --     dependencies = {
+    --         'nvim-tree/nvim-web-devicons',
+    --     },
+    --     config = function()
+    --         require('alpha').setup(require'alpha.themes.startify'.config)
+    --     end
+    -- },
+
     {
         'lewis6991/gitsigns.nvim',
         event = 'VeryLazy',
@@ -19,9 +37,9 @@ return {
         }
     },
 
-    -- {
-    --     'Bekaboo/dropbar.nvim',
-    -- },
+    {
+        'Bekaboo/dropbar.nvim',
+    },
 
     {
         'nvim-lualine/lualine.nvim',
@@ -34,8 +52,8 @@ return {
                 for i, server in pairs(vim.lsp.get_clients({ bufnr = 0 })) do
                     table.insert(names, server.name)
                 end
-                -- return " [" .. table.concat(names, " ") .. "]"
-                return "[" .. table.concat(names, " ") .. "]"
+                return " [" .. table.concat(names, " ") .. "]"
+                -- return "[" .. table.concat(names, " ") .. "]"
             end
             require('lualine').setup {
                 options = {

config/.config/nvim/lua/plugins/util.lua

@@ -1,4 +1,21 @@
 return {
+
+    {
+        'nvim-lua/plenary.nvim',
+        -- event = 'VeryLazy',
+        lazy = true,
+    },
+
+    {
+        'RaafatTurki/hex.nvim',
+        config = true,
+		cmd = {
+			'HexDump',
+			'HexAssemble',
+			'HexToggle',
+		},
+    },
+
     {
        "sindrets/diffview.nvim",
         event = 'VeryLazy',
@@ -16,6 +33,7 @@ return {
         "NeogitOrg/neogit",
         lazy = true,
         dependencies = {
+            "nvim-lua/plenary.nvim",         -- required
             "sindrets/diffview.nvim",        -- optional - Diff integration
 
             -- Only one of these is needed.
@@ -26,14 +44,6 @@ return {
         },
     },
 
-    {
-        "OXY2DEV/markview.nvim",
-        lazy = false,
-
-        -- Completion for `blink.cmp`
-        dependencies = { "saghen/blink.cmp" },
-    },
-
     {
         'vieitesss/command.nvim',
         lazy = false,
@@ -41,6 +51,12 @@ return {
         opts = {},
     },
 
+
+    {
+        'glacambre/firenvim',
+        build = ":call firenvim#install(0)"
+    },
+
     {
         'brenoprata10/nvim-highlight-colors',
         event = 'VeryLazy',
@@ -76,29 +92,7 @@ return {
             -- or leave it empty to use the default settings
             -- refer to the configuration section below
             bigfile = { enabled = true },
-            dashboard = {
-                enabled = true,
-                presets = {
-                },
-                formats = {
-                    key = function(item)
-                        return { { "[", hl = "special" }, { item.key, hl = "key" }, { "]", hl = "special" } }
-                    end,
-                },
-                sections = {
-                    -- { section = "terminal", cmd = "fortune -s | cowsay", hl = "header", padding = 1, indent = 8 },
-                    { section = "header" },
-                    { section = "startup" },
-                    { title = "MRU", padding = 1 },
-                    { section = "recent_files", limit = 8, padding = 1 },
-                    { title = "MRU ", file = vim.fn.fnamemodify(".", ":~"), padding = 1 },
-                    { section = "recent_files", cwd = true, limit = 8, padding = 1 },
-                    { title = "Sessions", padding = 1 },
-                    { section = "projects", padding = 1 },
-                    { title = "Bookmarks", padding = 1 },
-                    { section = "keys" },
-                },
-            },
+            -- dashboard = { enabled = true },
             dim = { enabled = true },
             -- explorer = { enabled = true },
             -- git = { enabled = false },
@@ -119,57 +113,92 @@ return {
             },
             notifier = { enabled = true },
             -- quickfile = { enabled = true },
-            scope = { enabled = true },
+            -- scope = { enabled = true },
             -- scroll = { enabled = true },
             terminal = { enabled = false },
             -- statuscolumn = { enabled = true },
-            words = { enabled = true },
-            zen = {
-                enabled = true,
-                -- toggles = {
-                --     git_signs = true,
-                -- },
-                win = {
-                    backdrop = {
-                        transparent = false,
-                        blend = 99,
-                    },
-                },
-            },
+            -- words = { enabled = true },
         },
     },
 
     {
-        "folke/which-key.nvim",
-        event = "VeryLazy",
-        opts = {
-            -- your configuration comes here
-            -- or leave it empty to use the default settings
-            -- refer to the configuration section below
-            preset = 'helix',
-            sort = { "order", "alphanum", "local", "mod" },
-            win = {
-                border = 'none',
-            },
-            icons = {
-                rules = false,
-            },
-            spec = {
-                { '<leader>f', group = 'Find' },
-                { '<leader>o', group = 'Open' },
-                { '<leader>g', group = 'Git' },
-                { '<leader>c', group = 'Compile' },
-            },
-        },
-        keys = {
-            {
-                "<leader>?",
-                function()
-                    require("which-key").show({ global = false })
-                end,
-                desc = "Buffer Local Keymaps (which-key)",
-            },
-        },
+        'echasnovski/mini.nvim',
+        config = function()
+            require('mini.starter').setup()
+            -- require('mini.cursorword').setup()
+            local miniclue = require'mini.clue'
+            miniclue.setup{
+                window = {
+                    delay = 0,
+                    config = {
+                        width = 'auto',
+                    },
+                },
+                triggers = {
+                    -- Leader triggers
+                    { mode = 'n', keys = '<Leader>' },
+                    { mode = 'x', keys = '<Leader>' },
+
+                    -- Built-in completion
+                    { mode = 'i', keys = '<C-x>' },
+
+                    -- `g` key
+                    { mode = 'n', keys = 'g' },
+                    { mode = 'x', keys = 'g' },
+
+                    -- Next
+                    { mode = 'n', keys = '['},
+                    { mode = 'n', keys = ']'},
+                    { mode = 'x', keys = '['},
+                    { mode = 'x', keys = ']'},
+
+                    -- Marks
+                    { mode = 'n', keys = "'" },
+                    { mode = 'n', keys = '`' },
+                    { mode = 'x', keys = "'" },
+                    { mode = 'x', keys = '`' },
+
+                    -- Registers
+                    { mode = 'n', keys = '"' },
+                    { mode = 'x', keys = '"' },
+                    { mode = 'i', keys = '<C-r>' },
+                    { mode = 'c', keys = '<C-r>' },
+
+                    -- Window commands
+                    { mode = 'n', keys = '<C-w>' },
+
+                    -- `z` key
+                    { mode = 'n', keys = 'z' },
+                    { mode = 'x', keys = 'z' },
+
+                    -- Localleader
+                    { mode = 'n', keys = '<Localleader>'},
+                    { mode = 'x', keys = '<Localleader>'},
+                },
+
+                clues = {
+                    -- Enhance this by adding descriptions for <Leader> mapping groups
+                    miniclue.gen_clues.builtin_completion(),
+                    miniclue.gen_clues.g(),
+                    miniclue.gen_clues.marks(),
+                    miniclue.gen_clues.registers(),
+                    miniclue.gen_clues.windows(),
+                    miniclue.gen_clues.z(),
+
+                    { mode = 'n', keys = '<leader>f', desc = '+Find' },
+                    { mode = 'x', keys = '<leader>f', desc = '+Find' },
+
+                    { mode = 'n', keys = '<leader>o', desc = '+Open' },
+                    { mode = 'x', keys = '<leader>o', desc = '+Open' },
+
+                    { mode = 'n', keys = '<leader>g', desc = '+Git' },
+                    { mode = 'x', keys = '<leader>g', desc = '+Git' },
+
+                    { mode = 'n', keys = '<leader>c', desc = '+Compile' },
+                    { mode = 'x', keys = '<leader>c', desc = '+Compile' },
+                },
+            }
+        end
     },
 
     {
@@ -273,19 +302,19 @@ return {
             -- Add cursor at next argument treesitter
             set({'n', 'x'}, ']A', function()
                 if vim.v.count < 1 then
-                    mc.addCursor(']p')
+                    mc.addCursor(']a')
                 else
                     for _=1, vim.v.count - 1 do
-                        mc.addCursor(']p')
+                        mc.addCursor(']a')
                     end
                 end
             end, { desc = 'Create multicursor on next argument'})
             set({'n', 'x'}, '[A', function()
                 if vim.v.count < 1 then
-                    mc.addCursor('[p')
+                    mc.addCursor('[a')
                 else
                     for _=1, vim.v.count - 1 do
-                        mc.addCursor('[p')
+                        mc.addCursor('[a')
                     end
                 end
             end, { desc = 'Create multicursor on previous argument'})

config/.config/picom/picom.conf

@@ -101,7 +101,7 @@ fade-in-step = 0.03;
 fade-out-step = 0.03;
 
 # The time between steps in fade step, in milliseconds. (> 0, defaults to 10)
-fade-delta = 4.0;
+fade-delta = 5.0;
 
 # Specify a list of conditions of windows that should not be faded.
 # fade-exclude = []

config/.config/polybar/config.ini

@@ -39,12 +39,12 @@ background = ${xrdb:background}
 foreground = ${xrdb:foreground}
 override-redirect = true
 wm-restack = bspwm
-font-0 = Olympe Mono Hacked:style=Regular:pixelsize=20;2
-font-1 = CaskaydiaCove Nerd Font:style=Regular:pixelsize=20:2
-font-2 = NotoColorEmoji:pixelsize=20
-font-3 = Font Awesome 6 Brands:style=Regular:size=20;2
-font-4 = Font Awesome 6 Free Solid:style=Regular:size=20;2
-height = 36
+font-0 = Olympe Mono Hacked:style=Regular:pixelsize=11;2
+font-1 = CaskaydiaCove Nerd Font:style=Regular:pixelsize=11:2
+font-2 = NotoColorEmoji:pixelsize=16
+font-3 = Font Awesome 6 Brands:style=Regular:size=13;2
+font-4 = Font Awesome 6 Free Solid:style=Regular:size=9;2
+height = 20
 line-size = 2
 modules-left = bspwm
 modules-right = music memory filesystem xkeyboard network redshift pulseaudio backlight tray battery datetime

config/.config/qt6ct/qt6ct.conf

@@ -28,7 +28,7 @@ wheel_scroll_lines=3
 geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\x3\xad\0\0\x1\x86\0\0\x6#\0\0\x3\x96\0\0\x3\xad\0\0\x1\x86\0\0\x6#\0\0\x3\x96\0\0\0\0\0\0\0\0\n\0\0\0\x3\xad\0\0\x1\x86\0\0\x6#\0\0\x3\x96)
 
 [SettingsWindow]
-geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\x5\xc7\0\0\x3\xba\0\0\0\0\0\0\0\0\0\0\x5\xc7\0\0\x3\xba\0\0\0\0\0\0\0\0\x5\xe0\0\0\0\0\0\0\0\0\0\0\x5\xc7\0\0\x3\xba)
+geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\v\xb0\0\0\0\0\0\0\x15\x93\0\0\x4\xc9\0\0\v\xb0\0\0\0\0\0\0\x15\x93\0\0\x4\xc9\0\0\0\x1\0\0\0\0\n\0\0\0\v\xb0\0\0\0\0\0\0\x15\x93\0\0\x4\xc9)
 
 [Troubleshooting]
 force_raster_widgets=1

config/.config/ranger/rc.conf

@@ -1 +1,2 @@
 set preview_images true
+set preview_images_method kitty

config/.config/river/init

@@ -139,8 +139,8 @@ do
     riverctl map $mode None XF86AudioNext  spawn 'playerctl next'
 
     # Control screen backlight brightness with brightnessctl (https://github.com/Hummer12007/brightnessctl)
-    riverctl map $mode None XF86MonBrightnessUp   spawn 'brightnessctl set +1%'
-    riverctl map $mode None XF86MonBrightnessDown spawn 'brightnessctl set 1%-'
+    riverctl map $mode None XF86MonBrightnessUp   spawn 'brightnessctl set +5%'
+    riverctl map $mode None XF86MonBrightnessDown spawn 'brightnessctl set 5%-'
 done
 
 # Set background and border color
@@ -170,17 +170,9 @@ riverctl focus-follows-cursor normal
 riverctl map normal Super+Control O spawn 'mumble rpc starttalking'
 riverctl map normal Super O spawn 'mumble rpc stoptalking'
 riverctl map normal Super Escape spawn 'swaylock -f -C ~/.config/sway/rose-pine'
-
-riverctl input pointer* tap enabled
-riverctl input pointer* click-method button-areas
-riverctl input pointer* natural-scroll enabled
 swaybg -m fill -i $HOME/Pictures/wallpapers/wallpaper &
 # pgrep creek || ( while $HOME/.config/river/bar.sh; do sleep 1; done ) | creek -fn 'Ubuntu:size=14' -nf 0xb8b8b8 -nb 0x282828 -ff 0x181818 -fb 0x7cafc2
-swayidle -w \
-     timeout 360 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \
-     timeout 600 'systemctl suspend-then-hibernate' \
-     before-sleep 'swaylock -f -C ~/.config/sway/rose-pine' &
 pipewire-launch &
 waybar &
-wlr-randr --output eDP-1 --scale 1.5
+wlr-randr --output DP-2 --adaptive-sync enabled --mode 2560x1440@165Hz
 dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP='river'

config/.config/sway/bar.sh

@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
 DATE=$(date +'%Y-%m-%d %I:%M:%S %p')
-BAT=$(cat /sys/class/power_supply/BAT1/capacity)
+# BAT=$(cat /sys/class/power_supply/BAT1/capacity)
 VOL=$(pactl get-sink-volume @DEFAULT_SINK@ | tr "," "\n" | grep \% | sed s/Volume\:// | sed 's/\%.*$//' | sed 's/^.*\///' | head -n1 | sed s/\ *//)
 VOL="${VOL}%"
 MUTED=$(pactl get-sink-mute @DEFAULT_SINK@ | cut -d\  -f2)
-BRIGHT=$(brightnessctl | tr "\n" " " | cut -d\  -f9 | tr -d "()%")
+# BRIGHT=$(brightnessctl | tr "\n" " " | cut -d\  -f9 | tr -d "()%")
 MEM=$(free -h | sed 's/[  ]\+/:/g' | cut -d\: -f4 | tr "\n" ":" | cut -d\: -f2)
 USER=$(id -u -n)
 HOST=$(cat /proc/sys/kernel/hostname)
@@ -17,4 +17,5 @@ then
     VOL='muted'
 fi
 
-echo ${MEM} \| ${USER}\@${HOST} \| KB\: ${LAYOUT} \| ${NETWORK_NAME}\@${IP} \| Vol: ${VOL}  \| ${BRIGHT}% Backlight \| ${BAT}\% Bat \| ${DATE}
+# echo ${MEM} \| ${USER}\@${HOST} \| KB\: ${LAYOUT} \| ${NETWORK_NAME}\@${IP} \| Vol: ${VOL}  \| ${BRIGHT}% Backlight \| ${BAT}\% Bat \| ${DATE}
+echo ${MEM} \| ${USER}\@${HOST} \| KB\: ${LAYOUT} \| ${NETWORK_NAME}\@${IP} \| Vol: ${VOL}  \| ${DATE}

config/.config/sway/config

@@ -39,7 +39,7 @@ output * bg $HOME/Pictures/wallpapers/wallpaper fill
 #
 # Example configuration:
 #
-output eDP-1 scale 1.5
+# output eDP-1 scale 1.5
 #
 # You can get the names of your outputs by running: swaymsg -t get_outputs
 output DP-2 mode 2560x1440@165.000Hz
@@ -50,10 +50,11 @@ font "Ubuntu 10"
 #
 # Example configuration:
 #
-exec swayidle -w \
-          timeout 360 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \
-          timeout 600 'systemctl suspend-then-hibernate' \
-          before-sleep 'swaylock -f -c 000000'
+# exec swayidle -w \
+#           # timeout 15 'swaylock -f -c 000000' \
+#           timeout 360 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \
+#           timeout 600 'systemctl suspend-then-hibernate' \
+#           before-sleep 'swaylock -f -c 000000'
 
 # set $lock 'swaylock -f'
 #
@@ -67,12 +68,12 @@ exec swayidle -w \
 #
 # Example configuration:
 #
-input "type:touchpad" {
-    dwt enabled
-    tap enabled
-    natural_scroll enabled
-    #middle_emulation enabled
-}
+# input "type:touchpad" {
+#     dwt enabled
+#     tap enabled
+#     natural_scroll enabled
+#     #middle_emulation enabled
+# }
 #
 # You can get the names of your inputs by running: swaymsg -t get_inputs
 # Read `man 5 sway-input` for more information about this section.
@@ -259,9 +260,9 @@ input "type:keyboard" {
 bindsym Mod1+Shift+space input "type:keyboard" xkb_switch_layout 0
 bindsym Mod1+space input "type:keyboard" xkb_switch_layout 1
 
-bindsym $mod+u output eDP-1 scale 1
-bindsym $mod+i output eDP-1 scale 1.5
-bindsym $mod+o output eDP-1 scale 2
+# bindsym $mod+u output eDP-1 scale 1
+# bindsym $mod+i output eDP-1 scale 1.5
+# bindsym $mod+o output eDP-1 scale 2
 
 # Multimedia
 bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +2% && pactl get-sink-volume @DEFAULT_SINK@ | head -n 1| awk '{print substr($5, 1, length($5)-1)}' > $WOBSOCK

config/.config/sxhkd/sxhkdrc

@@ -75,11 +75,11 @@ XF86AudioNext
 XF86AudioPrev
     playerctl previous
 # Brightness Up
-XF86MonBrightnessUp
+XF86_MonBrightnessUp
     brightnessctl set 1%+
 # Brightness Down
-XF86MonBrightnessDown
-    brightnessctl set 1%-
+XF86_MonBrightnessDown
+    brightnessctl set 1%+
 
 ## BSPWM Controls ##
  

config/.config/waybar/config.jsonc

@@ -12,9 +12,9 @@
         "river/layout",
         "custom/media"
     ],
-//    "modules-center": [
-//        "river/window"
-//    ],
+    "modules-center": [
+        "river/window"
+    ],
     "modules-right": [
         "idle_inhibitor",
         "pulseaudio",

config/.doom.d/config.el

@@ -155,5 +155,4 @@
 (setq dime-dylan-implementations
       '((opendylan ("/home/mikec/Documents/suckless/dylan/opendylan-2024.1/bin/dswank")
          :env ("OPEN_DYLAN_USER_REGISTRIES=/tmp/dime-test/registry"))))
-(setq doc-view-mupdf-use-svg t)
 (add-to-list 'default-frame-alist '(undecorated . t))

config/.doom.d/init.el

@@ -100,7 +100,7 @@
        magit             ; a git porcelain for Emacs
        ;;make              ; run make tasks from Emacs
        ;;pass              ; password manager for nerds
-       ;; pdf               ; pdf enhancements
+       pdf               ; pdf enhancements
        ;;prodigy           ; FIXME managing external services & code builders
        ;;rgb               ; creating color strings
        ;;taskrunner        ; taskrunner for all your projects

config/.icons/Chicago95-tux/actions/16/action-unavailable-symbolic.png

@@ -0,0 +1 @@
+stop.png

config/.icons/Chicago95-tux/actions/16/action-unavailable.png

@@ -0,0 +1 @@
+stop.png

config/.icons/Chicago95-tux/actions/16/add.png

@@ -0,0 +1 @@
+list-add.png

config/.icons/Chicago95-tux/actions/16/address-book-new-symbolic.png

@@ -0,0 +1 @@
+./address-book-new.png

config/.icons/Chicago95-tux/actions/16/align-horizontal-center-symbolic.png

@@ -0,0 +1 @@
+./align-horizontal-center.png

config/.icons/Chicago95-tux/actions/16/align-horizontal-left-symbolic.png

@@ -0,0 +1 @@
+./align-horizontal-left.png

config/.icons/Chicago95-tux/actions/16/align-horizontal-right-symbolic.png

@@ -0,0 +1 @@
+./align-horizontal-right.png

config/.icons/Chicago95-tux/actions/16/align-vertical-bottom-symbolic.png

@@ -0,0 +1 @@
+./align-vertical-bottom.png

config/.icons/Chicago95-tux/actions/16/align-vertical-center-symbolic.png

@@ -0,0 +1 @@
+./align-vertical-center.png

config/.icons/Chicago95-tux/actions/16/align-vertical-top-symbolic.png

@@ -0,0 +1 @@
+./align-vertical-top.png

config/.icons/Chicago95-tux/actions/16/application-add-symboliv.png

@@ -0,0 +1 @@
+window-new.png

config/.icons/Chicago95-tux/actions/16/application-add.png

@@ -0,0 +1 @@
+window-new.png

config/.icons/Chicago95-tux/actions/16/application-exit-symbolic.png

@@ -0,0 +1 @@
+./application-exit.png

config/.icons/Chicago95-tux/actions/16/appointment-new-symbolic.png

@@ -0,0 +1 @@
+./appointment-new.png

config/.icons/Chicago95-tux/actions/16/appointment.png

@@ -0,0 +1 @@
+appointment-new.png

config/.icons/Chicago95-tux/actions/16/back.png

@@ -0,0 +1 @@
+go-previous.png

config/.icons/Chicago95-tux/actions/16/blueman-send-file.png

@@ -0,0 +1 @@
+document-send.png

config/.icons/Chicago95-tux/actions/16/bonobo-component-browser.png

@@ -0,0 +1 @@
+document-properties.png

config/.icons/Chicago95-tux/actions/16/bookmark-new-symbolic.png

@@ -0,0 +1 @@
+./bookmark-new.png

config/.icons/Chicago95-tux/actions/16/bookmark_add.png

@@ -0,0 +1 @@
+bookmark-new.png

config/.icons/Chicago95-tux/actions/16/bookmarks_list_add.png

@@ -0,0 +1 @@
+bookmark-new.png

config/.icons/Chicago95-tux/actions/16/bottom.png

@@ -0,0 +1 @@
+go-bottom.png

config/.icons/Chicago95-tux/actions/16/browser-download.png

@@ -0,0 +1 @@
+document-save.png

config/.icons/Chicago95-tux/actions/16/button_cancel.png

@@ -0,0 +1 @@
+stock_no.png

config/.icons/Chicago95-tux/actions/16/call-missed-symbolic.png

@@ -0,0 +1 @@
+call-stop.png

config/.icons/Chicago95-tux/actions/16/call-start-symbolic.png

@@ -0,0 +1 @@
+./call-start.png

config/.icons/Chicago95-tux/actions/16/call-stop-symbolic.png

@@ -0,0 +1 @@
+./call-stop.png

config/.icons/Chicago95-tux/actions/16/cancel.png

@@ -0,0 +1 @@
+stock_no.png

config/.icons/Chicago95-tux/actions/16/centerjust.png

@@ -0,0 +1 @@
+format-justify-center.png

config/.icons/Chicago95-tux/actions/16/centrejust.png

@@ -0,0 +1 @@
+format-justify-center.png

config/.icons/Chicago95-tux/actions/16/color-select-symbolic.png

@@ -0,0 +1 @@
+color-select.png

config/.icons/Chicago95-tux/actions/16/contact-new-symbolic.png

@@ -0,0 +1 @@
+./contact-new.png

config/.icons/Chicago95-tux/actions/16/dialog-apply.png

@@ -0,0 +1 @@
+gtk-ok.png

config/.icons/Chicago95-tux/actions/16/dialog-cancel.png

@@ -0,0 +1 @@
+stock_no.png

config/.icons/Chicago95-tux/actions/16/dialog-close.png

@@ -0,0 +1 @@
+stock_no.png

config/.icons/Chicago95-tux/actions/16/dialog-no.png

@@ -0,0 +1 @@
+stock_no.png

config/.icons/Chicago95-tux/actions/16/dialog-ok-apply.png

@@ -0,0 +1 @@
+gtk-ok.png

config/.icons/Chicago95-tux/actions/16/dialog-ok.png

@@ -0,0 +1 @@
+dialog-apply.png

config/.icons/Chicago95-tux/actions/16/dialog-yes.png

@@ -0,0 +1 @@
+dialog-apply.png

config/.icons/Chicago95-tux/actions/16/distribute-horizontal-left-symbolic.png

@@ -0,0 +1 @@
+./distribute-horizontal-left.png

config/.icons/Chicago95-tux/actions/16/distribute-horizontal-right-symbolic.png

@@ -0,0 +1 @@
+./distribute-horizontal-right.png

config/.icons/Chicago95-tux/actions/16/distribute-vertical-bottom-symbolic.png

@@ -0,0 +1 @@
+./distribute-vertical-bottom.png

config/.icons/Chicago95-tux/actions/16/distribute-vertical-center-symbolic.png

@@ -0,0 +1 @@
+./distribute-vertical-center.png