aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.config/BetterDiscord/themes/MinimalCord.theme.css3
-rw-r--r--.config/dunst/dunstrc16
-rw-r--r--.config/nvim/init.vim1
3 files changed, 11 insertions, 9 deletions
diff --git a/.config/BetterDiscord/themes/MinimalCord.theme.css b/.config/BetterDiscord/themes/MinimalCord.theme.css
index 367df8a..5300216 100644
--- a/.config/BetterDiscord/themes/MinimalCord.theme.css
+++ b/.config/BetterDiscord/themes/MinimalCord.theme.css
@@ -21,7 +21,8 @@
--font: 'JetBrainsMono Nerd Font';
}
-.theme-dark {
+.theme-dark,
+.theme-light {
--background-light: var(--pywal-bg2) !important;
--background: var(--pywal-bg0) !important;
--background-alt: var(--pywal-bg1) !important;
diff --git a/.config/dunst/dunstrc b/.config/dunst/dunstrc
index 3f9b128..1f4ae55 100644
--- a/.config/dunst/dunstrc
+++ b/.config/dunst/dunstrc
@@ -49,20 +49,20 @@ mouse_middle_click = close_all
mouse_right_click = close_current
# vim: ft=cfg
-frame_color = "#8c627a"
+frame_color = "#DE9DAC"
[urgency_low]
- background = "#fdf9f7"
- foreground = "#8c627a"
+ background = "#121213"
+ foreground = "#DE9DAC"
timeout = 10
[urgency_normal]
- background = "#fdf9f7"
- foreground = "#121213"
+ background = "#121213"
+ foreground = "#fdf9f7"
timeout = 10
[urgency_critical]
- background = "#8c627a"
- foreground = "#fdf9f7"
- frame_color = "#8c627a"
+ background = "#DE9DAC"
+ foreground = "#121213"
+ frame_color = "#DE9DAC"
timeout = 0
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 5345657..8facb45 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -75,6 +75,7 @@ Plug 'tikhomirov/vim-glsl'
Plug 'neoclide/coc.nvim', {'branch': 'release'}
Plug 'ryanoasis/vim-devicons' "Icons for filetypes
Plug 'puremourning/vimspector'
+Plug 'samoshkin/vim-mergetool'
" themes
Plug 'arzg/vim-colors-xcode'