diff --git a/.config/nvim/lua/config/autocmds.lua b/.config/nvim/lua/config/autocmds.lua index 31ce9dee..53c8e1d8 100644 --- a/.config/nvim/lua/config/autocmds.lua +++ b/.config/nvim/lua/config/autocmds.lua @@ -14,14 +14,14 @@ vim.api.nvim_create_autocmd("FileType", { cl.Group.new("@constant.builtin", cl.colors.complement) end, }) -vim.api.nvim_create_autocmd("FileType", { - pattern = "tex", - callback = function() - vim.cmd([[ - syntax match texMathSymbol "\\oplus" conceal cchar=⊕ - ]]) - end, -}) +-- vim.api.nvim_create_autocmd("FileType", { +-- pattern = "tex", +-- callback = function() +-- vim.cmd([[ +-- syntax match texMathSymbol "\\oplus" conceal cchar=⊕ +-- ]]) +-- end, +-- }) -- This autocommand fixes syntax highlighting for inline math in markdown files -- Together with vimtex, it will apply very sexy good stuff here! vim.api.nvim_create_autocmd("FileType", { @@ -31,26 +31,22 @@ vim.api.nvim_create_autocmd("FileType", { syn region mathBlock start=/\$\$/ end=/\$\$/ contains=@tex " inline math syn match mathInline '\$[^$].\{-}\$' contains=@tex - " syn include @tex syntax/tex.vim " actually highlight the region we defined as "math" syn include @tex syntax/tex.vim hi def link mathBlock Statement hi def link mathInline Statement ]]) - vim.g.vimtex_syntax_custom_cmds = vim.tbl_extend("force", vim.g.vimtex_syntax_custom_cmds or {}, { - -- { name = "oplus", mathmode = 1, concealchar = "⊕" }, - { name = "oplus", mathmode = 1, concealchar = "⊕" }, - }) - -- vim.g.vimtex_syntax_conceal = { - -- math = 1, - -- oplus = "⊕", - -- } end, }) vim.api.nvim_create_autocmd({ "FileType" }, { pattern = { "markdown" }, callback = function() vim.opt_local.breakindent = true + -- We want markdown files to autosave + vim.api.nvim_create_autocmd({ "InsertLeave", "TextChanged" }, { + buffer = 0, + command = "silent! write", + }) vim.opt_local.wrap = true vim.opt_local.spell = true -- local secondary = "#379393" diff --git a/.config/nvim/lua/config/keymaps.lua b/.config/nvim/lua/config/keymaps.lua index 3711a0d1..7bde445e 100644 --- a/.config/nvim/lua/config/keymaps.lua +++ b/.config/nvim/lua/config/keymaps.lua @@ -60,6 +60,9 @@ map({ "n" }, "", "zz", { remap = false }) map({ "n", "x" }, "", "$", { remap = false }) map({ "n", "x" }, "", "0", { remap = false }) +-- easily access null register +map({ "n", "x" }, "n", '"_', { remap = false, silent = true, desc = "Null Register" }) + -- remove the default lazyvim, and also swap H and L (for move cursor) to make more sense on colemak vim.keymap.del({ "n" }, "") vim.keymap.del({ "n" }, "") diff --git a/.config/nvim/lua/plugins/extend-mini-files.lua b/.config/nvim/lua/plugins/extend-mini-files.lua index 42c2a958..9bf6af89 100644 --- a/.config/nvim/lua/plugins/extend-mini-files.lua +++ b/.config/nvim/lua/plugins/extend-mini-files.lua @@ -1,5 +1,6 @@ return { "echasnovski/mini.files", + lazy = false, keys = { { "e", @@ -9,14 +10,14 @@ return { desc = "Open mini.files (current file directory)", }, { - "E", + "fm", function() require("mini.files").open(vim.uv.cwd(), true) end, desc = "Open mini.files (cwd)", }, { - "fm", + "E", function() require("mini.files").open(LazyVim.root(), true) end, @@ -24,10 +25,21 @@ return { }, }, opts = { + content = { + -- hide hidden files by default + filter = function(fs_entry) + return not vim.startswith(fs_entry.name, ".") + end, + }, mappings = { go_in_plus = "", + synchronize = ":w", -- go_out = "", -- reset = "-", }, + options = { + permanent_delete = false, + use_as_default_explorer = true, + }, }, } diff --git a/.config/nvim/lua/plugins/no-neck-pain.lua b/.config/nvim/lua/plugins/no-neck-pain.lua index 255d3aad..d07a37c0 100644 --- a/.config/nvim/lua/plugins/no-neck-pain.lua +++ b/.config/nvim/lua/plugins/no-neck-pain.lua @@ -1,17 +1,37 @@ +local function mapPrefix(prefix, enabled) + -- create the WK group for the prefix + require("which-key").add({ + { prefix, group = "+NoNeckPain" }, + }) + -- define the suffix mappings + local mappings = { + toggle = "p", + toggleLeftSide = "ql", + toggleRightSide = "qr", + widthUp = "=", + widthDown = "-", + scratchPad = "s", + } + -- concat prefix and suffix + for action, suffix in pairs(mappings) do + mappings[action] = prefix .. suffix + end + -- include the enabled flag + mappings.enabled = enabled + return mappings +end -- Ok, this plugin is really awesome! -- And everyone should know about it -- game changer!!! return { "shortcuts/no-neck-pain.nvim", version = "*", opts = function() - require("which-key").add({ - { "n", group = "+NoNeckPain" }, - }) return { width = 120, - mappings = { - enabled = true, - }, + mappings = mapPrefix("N", true), + -- mappings = { + -- enabled = true, + -- }, autocmds = { enableOnVimEnter = true, skipEnteringNoNeckPainBuffer = true, diff --git a/.config/nvim/lua/plugins/oil.lua b/.config/nvim/lua/plugins/oil.lua index 494cfe1e..56cb6205 100644 --- a/.config/nvim/lua/plugins/oil.lua +++ b/.config/nvim/lua/plugins/oil.lua @@ -3,7 +3,7 @@ return { ---@module 'oil' ---@type oil.SetupOpts opts = { - default_file_explorer = true, + default_file_explorer = false, delete_to_trash = true, columns = { "icon", diff --git a/.config/tmux/plugins/minimal-tmux-status b/.config/tmux/plugins/minimal-tmux-status deleted file mode 160000 index 40108961..00000000 --- a/.config/tmux/plugins/minimal-tmux-status +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 40108961c064241455c180b2533f64f3b196eeca diff --git a/.config/tmux/plugins/tmux-sensible b/.config/tmux/plugins/tmux-sensible deleted file mode 160000 index 25cb91f4..00000000 --- a/.config/tmux/plugins/tmux-sensible +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 25cb91f42d020f675bb0a2ce3fbd3a5d96119efa diff --git a/.config/tmux/plugins/tmux-yank b/.config/tmux/plugins/tmux-yank deleted file mode 160000 index acfd36e4..00000000 --- a/.config/tmux/plugins/tmux-yank +++ /dev/null @@ -1 +0,0 @@ -Subproject commit acfd36e4fcba99f8310a7dfb432111c242fe7392 diff --git a/.config/tmux/plugins/tpm b/.config/tmux/plugins/tpm deleted file mode 160000 index 99469c4a..00000000 --- a/.config/tmux/plugins/tpm +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 99469c4a9b1ccf77fade25842dc7bafbc8ce9946 diff --git a/.config/tmux/plugins/vim-tmux-navigator b/.config/tmux/plugins/vim-tmux-navigator deleted file mode 160000 index a9b52e7d..00000000 --- a/.config/tmux/plugins/vim-tmux-navigator +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a9b52e7d36114d40350099f254b5f299a35df978 diff --git a/.config/yadm/autoshdpad.log b/.config/yadm/autoshdpad.log deleted file mode 100644 index 145d0e2b..00000000 --- a/.config/yadm/autoshdpad.log +++ /dev/null @@ -1,183 +0,0 @@ -[main 8765c96] Auto commit: 2024-11-08 14:05:02 - 2 files changed, 1 insertion(+), 1 deletion(-) - create mode 100644 .config/yadm/autoshdpad.log -[main 436d911] Auto commit: 2024-11-08 14:10:01 - 1 file changed, 3 insertions(+) -[main ed4869f] Auto commit: 2024-11-08 14:15:02 - 1 file changed, 2 insertions(+) -[main 50bec13] Auto commit: 2024-11-08 14:20:02 - 1 file changed, 2 insertions(+) -[main d9f0f46] Auto commit: 2024-11-08 14:25:02 - 1 file changed, 2 insertions(+) -[main f984a12] Auto commit: 2024-11-08 14:30:02 - 1 file changed, 2 insertions(+) -[main c92f706] Auto commit: 2024-11-08 14:35:02 - 1 file changed, 2 insertions(+) -[main 8f279ea] Auto commit: 2024-11-08 14:40:02 - 1 file changed, 2 insertions(+) -[main 9fe8ab9] Auto commit: 2024-11-08 14:45:02 - 1 file changed, 2 insertions(+) -[main a06b43e] Auto commit: 2024-11-08 14:50:02 - 1 file changed, 2 insertions(+) -[main 9c101dc] Auto commit: 2024-11-08 14:55:02 - 1 file changed, 2 insertions(+) -[main 853f0ca] Auto commit: 2024-11-08 15:00:02 - 1 file changed, 2 insertions(+) -[main 0b11da2] Auto commit: 2024-11-08 15:05:02 - 1 file changed, 2 insertions(+) -[main cebcdc9] Auto commit: 2024-11-08 15:10:02 - 1 file changed, 2 insertions(+) -[main 56c5aa8] Auto commit: 2024-11-08 15:15:02 - 1 file changed, 2 insertions(+) -[main 765eb79] Auto commit: 2024-11-08 15:20:02 - 1 file changed, 2 insertions(+) -[main 5a2a7fd] Auto commit: 2024-11-08 15:25:02 - 1 file changed, 2 insertions(+) -[main 9765088] Auto commit: 2024-11-08 15:30:02 - 1 file changed, 2 insertions(+) -[main 14b4c72] Auto commit: 2024-11-08 15:45:04 - 1 file changed, 2 insertions(+) -[main 2428f22] Auto commit: 2024-11-08 15:50:03 - 1 file changed, 2 insertions(+) -[main c9063ed] Auto commit: 2024-11-08 15:55:03 - 1 file changed, 2 insertions(+) -[main 3bf3439] Auto commit: 2024-11-08 16:00:03 - 1 file changed, 2 insertions(+) -[main 61a3689] Auto commit: 2024-11-08 16:05:02 - 1 file changed, 2 insertions(+) -[main 7c1723e] Auto commit: 2024-11-08 16:10:03 - 1 file changed, 2 insertions(+) -[main d956930] Auto commit: 2024-11-08 16:15:03 - 1 file changed, 2 insertions(+) -[main 13fc5c6] Auto commit: 2024-11-08 16:20:03 - 1 file changed, 2 insertions(+) -[main 22a273f] Auto commit: 2024-11-08 16:25:03 - 1 file changed, 2 insertions(+) -[main be78ca3] Auto commit: 2024-11-08 16:30:03 - 1 file changed, 2 insertions(+) -[main 19f6e85] Auto commit: 2024-11-08 16:35:03 - 1 file changed, 2 insertions(+) -[main dc933eb] Auto commit: 2024-11-08 16:40:03 - 1 file changed, 2 insertions(+) -[main d79db01] Auto commit: 2024-11-08 16:45:03 - 1 file changed, 2 insertions(+) -[main 7ef30dc] Auto commit: 2024-11-08 16:50:02 - 1 file changed, 2 insertions(+) -[main 2a17ffb] Auto commit: 2024-11-08 16:55:03 - 1 file changed, 2 insertions(+) -[main b4fa06b] Auto commit: 2024-11-08 17:00:03 - 1 file changed, 2 insertions(+) -[main d4ba063] Auto commit: 2024-11-08 17:05:03 - 1 file changed, 2 insertions(+) -[main 02cddac] Auto commit: 2024-11-08 17:10:03 - 1 file changed, 2 insertions(+) -[main 29aabaa] Auto commit: 2024-11-08 17:30:03 - 1 file changed, 2 insertions(+) -[main eeb8a0c] Auto commit: 2024-11-08 17:35:03 - 2 files changed, 3 insertions(+), 1 deletion(-) -[main f7c230a] Auto commit: 2024-11-08 17:40:03 - 1 file changed, 2 insertions(+) -[main 9b9efe0] Auto commit: 2024-11-08 17:45:03 - 1 file changed, 2 insertions(+) -[main 57b1e7c] Auto commit: 2024-11-08 17:50:03 - 1 file changed, 2 insertions(+) -[main f299169] Auto commit: 2024-11-08 17:55:03 - 1 file changed, 2 insertions(+) -[main 29487b4] Auto commit: 2024-11-08 18:00:03 - 1 file changed, 2 insertions(+) -[main deae75f] Auto commit: 2024-11-08 18:05:02 - 1 file changed, 2 insertions(+) -[main f90dc52] Auto commit: 2024-11-08 18:25:02 - 1 file changed, 2 insertions(+) -[main 39f6a5f] Auto commit: 2024-11-08 18:30:02 - 1 file changed, 2 insertions(+) -[main d27ba9c] Auto commit: 2024-11-08 18:35:02 - 1 file changed, 2 insertions(+) -[main f0429c2] Auto commit: 2024-11-08 18:40:02 - 1 file changed, 2 insertions(+) -[main 5a683de] Auto commit: 2024-11-08 18:45:02 - 1 file changed, 2 insertions(+) -[main 87929a5] Auto commit: 2024-11-08 18:50:02 - 3 files changed, 7 insertions(+), 1 deletion(-) - create mode 100644 .config/nvim/lua/plugins/no-neck-pain.lua -[main 19bdcd3] Auto commit: 2024-11-08 18:55:02 - 1 file changed, 3 insertions(+) -[main cc0e5ef] Auto commit: 2024-11-08 19:00:02 - 2 files changed, 19 insertions(+), 2 deletions(-) -[main 287902b] Auto commit: 2024-11-08 19:05:02 - 3 files changed, 19 insertions(+), 16 deletions(-) -[main ce16f38] Auto commit: 2024-11-08 19:10:02 - 2 files changed, 3 insertions(+) -[main 6406661] Auto commit: 2024-11-08 19:15:02 - 1 file changed, 2 insertions(+) -[main c2608b2] Auto commit: 2024-11-08 19:20:02 - 1 file changed, 2 insertions(+) -[main fe10c4a] Auto commit: 2024-11-08 19:25:02 - 4 files changed, 8 insertions(+) -[main cdee114] Auto commit: 2024-11-08 19:30:02 - 3 files changed, 13 insertions(+), 5 deletions(-) -[main e840172] Auto commit: 2024-11-08 19:35:02 - 2 files changed, 2 insertions(+), 1 deletion(-) -[main a2d9e72] Auto commit: 2024-11-08 19:40:02 - 2 files changed, 6 insertions(+) -[main a21f977] Auto commit: 2024-11-08 19:45:02 - 2 files changed, 8 insertions(+) -[main 6986b50] Auto commit: 2024-11-08 19:50:02 - 2 files changed, 13 insertions(+), 3 deletions(-) -[main b751252] Auto commit: 2024-11-08 19:55:02 - 2 files changed, 5 insertions(+) -[main a4594e3] Auto commit: 2024-11-08 20:00:02 - 1 file changed, 2 insertions(+) -[main 525744b] Auto commit: 2024-11-08 20:05:02 - 3 files changed, 5 insertions(+) -[main 4f40347] Auto commit: 2024-11-08 20:10:02 - 3 files changed, 3 insertions(+) -[main 4d800a7] Auto commit: 2024-11-08 20:15:02 - 1 file changed, 2 insertions(+) -[main 1f29792] Auto commit: 2024-11-08 20:20:01 - 1 file changed, 2 insertions(+) -[main a86a696] Auto commit: 2024-11-08 20:25:02 - 1 file changed, 2 insertions(+) -[main 41f27cb] Auto commit: 2024-11-08 20:30:02 - 2 files changed, 7 insertions(+) -hi -[main 4f7c77e] Auto commit: 2024-11-08 20:35:02 - 2 files changed, 7 insertions(+), 2 deletions(-) -ERROR: ssh-agent environment not found, aborting push... -[main 2c8bef4] Auto commit: 2024-11-08 20:40:03 - 3 files changed, 5 insertions(+), 2 deletions(-) -[main 712f0b1] Auto commit: 2024-11-08 20:45:02 - 1 file changed, 2 insertions(+) -[main 1b65254] Auto commit: 2024-11-08 20:50:02 - 1 file changed, 2 insertions(+) -[main c51b6cc] Auto commit: 2024-11-08 20:55:02 - 2 files changed, 3 insertions(+) - create mode 100644 .config/yadm/.gitignore -[main 9dfadaf] Auto commit: 2024-11-08 21:00:02 - 2 files changed, 11 insertions(+) -[main d4bfec3] Auto commit: 2024-11-08 21:05:02 - 2 files changed, 4 insertions(+) -[main b18db45] Auto commit: 2024-11-08 21:10:02 - 3 files changed, 3 insertions(+) -[main 521fcb3] Auto commit: 2024-11-08 21:15:02 - 3 files changed, 3 insertions(+) -[main c9838c5] Auto commit: 2024-11-08 21:20:02 - 2 files changed, 3 insertions(+) -[main ec908f5] Auto commit: 2024-11-08 21:25:02 - 1 file changed, 2 insertions(+) -[main 5f2c50f] Auto commit: 2024-11-08 21:30:02 - 1 file changed, 2 insertions(+) -[main 8a29964] Auto commit: 2024-11-08 21:35:02 - 1 file changed, 2 insertions(+) -[main 77cae5e] Auto commit: 2024-11-08 21:40:02 - 1 file changed, 2 insertions(+) -[main 4ead2ba] Auto commit: 2024-11-08 21:45:02 - 1 file changed, 2 insertions(+) -[main 1410343] Auto commit: 2024-11-08 21:50:02 - 1 file changed, 2 insertions(+) -[main dc5d5ab] Auto commit: 2024-11-08 21:55:02 - 1 file changed, 2 insertions(+) -[main 3f088dd] Auto commit: 2024-11-08 22:00:02 - 1 file changed, 2 insertions(+) -[main 03e28b5] Auto commit: 2024-11-08 22:05:02 - 1 file changed, 2 insertions(+) diff --git a/.zshrc b/.zshrc index fd40e54e..d4934e78 100644 --- a/.zshrc +++ b/.zshrc @@ -11,7 +11,7 @@ bindkey "^e" edit-command-line # Set up fzf key bindings and fuzzy completion # eval "$(fzf --zsh)" -alias ls="eza -lh" +alias ls="eza -lh --git" alias top=btop alias v=nvim alias testvim='NVIM_APPNAME=nvim-test nvim' @@ -27,6 +27,9 @@ alias tl="tmux list-sessions" alias tn="tmux new-session" alias tnt="tmux new-session -t" +alias svenv="source .venv/bin/activate" +alias szsh="source ~/.zshrc" + bindkey -r '^T' # Created by `pipx` on 2024-09-20 02:14:00