X-Git-Url: https://git.shemshak.org/gitweb.cgi/~bandali/configs/blobdiff_plain/ad65bea00265c8766030931b8dd244fe27dedf27..051074d65dac4696a91124dd08a47120a1cb1251:/rc.org?ds=sidebyside diff --git a/rc.org b/rc.org index dcce8ab..7561980 100644 --- a/rc.org +++ b/rc.org @@ -389,6 +389,52 @@ wintypes: }; #+end_src +** dovecot +:PROPERTIES: +:header-args+: :tangle "/sudo::/etc/dovecot/dovecot.conf" +:END: + +#+begin_src conf +protocols = imap + +listen = 127.0.0.1 +log_path = /var/log/dovecot.log +info_log_path = /var/log/dovecot-info.log + +ssl = no +disable_plaintext_auth = no + +auth_verbose = yes +auth_mechanisms = plain + +passdb { + driver = passwd-file + args = /etc/dovecot/passwd +} + +userdb { + driver = static + args = uid=amin gid=amin home=/home/amin/mail/%d/%n + default_fields = mail=maildir:/home/amin/mail/%d/%n/mail +} + +# mail_home = /home/amin/mail/%d/%n +# mail_location = maildir:/home/amin/mail/%d/%n/mail:LAYOUT=fs:INBOX=/home/amin/mail/%d/%n/mail/Inbox + +# namespace { +# inbox = yes +# separator = / +# } + +mail_plugins = $mail_plugins fts fts_lucene + +plugin { + fts = lucene + fts_lucene = whitespace_chars=@. + fts_autoindex = yes +} +#+end_src + ** Dunst :PROPERTIES: :header-args+: :tangle ~/.config/dunst/dunstrc @@ -643,7 +689,7 @@ timeout = 0 [retriever] type = SimplePOP3SSLRetriever server = fencepost.gnu.org -username = aminb +username = bandali password_command = ("gpg2", "--no-tty", "-q", "-d", "/home/amin/.passwd/gnu.gpg") port = 995 use_apop = True @@ -701,8 +747,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 @@ -781,7 +827,7 @@ WantedBy=timers.target **** send-email #+begin_src conf [sendemail] - smtpuser = aminb + smtpuser = bandali smtpserver = fencepost.gnu.org smtpserverport = 587 smtpencryption = tls @@ -921,13 +967,14 @@ separator_width=0 general { colors = true interval = 5 + output_format = "i3bar" } # order += "ipv6" order += "disk /" order += "disk /data" order += "wireless _first_" -# order += "ethernet _first_" +order += "ethernet _first_" order += "battery 0" order += "volume master" order += "load" @@ -938,11 +985,11 @@ wireless _first_ { format_down = "W: down" } -# ethernet _first_ { -# # if you use %speed, i3status requires root privileges -# format_up = "E: %ip (%speed)" -# format_down = "E: down" -# } +ethernet _first_ { + # if you use %speed, i3status requires root privileges + format_up = "E: %ip (%speed)" + format_down = "E: down" +} battery 0 { format = "%status %percentage %remaining (%consumption)" @@ -987,10 +1034,12 @@ disk "/data" { #+begin_src conf # Global defaults CopyArrivalDate yes +Create Both +Expunge Both ###### IMAPAccount amin -Host nix.aminb.org +Host mail.aminb.org User amin@aminb.org PassCmd "gpg -q --for-your-eyes-only --no-tty -d ~/.passwd/amin.gpg" SSLType IMAPS @@ -998,17 +1047,20 @@ SSLType IMAPS IMAPStore amin-remote Account amin -MaildirStore amin-local -Path ~/mail/amin/ -Inbox ~/mail/amin/Inbox -SubFolders Verbatim +IMAPAccount amin-dovecot +Host 127.0.0.1 +Port 143 +User amin@aminb.org +PassCmd "gpg -q --for-your-eyes-only --no-tty -d ~/.passwd/amin-dovecot.gpg" +SSLType None + +IMAPStore amin-local +Account amin-dovecot Channel amin Master :amin-remote: Slave :amin-local: -Patterns * !dovecot* -Create Both -SyncState * +Patterns * ###### IMAPAccount uwaterloo @@ -1020,17 +1072,20 @@ SSLType IMAPS IMAPStore uwaterloo-remote Account uwaterloo -MaildirStore uwaterloo-local -Path ~/mail/uwaterloo/ -Inbox ~/mail/uwaterloo/Inbox -SubFolders Verbatim +IMAPAccount uwaterloo-dovecot +Host 127.0.0.1 +Port 143 +User abandali@uwaterloo.ca +PassCmd "gpg -q --for-your-eyes-only --no-tty -d ~/.passwd/uwaterloo-dovecot.gpg" +SSLType None + +IMAPStore uwaterloo-local +Account uwaterloo-dovecot Channel uwaterloo Master :uwaterloo-remote: Slave :uwaterloo-local: -Patterns * !dovecot* -Create Both -SyncState * +Patterns * #+end_src *** mbsync.service @@ -1534,9 +1589,9 @@ logfile ~/.msmtp.log # aminb account aminb -host nix.aminb.org +host mail.aminb.org # use `msmtp -a aminb --serverinfo --tls --tls-certcheck=off --tls-fingerprint=` to get the current fingerprint -tls_fingerprint 98:C7:F0:02:7F:2B:D8:B6:D3:BF:E8:C1:D4:07:6B:B5:6C:B1:C7:5D:97:20:70:88:AB:9E:B5:09:5D:2C:DC:8E +tls_fingerprint C7:A4:2E:A3:11:FA:80:45:C4:29:D6:62:4D:73:DB:34:43:67:8F:16:F1:2E:54:43:06:1B:41:B6:A9:09:E0:37 tls_starttls on from amin@aminb.org user amin@aminb.org @@ -1546,17 +1601,17 @@ 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 93:59:52:1D:A6:95:13:31:7C:81:ED:DB:A5:BA:B5:2B:C8:BC:38:3E:71:A5:DF:8C:80:46:C1:E0:5D:2D:F4:E3 tls_starttls on -from aminb@gnu.org -user aminb +from bandali@gnu.org +user bandali passwordeval gpg2 --no-tty -q -d ~/.passwd/gnu.gpg -# gnu (amin) +# gnu (old) +account gnu-aminb : gnu +from aminb@gnu.org account gnu-amin : gnu from amin@gnu.org - -# gnu (mab) account gnu-mab : gnu from mab@gnu.org @@ -2171,7 +2226,7 @@ def_key "K" # configured here named ".notmuch". # [database] -path=/home/amin/mail +path=/home/amin/oldmail # User configuration # @@ -2191,7 +2246,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 +2332,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 @@ -3662,10 +3717,11 @@ adjustment-method=randr :END: #+begin_src conf -rofi.font: Ubuntu Mono 13 +! rofi.font: Ubuntu Mono 13 ! rofi.font: Inconsolata 16 ! rofi.font: Iosevka 13 ! rofi.font: Source Code Pro 11 +rofi.font: Source Code Pro 10.5 rofi.modi: run,window ! rofi.width: 640 rofi.width: 600 @@ -3764,13 +3820,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 ### Variables # super set $mod Mod4 @@ -3797,28 +3853,10 @@ output * bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill ### Idle configuration exec swayidle \ - timeout 60 swaylock \ - timeout 120 '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 "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 -} - ### Key bindings # @@ -3858,6 +3896,8 @@ input "1:1:AT_Translated_Set_2_keyboard" { bindsym XF86AudioMute exec pamixer --toggle-mute bindsym XF86AudioMicMute exec pactl set-source-mute 1 toggle + bindsym $mod+Shift+apostrophe exec rofi-remmina.py # choose remmina connection + # original sway workspace switch and window move bindsym $mod+bracketleft workspace prev bindsym $mod+bracketright workspace next @@ -3982,6 +4022,59 @@ mode "resize" { } bindsym $mod+Shift+r mode "resize" +# +# Power button +# + +set $mode_system System (l)ock, (e)xit sway, (s)uspend, (h)ibernate, (r)eboot, (S)hutdown +mode "$mode_system" { + 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" + bindsym Escape mode "default" + bindsym q mode "default" +} +bindsym XF86PowerOff mode "$mode_system" + +# +# Presentation mode +# + +bindsym $mod+$mod2+p exec ([ ! -e ~/.nosleep ] && touch ~/.nosleep || rm ~/.nosleep) && killall -USR1 i3status + +# +# 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: # @@ -3993,12 +4086,72 @@ bar { background #323232 inactive_workspace #32323200 #32323200 #5c5c5c } - status_command i3status + status_command i3status | my-i3status.py } +# font pango: benis uushi 9 +# font pango: Ubuntu Mono 11 +# font pango: Inconsolata 11 +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 @@ -4324,9 +4477,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 @@ -4867,7 +5020,8 @@ Emacs.FontBackend: xft,x ! Emacs.font: Inconsolata:size=16 ! Emacs.font: Inconsolata LGC:size=14 ! Emacs.font: Source Code Pro Medium-10.5 -Emacs.font: Ubuntu Mono:size=16 +Emacs.font: Source Code Pro:size=14 +! Emacs.font: Ubuntu Mono:size=16 ! Emacs.font: Iosevka:size=16 #+end_src @@ -4878,10 +5032,10 @@ Emacs.font: Ubuntu Mono:size=16 #+begin_src conf-xdefaults ! Font -URxvt.font: xft:ubuntu mono:pixelsize=16:antialias=true:hinting=true, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true -URxvt.boldFont: xft:ubuntu mono:pixelsize=16:antialias=true:hinting=true:bold, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true:bold -URxvt.italicFont: xft:ubuntu mono:pixelsize=16:antialias=true:hinting=true:italic, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true:italic -URxvt.bolditalicFont: xft:ubuntu mono:pixelsize=16:antialias=true:hinting=true:bold:italic, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true:bolditalic +URxvt.font: xft:source code pro:pixelsize=14:antialias=true:hinting=true, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true +URxvt.boldFont: xft:source code pro semibold:pixelsize=14:antialias=true:hinting=true:bold, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true:bold +URxvt.italicFont: xft:source code pro italic:pixelsize=14:antialias=true:hinting=true:italic, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true:italic +URxvt.bolditalicFont: xft:source code pro semibold italic:pixelsize=14:antialias=true:hinting=true:bold:italic, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true:bolditalic URxvt.xftAntialias: true URxvt.letterSpace: 0 @@ -4900,8 +5054,6 @@ URxvt.keysym.Shift-Up: command:\033]720;1\007 URxvt.keysym.Shift-Down: command:\033]721;1\007 URxvt.perl-ext-common: default,clipboard,url-select,keyboard-select -URxvt.perl-ext: bidi -URxvt.bidi.enabled: 1 URxvt.url-select.launcher: firefox URxvt.url-select.underline: true URxvt.keysym.M-u: perl:url-select:select_next @@ -5003,14 +5155,26 @@ URxvt.color13: #AD7FA8 !URxvt.color6: #06989A !URxvt.color14: #34E2E2 ! orange (replaces cyan) -*color6: #ce5c00 -*color14: #fcaf3e +,*color6: #ce5c00 +,*color14: #fcaf3e ! White URxvt.color7: #D3D7CF URxvt.color15: #EEEEEC #+end_src +*** xkb us_ab keyboard layout + +#+begin_src conf :tangle "/sudo::/usr/share/X11/xkb/symbols/us_ab" :comments none +default partial alphanumeric_keys +xkb_symbols "us_ab" { + include "us(basic)" + name[Group1]= "English (US)(aminb)"; + + key { [ Alt_R ] }; +}; +#+end_src + ** XDG :PROPERTIES: :header-args+: :tangle ~/.config/user-dirs.dirs @@ -5137,7 +5301,7 @@ zhighlighters=(main brackets pattern) # # Load these ssh identities with the ssh module -zssh_ids=(id_ed25519_amin) +zssh_ids=(id_ed25519_bandali) # @@ -5200,6 +5364,8 @@ export MOZ_USE_XINPUT2=1 # precise scrolling in firefox #export JAVA_HOME=/usr/lib/jvm/java-8-openjdk #export ANDROID_JACK_VM_ARGS="-Dfile.encoding=UTF-8 -XX:+TieredCompilation -Xmx4G" +export NIXPKGS=$HOME/src/git/nixpkgs + if [ -e /home/amin/.nix-profile/etc/profile.d/nix.sh ]; then . /home/amin/.nix-profile/etc/profile.d/nix.sh; fi # added by Nix installer #+end_src @@ -5279,10 +5445,11 @@ alias mv="mv -iv" alias cp="cp -iv" alias scl=systemctl alias jcl=journalctl -alias m="mbsync -Va; getmail; notmuch new" +alias m="mbsync uwaterloo; mbsync amin" alias best="youtube-dl -f best" -alias nixx="ssh amin@nix.aminb.org" -alias fence="ssh aminb@fencepost.gnu.org" +alias sd="ssh deb" +alias sf="ssh fp" +alias sn="ssh nix" aur() { cd ~/usr/build @@ -5332,6 +5499,83 @@ fi printf '%s%%%%%2dh%02dm \n' "$perc" $((secs / 3600)) $((secs % 3600 / 60)) #+end_src +** my-i3status.py +:PROPERTIES: +:header-args+: :tangle ~/.local/bin/my-i3status.py :shebang "#!/usr/bin/env python2" +:END: + +#+begin_src python :comments none +# -*- coding: utf-8 -*- + +# This script is a simple wrapper which prefixes each i3status line with custom +# information. It is based on: +# https://github.com/i3/i3status/blob/master/contrib/wrapper.py +# +# In ~/.i3status.conf, add the following line: +# output_format = "i3bar" +# in the 'general' section. +# Then, in ~/.config/i3/config or ~/.config/sway/config add: +# status_command i3status | my-i3status.py +# in the 'bar' section. Make sure my-i3status.py is in $PATH. +# +# © 2012 Valentin Haenel +# © 2018 Amin Bandali +# +# This program is free software. It comes without any warranty, to the extent +# permitted by applicable law. You can redistribute it and/or modify it under +# the terms of the Do What The Fuck You Want To Public License (WTFPL), Version +# 2, as published by Sam Hocevar. See http://sam.zoy.org/wtfpl/COPYING for more +# details. + +import sys +import json +import os + +def get_nosleep(): + """ Return true if ~/.nosleep exists. """ + return os.path.isfile(os.path.expanduser("~/.nosleep")) + +def print_line(message): + """ Non-buffered printing to stdout. """ + sys.stdout.write(message + '\n') + sys.stdout.flush() + +def read_line(): + """ Interrupted respecting reader for stdin. """ + # try reading a line, removing any extra whitespace + try: + line = sys.stdin.readline().strip() + # i3status sends EOF, or an empty line + if not line: + sys.exit(3) + return line + # exit on ctrl-c + except KeyboardInterrupt: + sys.exit() + +if __name__ == '__main__': + # Skip the first line which contains the version header. + print_line(read_line()) + + # The second line contains the start of the infinite array. + print_line(read_line()) + + while True: + line, prefix = read_line(), '' + # ignore comma at start of lines + if line.startswith(','): + line, prefix = line[1:], ',' + + if get_nosleep(): + j = json.loads(line) + # insert information into the start of the json, but could be anywhere + j.insert(0, {'full_text' : '🖵 ', 'name' : 'nosleep'}) + # and echo back new encoded json + print_line(prefix+json.dumps(j)) + else: + print_line(prefix+line) +#+end_src + ** rofi-light :PROPERTIES: :header-args+: :tangle ~/.local/bin/rofi-light :shebang "#!/bin/bash" @@ -5340,7 +5584,44 @@ printf '%s%%%%%2dh%02dm \n' "$perc" $((secs / 3600)) $((secs % 3600 / 60)) #+begin_src bash cur=$(light -G) val=$(rofi -dmenu -mesg "light $cur" -p "light -S " -l 0 -width 12) -light -S $val +[ -n "$val" ] && light -S $val +#+end_src + +** rofi-remmina.py +:PROPERTIES: +:header-args+: :tangle ~/.local/bin/rofi-remmina.py :shebang "#!/usr/bin/env python2" +:END: + +#+begin_src python +import ConfigParser +import os +from subprocess import Popen, PIPE + +remmina_dir = os.path.expanduser("~/.local/share/remmina") + +fdict = dict() + +for f in os.listdir(remmina_dir): + fp = os.path.join(remmina_dir, f) + c = ConfigParser.ConfigParser() + c.read(fp) + n = c.get('remmina', 'name') + fdict[n] = fp + +lines = max(min(15, len(fdict)), 1); +width = len(max(fdict.keys(), key=len)) +rofi = Popen(["rofi", "-i", "-dmenu", \ + "-l", str(lines), "-width", str(width), \ + "-p", "connection"], stdout=PIPE, stdin=PIPE) +selected = rofi.communicate("\n" \ + .join(fdict.keys()) \ + .encode("utf-8"))[0] \ + .decode("utf-8") \ + .strip() +rofi.wait() + +r = Popen(["remmina", "-c", fdict[selected]]) +r.wait() #+end_src ** s (run sway) @@ -5351,7 +5632,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