From 538490bf8b9a0e91547b38a9576b4ca2b2b16d7b Mon Sep 17 00:00:00 2001 From: Von Random Date: Wed, 30 Aug 2023 20:03:29 +0300 Subject: [PATCH] kitty: solarized; neovim: plugin cleanup --- cli/.config/nvim/lua/plugins.lua | 15 +-------- cli/.config/nvim/lua/settings.lua | 3 +- gui/.config/kitty/kitty.conf | 54 ++++++++++++++++--------------- 3 files changed, 31 insertions(+), 41 deletions(-) diff --git a/cli/.config/nvim/lua/plugins.lua b/cli/.config/nvim/lua/plugins.lua index 8ea31f1..05b01a0 100644 --- a/cli/.config/nvim/lua/plugins.lua +++ b/cli/.config/nvim/lua/plugins.lua @@ -7,10 +7,8 @@ local function plugins(use) branch = 'neovim' } use 'lifepillar/vim-cheat40' - use 'hoob3rt/lualine.nvim' use 'hashivim/vim-terraform' use 'khaveesh/vim-fish-syntax' - use 'lukas-reineke/indent-blankline.nvim' use 'mhinz/vim-signify' use 'tpope/vim-rsi' use 'tpope/vim-vinegar' @@ -24,20 +22,9 @@ local function plugins(use) cmd = 'ALEEnable' } end - ---[[ init plugins and install packer if missing ]] if require('packer_init').init(plugins) then return end ---[[ plugin configs ]] -require('lualine').setup{ - options = { - icons_enabled = false, - section_separators = { left = nil, right = nil }, - component_separators = { left = '\u{2022}', right = '\u{2022}' } - } -} - ---[[ plugin maps ]] +--[[ plugin configs and maps ]] map('n', '?', 'Cheat40') map('n', '.', 'Telescope git_files') map('n', ',', 'Telescope buffers') diff --git a/cli/.config/nvim/lua/settings.lua b/cli/.config/nvim/lua/settings.lua index ea31b79..61e6a8e 100644 --- a/cli/.config/nvim/lua/settings.lua +++ b/cli/.config/nvim/lua/settings.lua @@ -5,6 +5,7 @@ vim.o.colorcolumn = '80' vim.o.relativenumber = true vim.o.breakindent = true vim.o.clipboard = 'unnamedplus' +vim.o.statusline = '[%F] %R%H%W%M %=[%{&fenc}/%{&ff}] %y [%4l/%L:%3v]' vim.o.list = true vim.o.listchars = 'tab:|_,nbsp:x,trail:*' @@ -16,7 +17,7 @@ vim.o.scrolloff = 3 vim.o.sidescrolloff = 15 vim.o.tabstop = 8 -vim.o.softtabstop = 4 +vim.o.softtabstop = 3 vim.o.shiftwidth = 4 vim.o.expandtab = true diff --git a/gui/.config/kitty/kitty.conf b/gui/.config/kitty/kitty.conf index 2a5d673..36a2d9d 100644 --- a/gui/.config/kitty/kitty.conf +++ b/gui/.config/kitty/kitty.conf @@ -8,15 +8,17 @@ cursor_blink_interval 0 # background_blur 20 # background_opacity 0.95 +active_border_color #cb4b16 +inactive_border_color #93a1a1 tab_title_template " ┇{index}┇{title} " tab_bar_style separator tab_separator "" tab_bar_edge top -active_tab_background #a89984 -active_tab_foreground #282828 +active_tab_background #93a1a1 +active_tab_foreground #fdf6e3 active_tab_font_style italic -inactive_tab_foreground #ebdbb2 -inactive_tab_background #282828 +inactive_tab_background #eee8d5 +inactive_tab_foreground #657b83 inactive_tab_font_style italic enabled_layouts splits,stack @@ -64,27 +66,27 @@ mouse_map left click ungrabbed mouse_click_url_or_select mouse_map alt+left press ungrabbed mouse_selection rectangle # Gruvbox Dark -selection_foreground #282828 -selection_background #83a598 -foreground #ebdbb2 -background #282828 -cursor #fb4934 -cursor_text_color #282828 +selection_foreground #586e75 +selection_background #eee8d5 +foreground #657b83 +background #fdf6e3 +cursor #cb4b16 +cursor_text_color #fdf6e3 -color0 #282828 -color1 #cc241d -color2 #98971a -color3 #d79921 -color4 #458588 -color5 #b16286 -color6 #689d6a -color7 #a89984 +color0 #073642 +color1 #dc322f +color2 #859900 +color3 #b58900 +color4 #268bd2 +color5 #d33682 +color6 #2aa198 +color7 #eee8d5 -color8 #928374 -color9 #fb4934 -color10 #b8bb26 -color11 #fabd2f -color12 #83a598 -color13 #d3869b -color14 #8ec07c -color15 #ebdbb2 +color8 #93a1a1 +color9 #cb4b16 +color10 #586e75 +color11 #657b83 +color12 #839496 +color13 #6c71c4 +color14 #93a1a1 +color15 #fdf6e3