feat: updates

.config/kanshi/config

@@ -1,27 +1,34 @@
 # Triple monitor setup (2 external + laptop)
 profile docked {
-    output "ASUSTek COMPUTER INC VY249HGR SALMRS003158" mode 1920x1080@60Hz position 2880,0
-    output "ASUSTek COMPUTER INC VY249HGR SALMRS003212" mode 1920x1080@60Hz position 4800,0
-    output "Samsung Display Corp. 0x419F" mode 2880x1800@120Hz position 3979,1080 scale 1.648438
+    output DP-3 mode 1920x1080@60Hz position 2880,0
+    output DP-4 mode 1920x1080@60Hz position 4800,0
+    output eDP-1 mode 2880x1800@120Hz position 4020,1080 scale 1.648438
 }
 
 # Laptop only
 profile laptop {
-    output "Samsung Display Corp. 0x419F" mode 2880x1800@120Hz position 0,0 scale 1.648438
+    output eDP-1 mode 2880x1800@120Hz position 0,0 scale 1.648438
+    output DP-3 disable
+    output DP-4 disable
 }
 
 # Left external only
 profile left-external {
-    output "ASUSTek COMPUTER INC VY249HGR SALMRS003158" mode 1920x1080@60Hz position 0,0
+    output DP-3 mode 1920x1080@60Hz position 0,0
+    output DP-4 disable
+    output eDP-1 disable
 }
 
 # Right external only
 profile right-external {
-    output "ASUSTek COMPUTER INC VY249HGR SALMRS003212" mode 1920x1080@60Hz position 0,0
+    output DP-4 mode 1920x1080@60Hz position 0,0
+    output DP-3 disable
+    output eDP-1 disable
 }
 
 # Both externals, no laptop
 profile dual-external {
-    output "ASUSTek COMPUTER INC VY249HGR SALMRS003158" mode 1920x1080@60Hz position 0,0
-    output "ASUSTek COMPUTER INC VY249HGR SALMRS003212" mode 1920x1080@60Hz position 1920,0
+    output DP-3 mode 1920x1080@60Hz position 0,0
+    output DP-4 mode 1920x1080@60Hz position 1920,0
+    output eDP-1 disable
 }

.config/mako/config

@@ -0,0 +1,14 @@
+font=monospace 11
+background-color=#000000
+text-color=#ffffff
+border-color=#5ea1ff
+border-size=2
+width=300
+height=100
+margin=10
+padding=10
+default-timeout=5000
+ignore-timeout=1
+
+[urgency=high]
+border-color=#ff5555

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

@@ -59,16 +59,16 @@ function M.setup_lsp_keymaps(bufnr)
     map("n", "<leader>D", "<cmd>Telescope diagnostics bufnr=0<CR>", "Show buffer diagnostics")
     map("n", "<leader>d", vim.diagnostic.open_float, "Show line diagnostics")
     map("n", "[d", function()
-        vim.diagnostic.jump({ count = -1, float = true })
+        vim.diagnostic.jump({ count = -1 })
     end, "Go to previous diagnostic")
     map("n", "]d", function()
-        vim.diagnostic.jump({ count = 1, float = true })
+        vim.diagnostic.jump({ count = 1 })
     end, "Go to next diagnostic")
     map("n", "[e", function()
-        vim.diagnostic.jump({ count = -1, float = true, severity = vim.diagnostic.severity.ERROR })
+        vim.diagnostic.jump({ count = -1, severity = vim.diagnostic.severity.ERROR })
     end, "Go to previous diagnostic (error only)")
     map("n", "]e", function()
-        vim.diagnostic.jump({ count = 1, float = true, severity = vim.diagnostic.severity.ERROR })
+        vim.diagnostic.jump({ count = 1, severity = vim.diagnostic.severity.ERROR })
     end, "Go to next diagnostic (error only)")
 
     -- Documentation

.config/nvim/lua/plugins/diffview.lua

@@ -1,4 +1,11 @@
 return {
     "sindrets/diffview.nvim",
-    opts = {},
+    opts = {
+        enhanced_diff_hl = true,
+        view = {
+            merge_tool = {
+                layout = "diff3_mixed",  -- or "diff3_horizontal"
+            },
+        },
+    },
 }

.config/nvim/lua/plugins/lspconfig.lua

@@ -34,10 +34,7 @@ return {
         })
 
         vim.diagnostic.config({
-            virtual_text = {
-                prefix = "●",
-                source = "if_many",
-            },
+            virtual_text = false,
             float = {
                 border = "rounded",
             },

.config/nvim/lua/plugins/tiny-inline-diagnostic.lua

@@ -0,0 +1,9 @@
+return {
+    "rachartier/tiny-inline-diagnostic.nvim",
+    event = "VeryLazy",
+    priority = 1000,
+    config = function()
+        require("tiny-inline-diagnostic").setup()
+        vim.diagnostic.config({ virtual_text = false }) -- Disable Neovim's default virtual text diagnostics
+    end,
+}

.config/river/init

@@ -5,6 +5,10 @@ riverctl map normal Super P spawn "wofi --show drun"
 
 riverctl map normal Super T spawn ~/.config/river/scripts/toggle-caps-esc.sh
 
+riverctl map normal Super+Shift S spawn 'grim -g "$(slurp)" - | wl-copy'
+
+riverctl map normal Super+Control L spawn 'swaylock -f -c 000000'
+
 # Super+Q to close the focused view
 riverctl map normal Super Q close
 
@@ -142,6 +146,8 @@ riverctl border-color-unfocused 0x3c4048
 # Set keyboard repeat rate
 riverctl set-repeat 50 300
 
+riverctl focus-follows-cursor normal
+
 # Make all views with an app-id that starts with "float" and title "foo" start floating.
 riverctl rule-add -app-id 'float*' -title 'foo' float
 
@@ -151,8 +157,10 @@ riverctl rule-add -app-id "bar" csd
 # Set the default layout generator to be rivertile and start it.
 # River will send the process group of the init executable SIGTERM on exit.
 riverctl default-layout rivertile
-rivertile -view-padding 6 -outer-padding 6 &
+rivertile -view-padding 2 -outer-padding 2 &
 
 waybar &
 
 kanshi &
+
+mako &