X-Git-Url: https://git.shemshak.org/gitweb.cgi/~bandali/configs/blobdiff_plain/1f2bc66e0bca8d87124ddf3319fbc51a26af109b..405e14e90746a8cc694865ef1e29e78f4c690883:/rc.org?ds=inline diff --git a/rc.org b/rc.org index 5962ebf..51a9c97 100644 --- a/rc.org +++ b/rc.org @@ -701,8 +701,8 @@ WantedBy=timers.target #+begin_src conf [user] name = Amin Bandali - email = amin@gnu.org - signingkey = CDDE75F903538E71813CDA27D1FBA36627D65876 + email = bandali@gnu.org + signingkey = BE6273738E616D6D1B3A08E8A21A020248816103 #+end_src **** signing @@ -1546,19 +1546,15 @@ passwordeval gpg2 --no-tty -q -d ~/.passwd/amin.gpg account gnu host fencepost.gnu.org # use `msmtp -a gnu --serverinfo --tls --tls-certcheck=off --tls-fingerprint=` to get the current fingerprint -tls_fingerprint 28:70:42:76:1C:EC:91:5F:D1:B3:27:A1:CD:3B:32:A4:8B:0B:DC:3A:CD:CA:F6:6F:E4:61:BA:69:D7:4D:0D:0B +tls_fingerprint 34:60:91:B5:71:5B:76:87:50:F3:83:13:26:0F:EE:75:42:83:93:9A:E2:AF:1E:87:72:02:C9:61:CE:28:1B:8E tls_starttls on from aminb@gnu.org user aminb passwordeval gpg2 --no-tty -q -d ~/.passwd/gnu.gpg -# gnu (amin) -account gnu-amin : gnu -from amin@gnu.org - -# gnu (mab) -account gnu-mab : gnu -from mab@gnu.org +# gnu (bandali) +account gnu-bandali : gnu +from bandali@gnu.org # uwaterloo account uwaterloo @@ -2191,7 +2187,7 @@ path=/home/amin/mail [user] name=Amin Bandali primary_email=amin@aminb.org -other_email=amin@gnu.org;abandali@uwaterloo.ca;mab@gnu.org;aminb@gnu.org; +other_email=bandali@gnu.org;abandali@uwaterloo.ca; # Configuration for "notmuch new" # @@ -2277,7 +2273,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:amin@gnu.org or from:mab@gnu.org or from:aminb@gnu.org or from:abandali@uwaterloo.ca +notmuch tag -new +sent -- from:amin@aminb.org or from:bandali@gnu.org or from:aminb@gnu.org or from:amin@gnu.org or from:mab@gnu.org or from:abandali@uwaterloo.ca # initial tagging notmuch tag -latest -- tag:latest @@ -3765,17 +3761,13 @@ insert_pass="Alt+n" #+end_src ** sway + +*** main :PROPERTIES: :header-args+: :tangle ~/.config/sway/config :END: #+begin_src conf -exec xrdb .Xresources -exec dunst -exec pgrep -x "systemd-inhibit" || \ - systemd-inhibit --what=handle-power-key --who=aminb \ - --why="Handle power button in sway" sleep infinity - ### Variables # super set $mod Mod4 @@ -3802,36 +3794,10 @@ output * bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill ### Idle configuration exec swayidle \ - timeout 120 swaylock \ - timeout 180 'swaymsg "output * dpms off"' \ - resume 'swaymsg "output * dpms on"' \ + timeout 120 '[ -f ~/.nosleep ] || swaymsg "output * dpms off"' \ + resume '[ -f ~/.nosleep ] || swaymsg "output * dpms on"' \ before-sleep swaylock -### Input configuration - -input "1739:31251:DLL07BE:01_06CB:7A13_Touchpad" { - dwt enabled - tap enabled - natural_scroll enabled - middle_emulation enabled - click_method clickfinger -} - -input "2:7:SynPS/2_Synaptics_TouchPad" { - events disabled - dwt enabled - tap enabled - natural_scroll enabled - click_method clickfinger -} - -input "1:1:AT_Translated_Set_2_keyboard" { - repeat_delay 200 - repeat_rate 45 - xkb_layout us_ab,ir - xkb_options ctrl:nocaps,altwin:swap_alt_win,grp:shifts_toggle -} - ### Key bindings # @@ -3998,16 +3964,15 @@ bindsym $mod+Shift+r mode "resize" # # Power button # -set $locker swaylock && sleep 1 set $mode_system System (l)ock, (e)xit sway, (s)uspend, (h)ibernate, (r)eboot, (S)hutdown mode "$mode_system" { - bindsym l exec $locker, mode "default" - bindsym e exec swaymsg exit, mode "default" - bindsym s exec $locker && systemctl suspend, mode "default" - bindsym h exec $locker && systemctl hibernate, mode "default" - bindsym r exec systemctl reboot, mode "default" - bindsym Shift+s exec systemctl poweroff -i, mode "default" + bindsym l exec swaylock, mode "default" + bindsym e exec swaymsg exit, mode "default" + bindsym s exec systemctl suspend, mode "default" + bindsym h exec systemctl hibernate, mode "default" + bindsym r exec systemctl reboot, mode "default" + bindsym Shift+s exec systemctl poweroff -i, mode "default" # back to normal: Enter, Escape, or q bindsym Return mode "default" @@ -4016,6 +3981,39 @@ mode "$mode_system" { } bindsym XF86PowerOff mode "$mode_system" +# +# Presentation mode +# + +bindsym $mod+$mod2+p exec [ ! -e ~/.nosleep ] && touch ~/.nosleep || rm ~/.nosleep + +# +# Notifications +# + +bindsym $mod+Shift+n mode notifications +mode notifications { + bindsym Return exec makoctl invoke; exec makoctl dismiss; mode default + bindsym d exec makoctl dismiss; mode default + bindsym Shift+d exec makoctl dismiss -a; mode default + + bindsym Escape mode default + bindsym q mode default +} + +# +# Screenshotting +# + +bindsym $mod+Shift+s mode screenshot +mode screenshot { + bindsym a exec grim $(xdg-user-dir PICTURES)/shots/$(date +'%Y-%m-%d-%H%M%S.png'); mode default + bindsym r exec slurp | grim -g - $(xdg-user-dir PICTURES)/shots/$(date +'%Y-%m-%d-%H%M%S.png'); mode default + + bindsym Escape mode default + bindsym q mode default +} + # # Status Bar: # @@ -4036,9 +4034,63 @@ bar { font pango: DejaVu Sans Mono 9 # font pango: Liberation Mono 9 +exec xrdb .Xresources +exec pgrep -x "systemd-inhibit" || \ + systemd-inhibit --what=handle-power-key --who=aminb \ + --why="Handle power button in sway" sleep infinity +exec mako 2>&1 >/tmp/mako.log +exec /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 + include /etc/sway/config.d/* +include ~/.config/sway/`hostname` + +exec systemd-notify --ready || true + +#+end_src + +*** langa +:PROPERTIES: +:header-args+: :tangle ~/.config/sway/langa +:END: + +#+begin_src conf +input "2:7:SynPS/2_Synaptics_TouchPad" { + events disabled + dwt enabled + tap enabled + natural_scroll enabled + click_method clickfinger +} + +input "1:1:AT_Translated_Set_2_keyboard" { + repeat_delay 200 + repeat_rate 45 + xkb_layout us_ab,ir + xkb_options ctrl:nocaps,altwin:swap_alt_win,grp:shifts_toggle +} #+end_src +*** shemshak +:PROPERTIES: +:header-args+: :tangle ~/.config/sway/shemshak +:END: + +#+begin_src conf +input "1739:31251:DLL07BE:01_06CB:7A13_Touchpad" { + dwt enabled + tap enabled + natural_scroll enabled + middle_emulation enabled + click_method clickfinger +} + +input "1:1:AT_Translated_Set_2_keyboard" { + repeat_delay 200 + repeat_rate 45 + xkb_layout us,ir + xkb_options ctrl:nocaps,altwin:swap_alt_win,ctrl:rctrl_ralt,grp:shifts_toggle +} +#+end_src ** swaylock :PROPERTIES: :header-args+: :tangle ~/.config/swaylock/config @@ -4364,9 +4416,9 @@ DEVICES_TO_DISABLE_ON_STARTUP="bluetooth" #DEVICES_TO_DISABLE_ON_UNDOCK="" #+end_src -*** pary +*** shemshak -#+begin_src conf :tangle (when (and (eq system-type 'gnu/linux) (string= (system-name) "pary")) "/sudo::/etc/default/tlp") +#+begin_src conf :tangle (when (and (eq system-type 'gnu/linux) (string= (system-name) "shemshak")) "/sudo::/etc/default/tlp") # ------------------------------------------------------------------------------ # tlp - Parameters for power saving # See full explanation: http://linrunner.de/en/tlp/docs/tlp-configuration.html @@ -5188,7 +5240,7 @@ zhighlighters=(main brackets pattern) # # Load these ssh identities with the ssh module -zssh_ids=(id_ed25519_amin) +zssh_ids=(id_ed25519_bandali) # @@ -5332,7 +5384,7 @@ alias mv="mv -iv" alias cp="cp -iv" alias scl=systemctl alias jcl=journalctl -alias m="mbsync -Va; getmail; notmuch new" +alias m="mbsync -a; getmail; notmuch new" alias best="youtube-dl -f best" alias nixx="ssh amin@nix.aminb.org" alias fence="ssh aminb@fencepost.gnu.org" @@ -5404,7 +5456,7 @@ light -S $val #+begin_src bash export _JAVA_AWT_WM_NONREPARENTING=1 export _JAVA_OPTIONS='-Dawt.useSystemAAFontSettings=on -Dswing.aatext=true' -light -Scrs "intel_backlight" 2 +light -Nr 2 source $HOME/.zprofile sway #+end_src