M bash/prompt → bash/prompt

@@ -17,16 +17,29 @@ local on_commit="HEAD detached at ([^${IFS}]*)"
 
     if [[ $git_status =~ $on_branch ]]; then
         local branch=${BASH_REMATCH[1]}
-        echo -ne " ${grn} $branch ${rst}"
+        echo -ne "${ylw} $branch ${rst}"
     elif [[ $git_status =~ $on_commit ]]; then
         local commit=${BASH_REMATCH[1]}
-        echo -ne " ${ylw} $commit ${rst}"
+        echo -ne "${cyn} $commit ${rst}"
+    fi
+}
+
+dirtyorclean() {
+    status="$(git status --porcelain 2> /dev/null)"
+    local exit="$?"
+    if [[ "$exit" -eq 0 ]]; then
+        if [[ ${#status} -eq 0 ]]; then
+            echo -ne "${grn}•${rst}"
+        else
+            echo -ne "${red}×${rst}"
+        fi
+    else
+        echo -ne ""
     fi
 }
 
 prompt_pwd() {
-   path="$(echo $PWD)"
-   echo -ne "\001${gry}\002$path\001${rst}\002"
+    echo -ne "\001${gry}\002$(dirs +0)\001${rst}\002"
 }
 
 rootornot() {
@@ -37,5 +50,5 @@ echo -ne "›"
     fi
 }
 
-PS1='\n\w$(git_branch)\n$(rootornot) '
+PS1='\n$(prompt_pwd)$(git_branch)$(dirtyorclean)\n$(rootornot) '
 PS2="> "

M config/dunst/dunstrc → config/dunst/dunstrc

@@ -25,18 +25,7 @@ separator_height = 2
     padding = 20
     # Horizontal padding.
     horizontal_padding = 20
-
-    # 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
-
-    # Print a notification on startup.
-    # This is mainly for error detection, since dbus (re-)starts dunst
-    # automatically after a crash.
     startup_notification = false
 
     # dmenu path.
@@ -55,39 +44,26 @@
 [frame]
     width = 4
     width = 3
-    color = "#111111"
+    color = "#ffffff"
 
 [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 = alt+shift+space
-
-    # Redisplay last message(s).
-    # On the US keyboard layout "grave" is normally above TAB and left
-    # of "1".
     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 = "#111111"
-    foreground = "#6f7579"
+    background = "#6f7579"
+    foreground = "#111111"
     timeout = 5
 
 [urgency_normal]
-    background = "#111111"
-    foreground = "#ffffff"
+    background = "#ffffff"
+    foreground = "#111111"
     timeout = 5
 
 [urgency_critical]
@@ -95,57 +71,4 @@ background = "#1111111"
     foreground = "#dddddd"
     timeout = 5
 
-
-# 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", "summary", "body", "icon", "category",
-# "msg_urgency" and you can override the "timeout", "urgency", "foreground",
-# "background", "new_icon" and "format".
-# Shell-like globbing will get expanded.
-#
-# 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.
-
-#[espeak]
-#    summary = "*"
-#    script = dunst_espeak.sh
-
-#[script-test]
-#    summary = "*script*"
-#    script = dunst_test.sh
-
-#[ignore]
-#    # This notification will not be displayed
-#    summary = "foobar"
-#    format = ""
-
-#[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
-#
 # vim: ft=cfg

M weechat/weechat.conf → weechat/weechat.conf

@@ -392,7 +392,8 @@ default.buffer = "irc;rizon.#homescreen;3"
 default.buffer = "irc;rizon.#avpd;4"
 default.buffer = "irc;rizon.#linux;5"
 default.buffer = "irc;rizon.nerdypepper;6"
-default.window = "1;0;0;0;irc;rizon.nerdypepper"
+default.buffer = "script;scripts;7"
+default.window = "1;0;0;0;irc;server.rizon"
 default.current = on
 
 [notify]

M x/.xinitrc → x/.xinitrc

@@ -10,5 +10,6 @@
 setxkbmap -option compose:caps
 urxvtd &
 source ~/.fehbg
+eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh)
 libinput-gestures-setup start
 exec i3