From b094f782a946cc14efbd32fb9c595098e10735bf Mon Sep 17 00:00:00 2001 From: Ted Kulp Date: Fri, 5 Aug 2022 20:41:59 -0400 Subject: [PATCH] fix: theme stuff --- .config/lvim/config.lua | 38 +++++++++++++++++++++++++++++++------ .config/zsh/awesome-fzf.zsh | 4 ++++ 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/.config/lvim/config.lua b/.config/lvim/config.lua index 770e10b..6702b5f 100644 --- a/.config/lvim/config.lua +++ b/.config/lvim/config.lua @@ -1,7 +1,7 @@ local utils = require "lvim.utils" lvim.log.level = "warn" -lvim.colorscheme = "dracula" +lvim.colorscheme = "catppuccin" vim.opt.clipboard = "unnamed,unnamedplus" vim.opt.guifont = "JetBrainsMono Nerd Font Mono:h12" vim.opt.timeoutlen = 50 @@ -12,7 +12,7 @@ lvim.builtin.which_key.mappings['W'] = { ":w", "Save Buffer" } lvim.format_on_save = { timeout = 5000, } -lvim.builtin.lualine.options.theme = "dracula-nvim" +lvim.builtin.lualine.options.theme = "catppuccin" lvim.builtin.bufferline.options.show_buffer_close_icons = false lvim.builtin.bufferline.options.numbers = "buffer_id" lvim.builtin.bufferline.options.separator_style = "slant" @@ -94,6 +94,14 @@ lvim.plugins = { { "lunarvim/horizon.nvim", }, + { + "luisiacc/gruvbox-baby", + branch = "main", + config = function() + vim.g.gruvbox_baby_telescope_theme = 1 + vim.g.gruvbox_baby_transparent_mode = 0 + end, + }, { "Mofiqul/dracula.nvim", config = function() @@ -101,14 +109,31 @@ lvim.plugins = { vim.g.dracula_italic_comment = true end, }, + { "catppuccin/nvim", + as = "catppuccin", + config = function() + require('catppuccin').setup({ + dim_inactive = { + enabled = true, + }, + integrations = { + which_key = true, + indent_blankline = { + colored_indent_levels = true, + }, + hop = true, + } + }) + end, + }, { "kylechui/nvim-surround", config = function() require("nvim-surround").setup({ - delimiters = { - invalid_key_behavior = function(char) - return { char, char } - end + surrounds = { + -- invalid_key_behavior = function(char) + -- return { char, char } + -- end }, }) end @@ -444,6 +469,7 @@ lvim.plugins = { delete_buffer = false, } }) + vim.keymap.set("n", "", "Telescope marks", { noremap = true, silent = true }) end, }, } diff --git a/.config/zsh/awesome-fzf.zsh b/.config/zsh/awesome-fzf.zsh index d014012..9fac9f5 100644 --- a/.config/zsh/awesome-fzf.zsh +++ b/.config/zsh/awesome-fzf.zsh @@ -1,4 +1,8 @@ AWESOME_FZF_LOCATION="$HOME/.config/zsh/awesome-fzf.zsh" +export FZF_DEFAULT_OPTS=" \ +--color=bg+:#363a4f,bg:#24273a,spinner:#f4dbd6,hl:#ed8796 \ +--color=fg:#cad3f5,header:#ed8796,info:#c6a0f6,pointer:#f4dbd6 \ +--color=marker:#f4dbd6,fg+:#cad3f5,prompt:#c6a0f6,hl+:#ed8796" #List Awesome FZF Functions function fzf-awesome-list() {