Skip to content

Commit

Permalink
2024-05-03 12:50:47
Browse files Browse the repository at this point in the history
  • Loading branch information
Thomashighbaugh committed May 3, 2024
1 parent 9aeb61f commit 4c66f9c
Show file tree
Hide file tree
Showing 8 changed files with 161 additions and 95 deletions.
Binary file added .DS_Store
Binary file not shown.
18 changes: 9 additions & 9 deletions lazy-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"ChatGPT.nvim": { "branch": "main", "commit": "df53728e05129278d6ea26271ec086aa013bed90" },
"Comment.nvim": { "branch": "master", "commit": "e51f2b142d88bb666dcaa77d93a07f4b419aca70" },
"LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" },
"SchemaStore.nvim": { "branch": "main", "commit": "f7cae6f1b38cb296f48ce1a9c5ed1a419d912a42" },
"SchemaStore.nvim": { "branch": "main", "commit": "a0dc19e5f9aaebdf2866fcbbf70809da53a4c62b" },
"animation.nvim": { "branch": "main", "commit": "fb77091ab72ec9971aee0562e7081182527aaa6a" },
"barbecue.nvim": { "branch": "main", "commit": "cd7e7da622d68136e13721865b4d919efd6325ed" },
"bufferline.nvim": { "branch": "main", "commit": "f4b4b980ce88d546aeb69d11463187c8f716a1a1" },
Expand All @@ -12,7 +12,7 @@
"cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
"codeium.nvim": { "branch": "main", "commit": "dfcac077fa023b7194c6403ac9a8f931b9c24f28" },
"codeium.nvim": { "branch": "main", "commit": "ace6ee3efea3cda09aa5d9bddc41b7438c826a70" },
"comment-box.nvim": { "branch": "main", "commit": "e04635ed2b423448b87ddb2f35c26d1a7b7b3f1c" },
"conform.nvim": { "branch": "master", "commit": "9d5ba06d6ee7418c674f498634617416d15b6239" },
"copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" },
Expand All @@ -31,7 +31,7 @@
"llm.nvim": { "branch": "main", "commit": "51b76dac9c33c0122adfe28daf52ceaa31c4aa02" },
"lsp_signature.nvim": { "branch": "master", "commit": "e92b4e7073345b2a30a56b20db3d541a9aa2771e" },
"lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "2ba17cecfde8b8c7c7c287909a1e4de895223df6" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "1a14770dc8c7cb29643870ac79788eec6f7ce1f8" },
"mason-null-ls.nvim": { "branch": "main", "commit": "2b8433f76598397fcc97318d410e0c4f7a4bea6a" },
"mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" },
"middleclass": { "branch": "master", "commit": "9fab4d5bca67262614960960ca35c4740eb2be2c" },
Expand All @@ -44,19 +44,19 @@
"neo-tree.nvim": { "branch": "main", "commit": "7aad1bf3f6b849cbf108e02c55ad4d701cb4d33a" },
"nix-develop.nvim": { "branch": "main", "commit": "afea026f5c478c000a8af8de87f7b711676387ab" },
"noice.nvim": { "branch": "main", "commit": "0cbe3f88d038320bdbda3c4c5c95f43a13c3aa12" },
"none-ls.nvim": { "branch": "main", "commit": "63457547ffb7c7223d0f91feb1145393cc7b6728" },
"none-ls.nvim": { "branch": "main", "commit": "88821b67e6007041f43b802f58e3d9fa9bfce684" },
"nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" },
"nvim-cmp": { "branch": "main", "commit": "ce16de5665c766f39c271705b17fff06f7bcb84f" },
"nvim-cmp": { "branch": "main", "commit": "8f3c541407e691af6163e2447f3af1bd6e17f9a3" },
"nvim-dap": { "branch": "master", "commit": "9d81c11fd185a131f81841e64941859305f6c42d" },
"nvim-dap-python": { "branch": "master", "commit": "3dffa58541d1f52c121fe58ced046268c838d802" },
"nvim-jdtls": { "branch": "master", "commit": "a5c6f38f8151d7b4f5b32c005a95022fa66f4c9d" },
"nvim-lightbulb": { "branch": "master", "commit": "02aacd93b9b2367e6dbdd20f43b525f701faf834" },
"nvim-lint": { "branch": "master", "commit": "f098232d70cebe90e27404928c9bc19ca7a5a7b5" },
"nvim-lspconfig": { "branch": "master", "commit": "ed8b8a15acc441aec669f97d75f2c1f2ac8c8aa5" },
"nvim-lspconfig": { "branch": "master", "commit": "cfa386fc4027e847156ee16141ea1f4c0bc2f0a4" },
"nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" },
"nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" },
"nvim-scrollbar": { "branch": "main", "commit": "35f99d559041c7c0eff3a41f9093581ceea534e8" },
"nvim-treesitter": { "branch": "master", "commit": "bc808622986b0ba8eb64780b94d30cdfbd7c6a9f" },
"nvim-treesitter": { "branch": "master", "commit": "dc71d94fe223763d28ab49ee3de4fd7081a84891" },
"nvim-treesitter-context": { "branch": "master", "commit": "ba4289ad345ececd335a9cdd7b9616fd0bb6be92" },
"nvim-treesitter-textobjects": { "branch": "master", "commit": "23b820146956b3b681c19e10d3a8bc0cbd9a1d4c" },
"nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" },
Expand All @@ -68,9 +68,9 @@
"rust-tools.nvim": { "branch": "master", "commit": "676187908a1ce35ffcd727c654ed68d851299d3e" },
"sort.nvim": { "branch": "main", "commit": "c789da6968337d2a61104a929880b5f144e02855" },
"swenv.nvim": { "branch": "main", "commit": "c11eeaa6f8f05abdcbb0a53d0ac290e3f9fabd2c" },
"telescope.nvim": { "branch": "master", "commit": "d00d9df48c00d8682c14c2b5da78bda7ef06b939" },
"telescope.nvim": { "branch": "master", "commit": "7d1698f3d88b448e0639974248cc17f49b7b8acf" },
"todo-comments.nvim": { "branch": "main", "commit": "a7e39ae9e74f2c8c6dc4eea6d40c3971ae84752d" },
"toggleterm.nvim": { "branch": "main", "commit": "193786e0371e3286d3bc9aa0079da1cd41beaa62" },
"toggleterm.nvim": { "branch": "main", "commit": "066cccf48a43553a80a210eb3be89a15d789d6e6" },
"trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" },
"venv-selector.nvim": { "branch": "main", "commit": "c74e015082f6360f8713ece5b81902e2c179e4db" },
"vim-bbye": { "branch": "master", "commit": "903f5eb17f72ebf7b0b1524bbb792c0b36761af6" },
Expand Down
73 changes: 53 additions & 20 deletions lua/core/keymaps.lua
Original file line number Diff line number Diff line change
@@ -1,32 +1,45 @@
local Utils = require("utils")

