diff options
| -rw-r--r-- | .vimrc | 14 | ||||
| -rw-r--r-- | nvim/after/plugin/neowallust.lua | 0 | ||||
| -rw-r--r-- | nvim/lua/colorscheme.lua | 19 | ||||
| -rw-r--r-- | nvim/lua/commands.lua | 8 | ||||
| -rw-r--r-- | nvim/lua/options.lua | 1 | ||||
| -rw-r--r-- | nvim/lua/plugins.lua | 10 |
6 files changed, 27 insertions, 25 deletions
@@ -1,5 +1,4 @@ set termguicolors -colorscheme catppuccin_macchiato syntax on set nu @@ -11,6 +10,7 @@ set shiftwidth=4 set expandtab set smartindent +set autoindent set nohlsearch set incsearch @@ -20,6 +20,9 @@ set signcolumn=no set cursorline set cursorlineopt=number +set ignorecase +set smartcase + let mapleader = ' ' vnoremap <PageDown> :m '>+1<CR>gv=gv @@ -33,4 +36,11 @@ noremap J mzJ`z noremap o o<Esc> noremap O O<Esc> -noremap Q <nop> +call plug#begin() + +" List your plugins here +Plug 'dylanaraps/wal.vim' + +call plug#end() + +colorscheme wal diff --git a/nvim/after/plugin/neowallust.lua b/nvim/after/plugin/neowallust.lua new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/nvim/after/plugin/neowallust.lua diff --git a/nvim/lua/colorscheme.lua b/nvim/lua/colorscheme.lua index 86e8b42..44277ed 100644 --- a/nvim/lua/colorscheme.lua +++ b/nvim/lua/colorscheme.lua @@ -1,18 +1 @@ -require("catppuccin").setup({ - flavour = "macchiato", - background = { - light = "latte", - dark = "macchiato", - }, - custom_highlights = function (colors) - return { - CursorLineNr = { fg = colors.flamingo }, - } - end, - integrations = { - cmp = true, - telescope = true, - }, -}) - -vim.cmd.colorscheme "catppuccin" +vim.cmd.colorscheme("neopywal") diff --git a/nvim/lua/commands.lua b/nvim/lua/commands.lua index aea15ca..45b674f 100644 --- a/nvim/lua/commands.lua +++ b/nvim/lua/commands.lua @@ -2,10 +2,10 @@ vim.api.nvim_create_autocmd("ColorScheme", { pattern = "*", callback = function() package.loaded["feline"] = nil - package.loaded["catppuccin.groups.integrations.feline"] = nil - require("feline").setup { - components = require("catppuccin.groups.integrations.feline").get(), - } + package.loaded["neopywal.theme.plugins.feline"] = nil + require("feline").setup({ + components = require("neopywal.theme.plugins.feline").get(), + }) end, }) diff --git a/nvim/lua/options.lua b/nvim/lua/options.lua index 5974579..c8271f5 100644 --- a/nvim/lua/options.lua +++ b/nvim/lua/options.lua @@ -27,7 +27,6 @@ local options = { ignorecase = true, smartcase = true, - guifont = "FiraCode:h10", showmode = false, } diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua index f490221..4dacb75 100644 --- a/nvim/lua/plugins.lua +++ b/nvim/lua/plugins.lua @@ -29,6 +29,7 @@ require("lazy").setup({ 'sitiom/nvim-numbertoggle', 'folke/twilight.nvim', 'lewis6991/gitsigns.nvim', + 'xiyaowong/transparent.nvim', { 'akinsho/toggleterm.nvim', version = "*", config = true }, { 'echasnovski/mini.files', version = '*' }, { 'echasnovski/mini.trailspace', version = '*' }, @@ -85,5 +86,14 @@ require("lazy").setup({ 'windwp/nvim-autopairs', event = "InsertEnter", config = true + }, + { + "RedsXDD/neopywal.nvim", + name = "neopywal", + lazy = false, + priority = 1000, + opts = { + use_palette = 'wallust', + }, } }) |