[rc/tlp] fix hostname

[~bandali/configs] / rc.org

diff --git a/rc.org b/rc.org
index b00363a..535cca6 100644 (file)
--- a/rc.org
+++ b/rc.org
@@ -701,8 +701,8 @@ WantedBy=timers.target
 #+begin_src conf
 [user]
     name = Amin Bandali
 #+begin_src conf
 [user]
     name = Amin Bandali

-    email = amin@gnu.org
-    signingkey = CDDE75F903538E71813CDA27D1FBA36627D65876
+    email = bandali@gnu.org
+    signingkey = BE6273738E616D6D1B3A08E8A21A020248816103

 #+end_src
 
 **** signing
 #+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
 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
 
 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
 
 # uwaterloo
 account uwaterloo


@@ -2191,7 +2187,7 @@ path=/home/amin/mail
 [user]
 name=Amin Bandali
 primary_email=amin@aminb.org
 [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"
 #
 
 # 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
 
 #+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
 
 # initial tagging
 notmuch tag -latest                     -- tag:latest


@@ -3662,10 +3658,11 @@ adjustment-method=randr
 :END:
 
 #+begin_src conf
 :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: 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
 rofi.modi: run,window
 ! rofi.width: 640
 rofi.width: 600


@@ -3764,6 +3761,8 @@ insert_pass="Alt+n"
 #+end_src
 
 ** sway
 #+end_src
 
 ** sway

+
+*** main

 :PROPERTIES:
 :header-args+: :tangle ~/.config/sway/config
 :END:
 :PROPERTIES:
 :header-args+: :tangle ~/.config/sway/config
 :END:


@@ -3801,36 +3800,10 @@ output * bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill
 ### Idle configuration
 
 exec swayidle \
 ### Idle configuration
 
 exec swayidle \

-   timeout 120 swaylock \
-   timeout 180 'swaymsg "output * dpms off"' \
-      resume   'swaymsg "output * dpms on"'  \
+   timeout 120  'swaymsg "output * dpms off"' \
+   resume       'swaymsg "output * dpms on"'  \

    before-sleep swaylock
 
    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
 #
 
 ### Key bindings
 #


@@ -3997,16 +3970,15 @@ bindsym $mod+Shift+r mode "resize"
 #
 # Power button
 #
 #
 # 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" {
 
 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"
 
     # back to normal: Enter, Escape, or q
     bindsym Return mode "default"


@@ -4036,8 +4008,53 @@ font pango: DejaVu Sans Mono 9
 # font pango: Liberation Mono 9
 
 include /etc/sway/config.d/*
 # font pango: Liberation Mono 9
 
 include /etc/sway/config.d/*

+include ~/.config/sway/`hostname`
+
+#+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
 
 #+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
 ** swaylock
 :PROPERTIES:
 :header-args+: :tangle ~/.config/swaylock/config


@@ -4363,9 +4380,9 @@ DEVICES_TO_DISABLE_ON_STARTUP="bluetooth"
 #DEVICES_TO_DISABLE_ON_UNDOCK=""
 #+end_src
 
 #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
 # ------------------------------------------------------------------------------
 # tlp - Parameters for power saving
 # See full explanation: http://linrunner.de/en/tlp/docs/tlp-configuration.html


@@ -4906,7 +4923,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: 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
 
 ! Emacs.font: Iosevka:size=16
 #+end_src
 


@@ -4917,10 +4935,10 @@ Emacs.font: Ubuntu Mono:size=16
 
 #+begin_src conf-xdefaults
 ! Font
 
 #+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
 
 URxvt.xftAntialias:     true
 URxvt.letterSpace:      0


@@ -4939,8 +4957,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.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
 URxvt.url-select.launcher:  firefox
 URxvt.url-select.underline: true
 URxvt.keysym.M-u:           perl:url-select:select_next


@@ -5042,8 +5058,8 @@ URxvt.color13: #AD7FA8
 !URxvt.color6: #06989A
 !URxvt.color14: #34E2E2
 ! orange (replaces cyan)
 !URxvt.color6: #06989A
 !URxvt.color14: #34E2E2
 ! orange (replaces cyan)

-*color6:  #ce5c00
-*color14: #fcaf3e
+,*color6:  #ce5c00
+,*color14: #fcaf3e

 
 ! White
 URxvt.color7: #D3D7CF
 
 ! White
 URxvt.color7: #D3D7CF


@@ -5188,7 +5204,7 @@ zhighlighters=(main brackets pattern)
 #
 
 # Load these ssh identities with the ssh module
 #
 
 # Load these ssh identities with the ssh module

-zssh_ids=(id_ed25519_amin)
+zssh_ids=(id_ed25519_bandali)

 
 
 #
 
 
 #


@@ -5251,6 +5267,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 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
 
 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