Merge remote-tracking branch 'hjarl/main'

CONFIG/foot/foot.ini

@@ -32,6 +32,9 @@ dpi-aware=yes
 # selection-target=primary
 # workers=<number of logical CPUs>
 
+[main]
+include=/usr/share/foot/themes/gruvbox
+
 [environment]
 SYSTEMD_EDITOR=/usr/bin/nvim
 EDITOR=/usr/bin/nvim
@@ -68,50 +71,6 @@ lines=100000
 # hide-when-typing=no
 # alternate-scroll-mode=yes
 
-[colors-dark]
-alpha=0.9  # Adjust alpha to change transparency level
-foreground=cdd6f4
-background=1e1e2e
-cursor=11111b f5e0dc
-
-regular0=45475a
-regular1=f38ba8
-regular2=a6e3a1
-regular3=f9e2af
-regular4=89b4fa
-regular5=f5c2e7
-regular6=94e2d5
-regular7=bac2de
-
-bright0=585b70
-bright1=f38ba8
-bright2=a6e3a1
-bright3=f9e2af
-bright4=89b4fa
-bright5=f5c2e7
-bright6=94e2d5
-bright7=a6adc8
-
-## dimmed colors (see foot.ini(5) man page)
-# dim0=<not set>
-# ...
-# dim7=<not-set>
-
-## The remaining 256-color palette
-16=fab387
-17=f5e0dc
-# ...
-# 255 = <256-color palette #255>
-
-# Misc colors
-selection-foreground=cdd6f4
-selection-background=414356
-jump-labels=11111b fab387
-# scrollback-indicator=<regular0> <bright4>  # black-on-bright-blue
-search-box-no-match=11111b f38ba8
-search-box-match=cdd6f4 313244
-urls=89b4fa
-
 [csd]
 # preferred=server
 size=0

CONFIG/nvim/init.lua

@@ -98,7 +98,6 @@ vim.diagnostic.config({
     },
     float = { source = true },
 })
-vim.lsp.set_log_level(2)
 
 vim.api.nvim_create_autocmd("FileType", {
     desc = "Disable auto-commenting on new line",
@@ -331,62 +330,26 @@ vim.api.nvim_create_user_command("ConvertEOL", function(opts)
     })
 end, { nargs = 1 })
 
--- fix diff colors on some color schemes
--- https://codeyarns.com/tech/2011-07-29-vim-chart-of-color-names.html
-vim.api.nvim_create_user_command("FixColors", function()
-    vim.api.nvim_set_hl(0, "CustomCursor", { fg = "salmon1", bg = "cyan" })
-    vim.api.nvim_set_hl(0, "CustomICursor", { fg = "salmon1", bg = "cyan" })
-    vim.api.nvim_set_hl(0, "ColorColumn", { bg = "salmon4" })
-end, {})
-
 -- ----------------------------------------
 -- SPECS
 -- ----------------------------------------
 
 local function makespecs_themes()
     return {
-        { "aktersnurra/no-clown-fiesta.nvim", opts = { transparent = false } },
-        "NLKNguyen/papercolor-theme",
         "junegunn/seoul256.vim",
         "mcauley-penney/phobos-anomaly.nvim",
         "folke/tokyonight.nvim",
-        { "bluz71/vim-moonfly-colors", name = "moonfly", lazy = false },
         {
             "uloco/bluloco.nvim",
             lazy = false,
             dependencies = { "rktjmp/lush.nvim" },
             opts = {},
         },
-        {
-            "mhartington/oceanic-next",
-            config = function()
-                local customthemegroup = vim.api.nvim_create_augroup("customthemegroup", {})
-                vim.api.nvim_create_autocmd("ColorScheme", {
-                    pattern = { "OceanicNext" },
-                    group = customthemegroup,
-                    callback = function()
-                        vim.api.nvim_set_hl(0, "DiffAdded", { default = false, link = "DiffAdd" })
-                        vim.api.nvim_set_hl(0, "DiffRemoved", { default = false, link = "DiffDelete" })
-                        vim.api.nvim_set_hl(0, "Normal", {})
-                        vim.api.nvim_set_hl(0, "LineNr", {})
-                        vim.api.nvim_set_hl(0, "SignColumn", {})
-                        vim.api.nvim_set_hl(0, "EndOfBuffer", {})
-                    end,
-                })
-            end,
-        },
-        "morhetz/gruvbox",
-        {
-            "catppuccin/nvim",
-            name = "catppuccin",
-            -- opts = { integrations = { grug_far = true, mason = true, noice = true, snacks = true, which_key = true } },
-        },
-        {
-            "Shatur/neovim-ayu",
-            init = function() vim.g.ayu_extended_palette = 1 end,
-        },
-        "tomasr/molokai",
-        "jnurmine/Zenburn",
+        "sainnhe/gruvbox-material",
+        "sainnhe/everforest",
+        "sainnhe/edge",
+        "sainnhe/sonokai",
+        { "catppuccin/nvim", name = "catppuccin", opts = { auto_integrations = true } },
     }
 end
 
@@ -565,17 +528,6 @@ local function makespec_smearcursor()
     }
 end
 
