diff --git a/alacritty/.config/alacritty/alacritty.yml b/alacritty/.config/alacritty/alacritty.yml index 9d1f388..06eb81e 100644 --- a/alacritty/.config/alacritty/alacritty.yml +++ b/alacritty/.config/alacritty/alacritty.yml @@ -1,5 +1,5 @@ window: - opacity: 0.95 + opacity: 0.9 font: size: 14 @@ -7,36 +7,36 @@ font: family: FiraMono Nerd Font style: Regular -# Colors (Oxide) -colors: - # Default colors - primary: - background: '#212121' - foreground: '#c0c5ce' - bright_foreground: '#f3f4f5' - - cursor: - text: '#212121' - cursor: '#c0c5ce' - - # Normal colors - normal: - black: '#212121' - red: '#e57373' - green: '#a6bc69' - yellow: '#fac863' - blue: '#6699cc' - magenta: '#c594c5' - cyan: '#5fb3b3' - white: '#c0c5ce' - - # Bright colors - bright: - black: '#5c5c5c' - red: '#e57373' - green: '#a6bc69' - yellow: '#fac863' - blue: '#6699cc' - magenta: '#c594c5' - cyan: '#5fb3b3' - white: '#f3f4f5' +# # Colors (Oxide) +# colors: +# # Default colors +# primary: +# background: '#212121' +# foreground: '#c0c5ce' +# bright_foreground: '#f3f4f5' +# +# cursor: +# text: '#212121' +# cursor: '#c0c5ce' +# +# # Normal colors +# normal: +# black: '#212121' +# red: '#e57373' +# green: '#a6bc69' +# yellow: '#fac863' +# blue: '#6699cc' +# magenta: '#c594c5' +# cyan: '#5fb3b3' +# white: '#c0c5ce' +# +# # Bright colors +# bright: +# black: '#5c5c5c' +# red: '#e57373' +# green: '#a6bc69' +# yellow: '#fac863' +# blue: '#6699cc' +# magenta: '#c594c5' +# cyan: '#5fb3b3' +# white: '#f3f4f5' diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua index 6334d39..28131dd 100644 --- a/nvim/.config/nvim/init.lua +++ b/nvim/.config/nvim/init.lua @@ -54,6 +54,7 @@ require('nvim-treesitter').setup({ "dockerfile", "gitignore", "python", + "sql", }, -- auto install above language parsers auto_install = true, diff --git a/nvim/.config/nvim/lua/colorscheme.lua b/nvim/.config/nvim/lua/colorscheme.lua index 0d62ada..a87efce 100644 --- a/nvim/.config/nvim/lua/colorscheme.lua +++ b/nvim/.config/nvim/lua/colorscheme.lua @@ -1,12 +1,6 @@ --- vim.cmd("colorscheme minimalist") --- vim.cmd("colorscheme ayu") --- vim.cmd("let ayucolor='mirage'") --- vim.cmd("colorscheme gruvbox") -vim.cmd("colorscheme tender") --- vim.cmd("colorscheme railscasts") --- vim.cmd("colorscheme desert-warm-256") --- vim.cmd("colorscheme deus") +vim.cmd("colorscheme ayu") -- Ignore background color for transparency -vim.cmd("highlight Normal ctermbg=none") -vim.cmd("highlight NonText ctermbg=none") +vim.cmd("highlight Normal guibg=none") +vim.cmd("highlight NonText guibg=none") + diff --git a/nvim/.config/nvim/lua/keybindings.lua b/nvim/.config/nvim/lua/keybindings.lua index c966f6c..b0ddaff 100644 --- a/nvim/.config/nvim/lua/keybindings.lua +++ b/nvim/.config/nvim/lua/keybindings.lua @@ -42,9 +42,8 @@ keymap('n', 'gf', ':Telescope git_files', default_ops) keymap('n', 's', ':Telescope live_grep', default_ops) keymap('n', 'd', ':Telescope diagnostics', default_ops) keymap('n', 'h', ':Telescope neoclip', default_ops) - --- Buffers -keymap('n', 'b', ':JABSOpen', default_ops) +keymap('n', 'b', ':Telescope buffers', default_ops) +keymap('n', 'c', ':Telescope colorscheme', default_ops) -- Git keymap('n', 'gg', ':LazyGit', default_ops) diff --git a/nvim/.config/nvim/lua/plugins.lua b/nvim/.config/nvim/lua/plugins.lua index 52976b3..aace833 100644 --- a/nvim/.config/nvim/lua/plugins.lua +++ b/nvim/.config/nvim/lua/plugins.lua @@ -14,13 +14,18 @@ return require('packer').startup(function(use) use('saadparwaiz1/cmp_luasnip') -- colorschemes - use('ayu-theme/ayu-vim') + -- use('ayu-theme/ayu-vim') + use('Shatur/neovim-ayu') use('morhetz/gruvbox') use('dikiaap/minimalist') use('jacoborus/tender.vim') use('jpo/vim-railscasts-theme') use('rainux/vim-desert-warm-256') use('ajmwagar/vim-deus') + use('catppuccin/nvim') + use('bluz71/vim-moonfly-colors') + use('savq/melange') + use('srcery-colors/srcery-vim') -- airline use('vim-airline/vim-airline')