some changes to aristotle

boxes/aristotle/default.nix

@@ -22,7 +22,6 @@
     };
   };
   hardware = {
-    pulseaudio.enable = true;
     bluetooth = {
       enable = true;
       settings.General.ControllerMode = "bredr";
@@ -44,16 +43,14 @@
     experimental-features = [ "nix-command" "flakes" ];
   };
 
+  fonts.packages = with pkgs; [
+    fantasque-sans-mono
+  ];
+
   environment.systemPackages = with pkgs; [
     # x11
     brave
-    (pkgs.st.overrideAttrs (oldAttrs: rec {
-        patches = [
-          ../../builds/lappy-st/scrollback.patch
-          ../../builds/lappy-st/clipboard.patch
-        ];
-        conf = builtins.readFile ../../builds/lappy-st/config.h;
-    }))
+    (callPackage ../../builds/st.nix { aristotle = true; })
     (callPackage ../../builds/lappy-utils.nix {})
     (callPackage ../../builds/dwm.nix {})
     (callPackage ../../builds/sssg.nix {})

builds/lappy-utils/rebuild

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-cd $HOME/dots; sudo nixos-rebuild switch --flake .?submodules=1
+cd $HOME/dots; sudo nixos-rebuild switch --flake .?submodules=1 $@

builds/st.nix

@@ -9,6 +9,7 @@
 , ncurses
 , fantasque-sans-mono
 , lightMode ? false
+, aristotle ? false
 , extraLibs ? [ ]
 }:
 
@@ -21,10 +22,12 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config fontconfig freetype ncurses ];
   buildInputs = [ libX11 libXft ] ++ extraLibs;
 
-  buildPhase = lib.optionalString (lightMode == true) "cp lightmode.h colors.h;" +
-  ''
-    make
-  '';
+  buildPhase =
+    lib.optionalString (lightMode == true) "cp lightmode.h colors.h; " +
+    lib.optionalString (aristotle == true) "CFLAGS='-DARISTOTLE' " +
+    ''
+      make
+    '';
 
   installPhase = ''
     mkdir -p $out/bin

builds/st/config.h

@@ -5,6 +5,8 @@
  */
 #ifdef IS_PHONE
 static char *font = "Monospace:pixelsize=34:antialias=true:autohint=true";
+#elif ARISTOTLE
+static char *font = "Fantasque Sans Mono:pixelsize=24:antialias=true:autohint=true";
 #else
 static char *font = "Fantasque Sans Mono:pixelsize=14:antialias=true:autohint=true";
 #endif