diff --git a/.gitignore b/.gitignore
index a479117..422c46f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,3 +59,4 @@ oomox/
shalarm/
vivaldi/
qt5ct/
+rofi.old/
diff --git a/dunst/dunstrc b/dunst/dunstrc
deleted file mode 100644
index 45ad66d..0000000
--- a/dunst/dunstrc
+++ /dev/null
@@ -1,431 +0,0 @@
-[global]
- ### Display ###
-
- # Which monitor should the notifications be displayed on.
- monitor = 0
-
- # Display notification on focused monitor. Possible modes are:
- # mouse: follow mouse pointer
- # keyboard: follow window with keyboard focus
- # none: don't follow anything
- #
- # "keyboard" needs a window manager that exports the
- # _NET_ACTIVE_WINDOW property.
- # This should be the case for almost all modern window managers.
- #
- # If this option is set to mouse or keyboard, the monitor option
- # will be ignored.
- follow = mouse
-
- # The geometry of the window:
- # [{width}]x{height}[+/-{x}+/-{y}]
- # The geometry of the message window.
- # The height is measured in number of notifications everything else
- # in pixels. If the width is omitted but the height is given
- # ("-geometry x2"), the message window expands over the whole screen
- # (dmenu-like). If width is 0, the window expands to the longest
- # message displayed. A positive x is measured from the left, a
- # negative from the right side of the screen. Y is measured from
- # the top and down respectively.
- # The width can be negative. In this case the actual width is the
- # screen width minus the width defined in within the geometry option.
- geometry = "300x5-30+20"
-
- # Show how many messages are currently hidden (because of geometry).
- indicate_hidden = yes
-
- # Shrink window if it's smaller than the width. Will be ignored if
- # width is 0.
- shrink = no
-
- # The transparency of the window. Range: [0; 100].
- # This option will only work if a compositing window manager is
- # present (e.g. xcompmgr, compiz, etc.).
- transparency = 10
-
- # The height of the entire notification. If the height is smaller
- # than the font height and padding combined, it will be raised
- # to the font height and padding.
- notification_height = 0
-
- # Draw a line of "separator_height" pixel height between two
- # notifications.
- # Set to 0 to disable.
- separator_height = 2
-
- # Padding between text and separator.
- padding = 8
-
- # Horizontal padding.
- horizontal_padding = 8
-
- # Defines width in pixels of frame around the notification window.
- # Set to 0 to disable.
- frame_width = 2
-
- # Defines color of the frame around the notification window.
- frame_color = "#5e81ac"
-
- # Define a color for the separator.
- # possible values are:
- # * auto: dunst tries to find a color fitting to the background;
- # * foreground: use the same color as the foreground;
- # * frame: use the same color as the frame;
- # * anything else will be interpreted as a X color.
- separator_color = frame
-
- # Sort messages by urgency.
- sort = yes
-
- # Don't remove messages, if the user is idle (no mouse or keyboard input)
- # for longer than idle_threshold seconds.
- # Set to 0 to disable.
- # A client can set the 'transient' hint to bypass this. See the rules
- # section for how to disable this if necessary
- idle_threshold = 120
-
- ### Text ###
-
- font = Roboto 9
-
- # The spacing between lines. If the height is smaller than the
- # font height, it will get raised to the font height.
- line_height = 0
-
- # Possible values are:
- # full: Allow a small subset of html markup in notifications:
- # bold
- # italic
- # strikethrough
- # underline
- #
- # For a complete reference see
- # .
- #
- # strip: This setting is provided for compatibility with some broken
- # clients that send markup even though it's not enabled on the
- # server. Dunst will try to strip the markup but the parsing is
- # simplistic so using this option outside of matching rules for
- # specific applications *IS GREATLY DISCOURAGED*.
- #
- # no: Disable markup parsing, incoming notifications will be treated as
- # plain text. Dunst will not advertise that it has the body-markup
- # capability if this is set as a global setting.
- #
- # It's important to note that markup inside the format option will be parsed
- # regardless of what this is set to.
- 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 %
- # Markup is allowed
- format = "%s\n%b"
-
- # Alignment of message text.
- # Possible values are "left", "center" and "right".
- alignment = right
-
- # Vertical alignment of message text and icon.
- # Possible values are "top", "center" and "bottom".
- vertical_alignment = top
-
- # Show age of message if message is older than show_age_threshold
- # seconds.
- # Set to -1 to disable.
- show_age_threshold = 60
-
- # Split notifications into multiple lines if they don't fit into
- # geometry.
- word_wrap = yes
-
- # When word_wrap is set to no, specify where to make an ellipsis in long lines.
- # Possible values are "start", "middle" and "end".
- ellipsize = middle
-
- # Ignore newlines '\n' in notifications.
- ignore_newline = no
-
- # Stack together notifications with the same content
- stack_duplicates = true
-
- # Hide the count of stacked notifications with the same content
- hide_duplicate_count = false
-
- # Display indicators for URLs (U) and actions (A).
- show_indicators = yes
-
- ### Icons ###
-
- # Align icons left/right/off
- icon_position = left
-
- # Scale small icons up to this size, set to 0 to disable. Helpful
- # for e.g. small files or high-dpi screens. In case of conflict,
- # max_icon_size takes precedence over this.
- min_icon_size = 0
-
- # Scale larger icons down to this size, set to 0 to disable
- max_icon_size = 32
-
- # Paths to default icons.
- icon_path = /usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/
-
- ### History ###
-
- # Should a notification popped up from history be sticky or timeout
- # as if it would normally do.
- sticky_history = yes
-
- # Maximum amount of notifications kept in history
- history_length = 20
-
- ### Misc/Advanced ###
-
- # dmenu path.
- dmenu = /usr/bin/dmenu -p dunst:
-
- # Browser for opening urls in context menu.
- browser = /usr/bin/firefox -new-tab
-
- # Always run rule-defined scripts, even if the notification is suppressed
- always_run_script = true
-
- # Define the title of the windows spawned by dunst
- title = Dunst
-
- # Define the class of the windows spawned by dunst
- class = Dunst
-
- # Print a notification on startup.
- # This is mainly for error detection, since dbus (re-)starts dunst
- # automatically after a crash.
- startup_notification = false
-
- # Manage dunst's desire for talking
- # Can be one of the following values:
- # crit: Critical features. Dunst aborts
- # warn: Only non-fatal warnings
- # mesg: Important Messages
- # info: all unimportant stuff
- # debug: all less than unimportant stuff
- verbosity = mesg
-
- # Define the corner radius of the notification window
- # in pixel size. If the radius is 0, you have no rounded
- # corners.
- # The radius will be automatically lowered if it exceeds half of the
- # notification height to avoid clipping text and/or icons.
- corner_radius = 10
-
- # Ignore the dbus closeNotification message.
- # Useful to enforce the timeout set by dunst configuration. Without this
- # parameter, an application may close the notification sent before the
- # user defined timeout.
- ignore_dbusclose = false
-
- ### Legacy
-
- # Use the Xinerama extension instead of RandR for multi-monitor support.
- # This setting is provided for compatibility with older nVidia drivers that
- # do not support RandR and using it on systems that support RandR is highly
- # discouraged.
- #
- # By enabling this setting dunst will not be able to detect when a monitor
- # is connected or disconnected which might break follow mode if the screen
- # layout changes.
- force_xinerama = false
-
- ### mouse
-
- # Defines list of actions for each mouse event
- # Possible values are:
- # * none: Don't do anything.
- # * do_action: If the notification has exactly one action, or one is marked as default,
- # invoke it. If there are multiple and no default, open the context menu.
- # * close_current: Close current notification.
- # * close_all: Close all notifications.
- # These values can be strung together for each mouse event, and
- # will be executed in sequence.
- mouse_left_click = close_current
- mouse_middle_click = do_action, close_current
- mouse_right_click = close_all
-
-# Experimental features that may or may not work correctly. Do not expect them
-# to have a consistent behaviour across releases.
-[experimental]
- # Calculate the dpi to use on a per-monitor basis.
- # If this setting is enabled the Xft.dpi value will be ignored and instead
- # dunst will attempt to calculate an appropriate dpi value for each monitor
- # using the resolution and physical size. This might be useful in setups
- # where there are multiple screens with very different dpi values.
- per_monitor_dpi = false
-
-[shortcuts]
-
- # Shortcuts are specified as [modifier+][modifier+]...key
- # Available modifiers are "ctrl", "mod1" (the alt-key), "mod2",
- # "mod3" and "mod4" (windows-key).
- # Xev might be helpful to find names for keys.
-
- # Close notification.
- close = ctrl+space
-
- # Close all notifications.
- close_all = ctrl+shift+space
-
- # Redisplay last message(s).
- # On the US keyboard layout "grave" is normally above TAB and left
- # of "1". Make sure this key actually exists on your keyboard layout,
- # e.g. check output of 'xmodmap -pke'
- history = ctrl+grave
-
- # Context menu.
- context = ctrl+shift+period
-
-[urgency_low]
- # IMPORTANT: colors have to be defined in quotation marks.
- # Otherwise the "#" and following would be interpreted as a comment.
- background = "#5e81ac"
- foreground = "#d8dee9"
- timeout = 10
- # Icon for notifications with low urgency, uncomment to enable
- #icon = /path/to/icon
-
-[urgency_normal]
- background = "#2e3440"
- foreground = "#d8dee9"
- timeout = 10
- # Icon for notifications with normal urgency, uncomment to enable
- #icon = /path/to/icon
-
-[urgency_critical]
- background = "#bf616a"
- foreground = "#4c566a"
- frame_color = "#2e3440"
- timeout = 0
- # Icon for notifications with critical urgency, uncomment to enable
- #icon = /path/to/icon
-
-# Every section that isn't one of the above is interpreted as a rules to
-# override settings for certain messages.
-#
-# Messages can be matched by
-# appname (discouraged, see desktop_entry)
-# body
-# category
-# desktop_entry
-# icon
-# match_transient
-# msg_urgency
-# stack_tag
-# summary
-#
-# and you can override the
-# background
-# foreground
-# format
-# frame_color
-# fullscreen
-# new_icon
-# set_stack_tag
-# set_transient
-# timeout
-# urgency
-#
-# Shell-like globbing will get expanded.
-#
-# Instead of the appname filter, it's recommended to use the desktop_entry filter.
-# GLib based applications export their desktop-entry name. In comparison to the appname,
-# the desktop-entry won't get localized.
-#
-# SCRIPTING
-# You can specify a script that gets run when the rule matches by
-# setting the "script" option.
-# The script will be called as follows:
-# script appname summary body icon urgency
-# where urgency can be "LOW", "NORMAL" or "CRITICAL".
-#
-# NOTE: if you don't want a notification to be displayed, set the format
-# to "".
-# NOTE: It might be helpful to run dunst -print in a terminal in order
-# to find fitting options for rules.
-
-# Disable the transient hint so that idle_threshold cannot be bypassed from the
-# client
-#[transient_disable]
-# match_transient = yes
-# set_transient = no
-#
-# Make the handling of transient notifications more strict by making them not
-# be placed in history.
-#[transient_history_ignore]
-# match_transient = yes
-# history_ignore = yes
-
-# fullscreen values
-# show: show the notifications, regardless if there is a fullscreen window opened
-# delay: displays the new notification, if there is no fullscreen window active
-# If the notification is already drawn, it won't get undrawn.
-# pushback: same as delay, but when switching into fullscreen, the notification will get
-# withdrawn from screen again and will get delayed like a new notification
-#[fullscreen_delay_everything]
-# fullscreen = delay
-#[fullscreen_show_critical]
-# msg_urgency = critical
-# fullscreen = show
-
-#[espeak]
-# summary = "*"
-# script = dunst_espeak.sh
-
-#[script-test]
-# summary = "*script*"
-# script = dunst_test.sh
-
-#[ignore]
-# # This notification will not be displayed
-# summary = "foobar"
-# format = ""
-
-#[history-ignore]
-# # This notification will not be saved in history
-# summary = "foobar"
-# history_ignore = yes
-
-#[skip-display]
-# # This notification will not be displayed, but will be included in the history
-# summary = "foobar"
-# skip_display = yes
-
-#[signed_on]
-# appname = Pidgin
-# summary = "*signed on*"
-# urgency = low
-#
-#[signed_off]
-# appname = Pidgin
-# summary = *signed off*
-# urgency = low
-#
-#[says]
-# appname = Pidgin
-# summary = *says*
-# urgency = critical
-#
-#[twitter]
-# appname = Pidgin
-# summary = *twitter.com*
-# urgency = normal
-#
-#[stack-volumes]
-# appname = "some_volume_notifiers"
-# set_stack_tag = "volume"
-#
-# vim: ft=cfg
diff --git a/dunst/dunstrc b/dunst/dunstrc
new file mode 120000
index 0000000..b0ef99f
--- /dev/null
+++ b/dunst/dunstrc
@@ -0,0 +1 @@
+/home/nick/.cache/wal/colors-dunstrc
\ No newline at end of file
diff --git a/i3/config b/i3/config
index 0af37ca..39f6e9c 100644
--- a/i3/config
+++ b/i3/config
@@ -72,7 +72,7 @@ bindsym $mod+q kill
# start dmenu (a program launcher)
#bindsym $mod+d exec --no-startup-id dmenu_run
# A more modern dmenu replacement is rofi:
-bindsym $mod+d exec --no-startup-id "rofi -show drun"
+bindsym $mod+d exec --no-startup-id "~/.config/rofi/bin/launcher_colorful"
# There also is i3-dmenu-desktop which only displays applications shipping a
# .desktop file. It is a wrapper around dmenu, so you need that installed.
#bindsym $mod+d exec --no-startup-id i3-dmenu-desktop
@@ -158,7 +158,7 @@ bindsym $mod+Shift+c reload
# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
bindsym $mod+Shift+r restart
# exit i3 (logs you out of your X session)
-bindsym $mod+Shift+x exec "i3-nagbar -t warning -m 'exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"
+bindsym $mod+Shift+x exec "i3-nagbar -t warning -m 'End session?' -B 'Yes, exit i3' 'i3-msg exit'"
# resize window (you can also use the mouse for that)
mode "resize" {
@@ -192,14 +192,22 @@ default_floating_border normal
hide_edge_borders none
#titlebar_border_thickness 2
#titlebar_padding 5 2
-#
-# Colors #93cee9
-#
+
+
+# Colors
+set_from_resource $fg i3wm.foreground
+set_from_resource $bg i3wm.background
+set_from_resource $c1 i3wm.color1
+set_from_resource $c2 i3wm.color2
+set_from_resource $c3 i3wm.color3
+set_from_resource $c6 i3wm.color6
+set_from_resource $c7 i3wm.color7
+
# class border backgr. text indicator child_border
- client.focused #5e81ac #2e3440 #d8dee9 #5e81ac #5e81ac
- client.focused_inactive #3b4252 #3b4252 #d8dee9 #4c566a #4c566a
- client.unfocused #434c5e #434c5e #d8dee9 #4c566a #4c566a
- client.urgent #bf616a #bf616a #d8dee9 #d08770 #d08770
+ client.focused $c6 $bg $fg $c6 $c6
+ client.focused_inactive $c3 $bg $fg $c3 $c3
+ client.unfocused $c2 $bg $c1 $c2 $c2
+ client.urgent $fg $bg $c7 $fg $fg
# Start i3bar to display a workspace bar (plus the system information i3status
# finds out, if available)
diff --git a/polybar/config b/polybar/config
index 1dfacbe..71f1975 100644
--- a/polybar/config
+++ b/polybar/config
@@ -1,11 +1,11 @@
[colors]
-background = #2e3440
-background-alt = #3b4252
-foreground = #8fbcbb
-foreground-alt = #88c0d0
-primary = #5e81ac
-secondary = #81a1c1
-alert = #bf616a
+background = ${xrdb:background:#222}
+background-alt = ${xrdb:color0:#222}
+foreground = ${xrdb:color3:#222}
+foreground-alt = ${xrdb:color3:#222}
+primary = ${xrdb:color4:#222}
+secondary = ${xrdb:color5:#222}
+alert = ${xrdb:color6:#222}
[bar/mybar]
monitor = ${env:MONITOR:}
@@ -15,7 +15,7 @@ override-redirect = true
wm-restack = i3
offset-x = 10
offset-y = 10
-radius = 0.0
+radius = 10.0
fixed-center = true
background = ${colors.background}
@@ -24,21 +24,27 @@ foreground = ${colors.foreground}
line-size = 3
line-color = ${colors.foreground}
-border-size = 2
+border-size = 0
border-color = ${colors.primary}
-padding-left = 0
-padding-right = 2
+padding-left = 3
+padding-right = 3
module-margin-left = 3
module-margin-right = 3
-font-0 = kanitMedium:fontformat=truetype:size=8:antialias=true;2
-font-1 = unifont:fontformat=truetype:size=8:antialias=true;2
-font-2 = siji:pixelsize=10;2
+;font-0 = kanitMedium:fontformat=truetype:size=8:antialias=true;2
+;font-1 = unifont:fontformat=truetype:size=8:antialias=true;2
+;font-2 = siji:pixelsize=10;2
-modules-left = i3 xwindow
-modules-center = cpu memory swap date root_storage home_storage battery
+font-1 = Font Awesome 5 Free:style=Solid:pixelsize=8;2
+font-2 = Font Awesome 5 Free:style=Regular:pixelsize=8;2
+font-3 = Font Awesome 5 Brands:pixelsize=8;2
+font-4 = Font Awesome 5 Regular:pixelsize=8;2
+font-0 = Kanit Medium:style=Regular:size=8;2
+
+modules-left = date battery root_storage home_storage memory swap cpu
+modules-center = i3
modules-right = covid weather updates my-updates backlight-acpi pulseaudio powermenu
tray-position = right
@@ -53,7 +59,7 @@ exec = ~/.config/polybar/modules/updates
exec-if = file ~/tmp/updates.json
interval = 5
click-left = update-system; systemctl --user start updates.service
-label = "%output%"
+label = " %output%"
[module/my-updates]
type = custom/script
@@ -61,7 +67,7 @@ exec = ~/.config/polybar/modules/my-updates
exec-if = file ~/tmp/auroch.json
interval = 5
click-left = systemctl --user start auroch.service
-label = " %output%"
+label = " %output%"
[module/covid]
type = custom/script
@@ -76,7 +82,7 @@ interval = 3600
[module/swap]
type = custom/script
exec = free -h | grep Swap | awk '{print $3}'
-label = "%output%"
+label = " %output%"
interval = 5
[module/xwindow]
@@ -86,13 +92,13 @@ label = %title:0:30:...%
[module/home_storage]
type = custom/script
exec = df -h 2>/dev/null | grep sda3 | awk '{print $5}'
-label = "%output%"
+label = " %output%"
interval = 30
[module/root_storage]
type = custom/script
exec = df -h 2>/dev/null | grep sda2 | awk '{print $5}'
-label = "%output%"
+label = " %output%"
interval = 30
[module/i3]
@@ -110,7 +116,7 @@ label-mode-background = ${colors.primary}
; focused = Active workspace on focused monitor
label-focused = %index%
-label-focused-background = ${colors.background-alt}
+label-focused-background = ${colors.color4}
label-focused-padding = 2
; unfocused = Inactive workspace on any monitor
@@ -134,7 +140,7 @@ label-urgent-padding = 2
type = internal/xbacklight
format =