Xserver scaling, input settings

home/citadel.nix

@@ -43,9 +43,6 @@
   home.file.".Xresources" = {
     recursive = true;
     text = ''
-      ! scale
-      Xft.dpi: 192
-
       ! st
       st.alpha: 0.8
       St.font: monospace:pixelsize=31:antialias=true:autohint=true;

home/common/optional/desktop/dwm/scripts/sb-updates.nix

@@ -4,10 +4,10 @@
     (writeShellScriptBin "sb-updates" ''
             # Gets number of flake inputs that are ready for update
             # Checks every 60 minutes
-      inputs=$(cd /etc/nixos && 
-        nix flake update --output-lock-file <(cat flake.nix) 2> /tmp/update && 
-        cat /tmp/update | grep -c Update)
-      printf "[ $inputs] "
+      #      inputs=$(cd /etc/nixos && 
+      #        nix flake update --output-lock-file <(cat flake.nix) 2> /tmp/update && 
+      #        cat /tmp/update | grep -c Update)
+      #      printf "[ $inputs] "
     '')
   ];
 }

home/common/optional/desktop/dwm/xinitrc.nix

@@ -1,8 +1,4 @@
 { config, ... }:
-let
-
-  monitor = "${toString (builtins.map (m: "xrandr --output ${ m.name } --mode ${ toString( m.width )}x${ toString( m.height )} --pos ${ toString( m.x)}x${ toString( m.y)}" ) config.monitors)}";
-in
 {
   # TODO: configure x11 to look in .config/x11
   home.file.".xinitrc" = {
@@ -12,8 +8,6 @@ in
       picom -b --config ~/.config/picom/picom.conf
       xrdb ~/.Xresources
 
-      ${monitor}
-
       autostart="clipboard-save dwmblocks feh-wallpaper-changer sxhkd"
       
       for program in $autostart; do

home/semita.nix

@@ -43,9 +43,6 @@
   home.file.".Xresources" = {
     recursive = true;
     text = ''
-      ! scale
-      Xft.dpi: 144
-
       ! st
       st.alpha: 0.8
       St.font: monospace:pixelsize=21:antialias=true:autohint=true;

hosts/citadel/default.nix

@@ -46,6 +46,23 @@ in
     };
   };
 
+  services = {
+    libinput.touchpad.accelSpeed = "0.5";
+    xserver = {
+      xkb.options = "caps:swapescape";
+      dpi = 196;
+      upscaleDefaultCursor = true;
+    };
+  };
+
+  environment.variables = {
+    GDK_SCALE = "2.2";
+    GDK_DPI_SCALE = "0.8";
+    _JAVA_OPTIONS = "-Dsun.java2d.uiScale=2.2";
+    QT_AUTO_SCREEN_SCALE_FACTOR = "1";
+    XCURSOR_SIZE = "64";
+  };
+
   hardware = {
     enableRedistributableFirmware = true;
     firmware = [

hosts/common/optional/dwm.nix

@@ -3,8 +3,8 @@
   services = {
     libinput.enable = true;
     xserver = {
-      autoRepeatDelay = 250;
-      autoRepeatInterval = 30;
+      autoRepeatDelay = 300;
+      autoRepeatInterval = 15;
       enable = true;
       xkb.layout = "gb";
       displayManager.startx.enable = true;

hosts/semita/default.nix

@@ -45,6 +45,21 @@ in
     };
   };
 
+  services = {
+    xserver = {
+      dpi = 144;
+      upscaleDefaultCursor = true;
+    };
+  };
+
+  environment.variables = {
+    GDK_SCALE = "1.8";
+    GDK_DPI_SCALE = "0.4";
+    _JAVA_OPTIONS = "-Dsun.java2d.uiScale=1.8";
+    QT_AUTO_SCREEN_SCALE_FACTOR = "1";
+    XCURSOR_SIZE = "32";
+  };
+
   hardware.firmware = [
     pkgs.sof-firmware
   ];