From 8b904863294a210fcbc5e29cf2764e8d95f42cd4 Mon Sep 17 00:00:00 2001 From: Bryan Ramos Date: Fri, 18 Oct 2024 20:40:10 -0400 Subject: [PATCH] nvim updates switched to ts_ls colorscheme fixes changes --- .../neovim/config/lazyvim/lazy-lock.json | 23 ------------------- .../neovim/config/{lazyvim => nvim}/init.lua | 0 .../{lazyvim => nvim}/lua/config/keymaps.lua | 0 .../{lazyvim => nvim}/lua/config/lazy.lua | 0 .../{lazyvim => nvim}/lua/config/options.lua | 0 .../lua/plugins/bufferline.lua | 0 .../lua/plugins/colorscheme.lua | 7 +++--- .../lua/plugins/disabled.lua | 0 .../lua/plugins/gitsigns.lua | 0 .../lua/plugins/indent-blankline.lua | 0 .../{lazyvim => nvim}/lua/plugins/lsp.lua | 2 +- .../{lazyvim => nvim}/lua/plugins/lualine.lua | 0 .../{lazyvim => nvim}/lua/plugins/neotree.lua | 0 .../lua/plugins/telescope.lua | 0 .../lua/plugins/which-key.lua | 0 .../modules/utils/modules/neovim/default.nix | 2 +- 16 files changed, 6 insertions(+), 28 deletions(-) delete mode 100644 src/user/modules/utils/modules/neovim/config/lazyvim/lazy-lock.json rename src/user/modules/utils/modules/neovim/config/{lazyvim => nvim}/init.lua (100%) rename src/user/modules/utils/modules/neovim/config/{lazyvim => nvim}/lua/config/keymaps.lua (100%) rename src/user/modules/utils/modules/neovim/config/{lazyvim => nvim}/lua/config/lazy.lua (100%) rename src/user/modules/utils/modules/neovim/config/{lazyvim => nvim}/lua/config/options.lua (100%) rename src/user/modules/utils/modules/neovim/config/{lazyvim => nvim}/lua/plugins/bufferline.lua (100%) rename src/user/modules/utils/modules/neovim/config/{lazyvim => nvim}/lua/plugins/colorscheme.lua (81%) rename src/user/modules/utils/modules/neovim/config/{lazyvim => nvim}/lua/plugins/disabled.lua (100%) rename src/user/modules/utils/modules/neovim/config/{lazyvim => nvim}/lua/plugins/gitsigns.lua (100%) rename src/user/modules/utils/modules/neovim/config/{lazyvim => nvim}/lua/plugins/indent-blankline.lua (100%) rename src/user/modules/utils/modules/neovim/config/{lazyvim => nvim}/lua/plugins/lsp.lua (99%) rename src/user/modules/utils/modules/neovim/config/{lazyvim => nvim}/lua/plugins/lualine.lua (100%) rename src/user/modules/utils/modules/neovim/config/{lazyvim => nvim}/lua/plugins/neotree.lua (100%) rename src/user/modules/utils/modules/neovim/config/{lazyvim => nvim}/lua/plugins/telescope.lua (100%) rename src/user/modules/utils/modules/neovim/config/{lazyvim => nvim}/lua/plugins/which-key.lua (100%) diff --git a/src/user/modules/utils/modules/neovim/config/lazyvim/lazy-lock.json b/src/user/modules/utils/modules/neovim/config/lazyvim/lazy-lock.json deleted file mode 100644 index b659896..0000000 --- a/src/user/modules/utils/modules/neovim/config/lazyvim/lazy-lock.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" }, - "base16-vim": { "branch": "master", "commit": "3be3cd82cd31acfcab9a41bad853d9c68d30478d" }, - "bufferline.nvim": { "branch": "main", "commit": "2e3c8cc5a57ddd32f1edd2ffd2ccb10c09421f6c" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, - "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "gitsigns.nvim": { "branch": "main", "commit": "562dc47189ad3c8696dbf460d38603a74d544849" }, - "indent-blankline.nvim": { "branch": "master", "commit": "db926997af951da38e5004ec7b9fbdc480b48f5d" }, - "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, - "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "482350b050bd413931c2cdd4857443c3da7d57cb" }, - "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "neo-tree.nvim": { "branch": "main", "commit": "206241e451c12f78969ff5ae53af45616ffc9b72" }, - "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, - "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, - "nvim-lspconfig": { "branch": "master", "commit": "a7f0f9c18baa70a3970ea18f9984e03b6f6c2e8a" }, - "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" }, - "nvim-treesitter": { "branch": "master", "commit": "8724e7d028ba11604dde94dc4be63f70cccf16e0" }, - "nvim-web-devicons": { "branch": "master", "commit": "3722e3d1fb5fe1896a104eb489e8f8651260b520" }, - "plenary.nvim": { "branch": "master", "commit": "ec289423a1693aeae6cd0d503bac2856af74edaa" }, - "telescope.nvim": { "branch": "master", "commit": "5972437de807c3bc101565175da66a1aa4f8707a" }, - "which-key.nvim": { "branch": "main", "commit": "6c1584eb76b55629702716995cca4ae2798a9cca" } -} diff --git a/src/user/modules/utils/modules/neovim/config/lazyvim/init.lua b/src/user/modules/utils/modules/neovim/config/nvim/init.lua similarity index 100% rename from src/user/modules/utils/modules/neovim/config/lazyvim/init.lua rename to src/user/modules/utils/modules/neovim/config/nvim/init.lua diff --git a/src/user/modules/utils/modules/neovim/config/lazyvim/lua/config/keymaps.lua b/src/user/modules/utils/modules/neovim/config/nvim/lua/config/keymaps.lua similarity index 100% rename from src/user/modules/utils/modules/neovim/config/lazyvim/lua/config/keymaps.lua rename to src/user/modules/utils/modules/neovim/config/nvim/lua/config/keymaps.lua diff --git a/src/user/modules/utils/modules/neovim/config/lazyvim/lua/config/lazy.lua b/src/user/modules/utils/modules/neovim/config/nvim/lua/config/lazy.lua similarity index 100% rename from src/user/modules/utils/modules/neovim/config/lazyvim/lua/config/lazy.lua rename to src/user/modules/utils/modules/neovim/config/nvim/lua/config/lazy.lua diff --git a/src/user/modules/utils/modules/neovim/config/lazyvim/lua/config/options.lua b/src/user/modules/utils/modules/neovim/config/nvim/lua/config/options.lua similarity index 100% rename from src/user/modules/utils/modules/neovim/config/lazyvim/lua/config/options.lua rename to src/user/modules/utils/modules/neovim/config/nvim/lua/config/options.lua diff --git a/src/user/modules/utils/modules/neovim/config/lazyvim/lua/plugins/bufferline.lua b/src/user/modules/utils/modules/neovim/config/nvim/lua/plugins/bufferline.lua similarity index 100% rename from src/user/modules/utils/modules/neovim/config/lazyvim/lua/plugins/bufferline.lua rename to src/user/modules/utils/modules/neovim/config/nvim/lua/plugins/bufferline.lua diff --git a/src/user/modules/utils/modules/neovim/config/lazyvim/lua/plugins/colorscheme.lua b/src/user/modules/utils/modules/neovim/config/nvim/lua/plugins/colorscheme.lua similarity index 81% rename from src/user/modules/utils/modules/neovim/config/lazyvim/lua/plugins/colorscheme.lua rename to src/user/modules/utils/modules/neovim/config/nvim/lua/plugins/colorscheme.lua index 01aff2e..66c9dea 100644 --- a/src/user/modules/utils/modules/neovim/config/lazyvim/lua/plugins/colorscheme.lua +++ b/src/user/modules/utils/modules/neovim/config/nvim/lua/plugins/colorscheme.lua @@ -5,13 +5,14 @@ return { vim.cmd("colorscheme base16-onedark") vim.cmd([[ hi Normal guibg=NONE ctermbg=NONE guifg=#FFFFFF + hi Visual ctermbg=Gray guibg=Gray hi NonText guibg=NONE ctermbg=NONE hi LineNr guibg=NONE ctermbg=NONE hi CursorLine guibg=NONE ctermbg=NONE hi CursorLineNr guibg=NONE ctermbg=NONE guifg=#E5C07B ctermfg=Yellow cterm=bold hi Search ctermfg=Black guifg=#000000 ctermbg=Gray guibg=#FFCC66 - hi Pmenu ctermbg=Gray ctermfg=Black cterm=NONE guibg=Gray guifg=Black gui=NONE - hi PmenuSel ctermbg=Black ctermfg=Green cterm=NONE guibg=Black guifg=Green gui=NONE + hi Pmenu ctermbg=Black ctermfg=White cterm=NONE guibg=Black guifg=White gui=NONE + hi PmenuSel ctermbg=Green ctermfg=Black cterm=NONE guibg=Green guifg=Black gui=NONE hi PmenuThumb ctermbg=Green guibg=Green hi PmenuSbar ctermbg=Black guibg=Black hi WinSeparator guibg=NONE ctermbg=NONE @@ -26,7 +27,7 @@ return { hi TreesitterContext guibg=NONE ctermbg=NONE - hi LazyProp guibg=NONE ctermbg=NONE + hi LazyH1 ctermbg=Green ctermfg=Black guibg=Black guifg=Green hi IblScope guibg=NONE guifg=Yellow ctermbg=NONE ctermfg=Yellow ]]) diff --git a/src/user/modules/utils/modules/neovim/config/lazyvim/lua/plugins/disabled.lua b/src/user/modules/utils/modules/neovim/config/nvim/lua/plugins/disabled.lua similarity index 100% rename from src/user/modules/utils/modules/neovim/config/lazyvim/lua/plugins/disabled.lua rename to src/user/modules/utils/modules/neovim/config/nvim/lua/plugins/disabled.lua diff --git a/src/user/modules/utils/modules/neovim/config/lazyvim/lua/plugins/gitsigns.lua b/src/user/modules/utils/modules/neovim/config/nvim/lua/plugins/gitsigns.lua similarity index 100% rename from src/user/modules/utils/modules/neovim/config/lazyvim/lua/plugins/gitsigns.lua rename to src/user/modules/utils/modules/neovim/config/nvim/lua/plugins/gitsigns.lua diff --git a/src/user/modules/utils/modules/neovim/config/lazyvim/lua/plugins/indent-blankline.lua b/src/user/modules/utils/modules/neovim/config/nvim/lua/plugins/indent-blankline.lua similarity index 100% rename from src/user/modules/utils/modules/neovim/config/lazyvim/lua/plugins/indent-blankline.lua rename to src/user/modules/utils/modules/neovim/config/nvim/lua/plugins/indent-blankline.lua diff --git a/src/user/modules/utils/modules/neovim/config/lazyvim/lua/plugins/lsp.lua b/src/user/modules/utils/modules/neovim/config/nvim/lua/plugins/lsp.lua similarity index 99% rename from src/user/modules/utils/modules/neovim/config/lazyvim/lua/plugins/lsp.lua rename to src/user/modules/utils/modules/neovim/config/nvim/lua/plugins/lsp.lua index 927cbcb..e068eaa 100644 --- a/src/user/modules/utils/modules/neovim/config/lazyvim/lua/plugins/lsp.lua +++ b/src/user/modules/utils/modules/neovim/config/nvim/lua/plugins/lsp.lua @@ -1,5 +1,5 @@ local servers = { - "tsserver", + "ts_ls", "pyright", "nil_ls", "cssls", diff --git a/src/user/modules/utils/modules/neovim/config/lazyvim/lua/plugins/lualine.lua b/src/user/modules/utils/modules/neovim/config/nvim/lua/plugins/lualine.lua similarity index 100% rename from src/user/modules/utils/modules/neovim/config/lazyvim/lua/plugins/lualine.lua rename to src/user/modules/utils/modules/neovim/config/nvim/lua/plugins/lualine.lua diff --git a/src/user/modules/utils/modules/neovim/config/lazyvim/lua/plugins/neotree.lua b/src/user/modules/utils/modules/neovim/config/nvim/lua/plugins/neotree.lua similarity index 100% rename from src/user/modules/utils/modules/neovim/config/lazyvim/lua/plugins/neotree.lua rename to src/user/modules/utils/modules/neovim/config/nvim/lua/plugins/neotree.lua diff --git a/src/user/modules/utils/modules/neovim/config/lazyvim/lua/plugins/telescope.lua b/src/user/modules/utils/modules/neovim/config/nvim/lua/plugins/telescope.lua similarity index 100% rename from src/user/modules/utils/modules/neovim/config/lazyvim/lua/plugins/telescope.lua rename to src/user/modules/utils/modules/neovim/config/nvim/lua/plugins/telescope.lua diff --git a/src/user/modules/utils/modules/neovim/config/lazyvim/lua/plugins/which-key.lua b/src/user/modules/utils/modules/neovim/config/nvim/lua/plugins/which-key.lua similarity index 100% rename from src/user/modules/utils/modules/neovim/config/lazyvim/lua/plugins/which-key.lua rename to src/user/modules/utils/modules/neovim/config/nvim/lua/plugins/which-key.lua diff --git a/src/user/modules/utils/modules/neovim/default.nix b/src/user/modules/utils/modules/neovim/default.nix index b1019f4..9b0c478 100644 --- a/src/user/modules/utils/modules/neovim/default.nix +++ b/src/user/modules/utils/modules/neovim/default.nix @@ -16,7 +16,7 @@ in }; home.file.".config/nvim" = { - source = ./config/lazyvim; + source = ./config/nvim; recursive = true; }; };