diff --git a/config/alacritty/alacritty.toml b/config/alacritty/alacritty.toml index e008862..803b1e0 100644 --- a/config/alacritty/alacritty.toml +++ b/config/alacritty/alacritty.toml @@ -14,39 +14,20 @@ padding.y = 10 style.shape = "Beam" style.blinking = "Always" -# Kanagawa Wave Alacritty Colors +# LACKLUSTER COLORS [colors.primary] -background = '#141415' -foreground = '#dcd7ba' +background = '#101010' [colors.normal] -black = '#090618' -red = '#c34043' -green = '#76946a' -yellow = '#c0a36e' -blue = '#7e9cd8' -magenta = '#957fb8' -cyan = '#6a9589' -white = '#c8c093' +# black is gray0 +black = '#080808' +red = '#C11F1F' +green = '#789978' +yellow = '#ffAA88' +blue = '#7788AA' +magenta = '#BD61A3' +# cyan is set to lack +cyan = '#708090' +# white is set to luster +white = '#DEEEED' -[colors.bright] -black = '#727169' -red = '#e82424' -green = '#98bb6c' -yellow = '#e6c384' -blue = '#7fb4ca' -magenta = '#938aa9' -cyan = '#7aa89f' -white = '#dcd7ba' - -[colors.selection] -background = '#2d4f67' -foreground = '#c8c093' - -[[colors.indexed_colors]] -index = 16 -color = '#ffa066' - -[[colors.indexed_colors]] -index = 17 -color = '#ff5d62' diff --git a/config/nvim/init.lua b/config/nvim/init.lua index 35d3a15..9fe632b 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -1,10 +1,6 @@ require("vim._core.ui2").enable({}) map = vim.keymap.set -vim.g.termguicolors = true -vim.g.netrw_keepdir = 1 -vim.g.netrw_winsize = 30 -vim.g.netrw_liststyle = 3 -vim.g.netrw_browse_split = 4 +vim.o.termguicolors = true vim.o.nu = true vim.o.swapfile = false vim.o.winborder = "single" @@ -21,9 +17,7 @@ vim.o.foldlevel = 99 vim.o.completeopt = "menuone,noselect,fuzzy,nosort" vim.o.undofile = true vim.o.undodir = os.getenv("HOME") .. "/.cache/nvim/undodir" -vim.cmd.colorscheme("retrobox") vim.o.errorformat = "%f(%l:%c) %m,%-G%.%#" - -- ----------------------------- -- @BINDS -- ----------------------------- @@ -42,7 +36,6 @@ map("n", "", ":find ") map("n", "", ":Lex") map("n", "", ":bd") map("i", "", vim.lsp.buf.signature_help) - -- ----------------------------- -- @PLUGINS -- ----------------------------- @@ -50,14 +43,16 @@ vim.pack.add({ { src = 'https://github.com/ibhagwan/fzf-lua' }, { src = 'https://github.com/neovim/nvim-lspconfig' }, { src = 'https://github.com/echasnovski/mini.nvim' }, + { src = 'https://github.com/nvim-tree/nvim-tree.lua' }, { src = 'https://github.com/romus204/tree-sitter-manager.nvim' }, + { src = 'https://github.com/lukas-reineke/indent-blankline.nvim' }, + { src = 'https://github.com/slugbyte/lackluster.nvim' }, { src = 'https://github.com/xiyaowong/transparent.nvim' }, - { src = "https://github.com/rebelot/kanagawa.nvim" }, - { src = "https://github.com/lukas-reineke/indent-blankline.nvim" }, - { src = "https://github.com/nvim-tree/nvim-tree.lua" }, + { src = 'https://github.com/norcalli/nvim-colorizer.lua' } }) require("terminal") +require("colorizer").setup() require("mini.completion").setup() require('mini.statusline').setup({}) require("tree-sitter-manager").setup() @@ -65,20 +60,7 @@ require("ibl").setup({ indent = { char = "│" }, scope = { show_start = false, show_end = false }, }) -require('kanagawa').setup({ - commentStyle = { italic = false }, - keywordStyle = { italic = false }, - transparent = true, - overrides = function(colors) - return { - SignColumn = { bg = "none" }, - LineNr = { bg = "none" }, - CursorLineNr = { bg = "none" }, - FoldColumn = { bg = "none" }, - } - end, -}) -vim.cmd.colorscheme('kanagawa') +vim.cmd.colorscheme('lackluster-night') vim.api.nvim_set_hl(0, "WinSeparator", { fg = "#54546D" }) -- Lsp specific, uses nvim-lspconfigs with the below @@ -96,7 +78,6 @@ map("n", "", ":FzfLua grep_curbuf") require("nvim-tree").setup() map("n", "", ":NvimTreeToggle") - -- ----------------------------- -- @AUTOCMDS -- -----------------------------