thegeneralist01/config
1
Fork 0
mirror of https://github.com/thegeneralist01/config.git synced 2026-03-07 10:59:55 +01:00
Code Issues Activity

nvim: small tweaks

Browse source
This commit is contained in:
TheGeneralist 2026-01-24 14:07:59 +01:00
parent 89041df602
commit 144a01df3e
Signed by: thegeneralist01
SSH key fingerprint: SHA256:pp9qddbCNmVNoSjevdvQvM5z0DHN7LTa8qBMbcMq/R4
4 changed files with 90 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/common/shell/default.nix
View file

@ -75,7 +75,7 @@ in
export PATH="/run/current-system/sw/bin:/nix/var/nix/profiles/default/bin:/etc/profiles/per-user/$USER/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin''${PATH:+:}''${PATH}" export PATH="/run/current-system/sw/bin:/nix/var/nix/profiles/default/bin:/etc/profiles/per-user/$USER/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin''${PATH:+:}''${PATH}"
source ${config'.home.sessionVariablesPackage}/etc/profile.d/hm-session-vars.sh source ${config'.home.sessionVariablesPackage}/etc/profile.d/hm-session-vars.sh
if [ -z "$INTELLIJ_ENVIRONMENT_READER" ]; then if [ -z "$INTELLIJ_ENVIRONMENT_READER" ] && [ -z "$skip" ]; then
SHELL='${lib.getExe <| lib.head config'.shellsByPriority}' exec "$SHELL" SHELL='${lib.getExe <| lib.head config'.shellsByPriority}' exec "$SHELL"
fi fi
''; '';

8
modules/dotfiles/nvim/lua/thegeneralist/lazy/snacks.lua
View file

@ -38,6 +38,12 @@ return {
enabled = true, enabled = true,
preset = { preset = {
keys = { keys = {
{
icon = "",
key = "t",
desc = "TODOs",
action = ":lua Snacks.picker.todo_comments()",
},
{ {
icon = "", icon = "",
key = "f", key = "f",
@ -81,7 +87,7 @@ return {
cmd = "greeting", cmd = "greeting",
hl = "header", hl = "header",
ttl = 60, ttl = 60,
height = 3, height = 5,
padding = 2, padding = 2,
align = "center", align = "center",
}, },

141
modules/dotfiles/nvim/lua/thegeneralist/lazy/whichkey.lua
View file

@ -1,72 +1,77 @@
return { return {
"folke/which-key.nvim", "folke/which-key.nvim",
event = "VeryLazy", event = "VeryLazy",
commit = "af4ded85542d40e190014c732fa051bdbf88be3d", commit = "af4ded85542d40e190014c732fa051bdbf88be3d",
init = function() init = function()
vim.o.timeout = true vim.o.timeout = true
vim.o.timeoutlen = 300 vim.o.timeoutlen = 300
end, end,
opts = { opts = {
t = { t = {
name = '+Trouble', name = "+Trouble",
w = { '<cmd>TroubleToggle workspace_diagnostics<cr>', 'Workspace Diagnostics' }, w = { "<cmd>TroubleToggle workspace_diagnostics<cr>", "Workspace Diagnostics" },
d = { '<cmd>TroubleToggle document_diagnostics<cr>', 'Document Diagnostics' }, d = { "<cmd>TroubleToggle document_diagnostics<cr>", "Document Diagnostics" },
q = { '<cmd>TroubleToggle quickfix<cr>', 'Quickfix' }, q = { "<cmd>TroubleToggle quickfix<cr>", "Quickfix" },
l = { '<cmd>TroubleToggle loclist<cr>', 'Location List' }, l = { "<cmd>TroubleToggle loclist<cr>", "Location List" },
}, },
g = { g = {
R = { '<cmd>TroubleToggle lsp_references<cr>', 'LSP References' }, R = { "<cmd>TroubleToggle lsp_references<cr>", "LSP References" },
h = { h = {
name = "+Git", name = "+Git",
h = { h = {
name = "+Github", name = "+Github",
c = { c = {
name = "+Commits", name = "+Commits",
c = { "<cmd>GHCloseCommit<cr>", "Close" }, c = { "<cmd>GHCloseCommit<cr>", "Close" },
e = { "<cmd>GHExpandCommit<cr>", "Expand" }, e = { "<cmd>GHExpandCommit<cr>", "Expand" },
o = { "<cmd>GHOpenToCommit<cr>", "Open To" }, o = { "<cmd>GHOpenToCommit<cr>", "Open To" },
p = { "<cmd>GHPopOutCommit<cr>", "Pop Out" }, p = { "<cmd>GHPopOutCommit<cr>", "Pop Out" },
z = { "<cmd>GHCollapseCommit<cr>", "Collapse" }, z = { "<cmd>GHCollapseCommit<cr>", "Collapse" },
}, },
i = { i = {
name = "+Issues", name = "+Issues",
p = { "<cmd>GHPreviewIssue<cr>", "Preview" }, p = { "<cmd>GHPreviewIssue<cr>", "Preview" },
}, },
l = { l = {
name = "+Litee", name = "+Litee",
t = { "<cmd>LTPanel<cr>", "Toggle Panel" }, t = { "<cmd>LTPanel<cr>", "Toggle Panel" },
}, },
r = { r = {
name = "+Review", name = "+Review",
b = { "<cmd>GHStartReview<cr>", "Begin" }, b = { "<cmd>GHStartReview<cr>", "Begin" },
c = { "<cmd>GHCloseReview<cr>", "Close" }, c = { "<cmd>GHCloseReview<cr>", "Close" },
d = { "<cmd>GHDeleteReview<cr>", "Delete" }, d = { "<cmd>GHDeleteReview<cr>", "Delete" },
e = { "<cmd>GHExpandReview<cr>", "Expand" }, e = { "<cmd>GHExpandReview<cr>", "Expand" },
s = { "<cmd>GHSubmitReview<cr>", "Submit" }, s = { "<cmd>GHSubmitReview<cr>", "Submit" },
z = { "<cmd>GHCollapseReview<cr>", "Collapse" }, z = { "<cmd>GHCollapseReview<cr>", "Collapse" },
}, },
p = { p = {
name = "+Pull Request", name = "+Pull Request",
c = { "<cmd>GHClosePR<cr>", "Close" }, c = { "<cmd>GHClosePR<cr>", "Close" },
d = { "<cmd>GHPRDetails<cr>", "Details" }, d = { "<cmd>GHPRDetails<cr>", "Details" },
e = { "<cmd>GHExpandPR<cr>", "Expand" }, e = { "<cmd>GHExpandPR<cr>", "Expand" },
o = { "<cmd>GHOpenPR<cr>", "Open" }, o = { "<cmd>GHOpenPR<cr>", "Open" },
p = { "<cmd>GHPopOutPR<cr>", "PopOut" }, p = { "<cmd>GHPopOutPR<cr>", "PopOut" },
r = { "<cmd>GHRefreshPR<cr>", "Refresh" }, r = { "<cmd>GHRefreshPR<cr>", "Refresh" },
t = { "<cmd>GHOpenToPR<cr>", "Open To" }, t = { "<cmd>GHOpenToPR<cr>", "Open To" },
z = { "<cmd>GHCollapsePR<cr>", "Collapse" }, z = { "<cmd>GHCollapsePR<cr>", "Collapse" },
}, },
t = { t = {
name = "+Threads", name = "+Threads",
c = { "<cmd>GHCreateThread<cr>", "Create" }, c = { "<cmd>GHCreateThread<cr>", "Create" },
n = { "<cmd>GHNextThread<cr>", "Next" }, n = { "<cmd>GHNextThread<cr>", "Next" },
t = { "<cmd>GHToggleThread<cr>", "Toggle" }, t = { "<cmd>GHToggleThread<cr>", "Toggle" },
}, },
}, },
}, },
}, },
--conf end f = {
} name = "File Operations",
r = { "<cmd>:lua vim.lsp.buf.format()<cr>", "Fo[R]mat" },
t = { "<cmd>:lua Snacks.picker.todo_comments()<cr>", "TODOs" },
},
--conf end
},
} }
--local wk = require("which-key") --local wk = require("which-key")
--wk.register({ --wk.register({

19
modules/dotfiles/nvim/lua/thegeneralist/remap.lua
View file

@ -16,10 +16,10 @@ vim.keymap.set("n", "n", "nzzzv")
vim.keymap.set("n", "N", "Nzzzv") vim.keymap.set("n", "N", "Nzzzv")
vim.keymap.set("n", "<leader>vwm", function() vim.keymap.set("n", "<leader>vwm", function()
require("vim-with-me").StartVimWithMe() require("vim-with-me").StartVimWithMe()
end) end)
vim.keymap.set("n", "<leader>svwm", function() vim.keymap.set("n", "<leader>svwm", function()
require("vim-with-me").StopVimWithMe() require("vim-with-me").StopVimWithMe()
end) end)
vim.keymap.set("n", "<leader>vs", "<C-w>v") vim.keymap.set("n", "<leader>vs", "<C-w>v")
@ -38,7 +38,6 @@ vim.keymap.set("i", "<C-c>", "<Esc>")
vim.keymap.set("n", "Q", "<nop>") vim.keymap.set("n", "Q", "<nop>")
vim.keymap.set("n", "<C-f>", "<cmd>silent !tmux neww tmux-sessionizer<CR>") vim.keymap.set("n", "<C-f>", "<cmd>silent !tmux neww tmux-sessionizer<CR>")
vim.keymap.set("n", "<leader>fr", vim.lsp.buf.format)
vim.keymap.set("n", "<leader>m<C-k>", "<cmd>cnext<CR>zz") vim.keymap.set("n", "<leader>m<C-k>", "<cmd>cnext<CR>zz")
vim.keymap.set("n", "<leader>m<C-j>", "<cmd>cprev<CR>zz") vim.keymap.set("n", "<leader>m<C-j>", "<cmd>cprev<CR>zz")
@ -54,19 +53,19 @@ vim.keymap.set("n", "<leader>vpp", "<cmd>e ~/.dotfiles/nvim/.config/nvim/lua/the
vim.keymap.set("n", "<leader>mr", "<cmd>CellularAutomaton make_it_rain<CR>") vim.keymap.set("n", "<leader>mr", "<cmd>CellularAutomaton make_it_rain<CR>")
vim.keymap.set("n", "<leader><leader>", function() vim.keymap.set("n", "<leader><leader>", function()
vim.cmd("so") vim.cmd("so")
end) end)
vim.keymap.set("n", "zh", "$viBhzf", { vim.keymap.set("n", "zh", "$viBhzf", {
desc = "Fold { block", desc = "Fold { block",
}) })
vim.keymap.set("n", "zj", "$vi[hzf", { vim.keymap.set("n", "zj", "$vi[hzf", {
desc = "Fold [ block", desc = "Fold [ block",
}) })
vim.keymap.set("n", "zk", "$vibhzf", { vim.keymap.set("n", "zk", "$vibhzf", {
desc = "Fold ( block", desc = "Fold ( block",
}) })
vim.keymap.set("n", "ga", "<cmd>EasyAlign<CR>") vim.keymap.set("n", "ga", "<cmd>EasyAlign<CR>")
@ -85,9 +84,9 @@ vim.keymap.set("v", "<S-Tab>", "<gv")
vim.keymap.set("n", "<C-w>e", "<C-w>j<C-w>q") vim.keymap.set("n", "<C-w>e", "<C-w>j<C-w>q")
vim.keymap.set("n", "<leader>w", function() vim.keymap.set("n", "<leader>w", function()
vim.ui.input({ prompt = "Enter value for shiftwidth: " }, function(input) vim.ui.input({ prompt = "Enter value for shiftwidth: " }, function(input)
vim.o.shiftwidth = tonumber(input) vim.o.shiftwidth = tonumber(input)
end) end)
end) end)
-- vim.keymap.set("n", "<leader>tc", function() -- vim.keymap.set("n", "<leader>tc", function()
-- -- local file_number = tonumber(vim.fn.input("File number > "), 10) -- -- local file_number = tonumber(vim.fn.input("File number > "), 10)