Various updates from anahita

8 files changed, 56 insertions, 11 deletions

diff --git a/.Xresources.d/fonts b/.Xresources.d/fonts
index fc02922..e896636 100644
--- a/.Xresources.d/fonts
+++ b/.Xresources.d/fonts
@@ -6,3 +6,4 @@ Xft.hintstyle: hintslight
 ! Xft.hintstyle: hintfull
 Xft.rgba: rgb
 Xft.dpi: 96
+! Xft.dpi: 192
diff --git a/.config/sway/anahita b/.config/sway/anahita
new file mode 100644
index 0000000..7782d93
--- /dev/null
+++ b/.config/sway/anahita
@@ -0,0 +1,27 @@
+# -*-conf-*-
+
+output * bg ~/usr/pic/wallpaper fill
+# output eDP-1 scale 1
+
+input * {
+    xkb_options ctrl:swap_rwin_rctl,grp:shifts_toggle
+}
+
+input "0:0:Atmel_maXTouch_Touchpad" {
+    dwt enabled
+    natural_scroll enabled
+    middle_emulation enabled
+    click_method clickfinger
+}
+
+input "0:0:Atmel_maXTouch_Touchscreen" events disabled
+
+bindsym F7 exec light -A 5
+bindsym F6 exec light -U 5
+
+bindsym F10 exec $sinkup
+bindsym F9 exec $sinkdown
+bindsym F8 exec $sinkmute
+bindsym $mod+F10 exec $sourceup
+bindsym $mod+F9 exec $sourcedown
+bindsym $mod+F8 exec $sourcemute
diff --git a/.config/sway/config b/.config/sway/config
index 640ed06..ba1cc60 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -61,12 +61,21 @@ bindsym $mod+apostrophe exec dmenu-light
 bindsym XF86MonBrightnessUp exec light -A 5
 bindsym XF86MonBrightnessDown exec light -U 5
 
-bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5%
-bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -5%
-bindsym XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle
-bindsym $mod+XF86AudioRaiseVolume exec pactl set-source-volume @DEFAULT_SOURCE@ +5%
-bindsym $mod+XF86AudioLowerVolume exec pactl set-source-volume @DEFAULT_SOURCE@ -5%
-bindsym $mod+XF86AudioMute exec pactl set-source-mute @DEFAULT_SOURCE@ toggle
+bindsym $mod+semicolon exec dmenu-pavols
+
+set $sinkup pactl set-sink-volume @DEFAULT_SINK@ +5%
+set $sinkdown pactl set-sink-volume @DEFAULT_SINK@ -5%
+set $sinkmute pactl set-sink-mute @DEFAULT_SINK@ toggle
+set $sourceup pactl set-source-volume @DEFAULT_SOURCE@ +5%
+set $sourcedown pactl set-source-volume @DEFAULT_SOURCE@ -5%
+set $sourcemute pactl set-source-mute @DEFAULT_SOURCE@ toggle
+
+bindsym XF86AudioRaiseVolume exec $sinkup
+bindsym XF86AudioLowerVolume exec $sinkdown
+bindsym XF86AudioMute exec $sinkmute
+bindsym $mod+XF86AudioRaiseVolume exec $sourceup
+bindsym $mod+XF86AudioLowerVolume exec $sourcedown
+bindsym $mod+XF86AudioMute exec $sourcemute
 
 bindsym $mod+$left focus left
 bindsym $mod+$down focus down
diff --git a/.emacs.d/early-init.el b/.emacs.d/early-init.el
index 99646b0..962c724 100644
--- a/.emacs.d/early-init.el
+++ b/.emacs.d/early-init.el
@@ -2,3 +2,7 @@
 ;; https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=24acb31c04b4048b85311d794e600ecd7ce60d3b
 (setq package-enable-at-startup nil)
 (setq load-prefer-newer t)
+(menu-bar-mode -1)
+(tool-bar-mode -1)
+(scroll-bar-mode -1)
+(blink-cursor-mode -1)
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index a712bb1..5a9cdd3 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -303,6 +303,9 @@ plain variables.  This means that `setopt' will execute any
   (set-fontset-font t 'arabic "Sahel WOL")
   (with-eval-after-load 'faces
     (let ((grey "#e7e7e7"))
+      (set-face-attribute 'default nil
+                          :font "Source Code Pro"
+                          :weight 'medium)
       (set-face-attribute 'fixed-pitch nil
                           :font "Source Code Pro"
                           :weight 'medium)
@@ -1624,7 +1627,7 @@ non-nil."
   (global-display-fill-column-indicator-mode 1))
 
 (with-eval-after-load 'window
-  (setopt split-width-threshold 150))
+  (setopt split-width-threshold 140))
 
 (add-hook 'latex-mode-hook #'reftex-mode)
 
diff --git a/.local/bin/b-bar b/.local/bin/b-bar
index cfcd4cc..8f23563 100755
--- a/.local/bin/b-bar
+++ b/.local/bin/b-bar
@@ -17,6 +17,7 @@ do
             ;;
         *)
             b0="/sys/class/power_supply/BAT0"
+            [ "$h" = "anahita" ] && b0="/sys/class/power_supply/sbs-9-000b"
             bat="$(cat $b0/capacity)"
             # batl="$(cat $b0/capacity_level)"
             printf "%s%% | %s | %s | %s\n" \
diff --git a/.local/bin/dmenu-pamixer b/.local/bin/dmenu-pamixer
deleted file mode 100755
index cd5926a..0000000
--- a/.local/bin/dmenu-pamixer
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-cur=$(pamixer --get-volume)
-val=$(dmenu -fn 'Source Code Pro Medium-10.5' -p "volume ($cur):" < /dev/null)
-[ -n "$val" ] && pamixer --set-volume "$val"
diff --git a/.local/bin/dmenu-pavols b/.local/bin/dmenu-pavols
new file mode 100755
index 0000000..0b840ad
--- /dev/null
+++ b/.local/bin/dmenu-pavols
@@ -0,0 +1,4 @@
+#!/bin/sh
+cur=$(pactl get-sink-volume @DEFAULT_SINK@ | grep -Po '\d+(?=%)' | head -n1)
+val=$(dmenu -fn 'Source Code Pro Medium-10.5' -p "volume ($cur):" < /dev/null)
+[ -n "$val" ] && pactl set-sink-volume @DEFAULT_SINK@ "${val}%"