local map = Utils.safe_keymap_set

-------------------- General Mappings --------------------------



-- ┣━━━━━━━━━━━━━━━━━━━━━━━┫ General Mappings ┣━━━━━━━━━━━━━━━━━━━━━━━┫

map("n", "<leader>w", "<cmd>w!<CR>", { desc = "Save" })
map("n", "<leader>q", "<cmd>q!<CR>", { desc = "Quit" })
map("n", "<leader>Q", "<cmd>qa!<CR>", { desc = "Quit all" })
map("n", "<leader><Tab>", "<c-6>", { desc = "Switch buffer" })

-------------------- Better window navigation ------------------

-- ┣━━━━━━━━━━━━━━━━━━━┫ Better Window Navigation ┣━━━━━━━━━━━━━━━━━━━┫

map("n", "<C-h>", "<C-w>h", { desc = "Go to left window", remap = true })
map("n", "<C-j>", "<C-w>j", { desc = "Go to lower window", remap = true })
map("n", "<C-k>", "<C-w>k", { desc = "Go to upper window", remap = true })
map("n", "<C-l>", "<C-w>l", { desc = "Go to right window", remap = true })


-------------------- Stay in indent mode ------------------------

-- ┣━━━━━━━━━━━━━━━━━━━━━━━━━┫ Indentation ┣━━━━━━━━━━━━━━━━━━━━━━━┫

