chyrysalis: customizations

flake.lock: Update
Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/710771af3d1c8c3f86a9e5d562616973ed5f3f21' (2025-07-27) → 'github:nix-community/home-manager/19f94a3e0e6c8573ea58dac685e96c36e2526cfa' (2025-08-01) • Updated input 'lix': 'git+https://git@git.lix.systems/lix-project/lix?ref=refs/heads/main&rev=ef94901156c0c688ffffaa2c5caf1498119f01d4' (2025-07-26) → 'git+https://git@git.lix.systems/lix-project/lix?ref=refs/heads/main&rev=52872026fb77054c51a9b79c6ae93a17ecec8d89' (2025-08-01) • Updated input 'nil': 'github:oxalica/nil/524ae2d67dd84d99a10f409ed6cd8e4e7b3cae3f' (2025-07-18) → 'github:oxalica/nil/cd7a6f6d5dc58484e62a8e85677e06e47cf2bd4d' (2025-07-28) • Updated input 'niri': 'github:sodiboo/niri-flake/af1af659e690b3e535d94c54a64700767bfc9544' (2025-07-26) → 'github:sodiboo/niri-flake/861cc473b1fb92c93737d3918869cc3b084e338a' (2025-08-01) • Updated input 'niri/niri-unstable': 'github:YaLTeR/niri/fefc0bc0a71556eb75352e2b611e50eb5d3bf9c2' (2025-07-18) → 'github:YaLTeR/niri/91b6a111cf228fadaabba706d8f4d155efc63b3a' (2025-07-31) • Updated input 'niri/nixpkgs': 'github:NixOS/nixpkgs/7fd36ee82c0275fb545775cc5e4d30542899511d' (2025-07-25) → 'github:NixOS/nixpkgs/94def634a20494ee057c76998843c015909d6311' (2025-07-31) • Updated input 'niri/nixpkgs-stable': 'github:NixOS/nixpkgs/3ff0e34b1383648053bba8ed03f201d3466f90c9' (2025-07-24) → 'github:NixOS/nixpkgs/1f08a4df998e21f4e8be8fb6fbf61d11a1a5076a' (2025-07-29) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/7fd36ee82c0275fb545775cc5e4d30542899511d' (2025-07-25) → 'github:NixOS/nixpkgs/94def634a20494ee057c76998843c015909d6311' (2025-07-31) • Updated input 'stylix': 'github:danth/stylix/af85565aba0f4749cb18b118a7333a0745920950' (2025-07-26) → 'github:danth/stylix/ded4f29a023e0f14506ec16b0e32d129e56341cc' (2025-07-31)
2025-08-03 11:01:34 +02:00 · 2025-08-01 22:14:50 +02:00
9 changed files with 468 additions and 409 deletions
--- a/flake.lock
+++ b/flake.lock
@ -395,11 +395,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1753595562,
-        "narHash": "sha256-Ci88mAdtiP5RQkYmVhRUq69iYPMM7/lS9/mw+FnC7DE=",
+        "lastModified": 1754060289,
+        "narHash": "sha256-rWc9WUHtDCnHhnKEbiyLwBmvsXxHgBf56jvmmHPMUCk=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "710771af3d1c8c3f86a9e5d562616973ed5f3f21",
+        "rev": "19f94a3e0e6c8573ea58dac685e96c36e2526cfa",
        "type": "github"
      },
      "original": {
@ -419,11 +419,11 @@
        "pre-commit-hooks": "pre-commit-hooks"
      },
      "locked": {
-        "lastModified": 1753573361,
-        "narHash": "sha256-fCaJ29ZqevsIT1yqbpgdKeYr5GHF6sDhHlcXo2m+VuI=",
+        "lastModified": 1754068667,
+        "narHash": "sha256-qamvSPq9vPqcNe+gje61FMplCC+twHbSkkS+RNYA8z8=",
        "ref": "refs/heads/main",
-        "rev": "ef94901156c0c688ffffaa2c5caf1498119f01d4",
-        "revCount": 18200,
+        "rev": "52872026fb77054c51a9b79c6ae93a17ecec8d89",
+        "revCount": 18234,
        "type": "git",
        "url": "https://git@git.lix.systems/lix-project/lix"
      },
