diff --git a/home/dot_config/nvim/exact_lua/exact_config/exact_plugins/cmp.lua b/home/dot_config/nvim/exact_lua/exact_config/exact_plugins/cmp.lua index a818d28..a65a1a3 100644 --- a/home/dot_config/nvim/exact_lua/exact_config/exact_plugins/cmp.lua +++ b/home/dot_config/nvim/exact_lua/exact_config/exact_plugins/cmp.lua @@ -62,7 +62,7 @@ return { end, { 'i', 's' }), }), sources = { - { name = 'copilot' }, + -- { name = 'copilot' }, { name = 'nvim_lsp' }, { name = 'luasnip' }, { name = 'path' }, diff --git a/home/dot_config/nvim/exact_lua/exact_config/exact_plugins/copilot.lua b/home/dot_config/nvim/exact_lua/exact_config/exact_plugins/copilot.lua index b0fe3db..8aae349 100644 --- a/home/dot_config/nvim/exact_lua/exact_config/exact_plugins/copilot.lua +++ b/home/dot_config/nvim/exact_lua/exact_config/exact_plugins/copilot.lua @@ -29,14 +29,14 @@ return { mode = 'i', desc = 'Accept Copilot Suggestion', }, - -- { - -- '', - -- function() - -- require('copilot.suggestion').accept() - -- end, - -- mode = 'i', - -- desc = 'Accept Copilot Suggestion', - -- }, + { + '', + function() + require('copilot.suggestion').accept() + end, + mode = 'i', + desc = 'Accept Copilot Suggestion', + }, { '', function() diff --git a/home/dot_config/nvim/exact_lua/exact_config/exact_plugins/floaterm.lua b/home/dot_config/nvim/exact_lua/exact_config/exact_plugins/floaterm.lua new file mode 100644 index 0000000..1499daf --- /dev/null +++ b/home/dot_config/nvim/exact_lua/exact_config/exact_plugins/floaterm.lua @@ -0,0 +1,18 @@ +---@type LazySpec +return { + { + 'voldikss/vim-floaterm', + cond = false, + cmd = { + 'FloatermNew', + 'FloatermToggle', + 'FloatermNext', + 'FloatermPrev', + 'FloatermKill', + }, + keys = { + { 'gl', 'FloatermNew lazygit' }, + }, + opts = {}, + } +} diff --git a/home/dot_config/nvim/exact_lua/exact_config/exact_plugins/hurl.lua b/home/dot_config/nvim/exact_lua/exact_config/exact_plugins/hurl.lua new file mode 100644 index 0000000..ff42583 --- /dev/null +++ b/home/dot_config/nvim/exact_lua/exact_config/exact_plugins/hurl.lua @@ -0,0 +1,37 @@ +---@type LazySpec +return { + { + 'jellydn/hurl.nvim', + dependencies = { + 'MunifTanjim/nui.nvim', + 'nvim-lua/plenary.nvim', + 'nvim-treesitter/nvim-treesitter', + }, + ft = 'hurl', + opts = { + --Show Debugging info + debug = false, + --Show notifications on run + show_notifications = true, + --Show response in popup or split + mode = 'split', + --Formatters + formatters = { + json = { 'jq' }, + html = { 'prettier', '--parser', 'html' }, + }, + }, + keys = { + -- HurlRunner + { 'hA', 'HurlRunner', desc = 'Run All requests', ft = 'hurl' }, + -- HurlRunnerAt + { 'ha', 'HurlRunnerAt', desc = 'Run Api request', ft = 'hurl' }, + -- HurlRunnerToEntry + { 'hE', 'HurlRunnerToEntry', desc = 'Run to entry', ft = 'hurl' }, + -- HurlVerbose + { 'hv', 'HurlVerbose', desc = 'Run Api in verbose mode', ft = 'hurl' }, + -- run in visual mode + { 'hh', 'HurlRunner', desc = 'Run in visual mode', ft = 'hurl', mode = 'v' }, + }, + }, +} diff --git a/home/dot_config/nvim/exact_lua/exact_config/exact_plugins/lazygit.lua b/home/dot_config/nvim/exact_lua/exact_config/exact_plugins/lazygit.lua new file mode 100644 index 0000000..cf94c53 --- /dev/null +++ b/home/dot_config/nvim/exact_lua/exact_config/exact_plugins/lazygit.lua @@ -0,0 +1,18 @@ +---@type LazySpec +return { + 'kdheepak/lazygit.nvim', + cmd = { + 'LazyGit', + 'LazyGitConfig', + 'LazyGitCurrentFile', + 'LazyGitFilter', + 'LazyGitFilterCurrentFile', + }, + keys = { + { 'gl', 'LazyGitCurrentFile', desc = 'LazyGit (current file)' }, + }, + -- optional for floating window border decoration + dependencies = { + 'nvim-lua/plenary.nvim', + }, +} diff --git a/home/dot_config/nvim/exact_lua/exact_config/exact_plugins/vim-tmux-navigator.lua b/home/dot_config/nvim/exact_lua/exact_config/exact_plugins/vim-tmux-navigator.lua new file mode 100644 index 0000000..49c5423 --- /dev/null +++ b/home/dot_config/nvim/exact_lua/exact_config/exact_plugins/vim-tmux-navigator.lua @@ -0,0 +1,13 @@ +---@type LazySpec +return { + { + 'christoomey/vim-tmux-navigator', + cond = false, + keys = { + { '', 'TmuxNavigateLeft', desc = 'Go to left window' }, + { '', 'TmuxNavigateDown', desc = 'Go to lower window' }, + { '', 'TmuxNavigateUp', desc = 'Go to upper window' }, + { '', 'TmuxNavigateRight', desc = 'Go to right window' }, + }, + }, +} diff --git a/home/dot_config/nvim/lazy-lock.json b/home/dot_config/nvim/lazy-lock.json index bfaef42..5a6691a 100644 --- a/home/dot_config/nvim/lazy-lock.json +++ b/home/dot_config/nvim/lazy-lock.json @@ -1,57 +1,59 @@ { "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" }, - "LuaSnip": { "branch": "master", "commit": "2dbef19461198630b3d7c39f414d09fb07d1fdd2" }, + "LuaSnip": { "branch": "master", "commit": "de1a287c9cb525ae52bc846e8f6207e5ef1da5ac" }, "barbecue": { "branch": "main", "commit": "cd7e7da622d68136e13721865b4d919efd6325ed" }, - "bufferline.nvim": { "branch": "main", "commit": "b15c6daf5a64426c69732b31a951f4e438cb6590" }, - "catppuccin": { "branch": "main", "commit": "c2034f7b549152e5cc757820426341ea5000bc7a" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, + "bufferline.nvim": { "branch": "main", "commit": "73540cb95f8d95aa1af3ed57713c6720c78af915" }, + "catppuccin": { "branch": "main", "commit": "d97387aea8264f484bb5d5e74f2182a06c83e0d8" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "conform.nvim": { "branch": "master", "commit": "4588008a7c5b57fbff97fdfb529c059235cdc7ee" }, + "conform.nvim": { "branch": "master", "commit": "00f9d91391b04b1935e2f15948bd96cc111e7d3a" }, "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, - "copilot.lua": { "branch": "master", "commit": "03f825956ec49e550d07875d867ea6e7c4dc8c00" }, - "crates.nvim": { "branch": "main", "commit": "2bd990871f0aef159933bd5fe6da421690a832b9" }, - "dashboard-nvim": { "branch": "master", "commit": "63df28409d940f9cac0a925df09d3dc369db9841" }, - "dressing.nvim": { "branch": "master", "commit": "6f212262061a2120e42da0d1e87326e8a41c0478" }, - "firenvim": { "branch": "master", "commit": "f2dd6d3bcf3309a7dd30c79b3b3c03ab55cea6e2" }, - "flash.nvim": { "branch": "main", "commit": "48817af25f51c0590653bbc290866e4890fe1cbe" }, - "friendly-snippets": { "branch": "main", "commit": "b8fae73a479ae0a1c54f5c98fa687ae8a0addc53" }, - "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" }, - "image.nvim": { "branch": "master", "commit": "21f2073505d8c475008512db59bbd82ccc9ec5d5" }, - "indent-blankline.nvim": { "branch": "master", "commit": "12e92044d313c54c438bd786d11684c88f6f78cd" }, - "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" }, - "legendary.nvim": { "branch": "master", "commit": "234e2ef8dec65db153c63a8b310c74155bb93ee7" }, - "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "2b3d247fce06f53934174f5dfe0362c42d65c00c" }, - "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, - "mini.ai": { "branch": "main", "commit": "3ad9d455a91b8bf3c24d4e50518d9a6b9dddb42c" }, - "mini.animate": { "branch": "main", "commit": "6cec625114007527ff8a82316dba858046f9746f" }, - "mini.bufremove": { "branch": "main", "commit": "020243bfed8c8b941f2c20626faf3ea39c0c0e1b" }, - "mini.indentscope": { "branch": "main", "commit": "ca129b71edb672d30b8d7ec3138106db1b1f6a8b" }, - "mini.surround": { "branch": "main", "commit": "5ceb6a12d3761bc719fbdad5432c89333deb1498" }, - "neo-tree.nvim": { "branch": "main", "commit": "c2a9e81699021f4ccaac7c574cc42ca4211a499a" }, - "neoconf.nvim": { "branch": "main", "commit": "a0e63d84433ab03947cb3da82744220e39e05338" }, - "neodev.nvim": { "branch": "main", "commit": "2793ba3127c2c93ee486b9072a3ef129eeb950cc" }, - "noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" }, - "none-ls.nvim": { "branch": "main", "commit": "72e25ed4162474ef5d666525853f8a42bffd97c5" }, - "nui.nvim": { "branch": "main", "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418" }, - "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, - "nvim-lspconfig": { "branch": "master", "commit": "ac530dfb97e51d82e3b0a7cddbf7a4a7c4c10ff8" }, + "copilot.lua": { "branch": "master", "commit": "f7612f5af4a7d7615babf43ab1e67a2d790c13a6" }, + "crates.nvim": { "branch": "main", "commit": "d556c00d60c9421c913ee54ff690df2a34f6264e" }, + "dashboard-nvim": { "branch": "master", "commit": "5182c09ac8085dc73b78ad0ea9f5479c9a866fc4" }, + "dressing.nvim": { "branch": "master", "commit": "572314728cb1ce012e825fd66331f52c94acac12" }, + "firenvim": { "branch": "master", "commit": "fc72687977e1c34259c42f0e408655cf2638760d" }, + "flash.nvim": { "branch": "main", "commit": "11a2e667d19d8f48c93c6ed2e2e525ac6b1b79be" }, + "friendly-snippets": { "branch": "main", "commit": "dd2fd1281d4b22e7b4a5bfafa3e142d958e251f2" }, + "gitsigns.nvim": { "branch": "main", "commit": "805610a9393fa231f2c2b49cb521bfa413fadb3d" }, + "hurl.nvim": { "branch": "main", "commit": "fccd096f555864d3de1f103622c7020224ba6246" }, + "image.nvim": { "branch": "master", "commit": "da64ce69598875c9af028afe129f916b02ccc42e" }, + "indent-blankline.nvim": { "branch": "master", "commit": "ece00d5fb44d196680a81fd2761062d2fa44663b" }, + "lazy.nvim": { "branch": "main", "commit": "5d29ffeaa0f2d91f1dfbc21943d19a11e59a6fc6" }, + "lazygit.nvim": { "branch": "main", "commit": "ad3e1ea592f9d13e86e0d4e850224d9d78069508" }, + "legendary.nvim": { "branch": "master", "commit": "38d1f3950792295c38b8ce33d134ace3ad75a9a1" }, + "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "9ae570e206360e47d30b4c35a4550c165f4ea7b7" }, + "mason.nvim": { "branch": "main", "commit": "49ff59aded1047a773670651cfa40e76e63c6377" }, + "mini.ai": { "branch": "main", "commit": "a0262e61f79dfc7bb940d1719c00b0ede042ddd7" }, + "mini.animate": { "branch": "main", "commit": "82519630b2760ffc516ebc387bef632f9c07b9f5" }, + "mini.bufremove": { "branch": "main", "commit": "931a3bb514147d9e812767275c4beba6b779b1d3" }, + "mini.indentscope": { "branch": "main", "commit": "a8274b6ea2d868198d27bd91a31ed5ea3a6a5744" }, + "mini.surround": { "branch": "main", "commit": "c52aa751daf62d4a9e6ee24c4a91882ef6842f99" }, + "neo-tree.nvim": { "branch": "main", "commit": "6e20108c4a8128782f534f5fe90c757b44212ef6" }, + "neoconf.nvim": { "branch": "main", "commit": "0065de89c834e1090a847a9aa126af5dce1db4dc" }, + "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" }, + "noice.nvim": { "branch": "main", "commit": "9f6f6ba74f8bfbf7e43d6302cf86b070362f6203" }, + "none-ls.nvim": { "branch": "main", "commit": "37671797d6e5f9bd0ee3ab965ab2e6de251e1930" }, + "nui.nvim": { "branch": "main", "commit": "b1b3dcd6ed8f355c78bad3d395ff645be5f8b6ae" }, + "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" }, + "nvim-lspconfig": { "branch": "master", "commit": "6d2ae9fdc3111a6e8fd5db2467aca11737195a30" }, "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" }, - "nvim-notify": { "branch": "master", "commit": "80b67b265530632505193553d05127ae7fe09ddd" }, + "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-scrollbar": { "branch": "main", "commit": "35f99d559041c7c0eff3a41f9093581ceea534e8" }, - "nvim-spectre": { "branch": "master", "commit": "d1db6c1d37252b5a38f199e2f590c5a1617d9254" }, - "nvim-treesitter": { "branch": "master", "commit": "5fca7ae4960c415af0b038e89a2d84ef6e16d28d" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "8edd5a6d96936bdff23333d3bc177481388839e5" }, - "nvim-web-devicons": { "branch": "master", "commit": "aaec87dbdaa776bfa0a13c8694bec9bcb7454719" }, - "oil.nvim": { "branch": "master", "commit": "32e18df30f937e02135398c270b72a4d24b40120" }, - "persistence.nvim": { "branch": "main", "commit": "4982499c1636eac254b72923ab826ee7827b3084" }, - "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" }, + "nvim-spectre": { "branch": "master", "commit": "50e96602153f14c913e1969aaf9720e080394eb3" }, + "nvim-treesitter": { "branch": "master", "commit": "1eabe69bfa8f78e14fcf5d42a2b3881babaca30a" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "5f9bf4b1ead7707e4e74e5319ee56bdc81fb73db" }, + "nvim-web-devicons": { "branch": "master", "commit": "e37bb1feee9e7320c76050a55443fa843b4b6f83" }, + "oil.nvim": { "branch": "master", "commit": "06a19f77f1a1da37b675635e6f9c5b5d50bcaacd" }, + "persistence.nvim": { "branch": "main", "commit": "5fe077056c821aab41f87650bd6e1c48cd7dd047" }, + "plenary.nvim": { "branch": "master", "commit": "08e301982b9a057110ede7a735dd1b5285eb341f" }, "rustaceanvim": { "branch": "master", "commit": "bc8c4b8f7606d5b7c067cd8369e25c1a7ff77bd0" }, - "smart-splits.nvim": { "branch": "master", "commit": "36bfe63246386fc5ae2679aa9b17a7746b7403d5" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, - "telescope.nvim": { "branch": "0.1.x", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, - "vim-fugitive": { "branch": "master", "commit": "f116dcc8e21021e6fbfb6b0a9f8f7b9566d933f4" }, + "smart-splits.nvim": { "branch": "master", "commit": "f9c76974964cdead4527d217870194af66105e15" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, + "telescope.nvim": { "branch": "0.1.x", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }, + "vim-fugitive": { "branch": "master", "commit": "5a9bd42dd8dd127779f3cd8982a0419b7ca9c7f5" }, "vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" }, "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }, diff --git a/home/dot_config/wezterm/wezterm.lua b/home/dot_config/wezterm/wezterm.lua index c0dfe8f..eb6e132 100644 --- a/home/dot_config/wezterm/wezterm.lua +++ b/home/dot_config/wezterm/wezterm.lua @@ -7,7 +7,7 @@ local function get_config() end -- font settings config.font = wezterm.font("SpaceMono Nerd Font") - config.font_size = 13.5 + config.font_size = 15 -- disable ligatures -> config.harfbuzz_features = { "calt=0", "clig=0", "liga=0" } config.underline_position = "-0.2cell" diff --git a/home/dot_config/zsh/exact_rc.d/02-dirs.zsh b/home/dot_config/zsh/exact_rc.d/02-dirs.zsh index c9b3fd3..139da87 100644 --- a/home/dot_config/zsh/exact_rc.d/02-dirs.zsh +++ b/home/dot_config/zsh/exact_rc.d/02-dirs.zsh @@ -11,5 +11,6 @@ hash -d wezterm=~c/wezterm hash -d tmux=~c/tmux hash -d repos=~/Documents/repos hash -d projects=~/Documents/projects +hash -d tutorials=~/Documents/tutorials # `hash -d =` makes ~ a shortcut for . # You can use this ~name anywhere you would specify a dir, not just with `cd`! diff --git a/home/dot_config/zsh/exact_rc.d/09-commands.zsh b/home/dot_config/zsh/exact_rc.d/09-commands.zsh index c305af0..dfbbc0d 100644 --- a/home/dot_config/zsh/exact_rc.d/09-commands.zsh +++ b/home/dot_config/zsh/exact_rc.d/09-commands.zsh @@ -46,6 +46,8 @@ alias -s {css,gradle,html,js,json,md,patch,properties,txt,xml,yml}=$PAGER alias -s gz='gzip -l' alias -s {log,out}='tail -F' +alias lg='lazygit' + # Use `< file` to quickly view the contents of any text file. READNULLCMD=$PAGER # Set the program to use for this.