diff options
| -rw-r--r-- | machines/aszlig/slylandro.nix | 1 | ||||
| -rw-r--r-- | modules/user/aszlig/profiles/workstation/default.nix | 6 | ||||
| -rw-r--r-- | modules/user/aszlig/services/i3/default.nix | 2 | ||||
| -rw-r--r-- | modules/user/aszlig/services/i3/i3.conf | 2 | ||||
| -rw-r--r-- | pkgs/aszlig/psi/config.patch | 8 | ||||
| -rw-r--r-- | pkgs/aszlig/psi/default.nix | 3 |
6 files changed, 7 insertions, 15 deletions
diff --git a/machines/aszlig/slylandro.nix b/machines/aszlig/slylandro.nix index 8c9e91ab..85bd8bc6 100644 --- a/machines/aszlig/slylandro.nix +++ b/machines/aszlig/slylandro.nix @@ -27,7 +27,6 @@ hardware.firmware = [ pkgs.linux-firmware ]; vuizvui.hardware.tuxedo.pulse15.gen2.enable = true; - hardware.video.hidpi.enable = true; services.xserver.dpi = 188; services.xserver.xkbOptions = "caps:none"; diff --git a/modules/user/aszlig/profiles/workstation/default.nix b/modules/user/aszlig/profiles/workstation/default.nix index c6b86413..bb4785d6 100644 --- a/modules/user/aszlig/profiles/workstation/default.nix +++ b/modules/user/aszlig/profiles/workstation/default.nix @@ -3,8 +3,6 @@ let cfg = config.vuizvui.user.aszlig.profiles.workstation; inherit (config.services.xserver) xrandrHeads; - hidpi = config.hardware.video.hidpi.enable; - faceSize = if hidpi then 10 else 12; in { options.vuizvui.user.aszlig.profiles.workstation = { enable = lib.mkEnableOption "Workstation profile for aszlig"; @@ -37,7 +35,6 @@ in { (pkgs.vuizvui.aszlig.psi.override { jid = "aszlig@aszlig.net"; resource = config.networking.hostName; - inherit faceSize; }) ] ++ import ./packages.nix pkgs; @@ -49,7 +46,6 @@ in { # The default theme hurts my eyes. environment.variables.GTK_THEME = "Adwaita:dark"; - environment.variables.QT_AUTO_SCREEN_SCALE_FACTOR = lib.mkIf hidpi "1"; vuizvui.lazyPackages = import ./lazy-packages.nix pkgs; @@ -190,7 +186,7 @@ in { XTerm*termName: xterm-direct XTerm*directColor: true XTerm*faceName: MxPlus IBM VGA 8x16 - XTerm*faceSize: ${toString faceSize} + XTerm*faceSize: 12 XTerm*renderFont: true XTerm*saveLines: 10000 XTerm*bellIsUrgent: true diff --git a/modules/user/aszlig/services/i3/default.nix b/modules/user/aszlig/services/i3/default.nix index 503b192b..d11140dd 100644 --- a/modules/user/aszlig/services/i3/default.nix +++ b/modules/user/aszlig/services/i3/default.nix @@ -117,8 +117,6 @@ in inherit (pkgs.xorg) xsetroot; inherit wsConfig barConfig; - faceSize = if config.hardware.video.hidpi.enable then 10 else 12; - # XXX: Decouple this by making the i3 bindsym directives available to # the NixOS module system. flameshot = config.vuizvui.user.aszlig.programs.flameshot.package; diff --git a/modules/user/aszlig/services/i3/i3.conf b/modules/user/aszlig/services/i3/i3.conf index e3be7b23..1ace36ae 100644 --- a/modules/user/aszlig/services/i3/i3.conf +++ b/modules/user/aszlig/services/i3/i3.conf @@ -2,7 +2,7 @@ set $mod Mod4 # we want to have a VT-style font :-) -font pango:MxPlus IBM VGA 8x16 @faceSize@ +font pango:MxPlus IBM VGA 8x16 12 # Use Mouse+$mod to drag floating windows to their wanted position floating_modifier $mod diff --git a/pkgs/aszlig/psi/config.patch b/pkgs/aszlig/psi/config.patch index ea45fbd5..0fe49d66 100644 --- a/pkgs/aszlig/psi/config.patch +++ b/pkgs/aszlig/psi/config.patch @@ -131,10 +131,10 @@ index f4b71f53..387793a0 100644 - <contactlist type="QString">Sans Serif,11,-1,5,50,0,0,0,0,0</contactlist> - <message type="QString">Sans Serif,11,-1,5,50,0,0,0,0,0</message> - <passive-popup type="QString">Sans Serif,9,-1,5,50,0,0,0,0,0</passive-popup> -+ <chat type="QString">Monospace,@faceSize@,-1,5,50,0,0,0,0,0</chat> -+ <contactlist type="QString">Monospace,@faceSize@,-1,5,50,0,0,0,0,0</contactlist> -+ <message type="QString">Monospace,@faceSize@,-1,5,50,0,0,0,0,0</message> -+ <passive-popup type="QString">Monospace,@faceSize@,-1,5,50,0,0,0,0,0</passive-popup> ++ <chat type="QString">Monospace,12,-1,5,50,0,0,0,0,0</chat> ++ <contactlist type="QString">Monospace,12,-1,5,50,0,0,0,0,0</contactlist> ++ <message type="QString">Monospace,12,-1,5,50,0,0,0,0,0</message> ++ <passive-popup type="QString">Monospace,12,-1,5,50,0,0,0,0,0</passive-popup> </font> <css type="QString" /> </look> diff --git a/pkgs/aszlig/psi/default.nix b/pkgs/aszlig/psi/default.nix index 9ca2693f..9f0f12b8 100644 --- a/pkgs/aszlig/psi/default.nix +++ b/pkgs/aszlig/psi/default.nix @@ -6,7 +6,6 @@ , jid ? "something@example.org" , resource ? "psi-aszlig" -, faceSize ? 12 }: let @@ -56,7 +55,7 @@ in stdenv.mkDerivation rec { ./keep-urgency-hint.patch (substituteAll { src = ./config.patch; - inherit jid resource faceSize; + inherit jid resource; }) ]; |