aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.config/X11/base9
-rw-r--r--.config/X11/dark (renamed from .config/X11/Xresources)10
-rw-r--r--.config/X11/light20
-rw-r--r--.config/brave-flags.conf1
-rw-r--r--.config/dunst/base51
-rw-r--r--.config/dunst/dunstrc152
-rw-r--r--.config/i3/autostart2
-rw-r--r--.config/nvim/init.vim12
-rw-r--r--.config/polybar/config10
-rw-r--r--.config/rofi/config.rasi6
-rwxr-xr-x.local/share/bin/mode95
-rwxr-xr-x.local/share/bin/rofi11
12 files changed, 268 insertions, 111 deletions
diff --git a/.config/X11/base b/.config/X11/base
new file mode 100644
index 0000000..b2a81c9
--- /dev/null
+++ b/.config/X11/base
@@ -0,0 +1,9 @@
+*.font: JetBrainsMono Nerd Font:style=Medium,Regular:size=9
+
+*.termname: st-256color
+*.shell: /bin/sh
+
+*.tabspaces: 4
+*.borderpx: 16
+
+Xcursor.theme: OpenZone_Black
diff --git a/.config/X11/Xresources b/.config/X11/dark
index ed78ad5..b4083bd 100644
--- a/.config/X11/Xresources
+++ b/.config/X11/dark
@@ -18,13 +18,3 @@
*.foreground: #fdf9f7
*.background: #121213
*.cursorColor: #fdf9f7
-
-*.font: JetBrainsMono Nerd Font:style=Medium,Regular:size=9
-
-*.termname: st-256color
-*.shell: /bin/sh
-
-*.tabspaces: 4
-*.borderpx: 16
-
-Xcursor.theme: OpenZone_Black
diff --git a/.config/X11/light b/.config/X11/light
new file mode 100644
index 0000000..1f9c2ae
--- /dev/null
+++ b/.config/X11/light
@@ -0,0 +1,20 @@
+*.color0: #fdf9f7
+*.color1: #8c627a
+*.color2: #628c6e
+*.color3: #8c8b62
+*.color4: #626b8c
+*.color5: #6e628c
+*.color6: #62808c
+*.color7: #121213
+*.color8: #ccbeb7
+*.color9: #725063
+*.color10: #50725a
+*.color11: #727250
+*.color12: #505872
+*.color13: #5a5072
+*.color14: #506872
+*.color15: #393b3b
+
+*.foreground: #121213
+*.background: #fdf9f7
+*.cursorColor: #121213
diff --git a/.config/brave-flags.conf b/.config/brave-flags.conf
deleted file mode 100644
index 535f49f..0000000
--- a/.config/brave-flags.conf
+++ /dev/null
@@ -1 +0,0 @@
---force-dark-mode
diff --git a/.config/dunst/base b/.config/dunst/base
new file mode 100644
index 0000000..4e0ccd7
--- /dev/null
+++ b/.config/dunst/base
@@ -0,0 +1,51 @@
+[shortcuts]
+close_all = mod4+c
+
+[global]
+monitor = 0
+follow = none
+geometry = "400x5-50+82"
+indicate_hidden = yes
+shrink = no
+transparency = 0
+notification_height = 0
+separator_height = 2
+padding = 16
+horizontal_padding = 16
+frame_width = 2
+separator_color = frame
+sort = yes
+idle_threshold = 10
+font = Inter 11
+line_height = 0
+markup = full
+format = "<b>%s</b>\n%b"
+alignment = left
+vertical_alignment = top
+show_age_threshold = 60
+word_wrap = yes
+ellipsize = middle
+ignore_newline = no
+stack_duplicates = true
+hide_duplicate_count = false
+show_indicators = yes
+icon_position = left
+min_icon_size = 0
+max_icon_size = 128
+icon_path = /usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/
+sticky_history = yes
+history_length = 20
+browser = /usr/bin/firefox -new-tab
+always_run_script = true
+title = Dunst
+class = Dunst
+startup_notification = false
+verbosity = mesg
+corner_radius = 0
+ignore_dbusclose = false
+force_xinerama = false
+mouse_left_click = do_action
+mouse_middle_click = close_all
+mouse_right_click = close_current
+
+# vim: ft=cfg
diff --git a/.config/dunst/dunstrc b/.config/dunst/dunstrc
index 1fdcaf1..3f9b128 100644
--- a/.config/dunst/dunstrc
+++ b/.config/dunst/dunstrc
@@ -1,94 +1,68 @@
-[global]
- ### Display ###
- monitor = 0
- follow = none
- geometry = "400x5-50+82"
- indicate_hidden = yes
- shrink = no
- transparency = 0
- notification_height = 0
- separator_height = 2
- padding = 16
- horizontal_padding = 16
- frame_width = 2
- frame_color = "#de9dac"
- separator_color = frame
- sort = yes
- idle_threshold = 10
-
- ### Text ###
- font = Inter 11
- line_height = 0
- markup = full
-
- # The format of the message. Possible variables are:
- # %a appname
- # %s summary
- # %b body
- # %i iconname (including its path)
- # %I iconname (without its path)
- # %p progress value if set ([ 0%] to [100%]) or nothing
- # %n progress value if set without any extra characters
- # %% Literal %
- format = "<b>%s</b>\n%b"
- alignment = left
- vertical_alignment = top
- show_age_threshold = 60
- word_wrap = yes
- ellipsize = middle
- ignore_newline = no
- stack_duplicates = true
- hide_duplicate_count = false
- show_indicators = yes
-
- ### Icons ###
- icon_position = left
- min_icon_size = 0
- max_icon_size = 128
- icon_path = /usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/
-
- ### History ###
- sticky_history = yes
- history_length = 20
-
- ### Misc/Advanced ###
- browser = /usr/bin/firefox -new-tab
- always_run_script = true
- title = Dunst
- class = Dunst
- startup_notification = false
- verbosity = mesg
- corner_radius = 0
- ignore_dbusclose = false
-
- ### Legacy
- force_xinerama = false
-
- ### mouse
- mouse_left_click = do_action
- mouse_middle_click = close_all
- mouse_right_click = close_current
-
-[experimental]
- per_monitor_dpi = false
-
[shortcuts]
- close_all = mod4+c
+close_all = mod4+c
-[urgency_low]
- background = "#121213"
- foreground = "#de9dac"
- timeout = 10
+[global]
+monitor = 0
+follow = none
+geometry = "400x5-50+82"
+indicate_hidden = yes
+shrink = no
+transparency = 0
+notification_height = 0
+separator_height = 2
+padding = 16
+horizontal_padding = 16
+frame_width = 2
+separator_color = frame
+sort = yes
+idle_threshold = 10
+font = Inter 11
+line_height = 0
+markup = full
+format = "<b>%s</b>\n%b"
+alignment = left
+vertical_alignment = top
+show_age_threshold = 60
+word_wrap = yes
+ellipsize = middle
+ignore_newline = no
+stack_duplicates = true
+hide_duplicate_count = false
+show_indicators = yes
+icon_position = left
+min_icon_size = 0
+max_icon_size = 128
+icon_path = /usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/
+sticky_history = yes
+history_length = 20
+browser = /usr/bin/firefox -new-tab
+always_run_script = true
+title = Dunst
+class = Dunst
+startup_notification = false
+verbosity = mesg
+corner_radius = 0
+ignore_dbusclose = false
+force_xinerama = false
+mouse_left_click = do_action
+mouse_middle_click = close_all
+mouse_right_click = close_current
-[urgency_normal]
- background = "#121213"
- foreground = "#f9ece8"
- timeout = 10
+# vim: ft=cfg
+frame_color = "#8c627a"
-[urgency_critical]
- background = "#de9dac"
- foreground = "#121213"
- frame_color = "#de9dac"
- timeout = 0
+ [urgency_low]
+ background = "#fdf9f7"
+ foreground = "#8c627a"
+ timeout = 10
-# vim: ft=cfg
+ [urgency_normal]
+ background = "#fdf9f7"
+ foreground = "#121213"
+ timeout = 10
+
+ [urgency_critical]
+ background = "#8c627a"
+ foreground = "#fdf9f7"
+ frame_color = "#8c627a"
+ timeout = 0
diff --git a/.config/i3/autostart b/.config/i3/autostart
index 705c312..5ae2355 100644
--- a/.config/i3/autostart
+++ b/.config/i3/autostart
@@ -1,6 +1,6 @@
#!/bin/sh
/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 &
-xrdb ~/.config/X11/Xresources &
+cat ~/.config/X11/base ~/.config/X11/dark | xrdb &
polybar main -c ~/.config/polybar/config &
zsh -c "rwall" &
picom -b
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index ae77369..5345657 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -88,6 +88,7 @@ Plug 'mkarmona/materialbox'
Plug 'morhetz/gruvbox'
Plug 'co1ncidence/mountaineer'
Plug 'co1ncidence/bliss'
+Plug 'lonkaars/blubber'
call plug#end()
" keybinds
@@ -192,7 +193,15 @@ cnoreabbrev W w
cnoreabbrev sudow w !sudo tee %
" colorscheme thingers
-colorscheme bliss
+
+if filereadable(expand('~/.local/share/mode/light'))
+ colorscheme blubber
+ source $HOME/.config/nvim/blubber-lightline.vim
+else
+ colorscheme bliss
+ source $HOME/.config/nvim/bliss-lightline.vim
+endif
+
let g:lightline = {
\ 'colorscheme': 'bliss',
\ 'mode_map': {
@@ -230,7 +239,6 @@ let g:lightline = {
let g:lightline.tabline = {
\ 'left': [ [ 'tabs' ] ],
\ 'right': [ ] }
-source $HOME/.config/nvim/bliss-lightline.vim
hi! SignColumn guibg=NONE ctermbg=NONE
hi GitGutterAdd guibg=NONE
hi GitGutterChange guibg=NONE
diff --git a/.config/polybar/config b/.config/polybar/config
index e0788d6..1ba3d64 100644
--- a/.config/polybar/config
+++ b/.config/polybar/config
@@ -37,8 +37,8 @@ padding = 5
module-margin-left = 2
module-margin-right = 2
-font-0 = "Inter:pixelsize=11:weight=regular:size=0;3"
-font-1 = "Inter:pixelsize=11:weight=bold:size=0;3"
+font-0 = "Inter:pixelsize=11:weight=regular:size=0;2"
+font-1 = "Inter:pixelsize=11:weight=bold:size=0;2"
font-2 = "Material Design Icons:size=12;2"
modules-left = time date
@@ -98,9 +98,9 @@ pseudo-transparency = false
[color]
-bg = #121213
-fg = #fdf9f7
-fg-alt = #121213
+bg = ${xrdb:background:#121213}
+fg = ${xrdb:foreground:#fdf9f7}
+fg-alt = ${xrdb:background:#121213}
alpha = #00000000
diff --git a/.config/rofi/config.rasi b/.config/rofi/config.rasi
index 64484d2..20a6bba 100644
--- a/.config/rofi/config.rasi
+++ b/.config/rofi/config.rasi
@@ -12,8 +12,8 @@ configuration {
}
* {
- background-color: #121213;
- text-color: #f4e0d8;
+ background-color: ${ROFIBGCOLOR};
+ text-color: ${ROFIFGCOLOR};
spacing: 0;
width: 450;
line-padding: 5;
@@ -48,6 +48,6 @@ element {
}
element selected {
- background-color: #AF9DDE;
+ background-color: ${ROFIACCOLOR};
text-color: @background-color;
}
diff --git a/.local/share/bin/mode b/.local/share/bin/mode
new file mode 100755
index 0000000..47726e1
--- /dev/null
+++ b/.local/share/bin/mode
@@ -0,0 +1,95 @@
+#!/bin/sh
+
+get_color() {
+ xrdb -query | grep $1 | head -n1 | cut -f2 | cat
+}
+
+switch_xrdb() {
+ cat ~/.config/X11/base ~/.config/X11/$1 | xrdb
+}
+
+switch_dunst() {
+ read -r -d '' conf << EOF
+ frame_color = "$(get_color color1)"
+
+ [urgency_low]
+ background = "$(get_color background)"
+ foreground = "$(get_color color1)"
+ timeout = 10
+
+ [urgency_normal]
+ background = "$(get_color background)"
+ foreground = "$(get_color foreground)"
+ timeout = 10
+
+ [urgency_critical]
+ background = "$(get_color color1)"
+ foreground = "$(get_color background)"
+ frame_color = "$(get_color color1)"
+ timeout = 0
+EOF
+ echo "$conf" | cat ~/.config/dunst/base - > ~/.config/dunst/dunstrc
+}
+
+reload_terms() {
+ read -r -d '' escape_msgs << EOF
+ \033]11;$(get_color background)\007
+ \033]10;$(get_color foreground)\007
+ \033]12;$(get_color foreground)\007
+ \033]14;$(get_color background)\007
+ \033]13;$(get_color foreground)\007
+ \033]17;$(get_color color8)\007
+ \033]708;$(get_color background)\007
+ \033]4;0;$(get_color color0)\007
+ \033]4;1;$(get_color color1)\007
+ \033]4;2;$(get_color color2)\007
+ \033]4;3;$(get_color color3)\007
+ \033]4;4;$(get_color color4)\007
+ \033]4;5;$(get_color color5)\007
+ \033]4;6;$(get_color color6)\007
+ \033]4;7;$(get_color color7)\007
+ \033]4;8;$(get_color color8)\007
+ \033]4;9;$(get_color color9)\007
+ \033]4;10;$(get_color color10)\007
+ \033]4;11;$(get_color color11)\007
+ \033]4;12;$(get_color color12)\007
+ \033]4;13;$(get_color color13)\007
+ \033]4;14;$(get_color color14)\007
+ \033]4;15;$(get_color color15)\007
+EOF
+ escape_msgs=$(printf "$escape_msgs" | tr -d '\n')
+ find /dev/pts -exec sh -c "printf \"$escape_msgs\n\" > {}" \; 2> /dev/null
+}
+
+reload_dunst() {
+ killall dunst
+ dunst & disown
+}
+
+reload_polybar() {
+ polybar-msg cmd restart
+}
+
+switch_cfgs() {
+ echo "switching to $1 mode..."
+
+ switch_xrdb $1
+ switch_dunst $1
+
+ echo $1 > ~/.local/share/mode/active
+ rm ~/.local/share/mode/dark ~/.local/share/mode/light
+ touch ~/.local/share/mode/$1
+}
+
+[[ $1 == "dark" || $1 == "light" ]] && switch_cfgs $1
+
+reload_apps() {
+ echo "reloading programs..."
+
+ reload_polybar
+ reload_dunst
+ reload_terms
+}
+
+reload_apps
+
diff --git a/.local/share/bin/rofi b/.local/share/bin/rofi
new file mode 100755
index 0000000..4f61079
--- /dev/null
+++ b/.local/share/bin/rofi
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+get_color() {
+ xrdb -query | grep $1 | head -n1 | cut -f2 | cat
+}
+
+export ROFIBGCOLOR="$(get_color background)"
+export ROFIFGCOLOR="$(get_color foreground)"
+export ROFIACCOLOR="$(get_color color5)"
+
+/bin/rofi $@