-local function makespec_neoscroll()
-    return {
-        "karb94/neoscroll.nvim",
-        event = "VeryLazy",
-        config = function()
-            -- Initialize with empty mappings. It is loaded, but completely dormant.
-            require("neoscroll").setup({ mappings = {} })
-        end,
-    }
-end
-
 local function makespec_hexokinase()
     return {
         -- coloring of colornames
@@ -1181,44 +1133,6 @@ local function makespec_snacks()
                         get = function() return require("smear_cursor").enabled end,
                         set = function(state) require("smear_cursor").enabled = state end,
                     }):map("<leader>uS")
-
-                    -- Toggle for Neoscroll
-                    local ns_keys = {
-                        ["<C-u>"] = function() require("neoscroll").ctrl_u({ half_win_duration = 250 }) end,
-                        ["<C-d>"] = function() require("neoscroll").ctrl_d({ half_win_duration = 250 }) end,
-                        ["<C-b>"] = function() require("neoscroll").ctrl_b({ half_win_duration = 450 }) end,
-                        ["<C-f>"] = function() require("neoscroll").ctrl_f({ half_win_duration = 450 }) end,
-                        ["<C-y>"] = function()
-                            require("neoscroll").scroll(-0.1, { move_cursor = false, duration = 100 })
-                        end,
-                        ["<C-e>"] = function()
-                            require("neoscroll").scroll(0.1, { move_cursor = false, duration = 100 })
-                        end,
-                        ["zt"] = function() require("neoscroll").zt({ half_win_duration = 250 }) end,
-                        ["zz"] = function() require("neoscroll").zz({ half_win_duration = 250 }) end,
-                        ["zb"] = function() require("neoscroll").zb({ half_win_duration = 250 }) end,
-                    }
-
-                    vim.g.neoscroll_enabled = false
-
-                    Snacks.toggle({
-                        name = "Smooth Scroll",
-                        get = function() return vim.g.neoscroll_enabled end,
-                        set = function(state)
-                            vim.g.neoscroll_enabled = state
-                            if state then
-                                -- Turn ON: Map the keys to Neoscroll's functions
-                                for key, func in pairs(ns_keys) do
-                                    vim.keymap.set({ "n", "v", "x" }, key, func, { desc = "Smooth Scroll " .. key })
-                                end
-                            else
-                                -- Turn OFF: Delete the maps, returning Neovim to default scrolling
-                                for key, _ in pairs(ns_keys) do
-                                    pcall(vim.keymap.del, { "n", "v", "x" }, key)
-                                end
-                            end
-                        end,
-                    }):map("<leader>uN")
                 end,
             })
         end,
@@ -1760,7 +1674,6 @@ for _, spec in ipairs({
     makespec_flash(),
     makespec_grugfar(),
     -- visuals
-    makespec_neoscroll(),
     makespec_smearcursor(),
     makespec_hexokinase(),
     makespec_lualine(),
@@ -1801,4 +1714,4 @@ require("lazy").setup({
     spec = lazyspecs,
     checker = { enabled = true },
 })
-vim.cmd("colorscheme bluloco-dark")
+vim.cmd("colorscheme catppuccin-nvim")

CONFIG/qutebrowser/config.py

@@ -16,8 +16,8 @@ config.bind("<Ctrl+n>", "tab-clone -w")
 config.bind("<Ctrl+t>", "tab-clone -t")
 config.bind("<Ctrl+Shift+r>", "restart", mode="normal")
 config.bind("<Ctrl+h>", "history")
-config.bind("<F8>", "config-cycle colors.webpage.darkmode.enabled true false")
 config.bind("<F2>", "edit-url")
+config.bind("<F10>", "config-cycle colors.webpage.darkmode.enabled true false")
 config.bind("<F11>", "config-cycle tabs.position top left")
 config.bind("<F12>", "devtools")
 config.bind("<Shift+F12>", "view-source")

CONFIG/sway/config

@@ -157,15 +157,15 @@ bindsym {
 floating_modifier $mod normal
 bindsym {
     # Resize with arrow keys
-    $mod+ctrl+Right resize shrink width 10 px
-    $mod+ctrl+Up resize grow height 10 px
-    $mod+ctrl+Down resize shrink height 10 px
-    $mod+ctrl+Left resize grow width 10 px
+    $mod+ctrl+Right resize shrink width 100 px
+    $mod+ctrl+Up resize grow height 100 px
+    $mod+ctrl+Down resize shrink height 100 px
+    $mod+ctrl+Left resize grow width 100 px
     # Resize with Vim keys
-    $mod+ctrl+$right resize shrink width 10 px
-    $mod+ctrl+$up resize grow height 10 px
-    $mod+ctrl+$down resize shrink height 10 px
-    $mod+ctrl+$left resize grow width 10 px
+    $mod+ctrl+$right resize shrink width 100 px
+    $mod+ctrl+$up resize grow height 100 px
+    $mod+ctrl+$down resize shrink height 100 px
+    $mod+ctrl+$left resize grow width 100 px
 }
 # Resize floating windows with mouse scroll
 bindsym --whole-window --border {
@@ -294,7 +294,7 @@ exec_always swayidle -w \
     idlehint 240
 
 # Start foot server
-exec_always --no-startup-id foot --server
+exec systemctl --user enable --now foot-server.service
 
 exec {
     # Desktop notifications