@ -453,11 +453,11 @@
        "nixpkgs": "nixpkgs_5"
      },
      "locked": {
-        "lastModified": 1752799399,
-        "narHash": "sha256-Uy2qzd+fMoBcp4NPSO7DavEC1pGMegmAqoEMvmXbIQU=",
+        "lastModified": 1753661392,
+        "narHash": "sha256-fK4INnIJQNAA8cyjcDRZSPleA+N/STI6I0oBDMZ2r+E=",
        "owner": "oxalica",
        "repo": "nil",
-        "rev": "524ae2d67dd84d99a10f409ed6cd8e4e7b3cae3f",
+        "rev": "cd7a6f6d5dc58484e62a8e85677e06e47cf2bd4d",
        "type": "github"
      },
      "original": {
@ -476,11 +476,11 @@
        "xwayland-satellite-unstable": "xwayland-satellite-unstable"
      },
      "locked": {
-        "lastModified": 1753514742,
-        "narHash": "sha256-OP7hZTjnOLP3X6cWldPLcxQ4vvDYid6SlOf1mw+XRCg=",
+        "lastModified": 1754040945,
+        "narHash": "sha256-Tr9KNijTgyu7hkkI4caAAFs/qDwPyDfYD66AzbA5MuU=",
        "owner": "sodiboo",
        "repo": "niri-flake",
-        "rev": "af1af659e690b3e535d94c54a64700767bfc9544",
+        "rev": "861cc473b1fb92c93737d3918869cc3b084e338a",
        "type": "github"
      },
      "original": {
@ -509,11 +509,11 @@
    "niri-unstable": {
      "flake": false,
      "locked": {
-        "lastModified": 1752870529,
-        "narHash": "sha256-23DJk5EfEDCq7Xy1QELcayG0VxbbWpdQ6t7jbhae1Ok=",
+        "lastModified": 1753983552,
+        "narHash": "sha256-xnPPjASWt4/u+GmRdrHADBKKSCtIhTFY53CSKM+Xtfk=",
        "owner": "YaLTeR",
        "repo": "niri",
-        "rev": "fefc0bc0a71556eb75352e2b611e50eb5d3bf9c2",
+        "rev": "91b6a111cf228fadaabba706d8f4d155efc63b3a",
        "type": "github"
      },
      "original": {
@ -786,11 +786,11 @@
    },
    "nixpkgs-stable_2": {
      "locked": {
-        "lastModified": 1753345091,
-        "narHash": "sha256-CdX2Rtvp5I8HGu9swBmYuq+ILwRxpXdJwlpg8jvN4tU=",
+        "lastModified": 1753749649,
+        "narHash": "sha256-+jkEZxs7bfOKfBIk430K+tK9IvXlwzqQQnppC2ZKFj4=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "3ff0e34b1383648053bba8ed03f201d3466f90c9",
+        "rev": "1f08a4df998e21f4e8be8fb6fbf61d11a1a5076a",
        "type": "github"
      },
      "original": {
@ -865,11 +865,11 @@
    },
    "nixpkgs_6": {
      "locked": {
-        "lastModified": 1753429684,
-        "narHash": "sha256-9h7+4/53cSfQ/uA3pSvCaBepmZaz/dLlLVJnbQ+SJjk=",
+        "lastModified": 1753939845,
+        "narHash": "sha256-K2ViRJfdVGE8tpJejs8Qpvvejks1+A4GQej/lBk5y7I=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "7fd36ee82c0275fb545775cc5e4d30542899511d",
+        "rev": "94def634a20494ee057c76998843c015909d6311",
        "type": "github"
      },
      "original": {
@ -881,11 +881,11 @@
    },
    "nixpkgs_7": {
      "locked": {
-        "lastModified": 1753429684,
-        "narHash": "sha256-9h7+4/53cSfQ/uA3pSvCaBepmZaz/dLlLVJnbQ+SJjk=",
+        "lastModified": 1753939845,
+        "narHash": "sha256-K2ViRJfdVGE8tpJejs8Qpvvejks1+A4GQej/lBk5y7I=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "7fd36ee82c0275fb545775cc5e4d30542899511d",
+        "rev": "94def634a20494ee057c76998843c015909d6311",
        "type": "github"
      },
      "original": {
@ -1096,11 +1096,11 @@
        "tinted-zed": "tinted-zed"
      },
      "locked": {
-        "lastModified": 1753553562,
-        "narHash": "sha256-CpTwdsrPU3UFy95Btg56RcVMgNpnw3C0DYTznE5aRq4=",
+        "lastModified": 1753978157,
+        "narHash": "sha256-sVy8hb71VawSOIsLv/hMGzpvbbWszdP9aSKI5Drbt6Q=",
        "owner": "danth",
        "repo": "stylix",
-        "rev": "af85565aba0f4749cb18b118a7333a0745920950",
+        "rev": "ded4f29a023e0f14506ec16b0e32d129e56341cc",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -284,8 +284,8 @@

        modules = linuxOfflineGuiModules [
          ./nixos/hosts/chrysalis
+          ./nixos/configs/virtualbox.nix
          ./nixos/configs/power-saving-amd.nix
-          #./nixos/configs/vmware.nix
        ];
      };

--- a/nixos/configs/gui/niri.nix
+++ b/nixos/configs/gui/niri.nix
@ -5,15 +5,26 @@
 {
  lib,
  pkgs,
-  niri,
  config,
  ...
 }:
 let
-  niri-flake = niri;
  sysConfig = config;
+  cfg = config.deprekated.niri;
 in
 {
+  options.deprekated.niri = {
+    extraStartupCommands = lib.mkOption {
+      type = lib.types.str;
+      default = "";
+      example = ''
+        niri msg action spawn -- xmessage hi
+      '';
+      description = "Any extra commands to be added to Niri's startup.";
+    };
+  };
+
+  config = {
    # Add in some basic control utilities to our system config.
    environment.systemPackages = [
      pkgs.wlrctl
@ -188,10 +199,12 @@ in

            # Make anki flashcard windows modal floats.
            {
-            matches = [{
+              matches = [
+                {
                  app-id = "^anki$";
                  title = "Add";
-            }];
+                }
+              ];

              open-floating = true;
              default-floating-position = {
@ -370,9 +383,13 @@ in

                niri msg action spawn -- ${xwayland-satellite-loop}/bin/xwayland-satellite-loop
                niri msg action spawn -- home-assistant-desktop
-              ${if (sysConfig.networking.hostName != "trailblazer") then "#" else ""}niri msg action spawn -- ${pkgs.mission-center}/bin/missioncenter
+                ${
+                  if (sysConfig.networking.hostName != "trailblazer") then "#" else ""
+                }niri msg action spawn -- ${pkgs.mission-center}/bin/missioncenter
                niri msg action spawn -- ${pkgs.pcloud}/bin/pcloud

+                ${cfg.extraStartupCommands}
+
                sleep 10

                niri msg action spawn -- kdeconnect-cli -l
@ -381,4 +398,5 @@ in
            [ { command = [ "${niri-init}/bin/niri-init" ]; } ];
        };
      };
+  };
 }
--- a/nixos/configs/nix.nix
+++ b/nixos/configs/nix.nix
@ -27,7 +27,8 @@

    # For non-trailblazer machines, allow building on Trailblazer.
    distributedBuilds =
-      !(config.networking.hostName == "trailblazer");
+      !(config.networking.hostName == "trailblazer") &&
+      !(config.networking.hostName == "chrysalis");
    buildMachines =
      if config.nix.distributedBuilds then
        [
--- a/nixos/configuration.linux.nix
+++ b/nixos/configuration.linux.nix
@ -4,7 +4,12 @@
 #
 # vim: et:ts=2:sw=2:
 #
-{ pkgs, deprekages, talon, ... }:
+{
+  pkgs,
+  deprekages,
+  talon,
+  ...
+}:

 {
  # Ensures the system state isn't changed breakingly (e.g. by updating
@ -40,9 +45,6 @@
  # General tweaks and fixes.
  #

-  # Make systemd not hang here forever.
-  systemd.extraConfig = "DefaultTimeoutStopSec=20";
-
  #
  # Users.
  #
@ -99,11 +101,18 @@
  services.mullvad-vpn.enable = true;
  virtualisation.docker.enable = true;

-  services.udev.packages = [
+  services.udev.packages =
+    [
      pkgs.minipro
-  ] ++ (if pkgs.stdenv.isAarch64 then [] else [
+    ]
+    ++ (
+      if pkgs.stdenv.isAarch64 then
+        [ ]
+      else
+        [
          #talon.default
-  ]);
+        ]
+    );

  services.fwupd.enable = true;

@ -117,4 +126,12 @@
      userServices = true;
    };
  };
+
+  # No, you haven't doxed us.
+  # This is just the location of Amsterdam =P.
+  location = {
+    provider = "geoclue2";
+    latitude = 52.377956;
+    longitude = 4.897070;
+  };
 }
--- a/nixos/hosts/chrysalis/default.nix
+++ b/nixos/hosts/chrysalis/default.nix
@ -9,6 +9,7 @@
  pkgs,
  deprekages,
  modulesPath,
+  normalizeModule,
  ...
 }:
 {
@ -16,6 +17,7 @@
    (modulesPath + "/installer/scan/not-detected.nix")
    ./audio.nix
    ./ec_kmod.nix
+    (normalizeModule ./wluma.hm.nix)
  ];

  # Bootloader.
@ -56,6 +58,9 @@
  # Override stylix font sizes.
  stylix.fonts.sizes.desktop = lib.mkForce 16;

+  # Use wluma to manage backlight with the ALS and screen content.
+  deprekated.niri.extraStartupCommands = "niri msg action spawn -- ${lib.getExe pkgs.wluma}";
+
  # Accomodate the curved screen top by moving things in just a little.
  deprekated.waybar.hostSpecificCss = ''
    .modules-left > :first-child > * {
@ -73,8 +78,8 @@
  #
  # Hardware config.
  #
-  # Use the latest kernel, and our patches, until the Dell+Alienware stuff makes it into
-  # more mainline kernels. We'll include ccache so we can iterate sanely.
+
+  # Use the latest kernel to try and ward off WiFi issues.
  boot.kernelPackages = pkgs.linuxPackages_latest;

  boot.extraModprobeConfig = ''
--- a/nixos/hosts/chrysalis/wluma.hm.nix
+++ b/nixos/hosts/chrysalis/wluma.hm.nix
@ -0,0 +1,5 @@
+{ ... }:
+{
+  # Set up wluma.
+  xdg.configFile."wluma/config.toml".source = ../../../wluma/chrysalis.toml;
+}
--- a/nixos/packages/gui.pkgs.nix
+++ b/nixos/packages/gui.pkgs.nix
@ -30,7 +30,7 @@ with pkgs;

  # Comms.
  dino
-  gajim
+  #gajim
  vesktop
  nheko

--- a/wluma/chrysalis.toml
+++ b/wluma/chrysalis.toml
@ -0,0 +1,13 @@
+[als.iio]
+path = "/sys/bus/iio/devices"
+thresholds = { 0 = "night", 20 = "dark", 80 = "dim", 250 = "normal", 500 = "bright", 800 = "outdoors" }
+
+[[output.backlight]]
+name = "eDP-1"
+path = "/sys/class/backlight/amdgpu_bl1"
+capturer = "wayland"
+
+[[keyboard]]
+name = "keyboard-framework"
+path = "/sys/bus/platform/devices/framework_laptop/leds/framework_laptop::kbd_backlight"
+