Merge branch 'dev' into venus

nvim: smart pasting in visual mode
        add description to <C-E>
        comments and formatting
        keymaps for visual-mode only
        send selection to void register
        fix lsp formatting
dwm: window selborder gets its own variable
        increase bordersize
        update to 6.4
st: update to 0.9
dmenu: update to 5.2
system: restartsig patch for dwm
This commit is contained in:
David JULIEN 2023-01-08 17:48:44 +01:00
commit 61551cf45b
Signed by: swytch
GPG Key ID: 498590A3AA82A06F
10 changed files with 47 additions and 28 deletions

View File

@ -30,6 +30,7 @@
*.foreground: #fbf1c7
*.normforeground: #a89984
*.selforeground: #ebdbb2
*.selborder: #427d61
*.cursorColor: #ebdbb2
/* dmenu colors */

View File

@ -30,6 +30,7 @@
*.foreground: #665c64
*.normforeground: #665c64
*.selforeground: #1d2021
*.selborder: #d65d0e
*.cursorColor: #1d2021
/* dmenu colors */

View File

@ -4,7 +4,7 @@
*.japan: IPAexGothic:size=12
/* dwm config */
dwm.borderpx: 2
dwm.borderpx: 3
dwm.gappx: 15
/* st config */

View File

@ -11,7 +11,7 @@ vim.keymap.set({ "n", "v" }, "<space>",
})
vim.g.mapleader = " "
-- Dealing with word wrap
-- dealing with word wrap
vim.keymap.set("n", "k",
"v:count == 0 ? 'gk' : 'k'",
{
@ -27,21 +27,36 @@ vim.keymap.set("n", "j",
desc = "Smart down motion"
})
vim.keymap.set("n", "<leader>y",
-- yank and pasting
vim.keymap.set({ "n", "x" }, "<leader>y",
"\"+y",
{ desc = "Yank to clipboard"}
)
vim.keymap.set("n", "<leader>p",
"\"+P",
{ desc = "Copy from clipboard"}
{ desc = "Paste from clipboard" }
)
vim.keymap.set("x", "<leader>p",
"\"_dP",
{ desc = "Send selection to void register and paste from clipboard" }
)
-- deletion
vim.keymap.set({ "n", "x" }, "<leader>d",
"\"_d",
{ desc = "Send selection to void register" }
)
-- comfort zone
vim.keymap.set("n", "<leader><enter>",
"<cmd>w! | !compiler %<CR>",
{ desc = "Compile current file using ~/.local/bin/compiler"}
{ desc = "Compile current file using ~/.local/bin/compiler" }
)
-- packer
vim.keymap.set("n", "<leader>u",
function() require("packer").sync() end,
{ desc = "Sync packer config and update plugins"}
{ desc = "Sync packer config and update plugins" }
)
-- telescope
@ -77,4 +92,6 @@ vim.keymap.set("n", "<leader>s",
)
-- snippets
vim.keymap.set({ "i", "s" }, "<C-E>", "<Plug>luasnip-next-choice")
vim.keymap.set({ "i", "s" }, "<C-E>", "<Plug>luasnip-next-choice",
{ desc = "Cycle through luasnip choices" }
)

View File

@ -38,7 +38,7 @@ local on_attach = function(_, bufnr)
vim.keymap.set("n", "gi", vim.lsp.buf.implementation, opts)
vim.keymap.set("n", "<leader>ln", vim.diagnostic.goto_next, opts)
vim.keymap.set("n", "<leader>lp", vim.diagnostic.goto_prev, opts)
vim.keymap.set("n", "<leader>lf", vim.lsp.buf.formatting, opts)
vim.keymap.set("n", "<leader>lf", vim.lsp.buf.format, opts)
vim.keymap.set("n", "<C-k>", vim.lsp.buf.signature_help, opts)
vim.keymap.set("n", "<leader>wa",
vim.lsp.buf.add_workspace_folder, opts)

View File

@ -39,7 +39,7 @@ super + shift + o
dmenuopen
super + c
switch-colors
switch-colors && kill -1 $(pidof dwm)
super + alt + c
switch-colors -s

32
.gitmodules vendored
View File

@ -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

@ -1 +1 @@
Subproject commit 0f4c5faed3e396832bd11586371698d06bf21b71
Subproject commit d5b5994a280d07312e21f07d307c15e50bded81f

@ -1 +1 @@
Subproject commit 4af8e137098783c0c17305bae7b9b440bd6571b7
Subproject commit 4a476e877c4ce2210cafedfe7146b21d87a6a169

@ -1 +1 @@
Subproject commit 465b6c89b7ea9cd53fe3417d62f50dd1922df5dc
Subproject commit c0ce7e475b271aaf80059b2f2dd3163a8cf5f145