Merge remote-tracking branch 'origin/main'

git-keyring/.gitconfig

@@ -1,14 +0,0 @@
-[user]
-	email = matt@threlfall.dev
-	name = Matt
-	signingkey = B02E61FDF5CEF06E362B26FDB7E7478FC456A57A
-[core]
-	editor = nvim
-[credential]
-	helper = store
-[init]
-	defaultBranch = main
-[commit]
-	gpgsign = true
-[tag]
-	gpgsign = true

git/.gitconfig

@@ -1,7 +1,7 @@
 [user]
 	email = matt@threlfall.dev
 	name = Matt
-	signingkey = 2B19B7E053B101A8CA76256CCD563EFF28C1C306
+  signingkey = matt@threlfall.dev
 [core]
 	editor = nvim
 [credential]

nvim/.config/nvim/lazy-lock.json

@@ -11,7 +11,7 @@
   "conform.nvim": { "branch": "master", "commit": "c64cc754ace603e185ab30113aaef174187eacf8" },
   "crates.nvim": { "branch": "main", "commit": "ac9fa498a9edb96dc3056724ff69d5f40b898453" },
   "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
-  "gitsigns.nvim": { "branch": "main", "commit": "472f752943d44d732cece09d442d45681ce38f48" },
+  "gitsigns.nvim": { "branch": "main", "commit": "89f75073da1c8fab1d8b6285da72366ee54633ba" },
   "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
   "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
   "mason.nvim": { "branch": "main", "commit": "a83eabdc8c49c0c93bf5bb162fa3b57404a9d095" },
@@ -26,7 +26,7 @@
   "nvim-dap-go": { "branch": "main", "commit": "b4421153ead5d726603b02743ea40cf26a51ed5f" },
   "nvim-dap-python": { "branch": "master", "commit": "bfe572e4458e0ac876b9539a1e9f301c72db8ea0" },
   "nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" },
-  "nvim-lspconfig": { "branch": "master", "commit": "db8fef885009fdec0daeff3e5dda92e1f539611e" },
+  "nvim-lspconfig": { "branch": "master", "commit": "a844e89ea0e0e4b207ec550c3b51fb6e471881a4" },
   "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
   "nvim-tree.lua": { "branch": "master", "commit": "87d096a39cb2d5d43e6771563575ff042a79f48b" },
   "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },

nvim/.config/nvim/lua/chadrc.lua

@@ -6,7 +6,13 @@
 local M = {}
 
 M.base46 = {
-	theme = "starlight",
+	theme = "everforest",
+	hl_override = {
+		LspSignatureActiveParameter = {
+			fg = "#ff9e64",
+			bold = true,
+		},
+	},
 
 	-- hl_override = {
 	-- 	Comment = { italic = true },

nvim/.config/nvim/lua/mappings.lua

@@ -1,6 +1,7 @@
 require("nvchad.mappings")
 
 local map = vim.keymap.set
+local dap = require("dap")
 
 map("n", "]g", function()
 	vim.diagnostic.jump({ count = 1, float = true })
@@ -25,13 +26,59 @@ map("n", "[t", function()
 end, { desc = "Previous todo comment" })
 
 map("n", "<leader>db", function()
-	require("dap").toggle_breakpoint()
+	dap.toggle_breakpoint()
 end, { desc = "Add a breakpoint" })
 
+map("n", "<F5>", function()
+	dap.continue()
+end, { desc = "Debug: Continue / Start" })
+
+map("n", "<F10>", function()
+	dap.step_over()
+end, { desc = "Debug: Step Over" })
+
+map("n", "<F11>", function()
+	dap.step_into()
+end, { desc = "Debug: Step Into" })
+
+map("n", "<F12>", function()
+	dap.step_out()
+end, { desc = "Debug: Step Out" })
+
+-- --- Time Travel Debugging (Reverse/rr) ---
+map("n", "<S-F5>", function()
+	dap.reverse_continue()
+end, { desc = "Debug: Reverse Continue (Rewind)" })
+
+map("n", "<S-F10>", function()
+	dap.step_back()
+end, { desc = "Debug: Step Back (Undo Step)" })
+
+-- --- Breakpoints & UI ---
+map("n", "<leader>db", function()
+	dap.toggle_breakpoint()
+end, { desc = "Debug: Toggle Breakpoint" })
+
+map("n", "<leader>dc", function()
+	dap.set_breakpoint(vim.fn.input("Breakpoint condition: "))
+end, { desc = "Debug: Set Conditional Breakpoint" })
+
+map("n", "<leader>dl", function()
+	dap.set_breakpoint(nil, nil, vim.fn.input("Log point message: "))
+end, { desc = "Debug: Set Log Point" })
+
+map("n", "<F6>", function()
+	dap.terminate()
+end, { desc = "Debug: Terminate Session" })
+
 map("n", "<leader>dui", function()
 	require("dapui").toggle()
 end, { desc = "Toggle debugger ui" })
 
+map("n", "<leader>drui", function()
+	require("dapui").open({ reset = true })
+end, { desc = "Debug: Reset UI Layout" })
+
 map("n", "<leader>gb", function()
 	vim.cmd("Gitsigns blame_line")
 end, { desc = "Show lines git blame" })

nvim/.config/nvim/lua/plugins/init.lua

@@ -153,6 +153,9 @@ return {
 			require("dapui").setup()
 			vim.fn.sign_define("DapBreakpoint", { text = "🐞" })
 			vim.fn.sign_define("DapBreakpointRejected", { text = "🐞" })
+			vim.fn.sign_define("DapStopped", { text = "👉" })
+			vim.api.nvim_set_hl(0, "DapBreakpointCondition", { fg = "#e5c07b", ctermfg = 180 })
+			vim.fn.sign_define("DapBreakpointCondition", { text = "🐝", texthl = "DapBreakpointCondition" })
 			local dap, dapui = require("dap"), require("dapui")
 			dap.listeners.before.attach.dapui_config = function()
 				dapui.open()

waybar/.config/waybar/scripts/wireguard.sh

@@ -14,7 +14,16 @@ connection_status() {
     fi
 }
 
-config="/home/matt/.config/waybar/configs/gb-mnc-wg-005-2.conf"
+api_check() {
+  status=$(curl -s https://am.i.mullvad.net/connected)
+  if [[ "$status" != *"not"* ]]; then
+    echo "✅"
+  else
+    echo "❌"
+  fi
+}
+
+config="/home/matt/.config/waybar/configs/es-bcn-wg-001.conf"
 config_name=$(basename "${config%.*}")
 
 case "$1" in
@@ -26,12 +35,13 @@ case "$1" in
     fi
     ;;
 *)
+    check=$(api_check)
     if [ "$(connection_status)" = "1" ]; then
-        echo " VPN: On "
+        echo " VPN: On API: " $check " "
     elif [ "$(connection_status)" = "3" ]; then
         echo " Config not found! "
     else
-        echo " VPN: Off "
+        echo " VPN: Off " $check " " 
     fi
     ;;
 esac