X-Git-Url: https://git.shemshak.org/gitweb.cgi/~bandali/configs/blobdiff_plain/fc29469576f7db5203d8ef08b298a6fd72f78c27..74ef10b067c185020b35344229f383666080d45b:/rc.org
diff --git a/rc.org b/rc.org
index d679189..1ac68f8 100644
--- a/rc.org
+++ b/rc.org
@@ -643,7 +643,7 @@ timeout = 0
#+begin_src conf
[user]
name = Amin Bandali
- email = amin@aminb.org
+ email = mab@gnu.org
signingkey = 4E05246AB0BF7FFB
#+end_src
@@ -686,6 +686,8 @@ timeout = 0
pr = pull --rebase
ps = push
psf = push --force
+ nmam = "!f() { notmuch show --format=raw $1 | git am -; }; f"
+ nmam3 = "!f() { notmuch show --format=raw $1 | git am -3 -; }; f"
#+end_src
**** color
@@ -721,8 +723,8 @@ timeout = 0
**** send-email
#+begin_src conf
[sendemail]
- smtpuser = amin@aminb.org
- smtpserver = nix.aminb.org
+ smtpuser = aminb
+ smtpserver = fencepost.gnu.org
smtpserverport = 587
smtpencryption = tls
annotate = yes
@@ -752,25 +754,30 @@ timeout = 0
borders_width=0 0 2 0
separator_width=10
-[mpd]
-preset=MPD
-title= ï
-borders_color=#7FDBFF
+#[mpd]
+#preset=MPD
+#title= ï
+#borders_color=#7FDBFF
[ram]
preset=RAM
title= ï¾
borders_color=#3D9970
-[cpu]
-preset=CPU
-title= ï¤
-borders_color=#2ECC40
+#[cpu]
+#preset=CPU
+#title= ï¤
+#borders_color=#2ECC40
-[hdd]
-preset=HDD
-title= ï
-borders_color=#01FF70
+#[hdd]
+#preset=HDD
+#title= ï
+#borders_color=#01FF70
+
+[volume]
+command=volume-info
+title=ï§
+borders_color=#7FDBFF
[battery]
preset=BAT
@@ -785,7 +792,7 @@ borders_color=#01FF70
[date]
preset=DATE
-command=date '+%-I:%M, %a %b %d'
+command=date '+%-I:%M, %a %b %d '
title= ï
borders_color=#FFDC00
separator_width=0
@@ -1470,6 +1477,10 @@ from aminb@gnu.org
user aminb
passwordeval gpg2 --no-tty -q -d ~/.passwd/gnu.gpg
+# gnu (new address)
+account gnu-mab : gnu
+from mab@gnu.org
+
# uwaterloo
account uwaterloo
host connect.uwaterloo.ca
@@ -1479,10 +1490,6 @@ user abandali
passwordeval gpg2 --no-tty -q -d ~/.passwd/uwaterloo.gpg
tls_trust_file /etc/ssl/certs/ca-certificates.crt
-# uwaterloo (friendly address)
-account uwaterloo-friendly : uwaterloo
-from amin.bandali@uwaterloo.ca
-
# Set a default account
account default : aminb
#+end_src
@@ -2105,7 +2112,7 @@ path=/home/amin/mail
[user]
name=Amin Bandali
primary_email=amin@aminb.org
-other_email=abandali@uwaterloo.ca;amin.bandali@uwaterloo.ca;aminb@gnu.org;
+other_email=abandali@uwaterloo.ca;mab@gnu.org;aminb@gnu.org;
# Configuration for "notmuch new"
#
@@ -2191,7 +2198,7 @@ sieve-filter -eW -o postmaster_address=postmaster@aminb.org \
#+begin_src sh
# apply sent tag to messages sent by me
-notmuch tag -new +sent -- from:amin@aminb.org or from:aminb@gnu.org or from:abandali@uwaterloo.ca or from:amin.bandali@uwaterloo.ca
+notmuch tag -new +sent -- from:amin@aminb.org or from:mab@gnu.org or from:aminb@gnu.org or from:abandali@uwaterloo.ca
# initial tagging
notmuch tag -latest -- tag:latest
@@ -2210,6 +2217,7 @@ notmuch tag -inbox +lists/hackernewsletter -- folder:amin/lists/hackernewsletter
notmuch tag -inbox +lists/haskell-weekly -- folder:amin/lists/haskell-weekly
notmuch tag -inbox +pay -- folder:amin/pay
+notmuch tag -inbox +banking -- folder:amin/banking
#
#
@@ -3664,6 +3672,7 @@ insert_pass="Alt+n"
#+begin_src conf
exec xrdb .Xresources
+exec dunst
### Variables
# super
set $mod Mod4
@@ -3734,7 +3743,10 @@ input "1:1:AT_Translated_Set_2_keyboard" {
# Drag floating windows by holding down $mod and left mouse button.
# Resize them with right mouse button + $mod.
- floating_modifier $mod
+ # Despite the name, also works for non-floating windows.
+ # Change normal to inverse to use left mouse button for resizing and right
+ # mouse button for dragging.
+ floating_modifier $mod normal
# reload the configuration file
bindsym $mod+Shift+c reload
@@ -3751,17 +3763,17 @@ input "1:1:AT_Translated_Set_2_keyboard" {
bindsym XF86AudioMute exec pamixer --toggle-mute
bindsym XF86AudioMicMute exec pactl set-source-mute 1 toggle
- # bspwm-esque workspace switch and window move
- bindsym $mod+bracketleft exec sway-ws-util switch prev
- bindsym $mod+bracketright exec sway-ws-util switch next
- bindsym $mod+braceleft exec sway-ws-util move prev follow
- bindsym $mod+braceright exec sway-ws-util move next follow
-
# original sway workspace switch and window move
- bindsym $mod2+bracketleft workspace prev
- bindsym $mod2+bracketright workspace next
- bindsym $mod2+braceleft move container to workspace prev
- bindsym $mod2+braceright move container to workspace next
+ bindsym $mod+bracketleft workspace prev
+ bindsym $mod+bracketright workspace next
+ bindsym $mod+braceleft move container to workspace prev
+ bindsym $mod+braceright move container to workspace next
+
+ # bspwm-esque workspace switch and window move
+ bindsym $mod2+bracketleft exec sway-ws-util switch prev
+ bindsym $mod2+bracketright exec sway-ws-util switch next
+ bindsym $mod2+braceleft exec sway-ws-util move prev follow
+ bindsym $mod2+braceright exec sway-ws-util move next follow
#
# Moving around:
#
@@ -4877,13 +4889,30 @@ exact brightness value.
** battery-percentage-time
:PROPERTIES:
-:header-args+: :tangle ~/.local/bin/battery-percentage-time :shebang "#!/bin/bash"
+:header-args+: :tangle ~/.local/bin/battery-percentage-time :shebang "#!/bin/sh"
:END:
-#+begin_src bash
-pct=$(upower -i /org/freedesktop/UPower/devices/battery_BAT0 | grep percentage | awk '{print $2}')
-time=$(upower -i /org/freedesktop/UPower/devices/battery_BAT0 | grep time | awk '{print $4,$5}')
-echo "$pct ($time)"
+#+begin_src sh
+dbus_send() {
+ label=$1
+ dbus-send --print-reply=literal --system \
+ --dest=org.freedesktop.UPower \
+ /org/freedesktop/UPower/devices/battery_BAT0 \
+ org.freedesktop.DBus.Properties.Get \
+ string:org.freedesktop.UPower.Device \
+ string:"${label}" | awk '{print $3}'
+}
+
+perc=$(dbus_send 'Percentage')
+state=$(dbus_send 'State')
+
+if [ "$state" -eq 2 ]; then # Discharging
+ secs=$(dbus_send 'TimeToEmpty')
+elif [ "$state" -eq 1 ]; then # Charging
+ secs=$(dbus_send 'TimeToFull')
+fi
+
+printf '%s%%%%%2dh%02dm \n' "$perc" $((secs / 3600)) $((secs % 3600 / 60))
#+end_src
** rofi-light
@@ -5021,6 +5050,21 @@ import gnomekeyring as gk
gk.unlock_sync('Default_keyring',gk.item_get_info_sync('login',1L).get_secret())
#+end_src
+** volume-info
+:PROPERTIES:
+:header-args+: :tangle ~/.local/bin/volume-info :shebang "#!/bin/sh"
+:END:
+
+#+begin_src sh
+cur_vol=$(pamixer --get-volume)
+
+if [ $(pamixer --get-mute) = true ]; then
+ printf 'mt \n' "$cur_vol"
+else
+ printf '%02d \n' "$cur_vol"
+fi
+#+end_src
+
** wp
My little wallpaper changer script.