From 5931a7db29e68293e87062b6dec2a2fc829d1442 Mon Sep 17 00:00:00 2001 From: Matt Date: Tue, 17 Feb 2026 17:57:40 +0000 Subject: [PATCH 1/4] feat: Updated desk pgp key --- git-desk/.gitconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-desk/.gitconfig b/git-desk/.gitconfig index 05d44fa..aef52fd 100644 --- a/git-desk/.gitconfig +++ b/git-desk/.gitconfig @@ -1,7 +1,7 @@ [user] email = matt@threlfall.dev name = Matt - signingkey = 2B19B7E053B101A8CA76256CCD563EFF28C1C306 + signingkey = 36C9E5DF2937BC1F1B04CC38A9E046C961DCC48B [core] editor = nvim [credential] From 52821232b1199a9252ccd4cc4205db1b36723908 Mon Sep 17 00:00:00 2001 From: Matt Date: Tue, 17 Feb 2026 20:18:06 +0000 Subject: [PATCH 2/4] fix: previewed args are now readable feat: added keybindings for dap --- nvim/.config/nvim/lazy-lock.json | 4 +-- nvim/.config/nvim/lua/chadrc.lua | 6 ++++ nvim/.config/nvim/lua/mappings.lua | 49 +++++++++++++++++++++++++- nvim/.config/nvim/lua/plugins/init.lua | 3 ++ 4 files changed, 59 insertions(+), 3 deletions(-) diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index 2e05109..cce3104 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/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" }, @@ -25,7 +25,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" }, diff --git a/nvim/.config/nvim/lua/chadrc.lua b/nvim/.config/nvim/lua/chadrc.lua index 65041d7..3899f9d 100644 --- a/nvim/.config/nvim/lua/chadrc.lua +++ b/nvim/.config/nvim/lua/chadrc.lua @@ -7,6 +7,12 @@ local M = {} M.base46 = { theme = "everforest", + hl_override = { + LspSignatureActiveParameter = { + fg = "#ff9e64", + bold = true, + }, + }, -- hl_override = { -- Comment = { italic = true }, diff --git a/nvim/.config/nvim/lua/mappings.lua b/nvim/.config/nvim/lua/mappings.lua index c73e480..51547c9 100644 --- a/nvim/.config/nvim/lua/mappings.lua +++ b/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", "db", function() - require("dap").toggle_breakpoint() + dap.toggle_breakpoint() end, { desc = "Add a breakpoint" }) +map("n", "", function() + dap.continue() +end, { desc = "Debug: Continue / Start" }) + +map("n", "", function() + dap.step_over() +end, { desc = "Debug: Step Over" }) + +map("n", "", function() + dap.step_into() +end, { desc = "Debug: Step Into" }) + +map("n", "", function() + dap.step_out() +end, { desc = "Debug: Step Out" }) + +-- --- Time Travel Debugging (Reverse/rr) --- +map("n", "", function() + dap.reverse_continue() +end, { desc = "Debug: Reverse Continue (Rewind)" }) + +map("n", "", function() + dap.step_back() +end, { desc = "Debug: Step Back (Undo Step)" }) + +-- --- Breakpoints & UI --- +map("n", "db", function() + dap.toggle_breakpoint() +end, { desc = "Debug: Toggle Breakpoint" }) + +map("n", "dc", function() + dap.set_breakpoint(vim.fn.input("Breakpoint condition: ")) +end, { desc = "Debug: Set Conditional Breakpoint" }) + +map("n", "dl", function() + dap.set_breakpoint(nil, nil, vim.fn.input("Log point message: ")) +end, { desc = "Debug: Set Log Point" }) + +map("n", "", function() + dap.terminate() +end, { desc = "Debug: Terminate Session" }) + map("n", "dui", function() require("dapui").toggle() end, { desc = "Toggle debugger ui" }) +map("n", "drui", function() + require("dapui").open({ reset = true }) +end, { desc = "Debug: Reset UI Layout" }) + map("n", "gb", function() vim.cmd("Gitsigns blame_line") end, { desc = "Show lines git blame" }) diff --git a/nvim/.config/nvim/lua/plugins/init.lua b/nvim/.config/nvim/lua/plugins/init.lua index 84a3981..e122bed 100644 --- a/nvim/.config/nvim/lua/plugins/init.lua +++ b/nvim/.config/nvim/lua/plugins/init.lua @@ -119,6 +119,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() From d5891fee50100a9cc426ae0b875307c120a81095 Mon Sep 17 00:00:00 2001 From: Matt Date: Tue, 17 Feb 2026 21:07:22 +0000 Subject: [PATCH 3/4] feat: Sway git to one config using email as signing key id --- git-keyring/.gitconfig | 14 -------------- {git-desk => git}/.gitconfig | 2 +- 2 files changed, 1 insertion(+), 15 deletions(-) delete mode 100644 git-keyring/.gitconfig rename {git-desk => git}/.gitconfig (84%) diff --git a/git-keyring/.gitconfig b/git-keyring/.gitconfig deleted file mode 100644 index c6b4ee2..0000000 --- a/git-keyring/.gitconfig +++ /dev/null @@ -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 diff --git a/git-desk/.gitconfig b/git/.gitconfig similarity index 84% rename from git-desk/.gitconfig rename to git/.gitconfig index aef52fd..43a0a50 100644 --- a/git-desk/.gitconfig +++ b/git/.gitconfig @@ -1,7 +1,7 @@ [user] email = matt@threlfall.dev name = Matt - signingkey = 36C9E5DF2937BC1F1B04CC38A9E046C961DCC48B + signingkey = matt@threlfall.dev [core] editor = nvim [credential] From a43c683e7eb4cffc727a814037ab24a79c642109 Mon Sep 17 00:00:00 2001 From: Matt Date: Tue, 17 Feb 2026 22:25:37 +0000 Subject: [PATCH 4/4] feat: added tick for mullvad api check --- waybar/.config/waybar/scripts/wireguard.sh | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/waybar/.config/waybar/scripts/wireguard.sh b/waybar/.config/waybar/scripts/wireguard.sh index d6ee306..279ebb5 100755 --- a/waybar/.config/waybar/scripts/wireguard.sh +++ b/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