diff --git a/.config/aliasrc/work b/.config/aliasrc/work index c918ac5..77e1bf5 100755 --- a/.config/aliasrc/work +++ b/.config/aliasrc/work @@ -18,38 +18,42 @@ alias activate_venv="[ -f .venv/bin/activate ] && source .venv/bin/activate" alias display_makefile_help="[ -f Makefile ] && make" # dynamic aliases -for d in $PUB/*; do - if [ -d "$d" ]; then - last_part=$(basename $d | tr "_" " " | awk '{print $NF}') - last_part=${last_part:0:1} - last_part=$(echo $last_part | tr '[:upper:]' '[:lower:]') - alias pub$last_part="cd $d && display_makefile_help && activate_venv" - fi -done +create_work_aliases() { + for d in $PUB/*; do + if [ -d "$d" ]; then + last_part=$(basename $d | tr "_" " " | awk '{print $NF}') + last_part=${last_part:0:1} + last_part=$(echo $last_part | tr '[:upper:]' '[:lower:]') + alias pub$last_part="cd $d && display_makefile_help && activate_venv" + fi + done -for d in $NEG/*; do - if [ -d "$d" ]; then - last_part=$(basename $d | tr "_" " " | awk '{print $NF}') - last_part=${last_part:0:1} - last_part=$(echo $last_part | tr '[:upper:]' '[:lower:]') - alias neg$last_part="cd $d && display_makefile_help && activate_venv" - fi -done + for d in $NEG/*; do + if [ -d "$d" ]; then + last_part=$(basename $d | tr "_" " " | awk '{print $NF}') + last_part=${last_part:0:1} + last_part=$(echo $last_part | tr '[:upper:]' '[:lower:]') + alias neg$last_part="cd $d && display_makefile_help && activate_venv" + fi + done -for d in $SZ/*; do - if [ -d "$d" ]; then - last_part=$(basename $d | tr "_" " " | awk '{print $NF}') - last_part=${last_part:0:2} - last_part=$(echo $last_part | tr '[:upper:]' '[:lower:]') - alias sz$last_part="cd $d && display_makefile_help && activate_venv" - fi -done + for d in $SZ/*; do + if [ -d "$d" ]; then + last_part=$(basename $d | tr "_" " " | awk '{print $NF}') + last_part=${last_part:0:2} + last_part=$(echo $last_part | tr '[:upper:]' '[:lower:]') + alias sz$last_part="cd $d && display_makefile_help && activate_venv" + fi + done -for d in $AR/*; do - if [ -d "$d" ]; then - last_part=$(basename $d | tr "_" " " | awk '{print $NF}') - last_part=${last_part:0:1} - last_part=$(echo $last_part | tr '[:upper:]' '[:lower:]') - alias ar$last_part="cd $d && display_makefile_help && activate_venv" - fi -done + for d in $AR/*; do + if [ -d "$d" ]; then + last_part=$(basename $d | tr "_" " " | awk '{print $NF}') + last_part=${last_part:0:1} + last_part=$(echo $last_part | tr '[:upper:]' '[:lower:]') + alias ar$last_part="cd $d && display_makefile_help && activate_venv" + fi + done +} + +create_work_aliases diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 081ee34..5702818 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -1,41 +1,41 @@ { "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" }, - "LuaSnip": { "branch": "master", "commit": "cab667e2674881001a86a7478fff7dc7791c63f5" }, - "bufferline.nvim": { "branch": "main", "commit": "9e8d2f695dd50ab6821a6a53a840c32d2067a78a" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" }, - "copilot.lua": { "branch": "master", "commit": "73047082d72fcfdde1f73b7f17ad495cffcbafaa" }, - "dressing.nvim": { "branch": "master", "commit": "fe3071330a0720ce3695ac915820c8134b22d1b0" }, - "flutter-tools.nvim": { "branch": "main", "commit": "7350750d46fbeb4d2bb4878157b658d435935299" }, - "gitsigns.nvim": { "branch": "main", "commit": "59bd933faaf5be17b33b8c894210299071353089" }, - "harpoon": { "branch": "master", "commit": "c1aebbad9e3d13f20bedb8f2ce8b3a94e39e424a" }, - "indent-blankline.nvim": { "branch": "master", "commit": "29be0919b91fb59eca9e90690d76014233392bef" }, + "LuaSnip": { "branch": "master", "commit": "2463d687fe704b76eb0aa3bb34e95f69a5bb0362" }, + "bufferline.nvim": { "branch": "main", "commit": "e48ce1805697e4bb97bc171c081e849a65859244" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, + "copilot.lua": { "branch": "master", "commit": "858bbfa6fa81c88fb1f64107d7981f1658619e0a" }, + "dressing.nvim": { "branch": "master", "commit": "94b0d24483d56f3777ee0c8dc51675f21709318c" }, + "flutter-tools.nvim": { "branch": "main", "commit": "34d14ea37313fc755423117b1e9adda058fbffba" }, + "gitsigns.nvim": { "branch": "main", "commit": "d195f0c35ced5174d3ecce1c4c8ebb3b5bc23fa9" }, + "harpoon": { "branch": "master", "commit": "ccae1b9bec717ae284906b0bf83d720e59d12b91" }, + "indent-blankline.nvim": { "branch": "master", "commit": "5da5546947f3125dfd6aa85ab21074dc83f776d5" }, "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, - "lsp-zero.nvim": { "branch": "v2.x", "commit": "ffebf6f7b0649f1eb81b37c37b75552f8ff96337" }, - "lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "3d9e06ca604185ea5675d3c2ffd4284e0c2c7ffc" }, - "mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" }, - "mini.indentscope": { "branch": "main", "commit": "c8fdafa7bf603d758986a27eb546c55a5c73b1a3" }, - "mini.nvim": { "branch": "main", "commit": "05f4a49cd85a67b90328a1bcbae4d9ed2a0a417b" }, - "neo-tree.nvim": { "branch": "main", "commit": "230ff118613fa07138ba579b89d13ec2201530b9" }, + "lsp-zero.nvim": { "branch": "v2.x", "commit": "84771a9ec7f7d1fecec8bb84c0c97d811e4b08ec" }, + "lualine.nvim": { "branch": "master", "commit": "566b7036f717f3d676362742630518a47f132fff" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "56e435e09f8729af2d41973e81a0db440f8fe9c9" }, + "mason.nvim": { "branch": "main", "commit": "a09da6ac634926a299dd439da08bdb547a8ca011" }, + "mini.indentscope": { "branch": "main", "commit": "5a8369475cd7cd6f207a4d288406d03b0fc48bdb" }, + "mini.nvim": { "branch": "main", "commit": "40086c0a646100c766e8e05cd6e7d75bb1ca37de" }, + "neo-tree.nvim": { "branch": "main", "commit": "953313ecf0a92a8e9f2a4afc603731f1fcb331b4" }, "noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" }, - "nui.nvim": { "branch": "main", "commit": "c0c8e347ceac53030f5c1ece1c5a5b6a17a25b32" }, - "nvim-autopairs": { "branch": "master", "commit": "0f04d78619cce9a5af4f355968040f7d675854a1" }, + "nui.nvim": { "branch": "main", "commit": "80445d015d2b5f9af0d9e8bce63d303bc86eda8a" }, + "nvim-autopairs": { "branch": "master", "commit": "9fd41181693dd4106b3e414a822bb6569924de81" }, "nvim-base16": { "branch": "master", "commit": "010bedf0b7c01ab4d4e4e896a8527d97c222351d" }, - "nvim-cmp": { "branch": "main", "commit": "0b751f6beef40fd47375eaf53d3057e0bfa317e4" }, + "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-lspconfig": { "branch": "master", "commit": "553c4e0e667167640c5398573f6f3a488ff8047a" }, - "nvim-notify": { "branch": "master", "commit": "e4a2022f4fec2d5ebc79afa612f96d8b11c627b3" }, - "nvim-treesitter": { "branch": "master", "commit": "6d45b3469719a9740a5ef6304bb6771516d19bd5" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "dbcd9388e3b119a87c785e10a00d62876077d23d" }, - "nvim-web-devicons": { "branch": "master", "commit": "cdbcca210cf3655aa9b31ebf2422763ecd85ee5c" }, - "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, + "nvim-lspconfig": { "branch": "master", "commit": "0d9e870d01894c592d7ea93cfe0fa451916d9a7f" }, + "nvim-notify": { "branch": "master", "commit": "ebcdd8219e2a2cbc0a4bef68002f6867f1fde269" }, + "nvim-treesitter": { "branch": "master", "commit": "e49f1e8ef3e8450a8446cb1f2bbb53c919f60b6d" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "0e2d5bd4cbe75849a013901555d436a48c6680cb" }, + "nvim-web-devicons": { "branch": "master", "commit": "808627b8d412b2a6b6fc6eed816fec3557198b01" }, + "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" }, "symbols-outline.nvim": { "branch": "master", "commit": "512791925d57a61c545bc303356e8a8f7869763c" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, - "telescope.nvim": { "branch": "master", "commit": "18774ec7929c8a8003a91e9e1f69f6c32258bbfe" }, + "telescope.nvim": { "branch": "master", "commit": "3466159b0fcc1876483f6f53587562628664d850" }, "todo-comments.nvim": { "branch": "main", "commit": "4a6737a8d70fe1ac55c64dfa47fcb189ca431872" }, "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, "undotree": { "branch": "master", "commit": "36ff7abb6b60980338344982ad4cdf03f7961ecd" }, "vim-illuminate": { "branch": "master", "commit": "3bd2ab64b5d63b29e05691e624927e5ebbf0fb86" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }, - "window-picker": { "branch": "main", "commit": "fd5d3348b3e254ca3134f97793b4a8c702c4ad1d" } + "window-picker": { "branch": "main", "commit": "41cfaa428577c53552200a404ae9b3a0b5719706" } } \ No newline at end of file diff --git a/.config/nvim/lua/config/keymaps.lua b/.config/nvim/lua/config/keymaps.lua index 7441222..75d88d4 100644 --- a/.config/nvim/lua/config/keymaps.lua +++ b/.config/nvim/lua/config/keymaps.lua @@ -1,5 +1,5 @@ -vim.api.nvim_set_keymap("n", "j", "bprev", { noremap = true, silent = true }) -vim.api.nvim_set_keymap("n", "k", "bnext", { noremap = true, silent = true }) +vim.api.nvim_set_keymap("n", "bj", "bprev", { noremap = true, silent = true }) +vim.api.nvim_set_keymap("n", "bk", "bnext", { noremap = true, silent = true }) vim.api.nvim_set_keymap("x", "", '"_dP', { noremap = true, silent = true }) vim.api.nvim_set_keymap("n", "/", "gcc", { noremap = false, silent = true }) vim.api.nvim_set_keymap( @@ -102,3 +102,5 @@ vim.keymap.set('n', 'uu', vim.cmd.UndotreeToggle, { desc = "Toggle undo -- harpoon vim.keymap.set("n", "hh", "lua require('harpoon.ui').toggle_quick_menu()", { desc = "Harpoon Menu" }) vim.keymap.set("n", "ha", "lua require('harpoon.mark').add_file()", { desc = "Harpoon Add File" }) +vim.keymap.set("n", "k", "lua require('harpoon.ui').nav_next()", { desc = "Navigate to next harpoon file" }) +vim.keymap.set("n", "j", "lua require('harpoon.ui').nav_prev()", { desc = "Navigate to previous harpoon file" }) diff --git a/.config/nvim/lua/config/options.lua b/.config/nvim/lua/config/options.lua index cf4528c..5825be5 100644 --- a/.config/nvim/lua/config/options.lua +++ b/.config/nvim/lua/config/options.lua @@ -9,7 +9,6 @@ local opt = vim.opt opt.autowrite = true -- Enable auto write opt.clipboard = "unnamedplus" -- Sync with system clipboard opt.completeopt = "menu,menuone,noselect" -opt.conceallevel = 3 -- Hide * markup for bold and italic opt.confirm = true -- Confirm to save changes before exiting modified buffer opt.cursorline = true -- Enable highlighting of the current line opt.expandtab = true -- Use spaces instead of tabs