map("v", "<", "<gv", { desc = "Indent left" })
map("v", ">", ">gv", { desc = "Indent right" })
map("v", "p", '"_dP')

-------------------- Resize windows ----------------------------

-- ┣━━━━━━━━━━━━━━━━━━━━━━━━┫ Resize Windows ┣━━━━━━━━━━━━━━━━━━━━━━━━┫

map("n", "<C-Up>", "<cmd>resize +2<cr>", { desc = "Increase window height" })
map("n", "<C-Down>", "<cmd>resize -2<cr>", { desc = "Decrease window height" })
map("n", "<C-Left>", "<cmd>vertical resize -2<cr>", { desc = "Decrease window width" })
map("n", "<C-Right>", "<cmd>vertical resize +2<cr>", { desc = "Increase window width" })

-------------------- Move text up/ down ------------------------

-- ┣━━━━━━━━━━━━━━━━━━┫ Move Text Up/Down By Line ┣━━━━━━━━━━━━━━━━┫



-- Normal --
map("n", "<A-S-j>", "<cmd>m .+1<cr>==", { desc = "Move down" })
map("n", "<A-S-k>", "<cmd>m .-2<cr>==", { desc = "Move up" })
Expand All @@ -40,38 +53,58 @@ map("i", "<A-S-k>", "<esc><cmd>m .-2<cr>==gi", { desc = "Move up" })
map("v", "<A-S-j>", ":m '>+1<cr>gv=gv", { desc = "Move down" })
map("v", "<A-S-k>", ":m '<-2<cr>gv=gv", { desc = "Move up" })

-------------------- No highlight ------------------------------

-- ┣━━━━━━━━━━━━━━━━━━━━━━━┫ Clear Highlights ┣━━━━━━━━━━━━━━━━━━━━━━━┫

map("n", ";", ":noh<CR>", { desc = "Clear search" })

-------------------- Inspect --------------------------------

-- ┣━━━━━━━━━━━━━━━━━━━━━━━━━━━┫ Inspect ┣━━━━━━━━━━━━━━━━━━━━━━━━━┫

map("n", "<F2>", "<cmd>Inspect<CR>", { desc = "Inspect highlight fallback" })

-------------------- split window ------------------------------

-- ┣━━━━━━━━━━━━━━━━━━━━━━━━┫ Split Windows ┣━━━━━━━━━━━━━━━━━━━━━━┫

map("n", "<leader>\\", ":vsplit<CR>", { desc = "Split window vertically" })
map("n", "<leader>/", ":split<CR>", { desc = "Split window horizontally" })

-------------------- Switch two windows ------------------------

-- ┣━━━━━━━━━━━━━━━━━━━━━━━━━┫ Swap Window ┣━━━━━━━━━━━━━━━━━━━━━━━┫

map("n", "<A-o>", "<C-w>r", { desc = "Rotate window" })

------------------- Select all -----------------------------

-- ┣━━━━━━━━━━━━━━━━━━━━━━━━━━┫ Select All ┣━━━━━━━━━━━━━━━━━━━━━━━━━━┫

map("n", "<C-a>", "gg<S-v>G", { desc = "Select all" })

-------------------- Fuzzy Search --------------------------------

-- ┣━━━━━━━━━━━━━━━━━━━━━━━━━┫ Fuzzy Search ┣━━━━━━━━━━━━━━━━━━━━━━━━━┫

