dotfiles

commit 7cff056e0e8df7a547ab84b1843da1af35d31ad2
parent 8fcb6ff0af656e7ec87e3323049a0374c9339ae8
Author: finwo <finwo@pm.me>
Date:   Wed,  3 Jun 2020 16:12:23 +0200

Back to sensible font and display defaults

Diffstat:
M
dwm/home/.xinitrc
 | 
26
+-------------------------
M
dwm/root/etc/portage/patches/x11-wm/dwm/20-font.diff
 | 
6
+++---
M
st/root/etc/portage/patches/x11-terms/st/10-font-hack.diff
 | 
2
+-

3 files changed, 5 insertions(+), 29 deletions(-)
diff --git a/dwm/home/.xinitrc b/dwm/home/.xinitrc
@@ -16,13 +16,6 @@ if command -v xbindkeys &>/dev/null; then
   xbindkeys
 fi
 
-# Safe settings
-xsetroot -name ""
-hasUsbcDisplay=2
-xrandr --dpi 284 --fb 3840x2160 \
-  --output DP-2 --panning 3840x2160 --scale 2x2 \
-  --output DP-1 --off
-
 # Xresources
 if command -v xrdb &>/dev/null && [ -f ~/.Xresources ]; then
   xrdb ~/.Xresources
@@ -48,7 +41,7 @@ while sleep 1; do
 
   # Battery status
   if [ -d /sys/class/power_supply/BAT0 ]; then
-    case "$(cat /sys/class/power_supply/AC/online)" in
+    case "$(cat /sys/class/power_supply/AC0/online)" in
       0)
         for cpu in `seq 0 11`; do
           echo "powersave" | tee /sys/devices/system/cpu/cpu$cpu/cpufreq/scaling_governor
@@ -70,23 +63,6 @@ while sleep 1; do
   # Set title
   xsetroot -name "${XROOT}"
 
-  # # Detect DP-1 connected
-  if xrandr | grep DP-1 | grep -v disconnected &>/dev/null; then
-    if [ $hasUsbcDisplay -ne 1 ]; then
-      hasUsbcDisplay=1
-      xrandr --dpi 284 --fb 7680x2160 \
-        --output DP-2 --panning 3840x2160+0+0 --scale 2x2 \
-        --output DP-1 --mode 3840x2160 --pos 3840x0 --scale 1x1
-    fi
-  else
-    if [ $hasUsbcDisplay -ne 0 ]; then
-      hasUsbcDisplay=0
-      xrandr --dpi 284 --fb 3840x2160 \
-        --output DP-2 --panning 3840x2160 --scale 2x2 \
-        --output DP-1 --off
-    fi
-  fi
-
 done &
 
 # window manager
diff --git a/dwm/root/etc/portage/patches/x11-wm/dwm/20-font.diff b/dwm/root/etc/portage/patches/x11-wm/dwm/20-font.diff
@@ -7,9 +7,9 @@ index 69b49d8..159b241 100644
  /* appearance */
  static const char *fonts[] = {
 -	"monospace:size=10"
-+	"Hack Nerd Font Mono:size=6:antialias=true:autohint=true",
-+	"monospace:size=6"
++	"Hack Nerd Font Mono:size=10:antialias=true:autohint=true",
++	"monospace:size=10"
  };
 -static const char dmenufont[]       = "monospace:size=10";
-+static const char dmenufont[]       = "Hack Nerd Font Mono:size=6:antialias=true:autohint=true";
++static const char dmenufont[]       = "Hack Nerd Font Mono:size=10:antialias=true:autohint=true";
  static const char normbordercolor[] = "#444444";
diff --git a/st/root/etc/portage/patches/x11-terms/st/10-font-hack.diff b/st/root/etc/portage/patches/x11-terms/st/10-font-hack.diff
@@ -7,7 +7,7 @@ index 6ebea98..9a30699 100644
   * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
   */
 -static char *font = "Liberation Mono:pixelsize=12:antialias=true:autohint=true";
-+static char *font = "Hack Nerd Font Mono:size=6:antialias=true:autohint=true";
++static char *font = "Hack Nerd Font Mono:size=10:antialias=true:autohint=true";
  static int borderpx = 2;
  
  /*