From 7aef350e9ea4609272d61a2cd1f9eeedb2c34f20 Mon Sep 17 00:00:00 2001 From: Daniel Fichtinger Date: Thu, 7 Nov 2024 18:54:54 -0500 Subject: [PATCH] Auto commit: 2024-11-07 18:54:54 --- .config/lazygit/state.yml | 2 +- .config/nvim/lua/config/autocmds.lua | 142 +++++++++++++------------- .config/nvim/lua/config/keymaps.lua | 2 + .config/nvim/lua/plugins/markdown.lua | 28 +++++ .config/nvim/spell/en.utf-8.add | 3 + .config/nvim/spell/en.utf-8.add.spl | Bin 833 -> 874 bytes 6 files changed, 106 insertions(+), 71 deletions(-) create mode 100644 .config/nvim/lua/plugins/markdown.lua diff --git a/.config/lazygit/state.yml b/.config/lazygit/state.yml index 251480bc..5dbae760 100644 --- a/.config/lazygit/state.yml +++ b/.config/lazygit/state.yml @@ -1,6 +1,6 @@ lastupdatecheck: 0 recentrepos: - - /home/fic + - /home/fic/cisc/indiv-project - /home/fic/scripts startuppopupversion: 5 lastversion: 0.44.1 diff --git a/.config/nvim/lua/config/autocmds.lua b/.config/nvim/lua/config/autocmds.lua index e646754e..3bd614d2 100644 --- a/.config/nvim/lua/config/autocmds.lua +++ b/.config/nvim/lua/config/autocmds.lua @@ -21,75 +21,77 @@ vim.api.nvim_create_autocmd({ "FileType" }, { vim.api.nvim_set_hl(0, "ObsidianTodo", { fg = colors.complement:to_vim(), bold = true, underline = false }) vim.api.nvim_set_hl(0, "obsidiantag", { fg = colors.complement:to_vim(), bold = false, italic = true }) vim.api.nvim_set_hl(0, "ObsidianTag", { fg = colors.complement:to_vim(), bold = false, italic = true }) - vim.api.nvim_buf_set_keymap(0, "n", "mc", "gzaiW`", { desc = "Markdown: add Code Surround", silent = true }) - vim.api.nvim_buf_set_keymap( - 0, - "n", - "mr", - "gzd`", - { desc = "Markdown: delete Code Surround", silent = true } - ) - vim.api.nvim_buf_set_keymap( - 0, - "i", - "", - "__", - { desc = "Markdown: Italics", noremap = true, silent = true } - ) - vim.api.nvim_buf_set_keymap(0, "i", "", "- [ ] ", { desc = "Markdown: Task", noremap = true, silent = true }) - vim.api.nvim_buf_set_keymap( - 0, - "i", - "", - "I# ", - { desc = "Markdown: Heading", noremap = true, silent = true } - ) - vim.api.nvim_buf_set_keymap( - 0, - "i", - "", - "I## ", - { desc = "Markdown: Heading", noremap = true, silent = true } - ) - vim.api.nvim_buf_set_keymap( - 0, - "i", - "", - "I### ", - { desc = "Markdown: Heading", noremap = true, silent = true } - ) - vim.api.nvim_buf_set_keymap( - 0, - "i", - "", - "I#### ", - { desc = "Markdown: Heading", noremap = true, silent = true } - ) - vim.api.nvim_buf_set_keymap( - 0, - "i", - "", - "I##### ", - { desc = "Markdown: Heading", noremap = true, silent = true } - ) - vim.api.nvim_buf_set_keymap( - 0, - "i", - "", - "****", - { desc = "Markdown: Bold", noremap = true, silent = true } - ) - vim.api.nvim_buf_set_keymap( - 0, - "i", - "", - "I- ", - { desc = "Markdown: Bullet Point", noremap = true, silent = true } - ) - local wk = require("which-key") - wk.add({ - { "", mode = "i", desc = "Markdown Italics" }, - { "", mode = "i", desc = "Markdown Bold" }, - }) + -- vim.api.nvim_buf_set_keymap(0, "n", "mc", "gzaiW`", { desc = "Markdown: add Code Surround", silent = true }) + -- vim.api.nvim_buf_set_keymap(0, "n", "", "normal! zz", { remap = false }) + -- vim.api.nvim_buf_set_keymap(0, "n", "", "normal! zz", { remap = false }) + -- vim.api.nvim_buf_set_keymap( + -- 0, + -- "n", + -- "mr", + -- "gzd`", + -- { desc = "Markdown: delete Code Surround", silent = true } + -- ) + -- vim.api.nvim_buf_set_keymap( + -- 0, + -- "i", + -- "", + -- "__", + -- { desc = "Markdown: Italics", noremap = true, silent = true } + -- ) + -- vim.api.nvim_buf_set_keymap(0, "i", "", "- [ ] ", { desc = "Markdown: Task", noremap = true, silent = true }) + -- vim.api.nvim_buf_set_keymap( + -- 0, + -- "i", + -- "", + -- "I# ", + -- { desc = "Markdown: Heading", noremap = true, silent = true } + -- ) + -- vim.api.nvim_buf_set_keymap( + -- 0, + -- "i", + -- "", + -- "I## ", + -- { desc = "Markdown: Heading", noremap = true, silent = true } + -- ) + -- vim.api.nvim_buf_set_keymap( + -- 0, + -- "i", + -- "", + -- "I### ", + -- { desc = "Markdown: Heading", noremap = true, silent = true } + -- ) + -- vim.api.nvim_buf_set_keymap( + -- 0, + -- "i", + -- "", + -- "I#### ", + -- { desc = "Markdown: Heading", noremap = true, silent = true } + -- ) + -- vim.api.nvim_buf_set_keymap( + -- 0, + -- "i", + -- "", + -- "I##### ", + -- { desc = "Markdown: Heading", noremap = true, silent = true } + -- ) + -- vim.api.nvim_buf_set_keymap( + -- 0, + -- "i", + -- "", + -- "****", + -- { desc = "Markdown: Bold", noremap = true, silent = true } + -- ) + -- vim.api.nvim_buf_set_keymap( + -- 0, + -- "i", + -- "", + -- "I- ", + -- { desc = "Markdown: Bullet Point", noremap = true, silent = true } + -- ) + -- local wk = require("which-key") + -- wk.add({ + -- { "", mode = "i", desc = "Markdown Italics" }, + -- { "", mode = "i", desc = "Markdown Bold" }, + -- }) end, }) diff --git a/.config/nvim/lua/config/keymaps.lua b/.config/nvim/lua/config/keymaps.lua index dc1dcbde..3711a0d1 100644 --- a/.config/nvim/lua/config/keymaps.lua +++ b/.config/nvim/lua/config/keymaps.lua @@ -57,6 +57,8 @@ map({ "n" }, "n", "nzz", { remap = false }) map({ "n" }, "N", "Nzz", { remap = false }) map({ "n" }, "", "zz", { remap = false }) map({ "n" }, "", "zz", { remap = false }) +map({ "n", "x" }, "", "$", { remap = false }) +map({ "n", "x" }, "", "0", { remap = false }) -- remove the default lazyvim, and also swap H and L (for move cursor) to make more sense on colemak vim.keymap.del({ "n" }, "") diff --git a/.config/nvim/lua/plugins/markdown.lua b/.config/nvim/lua/plugins/markdown.lua new file mode 100644 index 00000000..07bf33a4 --- /dev/null +++ b/.config/nvim/lua/plugins/markdown.lua @@ -0,0 +1,28 @@ +local function retmap() + local m = { + inline_surround_toggle = "mm", -- (string|boolean) toggle inline style + inline_surround_toggle_line = "mmm", -- (string|boolean) line-wise toggle inline style + inline_surround_delete = "md", -- (string|boolean) delete emphasis surrounding cursor + inline_surround_change = "mc", -- (string|boolean) change emphasis surrounding cursor + link_add = "ml", -- (string|boolean) add link + link_follow = "mx", -- (string|boolean) follow link + go_curr_heading = "mp", + go_parent_heading = "mP", + go_next_heading = "", + go_prev_heading = "", + } + require("which-key").add({ + { "m", group = "Markdown" }, + }) + return m +end +local opts = { + mappings = retmap(), +} +local spec = { + "tadmccorkle/markdown.nvim", + ft = "markdown", + opts = opts, +} + +return spec diff --git a/.config/nvim/spell/en.utf-8.add b/.config/nvim/spell/en.utf-8.add index 588f4fcd..ad3ca723 100644 --- a/.config/nvim/spell/en.utf-8.add +++ b/.config/nvim/spell/en.utf-8.add @@ -53,3 +53,6 @@ Yadm yadm CryptoHack pwntools +networkx +NetworkX +ie diff --git a/.config/nvim/spell/en.utf-8.add.spl b/.config/nvim/spell/en.utf-8.add.spl index c09f2eba2187046bcb00158ea9f3a92a1538694e..61e87a1658d47ca0bf154d22e5daf812c0225fe3 100644 GIT binary patch delta 256 zcmYj~F-`(e6h+^8;Ly>TOhf22mO^1I0}2I3AsSj7J_%vMADA&pgDsORebKkqUU%^jMe;Ew3)FeskSA^5Pehd_mzS*BT6z+zr^J=WdlJkyb!;%jb z{d6;;Mv+vEU6YcqAZE%di_#-pxNjyDuA%o7&S>u}uXUmachKf8%-E8WW9c&`29a=y z`8VQ|2`PpZW1bn8Nzb!6;;HKI*B&j8wnwIs<(3h5<<})|teENGv8;C4V6ooU!nt_; E0gDYYuK)l5 delta 192 zcmW-YyAHun0EW+ZG#zcyLBc3T?P}4g%OG(Hu}alKoJMQFQ^^SBs8o|nOLT88Mp?XK`H}9hbg^c)!@jUwH%I% NYnKBGRrrlC`U4T9C-wjU