vim.keymap.set("n", "<C-f>", function()
-- You can pass additional configuration to telescope to change theme, layout, etc.
require("telescope.builtin").current_buffer_fuzzy_find(require("telescope.themes"))
end, { desc = "[/] Fuzzily search in current buffer]" })

-------------------Save Function---------------------------

-- ┣━━━━━━━━━━━━━━━━━━━━━━━━┫ Save Function ┣━━━━━━━━━━━━━━━━━━━━━━┫

map("v", "<C-s>", "<esc><cmd>wa!<cr>", { desc = "Save file" })
map("i", "<C-s>", "<esc><cmd>wa!<cr>", { desc = "Save file" })
map("n", "<C-s>", "<esc><cmd>wa!<cr>", { desc = "Save file" })
map("x", "<C-s>", "<esc><cmd>wa!<cr>", { desc = "Save file" })

--------------------Comment Bars---------------------
map("v", "<M-->", "<cmd>CBline7<cr>", { desc = "comment line" })
map("i", "<M-->", "<cmd>CBline7<cr>", { desc = "comment line" })
map("n", "<M-->", "<cmd>CBline7<cr>", { desc = "comment line" })
map("v", "<C-M-->", "<cmd>CBline15<cr>", { desc = "alternative comment line" })
map("i", "<C-M-->", "<cmd>CBline15<cr>", { desc = "alternative comment line" })
map("n", "<C-M-->", "<cmd>CBline15<cr>", { desc = "alternative comment line" })

-- ┣━━━━━━━━━━━━━━━━━━━━━━━━━┫ Comment Bars ┣━━━━━━━━━━━━━━━━━━━━━━━━━┫

-- With Titles --
map("v", "<M-->", "<cmd>lua require('comment-box').lcline(11)<cr>", { desc = "comment line" })
map("i", "<M-->", "<cmd>lua require('comment-box').lcline(11)<cr>", { desc = "comment line" })
map("n", "<M-->", "<cmd>lua require('comment-box').lcline(11)<cr>", { desc = "comment line" })
-- No Titles --
map("v", "<C-M-->", "<cmd>lua require('comment-box').line(11)<cr>", { desc = "alternative comment line" })
map("i", "<C-M-->", "<cmd>lua require('comment-box').line(11)<cr>", { desc = "alternative comment line" })
map("n", "<C-M-->", "<cmd>lua require('comment-box').line(11)<cr>", { desc = "alternative comment line" })


