From d5681bcc9cb43a48853e8dbc10bb89b8fbc3b7f2 Mon Sep 17 00:00:00 2001
From: Ben Sima <ben@bsima.me>
Date: Mon, 7 Nov 2022 20:12:48 -0500
Subject: Fix supported features in remote builder

---
 machines/helium.nix | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'machines')

diff --git a/machines/helium.nix b/machines/helium.nix
index d2a054f..228cd98 100644
--- a/machines/helium.nix
+++ b/machines/helium.nix
@@ -183,6 +183,10 @@ in {
         sshUser = "ben";
         sshKey = "/home/ben/.ssh/id_rsa";
         system = "x86_64-linux";
+        supportedFeatures = [
+          "x86_64-linux"
+          "big-parallel"
+        ];
       }
     ];
   nix.distributedBuilds = true;
-- 
cgit v1.2.3


From 0e55fb101a9a6ec5d796c99278e90ca28dbf1647 Mon Sep 17 00:00:00 2001
From: Ben Sima <ben@bsima.me>
Date: Mon, 7 Nov 2022 20:13:28 -0500
Subject: Disable locking for now

---
 machines/helium.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'machines')

diff --git a/machines/helium.nix b/machines/helium.nix
index 228cd98..f60b0c8 100644
--- a/machines/helium.nix
+++ b/machines/helium.nix
@@ -109,7 +109,7 @@ in {
     xserver.windowManager.xmonad.enable = true;
     xserver.desktopManager.xterm.enable = true;
 
-    xserver.xautolock.enable = true;
+    xserver.xautolock.enable = false;
     xserver.xautolock.locker = "${pkgs.xlockmore}/bin/xlock -mode matrix";
     xserver.xautolock.nowlocker = "${pkgs.xlockmore}/bin/xlock -mode matrix"; # xautolock -locknow
     xserver.xautolock.time = 5; # minutes
@@ -144,7 +144,7 @@ in {
   };
   systemd.services = {
     "xlock" = {
-      enable = true;
+      enable = false;
       script = "xlock";
       path = [ pkgs.xlockmore  ];
       # nat sure about these targets
-- 
cgit v1.2.3


From 69bbe8c4c6252baa74931e6ad28f788654776691 Mon Sep 17 00:00:00 2001
From: Ben Sima <ben@bsima.me>
Date: Mon, 7 Nov 2022 20:15:19 -0500
Subject: Trying to fix font sizing problems

---
 machines/helium.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'machines')

diff --git a/machines/helium.nix b/machines/helium.nix
index f60b0c8..8b6a42c 100644
--- a/machines/helium.nix
+++ b/machines/helium.nix
@@ -7,6 +7,8 @@ let
 in {
   imports = [ ./users.nix ];
 
+  console.font = "${pkgs.fira-mono}/share/fonts/opentype/FiraMono-Regular.otf";
+
   security.sudo.wheelNeedsPassword = true;
   security.pam.yubico.enable = true;
   security.pam.yubico.debug = false;
@@ -46,6 +48,11 @@ in {
     fira fira-code fira-code-symbols
   ];
 
+  environment.variables = {
+    GDK_SCALE = "2";
+    GDK_DPI_SCALE = "0.5";
+  };
+
   environment.systemPackages = with pkgs; [
     yubioath-desktop
     yubico-pam
@@ -60,6 +67,7 @@ in {
     };
   };
 
+  hardware.video.hidpi.enable = true;
   hardware.enableAllFirmware = true;
   hardware.bluetooth.enable = true;
   hardware.bluetooth.package = pkgs.bluezFull;
@@ -104,6 +112,7 @@ in {
     xserver.layout = "us";
     xserver.libinput.enable = true;
     xserver.xkbOptions = "caps:ctrl_modifier";
+    xserver.dpi = 331;
 
     xserver.displayManager.sddm.enable = true;
     xserver.windowManager.xmonad.enable = true;
-- 
cgit v1.2.3


From c5a5e27b08f188e6e8d1c5764c239022e6657a8e Mon Sep 17 00:00:00 2001
From: Ben Sima <ben@bsima.me>
Date: Mon, 7 Nov 2022 20:15:49 -0500
Subject: Support trackball thing

---
 machines/helium.nix | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'machines')

diff --git a/machines/helium.nix b/machines/helium.nix
index 8b6a42c..f0869bc 100644
--- a/machines/helium.nix
+++ b/machines/helium.nix
@@ -111,6 +111,11 @@ in {
     xserver.autorun = true;
     xserver.layout = "us";
     xserver.libinput.enable = true;
+    xserver.libinput.mouse.additionalOptions = ''
+      Option "ScrollMethod" "Button"
+      Option "ScrollButton" "3"
+    '';
+    xserver.libinput.mouse.buttonMapping = "1 2 8 4 5 6 7 3 9";
     xserver.xkbOptions = "caps:ctrl_modifier";
     xserver.dpi = 331;
 
-- 
cgit v1.2.3


From 15dcb4f3eee0d52c6f8f0d62e01a32007631e489 Mon Sep 17 00:00:00 2001
From: Ben Sima <ben@bsima.me>
Date: Mon, 7 Nov 2022 20:48:07 -0500
Subject: Fix size issue on laptop by setting dpi

The other changes served to set fontSize centrally, and adjust it for urxvt
which doesn't behave for some reason.
---
 machines/helium.nix | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'machines')

diff --git a/machines/helium.nix b/machines/helium.nix
index f0869bc..093b25d 100644
--- a/machines/helium.nix
+++ b/machines/helium.nix
@@ -48,11 +48,6 @@ in {
     fira fira-code fira-code-symbols
   ];
 
-  environment.variables = {
-    GDK_SCALE = "2";
-    GDK_DPI_SCALE = "0.5";
-  };
-
   environment.systemPackages = with pkgs; [
     yubioath-desktop
     yubico-pam
-- 
cgit v1.2.3