staging: 2025-10-02

.github/workflows/benchmark-eval.yml

@@ -2,12 +2,14 @@ name: Benchmark Evaluation Speed
 
 on:
   workflow_dispatch:
-  push:
-    branches:
-      - master
+  pull_request:
+    types:
+      - closed
 
 jobs:
   benchmark:
+    if: github.event.pull_request.merged == true
+
     name: Benchmark NixOS Configuration
     runs-on: ubuntu-latest
     steps:

hosts/iso/configuration.nix

@@ -8,22 +8,14 @@
   ];
 
   config = {
-    networking.networkmanager.enable = true;
+    my.desktops.gnome.enable = true;
 
-    services.desktopManager.plasma6.enable = true;
-    services.displayManager.defaultSession = "plasmax11";
-
-    services.displayManager = {
-      autoLogin.enable = true;
-      sddm.enable = true;
-    };
+    services.displayManager.autoLogin.enable = true;
 
     console.keyMap = "us";
     i18n.defaultLocale = "en_CA.UTF-8";
     time.timeZone = "America/Toronto";
 
-    zramSwap.enable = true;
-
     nixpkgs.config.allowUnfree = true;
   };
 }

hosts/laptop/configuration.nix

@@ -14,7 +14,7 @@
 
 
       my.desktops = {
-        sway.enable = lib.mkForce false;
+        niri.enable = lib.mkForce false;
         gnome.enable = true;
       };
     };
@@ -23,7 +23,7 @@
     boot.kernelPackages = pkgs.linuxPackages_xanmod_latest;
 
     # Enable a desktop environment
-    my.desktops.sway.enable = true;
+    my.desktops.niri.enable = true;
 
     # Set locale, keymap and timezone
     console.keyMap = "us";

hosts/laptop/hardware/mounts.nix

@@ -37,7 +37,5 @@
 
       interval = "weekly";
     };
-
-    zramSwap.enable = true;
   };
 }

modules/home-manager/fonts/fontconfig/module.nix

@@ -0,0 +1,24 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.fonts.fontconfig;
+in {
+  # TODO: eventually I want to move this to some environment flag, such as
+  # `config.environment.isTerminal`, `config.environment.isGraphical`, and
+  # have these environment flags controlled by their respective programs.
+  #
+  # For example, using `programs.eza.enable` should enable the `isTerminal`
+  # flag, and therefore bring in all terminal styling configurations.
+  #
+  # The naming here is very much pending, but I prefer this instead of
+  # activating it here.
+  config = lib.mkIf cfg.enable {
+    home.packages = with pkgs; [
+      nerd-fonts.symbols-only
+    ];
+  };
+}

modules/home-manager/my/programs/app2unit/config.nix

@@ -0,0 +1,14 @@
+{
+  config,
+  lib,
+  ...
+}:
+let
+  cfg = config.my.programs.app2unit;
+in {
+  config = lib.mkIf cfg.enable {
+    home.packages = [
+      cfg.package
+    ];
+  };
+}

modules/home-manager/my/programs/app2unit/options.nix

@@ -0,0 +1,21 @@
+{
+  lib,
+  pkgs,
+  ...
+}:
+{
+  options = {
+    my.programs.app2unit = {
+      enable = lib.mkEnableOption "app2unit";
+
+      package = lib.mkOption {
+        default = pkgs.app2unit;
+        apply = app2unit: pkgs.callPackage ./package {
+          inherit app2unit;
+        };
+
+        type = with lib.types; package;
+      };
+    };
+  };
+}

modules/home-manager/my/programs/app2unit/package/default.nix

@@ -0,0 +1,21 @@
+{
+  callPackage,
+  buildEnv,
+
+  app2unit,
+}:
+let
+  wrapper = callPackage ./package.nix {
+    inherit app2unit;
+  };
+in buildEnv {
+  inherit (app2unit) name version;
+
+  paths = [
+    wrapper
+    app2unit
+  ];
+
+  ignoreCollisions = true;
+  meta.mainProgram = "app2unit";
+}

modules/home-manager/my/programs/app2unit/package/package.nix

@@ -0,0 +1,38 @@
+{
+  lib,
+  stdenvNoCC,
+
+  app2unit,
+}:
+stdenvNoCC.mkDerivation {
+  pname = "app2unit-wrapper";
+  version = "0.1.0";
+
+  src = with lib.fileset; toSource {
+    root = ./.;
+    fileset = unions [
+      ./src
+    ];
+  };
+
+  env = {
+    app2unit = lib.getExe app2unit;
+  };
+
+  installPhase = ''
+    install -Dm755 src/app2unit.sh $out/bin/app2unit
+
+    substituteInPlace $out/bin/app2unit \
+      --subst-var app2unit
+  '';
+
+  meta = with lib; {
+    description = "Launch applications through app2unit with specific fixes";
+
+    license = licenses.agpl3Plus;
+    maintainers = with maintainers; [ frontear ];
+    platforms = platforms.linux;
+
+    mainProgram = "app2unit";
+  };
+}