2 changes: 1 addition & 1 deletion lua/core/lazy.lua
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ require("lazy").setup({
version = "*", -- try installing the latest stable version for plugins that support semver
},
install = { colorscheme = { "monokai-pro" } },
checker = { enabled = false, notify = false },
checker = { enabled = true, notify = false },
ui = {
icons = {
ft = Icons.lazy.ft,
Expand Down
3 changes: 1 addition & 2 deletions lua/core/options.lua
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,8 @@ if vim.g.neovide then
vim.g.neovide_scale_factor = 1
end

-- Fix markdown indentation settings
vim.g.markdown_recommended_style = 0

vim.g.markdown_recommended_style = 0 -- Fix markdown indentation settings
vim.g.cmp_enabled = true -- Enable completion at start.
vim.g.codelens_enabled = true -- Enable automatic codelens refreshing for lsp that support it.
vim.g.diagnostics_mode = 3 -- Set code linting (0=off, 1=only show in status line, 2=virtual text off, 3=all on).
Expand Down
64 changes: 33 additions & 31 deletions lua/plugins/coding.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
local Utils = require("utils")
local Icons = require("core").icons


return {
{
"L3MON4D3/LuaSnip",
Expand Down Expand Up @@ -171,35 +172,36 @@ return {
}
end,
},
{
"LudoPinelli/comment-box.nvim",
config = function()
require("comment-box").setup({
doc_width = 80, -- width of the document
box_width = 65, -- width of the boxes
borders = { -- symbols used to draw a box
top = "",
bottom = "",
left = "",
right = "",
top_left = "",
top_right = "",
bottom_left = "",
bottom_right = "",
},
line_width = 65, -- width of the lines
line = { -- symbols used to draw a line
line = "",
line_start = "",
line_end = "",
},
outer_blank_lines = true, -- insert a blank line above and below the box
inner_blank_lines = true, -- insert a blank line above and below the text
line_blank_line_above = false, -- insert a blank line above the line
line_blank_line_below = false, -- insert a blank line below the line
})
end,
},
{
"LudoPinelli/comment-box.nvim",
config = function()
require("comment-box").setup({
doc_width = 80, -- width of the document
box_width = 65, -- width of the boxes
borders = { -- symbols used to draw a box
top = "",
bottom = "",
left = "",
right = "",
top_left = "",
top_right = "",
bottom_left = "",
bottom_right = "",
},
line_width = 65, -- width of the lines
line = { -- symbols used to draw a line
line = "",
line_start = "",
line_end = "",
},
outer_blank_lines = true, -- insert a blank line above and below the box
inner_blank_lines = true, -- insert a blank line above and below the text
line_blank_line_above = false, -- insert a blank line above the line
line_blank_line_below = false, -- insert a blank line below the line
})
end,
},

-- ─────────────────────────────────────────────────────────────────
{
"numToStr/Comment.nvim",
Expand Down Expand Up @@ -270,8 +272,8 @@ return {
},
outer_blank_lines = true, -- insert a blank line above and below the box
inner_blank_lines = true, -- insert a blank line above and below the text
line_blank_line_above = false, -- insert a blank line above the line
line_blank_line_below = false, -- insert a blank line below the line
line_blank_line_above = true, -- insert a blank line above the line
line_blank_line_below = true, -- insert a blank line below the line
})
end,
},
Expand Down
30 changes: 22 additions & 8 deletions lua/plugins/editor.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
-- ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
-- ┃ ┃
-- ┃ Editor Plugins ┃
-- ┃ ┃
-- ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
-- NOTE: These are either additional features of the editor itself or somehow modify the editing experience

local Utils = require("utils")
local Icons = require("core").icons

-- ┣━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┫

return {
{
"serenevoid/kiwi.nvim",
Expand All @@ -9,19 +18,23 @@ return {
},
opts = {
{
name = "Tech",
path = "/home/tlh/Wiki/",
name = "Work",
path="/Users/macdre/Desktop/Wiki"
-- TODO: Uncomment the below and comment out the above when using Linux again
-- path = "/home/tlh/Wiki/",
},
{
name = "SanatanaDharma",
path = "/home/tlh/HinduismWiki",
path="Users/macdre/Desktop/HinduismWiki"
-- TODO: Uncomment the below and comment out the above when using Linux again
-- path = "/home/tlh/HinduismWiki",
},
},
keys = {
{
"<leader>wp",
':lua require("kiwi").open_wiki_index("Tech")<cr>',
desc = "Open index of personal wiki",
':lua require("kiwi").open_wiki_index("Work")<cr>',
desc = "Open index of Work-Related Wiki",
},
{
"<leader>wh",
Expand All @@ -33,6 +46,8 @@ return {
lazy = true,
},

-- ┣━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┫

{
"RutaTang/quicknote.nvim",
config = function()
Expand Down Expand Up @@ -84,9 +99,8 @@ return {
wk.register({
C = {
name = "Comment Box",
b = { "<cmd>Bllbox5<cr>", "left aligned fixed size box" },
r = { "<cmd>CBrrbox5<cr>", "right aligned fixed size box with left aligned text" },
c = { "<cmd>CBccbox5<cr>", "center aligned fixed size box with center aligned text" },
t = { "<cmd>lua require('comment-box').ccbox(3)<cr>", "Title Box" },
s = { "<cmd>lua require('comment-box').labox(17)<cr>", "Subtitle Box" },
},

x = {
Expand Down
Loading

0 comments on commit 4c66f9c

Please sign in to comment.