nvim changes, aliases for fish
This commit is contained in:
parent
b6b1c24aa0
commit
10e210a276
18 changed files with 387 additions and 130 deletions
24
.config/fish/aliases.fish
Normal file
24
.config/fish/aliases.fish
Normal file
|
@ -0,0 +1,24 @@
|
||||||
|
alias code='vscodium'
|
||||||
|
alias ls='exa --long --header -a --icons'
|
||||||
|
alias tree='exa --long --header -a --icons --tree'
|
||||||
|
alias bruh='genact -s 4'
|
||||||
|
alias matrix='unimatrix'
|
||||||
|
alias q='exit'
|
||||||
|
alias install='yay -S '
|
||||||
|
alias uninstall='yay -R '
|
||||||
|
alias update='yay -Syu'
|
||||||
|
alias search='pacseek'
|
||||||
|
alias gpt='tgpt'
|
||||||
|
alias clock='tty-clock -sbc'
|
||||||
|
alias files='xplr'
|
||||||
|
alias sysproc='sysz'
|
||||||
|
alias cat='bat'
|
||||||
|
alias dots='yadm enter lazygit'
|
||||||
|
alias audiorestart='systemctl --user restart wireplumber pipewire pipewire-pulse'
|
||||||
|
alias info='tldr'
|
||||||
|
alias cd='z'
|
||||||
|
alias disks='duf'
|
||||||
|
alias cdh='zi'
|
||||||
|
alias vim='nvim'
|
||||||
|
alias vi='nvim'
|
||||||
|
alias neovide='env WINIT_UNIX_BACKEND=x11 neovide'
|
|
@ -1,13 +1,13 @@
|
||||||
{
|
{
|
||||||
"LazyVim": { "branch": "main", "commit": "142e6bec209704210db23b3424b4d51896bb206a" },
|
"LazyVim": { "branch": "main", "commit": "aa1cccf230a01bd85d5173f7d87f782fd83caa88" },
|
||||||
"LuaSnip": { "branch": "master", "commit": "0b4950a237ce441a6a3a947d501622453f6860ea" },
|
"LuaSnip": { "branch": "master", "commit": "e81cbe6004051c390721d8570a4a0541ceb0df10" },
|
||||||
"SchemaStore.nvim": { "branch": "main", "commit": "f33af3051c79f084824753f9852ed4db95b43c8d" },
|
"SchemaStore.nvim": { "branch": "main", "commit": "fba131b5ef7a54a8f8d71ef2a2e8d2263b87daac" },
|
||||||
"alpha-nvim": { "branch": "main", "commit": "e4fc5e29b731bdf55d204c5c6a11dc3be70f3b65" },
|
"alpha-nvim": { "branch": "main", "commit": "e4fc5e29b731bdf55d204c5c6a11dc3be70f3b65" },
|
||||||
"blamer.nvim": { "branch": "master", "commit": "f4eb22a9013642c411725fdda945ae45f8d93181" },
|
"blamer.nvim": { "branch": "master", "commit": "f4eb22a9013642c411725fdda945ae45f8d93181" },
|
||||||
"bufferline.nvim": { "branch": "main", "commit": "99f0932365b34e22549ff58e1bea388465d15e99" },
|
"bufferline.nvim": { "branch": "main", "commit": "99f0932365b34e22549ff58e1bea388465d15e99" },
|
||||||
"catppuccin": { "branch": "main", "commit": "6425df128d46f2db2cccf9aa7a66ca2823c1d153" },
|
"catppuccin": { "branch": "main", "commit": "057c34f849cf21059487d849e2f3b3efcd4ee0eb" },
|
||||||
"cinnamon.nvim": { "branch": "master", "commit": "c406ffda3a0302f32c23b24ab756ea20467d6578" },
|
"cinnamon.nvim": { "branch": "master", "commit": "c406ffda3a0302f32c23b24ab756ea20467d6578" },
|
||||||
"cmake-tools.nvim": { "branch": "master", "commit": "213932932d1fb17d513a40343ce9f7f026197847" },
|
"cmake-tools.nvim": { "branch": "master", "commit": "8e8e9520bf09c52f540b8c12ae2942da4d5803b2" },
|
||||||
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
|
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
|
||||||
"cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" },
|
"cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" },
|
||||||
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
|
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
|
||||||
|
@ -18,9 +18,9 @@
|
||||||
"dressing.nvim": { "branch": "master", "commit": "39611852fd7bbac117e939a26759bb37361f0c90" },
|
"dressing.nvim": { "branch": "master", "commit": "39611852fd7bbac117e939a26759bb37361f0c90" },
|
||||||
"flash.nvim": { "branch": "main", "commit": "967117690bd677cb7b6a87f0bc0077d2c0be3a27" },
|
"flash.nvim": { "branch": "main", "commit": "967117690bd677cb7b6a87f0bc0077d2c0be3a27" },
|
||||||
"friendly-snippets": { "branch": "main", "commit": "bc38057e513458cb2486b6cd82d365fa294ee398" },
|
"friendly-snippets": { "branch": "main", "commit": "bc38057e513458cb2486b6cd82d365fa294ee398" },
|
||||||
"gitsigns.nvim": { "branch": "main", "commit": "adcf2c7f2f495f5df148683764bf7cba6a70f34c" },
|
"gitsigns.nvim": { "branch": "main", "commit": "5d73da785a3c05fd63ac31769079db05169a6ec7" },
|
||||||
"glance.nvim": { "branch": "master", "commit": "866d0f8584c129e071d84138c679d39aa9b5684c" },
|
"glance.nvim": { "branch": "master", "commit": "b78ef99ffda23fa42ce85de50e3fc13a5472ecfd" },
|
||||||
"glow.nvim": { "branch": "main", "commit": "bbd0473d72a45094495ee5600b5577823543eefe" },
|
"glow.nvim": { "branch": "main", "commit": "8942dfb05794f436af4fbc90a34393f1fd36f361" },
|
||||||
"indent-blankline.nvim": { "branch": "master", "commit": "4541d690816cb99a7fc248f1486aa87f3abce91c" },
|
"indent-blankline.nvim": { "branch": "master", "commit": "4541d690816cb99a7fc248f1486aa87f3abce91c" },
|
||||||
"lazy.nvim": { "branch": "main", "commit": "3ad55ae678876516156cca2f361c51f7952a924b" },
|
"lazy.nvim": { "branch": "main", "commit": "3ad55ae678876516156cca2f361c51f7952a924b" },
|
||||||
"legendary.nvim": { "branch": "master", "commit": "3db15cae08d63bab40d0c38474e368f97414f090" },
|
"legendary.nvim": { "branch": "master", "commit": "3db15cae08d63bab40d0c38474e368f97414f090" },
|
||||||
|
@ -28,7 +28,7 @@
|
||||||
"lualine.nvim": { "branch": "master", "commit": "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9" },
|
"lualine.nvim": { "branch": "master", "commit": "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9" },
|
||||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "e86a4c84ff35240639643ffed56ee1c4d55f538e" },
|
"mason-lspconfig.nvim": { "branch": "main", "commit": "e86a4c84ff35240639643ffed56ee1c4d55f538e" },
|
||||||
"mason-nvim-dap.nvim": { "branch": "main", "commit": "e4d56b400e9757b1dc77d620fd3069396e92d5fc" },
|
"mason-nvim-dap.nvim": { "branch": "main", "commit": "e4d56b400e9757b1dc77d620fd3069396e92d5fc" },
|
||||||
"mason.nvim": { "branch": "main", "commit": "3f6b544c75c01549f7a2a9e395e0f1cea42b25dd" },
|
"mason.nvim": { "branch": "main", "commit": "fe9e34a9ab4d64321cdc3ecab4ea1809239bb73f" },
|
||||||
"mini.ai": { "branch": "main", "commit": "5218ea75e635df78a807bc9d5a7162594fb76d02" },
|
"mini.ai": { "branch": "main", "commit": "5218ea75e635df78a807bc9d5a7162594fb76d02" },
|
||||||
"mini.bufremove": { "branch": "main", "commit": "7821606e35c1ac931b56d8e3155f45ffe76ee7e5" },
|
"mini.bufremove": { "branch": "main", "commit": "7821606e35c1ac931b56d8e3155f45ffe76ee7e5" },
|
||||||
"mini.comment": { "branch": "main", "commit": "877acea5b2a32ff55f808fc0ebe9aa898648318c" },
|
"mini.comment": { "branch": "main", "commit": "877acea5b2a32ff55f808fc0ebe9aa898648318c" },
|
||||||
|
@ -37,25 +37,25 @@
|
||||||
"mini.surround": { "branch": "main", "commit": "9d1956b576d7051da3a483b251dfc778121c60db" },
|
"mini.surround": { "branch": "main", "commit": "9d1956b576d7051da3a483b251dfc778121c60db" },
|
||||||
"neo-tree.nvim": { "branch": "v3.x", "commit": "981a43adcca25e7ccc3c589902d49f25e4d48ebc" },
|
"neo-tree.nvim": { "branch": "v3.x", "commit": "981a43adcca25e7ccc3c589902d49f25e4d48ebc" },
|
||||||
"neoconf.nvim": { "branch": "main", "commit": "08f146d53e075055500dca35e93281faff95716b" },
|
"neoconf.nvim": { "branch": "main", "commit": "08f146d53e075055500dca35e93281faff95716b" },
|
||||||
"neodev.nvim": { "branch": "main", "commit": "866b6b6e687a93ba98851a03a74bf6d9211b7299" },
|
"neodev.nvim": { "branch": "main", "commit": "6adf4931c2a1a532d3f7a5c2217c280a07a1aabb" },
|
||||||
"noice.nvim": { "branch": "main", "commit": "c7969e3c25530087b3a52128030163280a7cf679" },
|
"noice.nvim": { "branch": "main", "commit": "894db25ec726d32047799d4d0a982b701bec453b" },
|
||||||
"nui.nvim": { "branch": "main", "commit": "9e3916e784660f55f47daa6f26053ad044db5d6a" },
|
"nui.nvim": { "branch": "main", "commit": "9e3916e784660f55f47daa6f26053ad044db5d6a" },
|
||||||
"null-ls.nvim": { "branch": "main", "commit": "db09b6c691def0038c456551e4e2772186449f35" },
|
"null-ls.nvim": { "branch": "main", "commit": "db09b6c691def0038c456551e4e2772186449f35" },
|
||||||
"numb.nvim": { "branch": "master", "commit": "2c89245d1185e02fec1494c45bc765a38b6b40b3" },
|
"numb.nvim": { "branch": "master", "commit": "2c89245d1185e02fec1494c45bc765a38b6b40b3" },
|
||||||
"nvim-cmp": { "branch": "main", "commit": "c4e491a87eeacf0408902c32f031d802c7eafce8" },
|
"nvim-cmp": { "branch": "main", "commit": "c4e491a87eeacf0408902c32f031d802c7eafce8" },
|
||||||
"nvim-dap": { "branch": "master", "commit": "d17d1bba23ec72a157bd183c57840c39e323f515" },
|
"nvim-dap": { "branch": "master", "commit": "2f28ea843bcdb378b171a66ddcd568516e431d55" },
|
||||||
"nvim-dap-go": { "branch": "main", "commit": "eab43d63cef832801a701812913e4d1d726725e5" },
|
"nvim-dap-go": { "branch": "main", "commit": "eab43d63cef832801a701812913e4d1d726725e5" },
|
||||||
"nvim-dap-python": { "branch": "master", "commit": "37b4cba02e337a95cb62ad1609b3d1dccb2e5d42" },
|
"nvim-dap-python": { "branch": "master", "commit": "37b4cba02e337a95cb62ad1609b3d1dccb2e5d42" },
|
||||||
"nvim-dap-ui": { "branch": "master", "commit": "85b16ac2309d85c88577cd8ee1733ce52be8227e" },
|
"nvim-dap-ui": { "branch": "master", "commit": "85b16ac2309d85c88577cd8ee1733ce52be8227e" },
|
||||||
"nvim-dap-virtual-text": { "branch": "master", "commit": "57f1dbd0458dd84a286b27768c142e1567f3ce3b" },
|
"nvim-dap-virtual-text": { "branch": "master", "commit": "57f1dbd0458dd84a286b27768c142e1567f3ce3b" },
|
||||||
"nvim-jdtls": { "branch": "master", "commit": "96e3978c3fdae3950f6ccda548775e8b8952f74a" },
|
"nvim-jdtls": { "branch": "master", "commit": "96e3978c3fdae3950f6ccda548775e8b8952f74a" },
|
||||||
"nvim-lspconfig": { "branch": "master", "commit": "dd11ba7b3c8f82d51b6d4dd7d68fce2d78bf78a0" },
|
"nvim-lspconfig": { "branch": "master", "commit": "b6091272422bb0fbd729f7f5d17a56d37499c54f" },
|
||||||
"nvim-navic": { "branch": "master", "commit": "9c89730da6a05acfeb6a197e212dfadf5aa60ca0" },
|
"nvim-navic": { "branch": "master", "commit": "9c89730da6a05acfeb6a197e212dfadf5aa60ca0" },
|
||||||
"nvim-notify": { "branch": "master", "commit": "ea9c8ce7a37f2238f934e087c255758659948e0f" },
|
"nvim-notify": { "branch": "master", "commit": "ea9c8ce7a37f2238f934e087c255758659948e0f" },
|
||||||
"nvim-spectre": { "branch": "master", "commit": "3ba6edeea1390457caaf73e96ab9c086ff6f90e9" },
|
"nvim-spectre": { "branch": "master", "commit": "3ba6edeea1390457caaf73e96ab9c086ff6f90e9" },
|
||||||
"nvim-treesitter": { "branch": "master", "commit": "7b04e8b67eec7d92daadf9f0717dd272ddfc81a3" },
|
"nvim-treesitter": { "branch": "master", "commit": "ee107fc759647293a84ad42b867f518331364fbe" },
|
||||||
"nvim-treesitter-textobjects": { "branch": "master", "commit": "ef32a5c24b767d165ed63fd2b24ac8dc52742521" },
|
"nvim-treesitter-textobjects": { "branch": "master", "commit": "9e519b6146512c8e2e702faf8ac48420f4f5deec" },
|
||||||
"nvim-ts-context-commentstring": { "branch": "main", "commit": "7f625207f225eea97ef7a6abe7611e556c396d2f" },
|
"nvim-ts-context-commentstring": { "branch": "main", "commit": "e9062e2dfb9854e6a927370f2d720de354c88524" },
|
||||||
"nvim-web-devicons": { "branch": "master", "commit": "efbfed0567ef4bfac3ce630524a0f6c8451c5534" },
|
"nvim-web-devicons": { "branch": "master", "commit": "efbfed0567ef4bfac3ce630524a0f6c8451c5534" },
|
||||||
"persistence.nvim": { "branch": "main", "commit": "4b8051c01f696d8849a5cb8afa9767be8db16e40" },
|
"persistence.nvim": { "branch": "main", "commit": "4b8051c01f696d8849a5cb8afa9767be8db16e40" },
|
||||||
"plenary.nvim": { "branch": "master", "commit": "267282a9ce242bbb0c5dc31445b6d353bed978bb" },
|
"plenary.nvim": { "branch": "master", "commit": "267282a9ce242bbb0c5dc31445b6d353bed978bb" },
|
||||||
|
@ -63,14 +63,15 @@
|
||||||
"project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" },
|
"project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" },
|
||||||
"rnvimr": { "branch": "main", "commit": "a89e373330649326a80c2fcafe7b92b5814792f6" },
|
"rnvimr": { "branch": "main", "commit": "a89e373330649326a80c2fcafe7b92b5814792f6" },
|
||||||
"rust-tools.nvim": { "branch": "master", "commit": "0cc8adab23117783a0292a0c8a2fbed1005dc645" },
|
"rust-tools.nvim": { "branch": "master", "commit": "0cc8adab23117783a0292a0c8a2fbed1005dc645" },
|
||||||
"telescope.nvim": { "branch": "master", "commit": "1228f3b15ca3d9b95dcb92efda6a3448871030bd" },
|
"telescope.nvim": { "branch": "master", "commit": "22735947d84d78f29436c203f0a4b8dc15dda204" },
|
||||||
"todo-comments.nvim": { "branch": "main", "commit": "09b0b17d824d2d56f02ff15967e8a2499a89c731" },
|
"todo-comments.nvim": { "branch": "main", "commit": "3094ead8edfa9040de2421deddec55d3762f64d1" },
|
||||||
"tokyonight.nvim": { "branch": "main", "commit": "1ee11019f8a81dac989ae1db1a013e3d582e2033" },
|
"tokyonight.nvim": { "branch": "main", "commit": "1ee11019f8a81dac989ae1db1a013e3d582e2033" },
|
||||||
"trouble.nvim": { "branch": "main", "commit": "0e6703c1d37d2d34ed029ab54f9bd66e3f2ecbf7" },
|
"trouble.nvim": { "branch": "main", "commit": "40aad004f53ae1d1ba91bcc5c29d59f07c5f01d3" },
|
||||||
"typescript.nvim": { "branch": "main", "commit": "de304087e6e49981fde01af8ccc5b21e8519306f" },
|
"typescript.nvim": { "branch": "main", "commit": "de304087e6e49981fde01af8ccc5b21e8519306f" },
|
||||||
|
"undotree": { "branch": "master", "commit": "0e11ba7325efbbb3f3bebe06213afa3e7ec75131" },
|
||||||
"venv-selector.nvim": { "branch": "main", "commit": "cc312074371aff5b0d8d481b80c9c4de2a5287d7" },
|
"venv-selector.nvim": { "branch": "main", "commit": "cc312074371aff5b0d8d481b80c9c4de2a5287d7" },
|
||||||
"vim-illuminate": { "branch": "master", "commit": "a2907275a6899c570d16e95b9db5fd921c167502" },
|
"vim-illuminate": { "branch": "master", "commit": "a2907275a6899c570d16e95b9db5fd921c167502" },
|
||||||
"vim-startuptime": { "branch": "master", "commit": "454b3de856b7bd298700de33d79774ca9b9e3875" },
|
"vim-startuptime": { "branch": "master", "commit": "454b3de856b7bd298700de33d79774ca9b9e3875" },
|
||||||
"vim-wakatime": { "branch": "master", "commit": "018fa9a80c27ccf2a8967b9e27890372e5c2fb4f" },
|
"vim-wakatime": { "branch": "master", "commit": "018fa9a80c27ccf2a8967b9e27890372e5c2fb4f" },
|
||||||
"which-key.nvim": { "branch": "main", "commit": "38b990f6eabf62014018b4aae70a97d7a6c2eb88" }
|
"which-key.nvim": { "branch": "main", "commit": "7ccf476ebe0445a741b64e36c78a682c1c6118b7" }
|
||||||
}
|
}
|
|
@ -1,3 +1,4 @@
|
||||||
-- Keymaps are automatically loaded on the VeryLazy event
|
-- Keymaps are automatically loaded on the VeryLazy event
|
||||||
-- Default keymaps that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/keymaps.lua
|
-- Default keymaps that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/keymaps.lua
|
||||||
-- Add any additional keymaps here
|
-- Add any additional keymaps here
|
||||||
|
vim.keymap.set("n", "<leader>uu", vim.cmd.UndotreeToggle)
|
||||||
|
|
|
@ -14,8 +14,7 @@ require("lazy").setup({
|
||||||
-- import any extras modules here
|
-- import any extras modules here
|
||||||
{ import = "lazyvim.plugins.extras.lang.typescript" },
|
{ import = "lazyvim.plugins.extras.lang.typescript" },
|
||||||
{ import = "lazyvim.plugins.extras.lang.json" },
|
{ import = "lazyvim.plugins.extras.lang.json" },
|
||||||
--{ import = "lazyvim.plugins.extras.ui.mini-animate" },
|
--{ import = "lazyvim.plugins.extras.ui.mini-animate" }
|
||||||
{ import = "lazyvim.plugins.extras.coding.copilot" },
|
|
||||||
{ import = "lazyvim.plugins.extras.dap.core" },
|
{ import = "lazyvim.plugins.extras.dap.core" },
|
||||||
{ import = "lazyvim.plugins.extras.formatting.prettier" },
|
{ import = "lazyvim.plugins.extras.formatting.prettier" },
|
||||||
{ import = "lazyvim.plugins.extras.util.project" },
|
{ import = "lazyvim.plugins.extras.util.project" },
|
||||||
|
@ -27,7 +26,7 @@ require("lazy").setup({
|
||||||
{ import = "lazyvim.plugins.extras.lang.rust" },
|
{ import = "lazyvim.plugins.extras.lang.rust" },
|
||||||
{ import = "lazyvim.plugins.extras.linting.eslint" },
|
{ import = "lazyvim.plugins.extras.linting.eslint" },
|
||||||
{ import = "lazyvim.plugins.extras.dap.core" },
|
{ import = "lazyvim.plugins.extras.dap.core" },
|
||||||
{ import = "lazyvim.plugins.extras.formatting.prettier" },
|
{ import = "lazyvim.plugins.extras.coding.copilot" },
|
||||||
--{ import = "lazyvim.plugins.extras.editor.flash" },
|
--{ import = "lazyvim.plugins.extras.editor.flash" },
|
||||||
-- import/override with your plugins
|
-- import/override with your plugins
|
||||||
{ import = "plugins" },
|
{ import = "plugins" },
|
||||||
|
|
|
@ -26,9 +26,15 @@ ResetGuiFont()
|
||||||
|
|
||||||
local opts = { noremap = true, silent = true }
|
local opts = { noremap = true, silent = true }
|
||||||
|
|
||||||
vim.keymap.set({ 'n', 'i' }, "<C-+>", function() ResizeGuiFont(1) end, opts)
|
vim.keymap.set({ "n", "i" }, "<C-+>", function()
|
||||||
vim.keymap.set({ 'n', 'i' }, "<C-->", function() ResizeGuiFont(-1) end, opts)
|
ResizeGuiFont(1)
|
||||||
vim.keymap.set({ 'n', 'i' }, "<C-BS>", function() ResetGuiFont() end, opts)
|
end, opts)
|
||||||
|
vim.keymap.set({ "n", "i" }, "<C-->", function()
|
||||||
|
ResizeGuiFont(-1)
|
||||||
|
end, opts)
|
||||||
|
vim.keymap.set({ "n", "i" }, "<C-BS>", function()
|
||||||
|
ResetGuiFont()
|
||||||
|
end, opts)
|
||||||
|
|
||||||
if vim.g.neovide then
|
if vim.g.neovide then
|
||||||
-- Put anything you want to happen only in Neovide here
|
-- Put anything you want to happen only in Neovide here
|
||||||
|
@ -48,27 +54,32 @@ if vim.g.neovide then
|
||||||
vim.opt.winblend = 20
|
vim.opt.winblend = 20
|
||||||
|
|
||||||
if vim.fn.exists("g:terminal_color_0") == 0 then
|
if vim.fn.exists("g:terminal_color_0") == 0 then
|
||||||
vim.api.nvim_set_var("terminal_color_0", '#494D64')
|
vim.api.nvim_set_var("terminal_color_0", "#494D64")
|
||||||
vim.api.nvim_set_var("terminal_color_1", '#ED8796')
|
vim.api.nvim_set_var("terminal_color_1", "#ED8796")
|
||||||
vim.api.nvim_set_var("terminal_color_2", '#A6DA95')
|
vim.api.nvim_set_var("terminal_color_2", "#A6DA95")
|
||||||
vim.api.nvim_set_var("terminal_color_3", '#EED49F')
|
vim.api.nvim_set_var("terminal_color_3", "#EED49F")
|
||||||
vim.api.nvim_set_var("terminal_color_4", '#8AADF4')
|
vim.api.nvim_set_var("terminal_color_4", "#8AADF4")
|
||||||
vim.api.nvim_set_var("terminal_color_5", '#F5BDE6')
|
vim.api.nvim_set_var("terminal_color_5", "#F5BDE6")
|
||||||
vim.api.nvim_set_var("terminal_color_6", '#8BD5CA')
|
vim.api.nvim_set_var("terminal_color_6", "#8BD5CA")
|
||||||
vim.api.nvim_set_var("terminal_color_7", '#B8C0E0')
|
vim.api.nvim_set_var("terminal_color_7", "#B8C0E0")
|
||||||
vim.api.nvim_set_var("terminal_color_8", '#5B6078')
|
vim.api.nvim_set_var("terminal_color_8", "#5B6078")
|
||||||
vim.api.nvim_set_var("terminal_color_9", '#ED8796')
|
vim.api.nvim_set_var("terminal_color_9", "#ED8796")
|
||||||
vim.api.nvim_set_var("terminal_color_10", '#A6DA95')
|
vim.api.nvim_set_var("terminal_color_10", "#A6DA95")
|
||||||
vim.api.nvim_set_var("terminal_color_11", '#EED49F')
|
vim.api.nvim_set_var("terminal_color_11", "#EED49F")
|
||||||
vim.api.nvim_set_var("terminal_color_12", '#8AADF4')
|
vim.api.nvim_set_var("terminal_color_12", "#8AADF4")
|
||||||
vim.api.nvim_set_var("terminal_color_13", '#F5BDE6')
|
vim.api.nvim_set_var("terminal_color_13", "#F5BDE6")
|
||||||
vim.api.nvim_set_var("terminal_color_14", '#8BD5CA')
|
vim.api.nvim_set_var("terminal_color_14", "#8BD5CA")
|
||||||
vim.api.nvim_set_var("terminal_color_15", '#B8C0E0')
|
vim.api.nvim_set_var("terminal_color_15", "#B8C0E0")
|
||||||
end
|
end
|
||||||
|
|
||||||
vim.g.neovide_theme = 'catppuccin-macchiato'
|
vim.g.neovide_theme = "catppuccin-macchiato"
|
||||||
end
|
end
|
||||||
|
|
||||||
vim.opt.relativenumber = false
|
vim.opt.relativenumber = false
|
||||||
|
|
||||||
vim.opt.shell = "fish"
|
vim.opt.shell = "fish"
|
||||||
|
|
||||||
|
vim.opt.shiftwidth = 4
|
||||||
|
vim.opt.tabstop = 4
|
||||||
|
vim.opt.smartindent = true
|
||||||
|
vim.opt.expandtab = true
|
||||||
|
|
19
.config/nvim/lua/plugins/alpha.lua
Normal file
19
.config/nvim/lua/plugins/alpha.lua
Normal file
|
@ -0,0 +1,19 @@
|
||||||
|
return {
|
||||||
|
{
|
||||||
|
"goolord/alpha-nvim",
|
||||||
|
event = "VimEnter",
|
||||||
|
opts = function()
|
||||||
|
local dashboard = require("alpha.themes.dashboard")
|
||||||
|
local logo = [[
|
||||||
|
███╗ ███╗ █████╗ ████████╗████████╗ ██╗██████╗ ███████╗
|
||||||
|
████╗ ████║██╔══██╗╚══██╔══╝╚══██╔══╝ ██║██╔══██╗██╔════╝
|
||||||
|
██╔████╔██║███████║ ██║ ██║ ██║██║ ██║█████╗
|
||||||
|
██║╚██╔╝██║██╔══██║ ██║ ██║ ██║██║ ██║██╔══╝
|
||||||
|
██║ ╚═╝ ██║██║ ██║ ██║ ██║ ██║██████╔╝███████╗
|
||||||
|
╚═╝ ╚═╝╚═╝ ╚═╝ ╚═╝ ╚═╝ ╚═╝╚═════╝ ╚══════╝
|
||||||
|
]]
|
||||||
|
dashboard.section.header.val = vim.split(logo, "\n")
|
||||||
|
return dashboard
|
||||||
|
end
|
||||||
|
}
|
||||||
|
}
|
48
.config/nvim/lua/plugins/bufferline.lua
Normal file
48
.config/nvim/lua/plugins/bufferline.lua
Normal file
|
@ -0,0 +1,48 @@
|
||||||
|
return {
|
||||||
|
{
|
||||||
|
"akinsho/bufferline.nvim",
|
||||||
|
event = "VeryLazy",
|
||||||
|
keys = {
|
||||||
|
{ "<leader>bp", "<Cmd>BufferLineTogglePin<CR>", desc = "Toggle pin" },
|
||||||
|
{ "<leader>bP", "<Cmd>BufferLineGroupClose ungrouped<CR>", desc = "Delete non-pinned buffers" },
|
||||||
|
},
|
||||||
|
opts = {
|
||||||
|
options = {
|
||||||
|
-- stylua: ignore
|
||||||
|
close_command = function(n) require("mini.bufremove").delete(n, false) end,
|
||||||
|
-- stylua: ignore
|
||||||
|
separator_style = "slope",
|
||||||
|
highlights = {
|
||||||
|
fill = {
|
||||||
|
fg = "#cad3f5",
|
||||||
|
bg = "#24273a",
|
||||||
|
},
|
||||||
|
background = {
|
||||||
|
fg = "#cad3f5",
|
||||||
|
bg = "#24273a",
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
right_mouse_command = function(n)
|
||||||
|
require("mini.bufremove").delete(n, false)
|
||||||
|
end,
|
||||||
|
diagnostics = "nvim_lsp",
|
||||||
|
always_show_bufferline = false,
|
||||||
|
diagnostics_indicator = function(_, _, diag)
|
||||||
|
local icons = require("lazyvim.config").icons.diagnostics
|
||||||
|
local ret = (diag.error and icons.Error .. diag.error .. " " or "")
|
||||||
|
.. (diag.warning and icons.Warn .. diag.warning or "")
|
||||||
|
return vim.trim(ret)
|
||||||
|
end,
|
||||||
|
offsets = {
|
||||||
|
{
|
||||||
|
filetype = "neo-tree",
|
||||||
|
text = "Neo-tree",
|
||||||
|
highlight = "Directory",
|
||||||
|
text_align = "left",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
38
.config/nvim/lua/plugins/catppuccin.lua
Normal file
38
.config/nvim/lua/plugins/catppuccin.lua
Normal file
|
@ -0,0 +1,38 @@
|
||||||
|
return {
|
||||||
|
{
|
||||||
|
"catppuccin/nvim",
|
||||||
|
lazy = true,
|
||||||
|
name = "catppuccin",
|
||||||
|
opts = {
|
||||||
|
integrations = {
|
||||||
|
alpha = true,
|
||||||
|
cmp = true,
|
||||||
|
flash = true,
|
||||||
|
gitsigns = true,
|
||||||
|
illuminate = true,
|
||||||
|
indent_blankline = { enabled = true },
|
||||||
|
lsp_trouble = true,
|
||||||
|
mason = true,
|
||||||
|
mini = true,
|
||||||
|
native_lsp = {
|
||||||
|
enabled = true,
|
||||||
|
underlines = {
|
||||||
|
errors = { "undercurl" },
|
||||||
|
hints = { "undercurl" },
|
||||||
|
warnings = { "undercurl" },
|
||||||
|
information = { "undercurl" },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
navic = { enabled = true, custom_bg = "lualine" },
|
||||||
|
neotest = true,
|
||||||
|
noice = true,
|
||||||
|
notify = true,
|
||||||
|
neotree = true,
|
||||||
|
semantic_tokens = true,
|
||||||
|
telescope = true,
|
||||||
|
treesitter = true,
|
||||||
|
which_key = true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,18 +0,0 @@
|
||||||
return {
|
|
||||||
{
|
|
||||||
"zbirenbaum/copilot-cmp",
|
|
||||||
dependencies = "copilot.lua",
|
|
||||||
opts = {},
|
|
||||||
config = function(_, opts)
|
|
||||||
local copilot_cmp = require("copilot_cmp")
|
|
||||||
copilot_cmp.setup(opts)
|
|
||||||
-- attach cmp source whenever copilot attaches
|
|
||||||
-- fixes lazy-loading issues with the copilot cmp source
|
|
||||||
require("lazyvim.util").on_attach(function(client)
|
|
||||||
if client.name == "copilot" then
|
|
||||||
copilot_cmp._on_insert_enter({})
|
|
||||||
end
|
|
||||||
end)
|
|
||||||
end,
|
|
||||||
}
|
|
||||||
}
|
|
18
.config/nvim/lua/plugins/copilot-cmp.lua.bak
Normal file
18
.config/nvim/lua/plugins/copilot-cmp.lua.bak
Normal file
|
@ -0,0 +1,18 @@
|
||||||
|
return {
|
||||||
|
{
|
||||||
|
"zbirenbaum/copilot-cmp",
|
||||||
|
dependencies = "copilot.lua",
|
||||||
|
opts = {},
|
||||||
|
config = function(_, opts)
|
||||||
|
local copilot_cmp = require("copilot_cmp")
|
||||||
|
copilot_cmp.setup(opts)
|
||||||
|
-- attach cmp source whenever copilot attaches
|
||||||
|
-- fixes lazy-loading issues with the copilot cmp source
|
||||||
|
require("lazyvim.util").on_attach(function(client)
|
||||||
|
if client.name == "copilot" then
|
||||||
|
copilot_cmp._on_insert_enter({})
|
||||||
|
end
|
||||||
|
end)
|
||||||
|
end,
|
||||||
|
},
|
||||||
|
}
|
22
.config/nvim/lua/plugins/copilot-lua.lua
Normal file
22
.config/nvim/lua/plugins/copilot-lua.lua
Normal file
|
@ -0,0 +1,22 @@
|
||||||
|
return {
|
||||||
|
"zbirenbaum/copilot.lua",
|
||||||
|
opts = {
|
||||||
|
suggestion = {
|
||||||
|
enabled = true,
|
||||||
|
auto_trigger = true,
|
||||||
|
keymap = {
|
||||||
|
accept = "<M-CR>",
|
||||||
|
accept_line = "<M-l>",
|
||||||
|
accept_word = "<M-k>",
|
||||||
|
next = "<M-]>",
|
||||||
|
prev = "<M-[>",
|
||||||
|
dismiss = "<M-c>",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
panel = { enabled = false },
|
||||||
|
filetypes = {
|
||||||
|
markdown = true,
|
||||||
|
help = true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
|
@ -1,11 +0,0 @@
|
||||||
return {
|
|
||||||
"zbirenbaum/copilot.lua",
|
|
||||||
opts = {
|
|
||||||
suggestion = { enabled = true },
|
|
||||||
panel = { enabled = false },
|
|
||||||
filetypes = {
|
|
||||||
markdown = true,
|
|
||||||
help = true,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
|
@ -24,6 +24,6 @@ return {
|
||||||
reading_text = "Reading %s", -- Format string rendered when a read-only or unmodifiable file is loaded in the buffer (either string or function(filename: string): string)
|
reading_text = "Reading %s", -- Format string rendered when a read-only or unmodifiable file is loaded in the buffer (either string or function(filename: string): string)
|
||||||
workspace_text = "Working on %s", -- Format string rendered when in a git repository (either string or function(project_name: string|nil, filename: string): string)
|
workspace_text = "Working on %s", -- Format string rendered when in a git repository (either string or function(project_name: string|nil, filename: string): string)
|
||||||
line_number_text = "Line %s out of %s", -- Format string rendered when `enable_line_number` is set to true (either string or function(line_number: number, line_count: number): string)
|
line_number_text = "Line %s out of %s", -- Format string rendered when `enable_line_number` is set to true (either string or function(line_number: number, line_count: number): string)
|
||||||
}
|
},
|
||||||
}
|
},
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
return {
|
return {
|
||||||
{
|
{
|
||||||
"dnlhc/glance.nvim",
|
"dnlhc/glance.nvim",
|
||||||
lazy = false
|
lazy = false,
|
||||||
}
|
},
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,8 +1,93 @@
|
||||||
return {
|
return {
|
||||||
{
|
{
|
||||||
"williamboman/mason.nvim",
|
"williamboman/mason.nvim",
|
||||||
opts = function(_, opts)
|
opts = {
|
||||||
table.insert(opts.ensure_installed, "prettierd")
|
ensure_installed = {
|
||||||
end,
|
"angular-language-server",
|
||||||
}
|
"arduino-language-server",
|
||||||
|
"bash-language-server",
|
||||||
|
"bash-debug-adapter",
|
||||||
|
"beautysh",
|
||||||
|
"clang-format",
|
||||||
|
"cmake-language-server",
|
||||||
|
"cmakelang",
|
||||||
|
"cmakelint",
|
||||||
|
"codelldb",
|
||||||
|
"codespell",
|
||||||
|
"csharp-language-server",
|
||||||
|
"csharpier",
|
||||||
|
"css-lsp",
|
||||||
|
"cssmodules-language-server",
|
||||||
|
"dart-debug-adapter",
|
||||||
|
"debugpy",
|
||||||
|
"delve",
|
||||||
|
"docformatter",
|
||||||
|
"docker-compose-language-service",
|
||||||
|
"dockerfile-language-server",
|
||||||
|
"elixir-ls",
|
||||||
|
"emmet-language-server",
|
||||||
|
"emmet-ls",
|
||||||
|
"eslint-lsp",
|
||||||
|
"eslint_d",
|
||||||
|
"firefox-debug-adapter",
|
||||||
|
"gitlint",
|
||||||
|
"go-debug-adapter",
|
||||||
|
"gofumpt",
|
||||||
|
"goimports",
|
||||||
|
"goimports-reviser",
|
||||||
|
"golangci-lint",
|
||||||
|
"golangci-lint-langserver",
|
||||||
|
"gomodifytags",
|
||||||
|
"gopls",
|
||||||
|
"gradle-language-server",
|
||||||
|
"grammarly-languageserver",
|
||||||
|
"graphql-language-service-cli",
|
||||||
|
"hadolint",
|
||||||
|
"html-lsp",
|
||||||
|
"impl",
|
||||||
|
"intelephense",
|
||||||
|
"java-debug-adapter",
|
||||||
|
"java-test",
|
||||||
|
"jdtls",
|
||||||
|
"js-debug-adapter",
|
||||||
|
"json-lsp",
|
||||||
|
"jsonlint",
|
||||||
|
"julia-lsp",
|
||||||
|
"kotlin-language-server",
|
||||||
|
"kotlin-debug-adapter",
|
||||||
|
"ktlint",
|
||||||
|
"lua-language-server",
|
||||||
|
"luacheck",
|
||||||
|
"markdownlint",
|
||||||
|
"neocmakelsp",
|
||||||
|
"netcoredbg",
|
||||||
|
"omnisharp",
|
||||||
|
"omnisharp-mono",
|
||||||
|
"php-debug-adapter",
|
||||||
|
"prettier",
|
||||||
|
"prettierd",
|
||||||
|
"purescript-language-server",
|
||||||
|
"pyright",
|
||||||
|
"ruff-lsp",
|
||||||
|
"rust-analyzer",
|
||||||
|
"rustywind",
|
||||||
|
"shfmt",
|
||||||
|
"sql-formatter",
|
||||||
|
"stylelint-lsp",
|
||||||
|
"stylua",
|
||||||
|
"svelte-language-server",
|
||||||
|
"tailwindcss-language-server",
|
||||||
|
"taplo",
|
||||||
|
"ts-standard",
|
||||||
|
"typescript-language-server",
|
||||||
|
"vetur-vls",
|
||||||
|
"vim-language-server",
|
||||||
|
"vue-language-server",
|
||||||
|
"xmlformatter",
|
||||||
|
"yaml-language-server",
|
||||||
|
"yamlfix",
|
||||||
|
"stylelint",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
14
.config/nvim/lua/plugins/project.lua
Normal file
14
.config/nvim/lua/plugins/project.lua
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
return {
|
||||||
|
{
|
||||||
|
"ahmedkhalf/project.nvim",
|
||||||
|
opts = {},
|
||||||
|
event = "VeryLazy",
|
||||||
|
config = function(_, opts)
|
||||||
|
require("project_nvim").setup(opts)
|
||||||
|
require("telescope").load_extension("projects")
|
||||||
|
end,
|
||||||
|
keys = {
|
||||||
|
{ "<leader>fp", "<Cmd>Telescope projects<CR>", desc = "Projects" },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
6
.config/nvim/lua/plugins/undotree.lua
Normal file
6
.config/nvim/lua/plugins/undotree.lua
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
return {
|
||||||
|
{
|
||||||
|
"mbbill/undotree",
|
||||||
|
lazy = false,
|
||||||
|
},
|
||||||
|
}
|
Loading…
Add table
Reference in a new issue