From b66dcdcec7d9ec7976c6beaffe3799e6e7c75e17 Mon Sep 17 00:00:00 2001 From: David JULIEN Date: Sat, 7 Jan 2023 22:09:20 +0100 Subject: [PATCH 01/14] [nvim] feat: smart pasting in visual mode --- .config/nvim/lua/maps.lua | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.config/nvim/lua/maps.lua b/.config/nvim/lua/maps.lua index a6afe95..1dfb8ef 100644 --- a/.config/nvim/lua/maps.lua +++ b/.config/nvim/lua/maps.lua @@ -35,6 +35,11 @@ vim.keymap.set("n", "p", "\"+P", { desc = "Copy from clipboard"} ) +vim.keymap.set("x", "p", + "\"_dP", + { desc = "Send selection to void register and paste from clipboard" } +) + vim.keymap.set("n", "", "w! | !compiler %", { desc = "Compile current file using ~/.local/bin/compiler"} From 5e892c4f2c8a9fe9a42d4e6283c5014fe9f705fd Mon Sep 17 00:00:00 2001 From: David JULIEN Date: Sat, 7 Jan 2023 22:11:01 +0100 Subject: [PATCH 02/14] [nvim] feat: add description to --- .config/nvim/lua/maps.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.config/nvim/lua/maps.lua b/.config/nvim/lua/maps.lua index 1dfb8ef..756f0c9 100644 --- a/.config/nvim/lua/maps.lua +++ b/.config/nvim/lua/maps.lua @@ -82,4 +82,6 @@ vim.keymap.set("n", "s", ) -- snippets -vim.keymap.set({ "i", "s" }, "", "luasnip-next-choice") +vim.keymap.set({ "i", "s" }, "", "luasnip-next-choice", + { desc = "Cycle through luasnip choices" } +) From 312d469f22f34b0c7ffa07063a6ed798e7c5e967 Mon Sep 17 00:00:00 2001 From: David JULIEN Date: Sat, 7 Jan 2023 22:11:21 +0100 Subject: [PATCH 03/14] [nvim] feat: comments and formatting --- .config/nvim/lua/maps.lua | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.config/nvim/lua/maps.lua b/.config/nvim/lua/maps.lua index 756f0c9..fbac41b 100644 --- a/.config/nvim/lua/maps.lua +++ b/.config/nvim/lua/maps.lua @@ -11,7 +11,7 @@ vim.keymap.set({ "n", "v" }, "", }) vim.g.mapleader = " " --- Dealing with word wrap +-- dealing with word wrap vim.keymap.set("n", "k", "v:count == 0 ? 'gk' : 'k'", { @@ -27,26 +27,30 @@ vim.keymap.set("n", "j", desc = "Smart down motion" }) -vim.keymap.set("n", "y", +-- yank and pasting +vim.keymap.set({ "n", "v" }, "y", "\"+y", { desc = "Yank to clipboard"} ) vim.keymap.set("n", "p", "\"+P", - { desc = "Copy from clipboard"} + { desc = "Paste from clipboard" } ) vim.keymap.set("x", "p", "\"_dP", { desc = "Send selection to void register and paste from clipboard" } ) +-- comfort zone vim.keymap.set("n", "", "w! | !compiler %", - { desc = "Compile current file using ~/.local/bin/compiler"} + { desc = "Compile current file using ~/.local/bin/compiler" } ) + +-- packer vim.keymap.set("n", "u", function() require("packer").sync() end, - { desc = "Sync packer config and update plugins"} + { desc = "Sync packer config and update plugins" } ) -- telescope From 07741bae28c58410a99d5103a50823377d38f19d Mon Sep 17 00:00:00 2001 From: David JULIEN Date: Sat, 7 Jan 2023 22:30:23 +0100 Subject: [PATCH 04/14] [nvim] fix: keymaps for visual-mode only --- .config/nvim/lua/maps.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/nvim/lua/maps.lua b/.config/nvim/lua/maps.lua index fbac41b..c3934bd 100644 --- a/.config/nvim/lua/maps.lua +++ b/.config/nvim/lua/maps.lua @@ -28,7 +28,7 @@ vim.keymap.set("n", "j", }) -- yank and pasting -vim.keymap.set({ "n", "v" }, "y", +vim.keymap.set({ "n", "x" }, "y", "\"+y", { desc = "Yank to clipboard"} ) From 17f4fcbe18424fbd17e5f5d2e59e0a7620d585ba Mon Sep 17 00:00:00 2001 From: David JULIEN Date: Sat, 7 Jan 2023 22:30:59 +0100 Subject: [PATCH 05/14] [nvim] feat: send selection to void register --- .config/nvim/lua/maps.lua | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.config/nvim/lua/maps.lua b/.config/nvim/lua/maps.lua index c3934bd..3b8e52e 100644 --- a/.config/nvim/lua/maps.lua +++ b/.config/nvim/lua/maps.lua @@ -41,6 +41,12 @@ vim.keymap.set("x", "p", { desc = "Send selection to void register and paste from clipboard" } ) +-- deletion +vim.keymap.set({ "n", "x" }, "d", + "\"_d", + { desc = "Send selection to void register" } +) + -- comfort zone vim.keymap.set("n", "", "w! | !compiler %", From 1c90ace02802252363d6f4d36e35e11a8f770cf7 Mon Sep 17 00:00:00 2001 From: David JULIEN Date: Sat, 7 Jan 2023 22:50:54 +0100 Subject: [PATCH 06/14] [nvim] fix: lsp formatting vim.lsp.buf.formatting got deprecated --- .config/nvim/lua/plugin/lsp/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/nvim/lua/plugin/lsp/init.lua b/.config/nvim/lua/plugin/lsp/init.lua index 8af6b8d..ba49aa5 100644 --- a/.config/nvim/lua/plugin/lsp/init.lua +++ b/.config/nvim/lua/plugin/lsp/init.lua @@ -38,7 +38,7 @@ local on_attach = function(_, bufnr) vim.keymap.set("n", "gi", vim.lsp.buf.implementation, opts) vim.keymap.set("n", "ln", vim.diagnostic.goto_next, opts) vim.keymap.set("n", "lp", vim.diagnostic.goto_prev, opts) - vim.keymap.set("n", "lf", vim.lsp.buf.formatting, opts) + vim.keymap.set("n", "lf", vim.lsp.buf.format, opts) vim.keymap.set("n", "", vim.lsp.buf.signature_help, opts) vim.keymap.set("n", "wa", vim.lsp.buf.add_workspace_folder, opts) From 58f90bbf8b36968ce3cabbb91690cce9f5ac47ab Mon Sep 17 00:00:00 2001 From: David JULIEN Date: Sun, 8 Jan 2023 00:25:07 +0100 Subject: [PATCH 07/14] [dwm] feat: window selborder get its own variable --- .config/X11/xcolors_dark | 1 + .config/X11/xcolors_light | 1 + .local/src/dwm | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.config/X11/xcolors_dark b/.config/X11/xcolors_dark index 4ef9146..b2094a5 100644 --- a/.config/X11/xcolors_dark +++ b/.config/X11/xcolors_dark @@ -30,6 +30,7 @@ *.foreground: #fbf1c7 *.normforeground: #a89984 *.selforeground: #ebdbb2 +*.selborder: #427d61 *.cursorColor: #ebdbb2 /* dmenu colors */ diff --git a/.config/X11/xcolors_light b/.config/X11/xcolors_light index 4efad90..ffded1c 100644 --- a/.config/X11/xcolors_light +++ b/.config/X11/xcolors_light @@ -30,6 +30,7 @@ *.foreground: #665c64 *.normforeground: #665c64 *.selforeground: #1d2021 +*.selborder: #d65d0e *.cursorColor: #1d2021 /* dmenu colors */ diff --git a/.local/src/dwm b/.local/src/dwm index 4af8e13..115058f 160000 --- a/.local/src/dwm +++ b/.local/src/dwm @@ -1 +1 @@ -Subproject commit 4af8e137098783c0c17305bae7b9b440bd6571b7 +Subproject commit 115058faa89079d6b83603946a22bc9340b79091 From c8aee7fd9cf16e07a89ddcfb5d690568a261409d Mon Sep 17 00:00:00 2001 From: David JULIEN Date: Sun, 8 Jan 2023 00:25:33 +0100 Subject: [PATCH 08/14] [dwm] feat: increase bordersize --- .config/X11/xresources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/X11/xresources b/.config/X11/xresources index 9568298..5701d71 100644 --- a/.config/X11/xresources +++ b/.config/X11/xresources @@ -4,7 +4,7 @@ *.japan: IPAexGothic:size=12 /* dwm config */ -dwm.borderpx: 2 +dwm.borderpx: 3 dwm.gappx: 15 /* st config */ From 24cf70ac9dc7b299f98204ee0c91e6026696c2f5 Mon Sep 17 00:00:00 2001 From: David JULIEN Date: Sun, 8 Jan 2023 00:37:01 +0100 Subject: [PATCH 09/14] [repo] feat: put everything on chapril.org --- .gitmodules | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/.gitmodules b/.gitmodules index 70837f4..af80c0c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,18 +1,18 @@ -[submodule ".local/src/dwm"] - path = .local/src/dwm - url = git@github.com:swy7ch/dwm.git -[submodule ".local/src/dwmblocks"] - path = .local/src/dwmblocks - url = git@github.com:swy7ch/dwmblocks.git -[submodule ".local/src/st"] - path = .local/src/st - url = git@github.com:swy7ch/st.git -[submodule ".local/src/dmenu"] - path = .local/src/dmenu - url = git@github.com:swy7ch/dmenu -[submodule ".local/src/slock"] - path = .local/src/slock - url = git@github.com:swy7ch/slock.git [submodule ".local/src/astronomy.nvim"] path = .local/src/astronomy.nvim - url = git@github.com:swy7ch/astronomy.nvim + url = ssh://gitea@forge.chapril.org:222/swytch/astronomy.nvim +[submodule ".local/src/dmenu"] + path = .local/src/dmenu + url = ssh://gitea@forge.chapril.org:222/swytch/dmenu +[submodule ".local/src/dwm"] + path = .local/src/dwm + url = ssh://gitea@forge.chapril.org:222/swytch/dwm +[submodule ".local/src/dwmblocks"] + path = .local/src/dwmblocks + url = ssh://gitea@forge.chapril.org:222/swytch/dwmblocks +[submodule ".local/src/slock"] + path = .local/src/slock + url = ssh://gitea@forge.chapril.org:222/swytch/slock +[submodule ".local/src/st"] + path = .local/src/st + url = ssh://gitea@forge.chapril.org:222/swytch/st From 0e9e90734d1a4f84304375e046b28b64e466dad1 Mon Sep 17 00:00:00 2001 From: David JULIEN Date: Sun, 8 Jan 2023 15:28:08 +0100 Subject: [PATCH 10/14] [st] feat: update to 0.9 --- .local/src/st | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.local/src/st b/.local/src/st index 465b6c8..870124f 160000 --- a/.local/src/st +++ b/.local/src/st @@ -1 +1 @@ -Subproject commit 465b6c89b7ea9cd53fe3417d62f50dd1922df5dc +Subproject commit 870124f0fe23699b6d7ab33b789952d3279cf061 From 9625223687b6eda299e5e533b3d0ca385f5931af Mon Sep 17 00:00:00 2001 From: David JULIEN Date: Sun, 8 Jan 2023 15:28:46 +0100 Subject: [PATCH 11/14] [dmenu] feat: update to 5.2 --- .local/src/dmenu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.local/src/dmenu b/.local/src/dmenu index 0f4c5fa..d5b5994 160000 --- a/.local/src/dmenu +++ b/.local/src/dmenu @@ -1 +1 @@ -Subproject commit 0f4c5faed3e396832bd11586371698d06bf21b71 +Subproject commit d5b5994a280d07312e21f07d307c15e50bded81f From e697700e75352c57ee1bc6f273ce4c40d146981c Mon Sep 17 00:00:00 2001 From: David JULIEN Date: Sun, 8 Jan 2023 15:29:47 +0100 Subject: [PATCH 12/14] [dwm] feat: update to 6.4 --- .local/src/dwm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.local/src/dwm b/.local/src/dwm index 115058f..16bc69c 160000 --- a/.local/src/dwm +++ b/.local/src/dwm @@ -1 +1 @@ -Subproject commit 115058faa89079d6b83603946a22bc9340b79091 +Subproject commit 16bc69ce1ca3b2a6a1eed77a2c3c5499188612da From f80d34861275165252db2a9c9f0659dd152cce64 Mon Sep 17 00:00:00 2001 From: David JULIEN Date: Sun, 8 Jan 2023 15:31:16 +0100 Subject: [PATCH 13/14] [system] feat: restartsig patch for dwm switch-color keybinding now restarts dwm --- .config/sxhkd/sxhkdrc | 2 +- .local/src/dwm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.config/sxhkd/sxhkdrc b/.config/sxhkd/sxhkdrc index a92f7b4..ac734a5 100644 --- a/.config/sxhkd/sxhkdrc +++ b/.config/sxhkd/sxhkdrc @@ -39,7 +39,7 @@ super + shift + o dmenuopen super + c - switch-colors + switch-colors && kill -1 $(pidof dwm) super + alt + c switch-colors -s diff --git a/.local/src/dwm b/.local/src/dwm index 16bc69c..4a476e8 160000 --- a/.local/src/dwm +++ b/.local/src/dwm @@ -1 +1 @@ -Subproject commit 16bc69ce1ca3b2a6a1eed77a2c3c5499188612da +Subproject commit 4a476e877c4ce2210cafedfe7146b21d87a6a169 From 1344ce8f2d23bbfa16e60366c83d1809d6df098a Mon Sep 17 00:00:00 2001 From: David JULIEN Date: Sun, 8 Jan 2023 17:46:53 +0100 Subject: [PATCH 14/14] [st] fix: color codes in config.def.h --- .local/src/st | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.local/src/st b/.local/src/st index 870124f..c0ce7e4 160000 --- a/.local/src/st +++ b/.local/src/st @@ -1 +1 @@ -Subproject commit 870124f0fe23699b6d7ab33b789952d3279cf061 +Subproject commit c0ce7e475b271aaf80059b2f2dd3163a8cf5f145