temp: stylix kmscon disable

chore: bump lockfile
- bump claude-code to v2.1.160
2026-06-02 09:59:26 +02:00 · 2026-06-02 09:05:37 +02:00 · 2026-05-31 15:22:49 +02:00 · 2026-05-27 10:44:47 +02:00 · 2026-05-26 21:29:17 +02:00 · 2026-05-26 21:21:18 +02:00
12 changed files with 221 additions and 201 deletions
--- a/features/bootloader.nix
+++ b/features/bootloader.nix
@@ -3,11 +3,23 @@
    {
      config,
      lib,
+      pkgs,
      inputs,
      ...
    }:
    let
      cfg = config.features.bootloader;
+      keyDir = "/etc/secrets/initrd";
+
+      mkIpString =
+        {
+          address,
+          gateway,
+          netmask,
+          interface,
+          ...
+        }:
+        "${address}::${gateway}:${netmask}::${interface}:none";
    in
    {
      imports = [ inputs.lanzaboote.nixosModules.lanzaboote ];
@@ -23,15 +35,92 @@
          default = "systemd-boot";
        };

-        plymouth.enable = lib.mkEnableOption "plymouth boot splash";
+        configurationLimit = lib.mkOption {
+          type = lib.types.int;
+          default = 10;
+        };
+
+        consoleFont = lib.mkOption {
+          type = lib.types.str;
+          default = "ter-v32n";
+        };
+
+        resumeDevice = lib.mkOption {
+          type = lib.types.nullOr lib.types.str;
+          default = null;
+        };
+
+        initrdSsh = {
+          enable = lib.mkEnableOption "remote LUKS unlock via ssh in initrd";
+
+          networkModule = lib.mkOption {
+            type = lib.types.str;
+          };
+
+          ip = {
+            enable = lib.mkEnableOption "static IP for initrd (otherwise DHCP)";
+
+            address = lib.mkOption {
+              type = lib.types.str;
+            };
+
+            gateway = lib.mkOption {
+              type = lib.types.str;
+            };
+
+            netmask = lib.mkOption {
+              type = lib.types.str;
+              default = "255.255.255.0";
+            };
+
+            interface = lib.mkOption {
+              type = lib.types.str;
+            };
+          };
+
+          authorizedKeys = lib.mkOption {
+            type = lib.types.listOf lib.types.str;
+            default = [ ];
+          };
+        };
      };

      config = lib.mkIf cfg.enable (
        lib.mkMerge [
          {
            boot.loader.efi.canTouchEfiVariables = true;
-            # request the largest framebuffer uefi offers; plymouth inherits it
-            boot.loader.systemd-boot.consoleMode = "max";
+
+            # lanzaboote inherits editor + configurationLimit from systemd-boot.*
+            boot.loader.systemd-boot = {
+              editor = false;
+              inherit (cfg) configurationLimit;
+            };
+
+            boot.initrd.systemd.enable = true;
+
+            # wait forever at the luks prompt instead of timing out the device
+            # job; applies whether the prompt is local or forwarded via initrd ssh
+            boot.initrd.systemd.settings.Manager.DefaultDeviceTimeoutSec = "infinity";
+
+            # block simpledrm so fbcon defers until the gpu driver binds; avoids
+            # the simpledrm -> real-driver fbcon transition that mangles console
+            # text and leaves the luks prompt typing offset from the visible
+            # surface. hosts must put the gpu driver in initrd (nixos-hardware
+            # does this for amd; manual hardware.amdgpu.initrd.enable on others)
+            boot.kernelParams = [ "initcall_blacklist=simpledrm_platform_driver_init" ];
+
+            # verbose boot: kernel messages and systemd unit lines visible end
+            # to end. trade-off: the luks prompt will be interleaved with the
+            # last few "Starting/Started ..." lines (no upstream fix exists
+            # without plymouth). boot.initrd.verbose is a no-op under
+            # systemd-initrd, so not set here.
+
+            # readable luks prompt at panel-native dpi
+            console = {
+              earlySetup = true;
+              font = cfg.consoleFont;
+              packages = [ pkgs.terminus_font ];
+            };
          }

          (lib.mkIf (cfg.mode == "systemd-boot") {
@@ -46,26 +135,39 @@
            };
          })

-          (lib.mkIf cfg.plymouth.enable {
-            # plymouth needs systemd-initrd to render the luks prompt cleanly
-            boot.initrd.systemd.enable = true;
+          (lib.mkIf (cfg.resumeDevice != null) {
+            boot.resumeDevice = cfg.resumeDevice;
+          })

-            # host is responsible for early-KMS so plymouth lands on the gpu driver,
-            # not simpledrm (e.g. hardware.amdgpu.initrd.enable on amd hosts)
-            boot.plymouth.enable = true;
-            stylix.targets.plymouth.logoAnimated = false;
+          (lib.mkIf cfg.initrdSsh.enable {
+            boot.initrd.availableKernelModules = [ cfg.initrdSsh.networkModule ];

-            boot.kernelParams = [
-              "quiet"
-              "splash"
-              "loglevel=3"
-              "rd.systemd.show_status=false"
-              "rd.udev.log_level=3"
-              "udev.log_priority=3"
-              "plymouth.force-scale=1"
+            boot.kernelParams = lib.mkIf cfg.initrdSsh.ip.enable [
+              "ip=${mkIpString cfg.initrdSsh.ip}"
            ];
-            boot.consoleLogLevel = 0;
-            boot.initrd.verbose = false;
+
+            boot.initrd.network = {
+              enable = true;
+              ssh = {
+                enable = true;
+                port = 22;
+                hostKeys = [
+                  "${keyDir}/ssh_host_rsa_key"
+                  "${keyDir}/ssh_host_ed25519_key"
+                ];
+                inherit (cfg.initrdSsh) authorizedKeys;
+              };
+            };
+
+            # forward LUKS password prompt to the ssh session (systemd-initrd idiom)
+            boot.initrd.systemd.users.root.shell = "/bin/systemd-tty-ask-password-agent";
+
+            boot.initrd.systemd.network.networks = lib.mkIf (!cfg.initrdSsh.ip.enable) {
+              "10-initrd" = {
+                matchConfig.Driver = cfg.initrdSsh.networkModule;
+                networkConfig.DHCP = "yes";
+              };
+            };
          })
        ]
      );
--- a/features/desktop.nix
+++ b/features/desktop.nix
@@ -87,6 +87,9 @@
              inherit (cfg.theme) polarity;
              image = cfg.theme.wallpaper;
              base16Scheme = "${pkgs.base16-schemes}/share/themes/${cfg.theme.scheme}.yaml";
+
+              # TEMP:(@janezicmatej) stylix kmscon target sets nixpkgs-removed options
+              targets.kmscon.enable = false;
            };
          }

@@ -105,11 +108,7 @@
          # bluetooth
          (lib.mkIf cfg.bluetooth.enable {
            hardware.bluetooth.enable = true;
-            services.blueman = {
-              enable = true;
-              # TEMP:(@janezicmatej) workaround for nixpkgs#514705, fix in nixpkgs#517250
-              withApplet = false;
-            };
+            services.blueman.enable = true;
          })

          # apps
--- a/features/initrd-ssh.nix
+++ b/features/initrd-ssh.nix
@@ -1,90 +0,0 @@
-{
-  nixos =
-    { lib, config, ... }:
-    let
-      cfg = config.features.initrd-ssh;
-      keyDir = "/etc/secrets/initrd";
-
-      mkIpString =
-        {
-          address,
-          gateway,
-          netmask,
-          interface,
-          ...
-        }:
-        "${address}::${gateway}:${netmask}::${interface}:none";
-    in
-    {
-      options.features.initrd-ssh = {
-        enable = lib.mkEnableOption "initrd ssh";
-
-        ip = {
-          enable = lib.mkEnableOption "static IP for initrd (otherwise DHCP)";
-
-          address = lib.mkOption {
-            type = lib.types.str;
-          };
-
-          gateway = lib.mkOption {
-            type = lib.types.str;
-          };
-
-          netmask = lib.mkOption {
-            type = lib.types.str;
-            default = "255.255.255.0";
-          };
-
-          interface = lib.mkOption {
-            type = lib.types.str;
-          };
-        };
-
-        authorizedKeys = lib.mkOption {
-          type = lib.types.listOf lib.types.str;
-          default = [ ];
-        };
-
-        networkModule = lib.mkOption {
-          type = lib.types.str;
-        };
-      };
-
-      config = lib.mkIf cfg.enable {
-        boot.initrd.availableKernelModules = [ cfg.networkModule ];
-        boot.initrd.kernelModules = [ cfg.networkModule ];
-        boot.kernelParams = lib.mkIf cfg.ip.enable [
-          "ip=${mkIpString cfg.ip}"
-        ];
-
-        boot.initrd.systemd.enable = true;
-
-        # remote unlock may take a while; don't let device units give up
-        boot.initrd.systemd.settings.Manager.DefaultDeviceTimeoutSec = "infinity";
-
-        boot.initrd.network = {
-          enable = true;
-          ssh = {
-            enable = true;
-            port = 22;
-            hostKeys = [
-              "${keyDir}/ssh_host_rsa_key"
-              "${keyDir}/ssh_host_ed25519_key"
-            ];
-            inherit (cfg) authorizedKeys;
-          };
-        };
-
-        # systemd-networkd retries DHCP indefinitely, unlike udhcpc
-        boot.initrd.systemd.network.networks = lib.mkIf (!cfg.ip.enable) {
-          "10-initrd" = {
-            matchConfig.Driver = cfg.networkModule;
-            networkConfig.DHCP = "yes";
-          };
-        };
-
-        # forward LUKS password prompt to the SSH session
-        boot.initrd.systemd.users.root.shell = "/bin/systemd-tty-ask-password-agent";
-      };
-    };
-}
--- a/features/power.nix
+++ b/features/power.nix
@@ -8,11 +8,6 @@
      options.features.power = {
        enable = lib.mkEnableOption "laptop power management";

-        resumeDevice = lib.mkOption {
-          type = lib.types.nullOr lib.types.str;
-          default = null;
-        };
-
        lidSwitch = lib.mkOption {
          type = lib.types.str;
          default = "suspend-then-hibernate";
@@ -40,8 +35,6 @@
      };

      config = lib.mkIf cfg.enable {
-        boot.resumeDevice = lib.mkIf (cfg.resumeDevice != null) cfg.resumeDevice;
-
        services.logind.settings.Login = {
          HandleLidSwitch = cfg.lidSwitch;
          HandlePowerKey = cfg.powerKey;
--- a/flake.lock
+++ b/flake.lock
@@ -106,11 +106,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1777713215,
-        "narHash": "sha256-8GzXDOXckDWwST8TY5DbwYFjdvQLlP7K9CLSVx6iTTo=",
+        "lastModified": 1780290312,
+        "narHash": "sha256-eTAlX0CwgB84Ts3GaBd944A3DRXVMzgA0EqroZBISUo=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "63b4e7e6cf75307c1d26ac3762b886b5b0247267",
+        "rev": "115e5211780054d8a890b41f0b7734cafad54dfe",
        "type": "github"
      },
      "original": {
@@ -122,11 +122,11 @@
    "firefox-gnome-theme": {
      "flake": false,
      "locked": {
-        "lastModified": 1776136500,
-        "narHash": "sha256-r0gN2brVWA351zwMV0Flmlcd6SGMvYqFbvC3DfKFM8Y=",
+        "lastModified": 1779670703,
+        "narHash": "sha256-UdfMivNMwCCqQsYDg5pSz8X2IOaOrIZLIIy+Bg3CO2o=",
        "owner": "rafaelmardojai",
        "repo": "firefox-gnome-theme",
-        "rev": "0f8ba203d475587f477e7ae12661bd8459e225b7",
+        "rev": "942159e73e40bf785816f7f1f5feed9ef3d7c8f9",
        "type": "github"
      },
      "original": {
@@ -156,11 +156,11 @@
        "nixpkgs-lib": "nixpkgs-lib"
      },
      "locked": {
-        "lastModified": 1777988971,
-        "narHash": "sha256-qIoWPDs+0/8JecyYgE3gpKQxW/4bLW/gp45vow9ioCQ=",
+        "lastModified": 1778716662,
+        "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "0678d8986be1661af6bb555f3489f2fdfc31f6ff",
+        "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
        "type": "github"
      },
      "original": {
@@ -177,11 +177,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1777988971,
-        "narHash": "sha256-qIoWPDs+0/8JecyYgE3gpKQxW/4bLW/gp45vow9ioCQ=",
+        "lastModified": 1778716662,
+        "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "0678d8986be1661af6bb555f3489f2fdfc31f6ff",
+        "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
        "type": "github"
      },
      "original": {
@@ -198,11 +198,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1775087534,
-        "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
+        "lastModified": 1778716662,
+        "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
+        "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
        "type": "github"
      },
      "original": {
@@ -273,11 +273,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1778248595,
-        "narHash": "sha256-dhFgEjoeJMYN/7OY6xfxS799YB4IjbbYXTjyGIJyLpc=",
+        "lastModified": 1780370888,
+        "narHash": "sha256-PRJj9RKTEf/sITycujP1c/BrvLJKMYXzcpwTsXNulXQ=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "fdb2ccba9d5e1238d32e0c4a3ec1a277efa80c1d",
+        "rev": "a7a415883195ffbd4dabec8f098f201e6eaaadf8",
        "type": "github"
      },
      "original": {
@@ -317,11 +317,11 @@
        "nixpkgs": "nixpkgs"
      },
      "locked": {
-        "lastModified": 1778285091,
-        "narHash": "sha256-4YwkGkjvLD0EB7rQGCRA9J/zgwrnTL20dJd7Wmnicj0=",
+        "lastModified": 1780358691,
+        "narHash": "sha256-sqmYDR+LUEbWOR9PWYStMzxvBLdEz4hTJ1mglpjaZnw=",
        "owner": "nix-community",
        "repo": "neovim-nightly-overlay",
-        "rev": "cca2a2d1c03f763fdcd7066791363d792313c641",
+        "rev": "c4a4180888faddfeb07535bbca9147c96ccf4cad",
        "type": "github"
      },
      "original": {
@@ -333,11 +333,11 @@
    "neovim-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1778266020,
-        "narHash": "sha256-qoydKalrn/QGsGYVRicz0Hzb7bfGmV7Z9CnVONXN/Lc=",
+        "lastModified": 1780339018,
+        "narHash": "sha256-/zjJZ6NC+3gVOfizs9h/XrBNvgSay8anXYlOET4B0vY=",
        "owner": "neovim",
        "repo": "neovim",
-        "rev": "b7d8a41d91dcfebe9a5f3d0cf2f0bb0b8d59e32e",
+        "rev": "fb5aad1d07d68b3da38bc7ba5c6a7896b3dfcda5",
        "type": "github"
      },
      "original": {
@@ -347,12 +347,15 @@
      }
    },
    "nixos-hardware": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_2"
+      },
      "locked": {
-        "lastModified": 1778143761,
-        "narHash": "sha256-lkesY6x2X2qxlqLM7CT2iM/0rP2JB7fruPN3h8POXmI=",
+        "lastModified": 1780310866,
+        "narHash": "sha256-fPBRVf6A5xlACYcOI59shGrjURuvwu0lRsDoSCEXt/I=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "3bcaa367d4c550d687a17ac792fd5cda214ee871",
+        "rev": "4ed851c979641e28597a05086332d75cdc9e395f",
        "type": "github"
      },
      "original": {
@@ -364,11 +367,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1778124196,
-        "narHash": "sha256-pYEytCNic/czazbV9r3tbQ6BZzqRBg/41x2dIC5ymOo=",
+        "lastModified": 1780246643,
+        "narHash": "sha256-4T1KWX7xWGQMs9hNZ24IOY3aYOi8D6+5WtkNRBSttB8=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "68a8af93ff4297686cb68880845e61e5e2e41d92",
+        "rev": "3109eaae18e09d0b8aef23dc2579e7d94b8d4b4e",
        "type": "github"
      },
      "original": {
@@ -395,11 +398,11 @@
    },
    "nixpkgs-master": {
      "locked": {
-        "lastModified": 1778360830,
-        "narHash": "sha256-tD44tgf123UcERx3cC91rwefFmGmlTd2M1QdL6d5iLc=",
+        "lastModified": 1780383485,
+        "narHash": "sha256-K/s3j+b5Qvknu+8coeB0KozojFUm2458uskTXu4PJTE=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "82cbc979e10cf2b893566a0f259daf5e1f26c887",
+        "rev": "a4421cecfb7c923d21da0100e0d40db046ed968a",
        "type": "github"
      },
      "original": {
@@ -411,11 +414,11 @@
    },
    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1778003029,
-        "narHash": "sha256-q/nkKLDtHIyLjZpKhWk3cSK5IYsFqtMd6UtXF3ddjgA=",
+        "lastModified": 1779796641,
+        "narHash": "sha256-ZsIrKmhp4vbBXoXXmR/tBXA/UCsAQiJL9vsgZEduhVY=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "0c88e1f2bdb93d5999019e99cb0e61e1fe2af4c5",
+        "rev": "25f538306313eae3927264466c70d7001dcea1df",
        "type": "github"
      },
      "original": {
@@ -427,11 +430,24 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1777954456,
-        "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=",
+        "lastModified": 1767892417,
+        "narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=",
+        "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba",
+        "type": "tarball",
+        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre924538.3497aa5c9457/nixexprs.tar.xz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"
+      }
+    },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1780243769,
+        "narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1",
+        "rev": "331800de5053fcebacf6813adb5db9c9dca22a0c",
        "type": "github"
      },
      "original": {
@@ -453,11 +469,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1777598946,
-        "narHash": "sha256-X239dAGaU1+gfDj8jKH8GzlqKMcxaVfXOio+uzBOkeE=",
+        "lastModified": 1779766384,
+        "narHash": "sha256-P7Ohnlq8b8b2fU+Sgkrej7LBTM60LBTkHleLuYzmLmU=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "5d55af01c0f86be583931fe99207fc56c14134b3",
+        "rev": "57800b7ab648725ccd33551d01484ee14952ad3f",
        "type": "github"
      },
      "original": {
@@ -514,7 +530,7 @@
        "lanzaboote": "lanzaboote",
        "neovim-nightly-overlay": "neovim-nightly-overlay",
        "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs_3",
        "nixpkgs-master": "nixpkgs-master",
        "nixpkgs-stable": "nixpkgs-stable",
        "nvim": "nvim",
@@ -583,11 +599,11 @@
        "tinted-zed": "tinted-zed"
      },
      "locked": {
-        "lastModified": 1778104276,
-        "narHash": "sha256-/DSSnU0LLmOTG/OCgGwYpxP6+5YvxRx2g/GhI4x6aCU=",
+        "lastModified": 1780256506,
+        "narHash": "sha256-wEXN/OoZt9HfsKBL6694p2Y9xRlwfUbdn/M107U8fVU=",
        "owner": "danth",
        "repo": "stylix",
-        "rev": "18ed8d270231e067fe2739998479ed5d7c659c2c",
+        "rev": "8ed48a41087feeb66372ff718021a9512fc552b3",
        "type": "github"
      },
      "original": {
@@ -630,11 +646,11 @@
    "tinted-schemes": {
      "flake": false,
      "locked": {
-        "lastModified": 1777041405,
-        "narHash": "sha256-BAGZ7ObFV/9Z61OJZun7ifPyhkuHqNuW1QIhQ8LuzCo=",
+        "lastModified": 1777806186,
+        "narHash": "sha256-PDF0/wObw4nIsSBeXVYLsloXOiphXCgIdsrNcVXguKs=",
        "owner": "tinted-theming",
        "repo": "schemes",
-        "rev": "5f868b3a338b6904c47f3833b9c411be641983a8",
+        "rev": "0c94645546f4f3ddac77a1a5fce54eb95bf50795",
        "type": "github"
      },
      "original": {
@@ -646,11 +662,11 @@
    "tinted-tmux": {
      "flake": false,
      "locked": {
-        "lastModified": 1777169200,
-        "narHash": "sha256-h7dDbIzP5hDr9v97w9PL6jdAgXawmj6krcH+959rqpU=",
+        "lastModified": 1778379944,
+        "narHash": "sha256-wPDFzMGSlARlw0Sfsn48Q2+jPSfk6N0Ng6BC/d+7Q24=",
        "owner": "tinted-theming",
        "repo": "tinted-tmux",
-        "rev": "f798c2dce44ef815bb6b8f05a82135c7942d35ac",
+        "rev": "fe0203a198690e71a5ff11e08812a4673de3678d",
        "type": "github"
      },
      "original": {
@@ -662,11 +678,11 @@
    "tinted-zed": {
      "flake": false,
      "locked": {
-        "lastModified": 1777463218,
-        "narHash": "sha256-Bhkozqtq3BKLqWTlmKm8uAptfX4aRGI8QX3eEL54Vpc=",
+        "lastModified": 1778378178,
+        "narHash": "sha256-OXPXRIQgGwV77HjYRryOHguh4ALX96jkg+tseLkGgHA=",
        "owner": "tinted-theming",
        "repo": "base16-zed",
-        "rev": "5768d08ed2e7944a26a958868cdb073cb8856dae",
+        "rev": "9cd816033ff969415b190722cddf134e78a5665f",
        "type": "github"
      },
      "original": {
--- a/flake/dev-components.nix
+++ b/flake/dev-components.nix
@@ -14,11 +14,9 @@ let
  mkNode = nodejs: {
    packages = [
      nodejs
-      pkgs.corepack
+      (pkgs.pnpm.override { withNode = false; })
+      (pkgs.yarn.override { withNode = false; })
    ];
-    env = {
-      COREPACK_ENABLE_STRICT = "0";
-    };
  };

  mkUv = python: {
--- a/flake/hosts.nix
+++ b/flake/hosts.nix
@@ -55,7 +55,6 @@ in
        "git"
        "gnupg"
        "harmonia"
-        "initrd-ssh"
        "localisation"
        "neovim"
        "networkmanager"
--- a/hosts/fw16/configuration.nix
+++ b/hosts/fw16/configuration.nix
@@ -10,16 +10,13 @@
    inputs.nixos-hardware.nixosModules.framework-16-amd-ai-300-series
  ];

-  features.bootloader.plymouth.enable = true;
+  features.bootloader.resumeDevice = "/dev/mapper/vg0-swap";
  features.desktop.bluetooth.enable = true;
  features.gnupg.yubikey.enable = true;
  features.udev = {
    ledger.enable = true;
    keyboard-zsa.enable = true;
  };
-  features.power.resumeDevice = "/dev/disk/by-uuid/ff4750e7-3a9f-42c2-bb68-c458a6560540";
-
-  boot.kernelParams = [ "pcie_aspm.policy=powersupersave" ];

  programs.nix-ld.libraries = options.programs.nix-ld.libraries.default;

--- a/hosts/fw16/hardware-configuration.nix
+++ b/hosts/fw16/hardware-configuration.nix
@@ -37,10 +37,7 @@
  fileSystems."/boot" = {
    device = "/dev/disk/by-uuid/42D9-FAFD";
    fsType = "vfat";
-    options = [
-      "fmask=0022"
-      "dmask=0022"
-    ];
+    options = [ "umask=0077" ];
  };

  swapDevices = [
--- a/hosts/tower/configuration.nix
+++ b/hosts/tower/configuration.nix
@@ -8,7 +8,11 @@
  features.nix-settings.towerCache.enable = false;
  features.bootloader = {
    mode = "lanzaboote";
-    plymouth.enable = true;
+    initrdSsh = {
+      enable = true;
+      networkModule = "r8169";
+      authorizedKeys = userKeys.sshAuthorizedKeys;
+    };
  };
  features.desktop.bluetooth.enable = true;
  features.gnupg.yubikey.enable = true;
@@ -16,17 +20,14 @@
    ledger.enable = true;
    keyboard-zsa.enable = true;
  };
-  features.initrd-ssh = {
-    networkModule = "r8169";
-    authorizedKeys = userKeys.sshAuthorizedKeys;
-  };

  # nix store signing
  sops.secrets.nix-signing-key.sopsFile = ../../secrets/tower.yaml;
  nix.settings.secret-key-files = [ config.sops.secrets.nix-signing-key.path ];

  boot.kernelParams = [ "btusb.reset=1" ];
-  # early kms so plymouth lands on amdgpu, not simpledrm
+  # pairs with bootloader's simpledrm initcall blacklist: amdgpu owns fbcon
+  # from the start, no driver-swap mode-set
  hardware.amdgpu.initrd.enable = true;

  services.udisks2.enable = true;
--- a/lib/mkHost.nix
+++ b/lib/mkHost.nix
@@ -98,6 +98,14 @@ nixpkgs.lib.nixosSystem {
      ];
    }

+    # cap unit stop timeout so a single misbehaving app (electron, etc) can't
+    # block poweroff for the full 90s default. user-scope cap is required for
+    # session-N.scope to honor it. see discourse/49711
+    {
+      systemd.settings.Manager.DefaultTimeoutStopSec = "10s";
+      systemd.user.extraConfig = "DefaultTimeoutStopSec=10s";
+    }
+
    featureEnableModule
    hostConfig
  ]
--- a/packages/claude-code/package.nix
+++ b/packages/claude-code/package.nix
@@ -2,7 +2,7 @@

 let
  inherit (pkgs) stdenv lib;
-  version = "2.1.138";
+  version = "2.1.160";

  # upstream ships platform-native binaries as separate npm packages under
  # @anthropic-ai/claude-code-<platform>; the wrapper package is just a
@@ -10,19 +10,19 @@ let
  sources = {
    "x86_64-linux" = {
      slug = "linux-x64";
-      hash = "sha256-MGYEPPO4O84Egb5Ym/9f56l+TzPqogpSabosvHTIJZg=";
+      hash = "sha256-6CMDSnl143pVN4Swcu7pSNzaXyxQn28xwcc5Ljie8Ec=";
    };
    "aarch64-linux" = {
      slug = "linux-arm64";
-      hash = "sha256-LWBtOAjPDFtLP93TNrsd8bPHJd7VKK6J90CRxUp1/XQ=";
+      hash = "sha256-vXy8frnlnAhFBxQIexfizsyKkB9VIZUNRVkGpMaz9k4=";
    };
    "x86_64-darwin" = {
      slug = "darwin-x64";
-      hash = "sha256-tkupKzb+XAPmdCRNoT90cfVLKUar3FCTRgufiMVuVPc=";
+      hash = "sha256-5oncvZY0eNgrn9NwBp00ALcn3SAoz9IDIuwMfTA5QS8=";
    };
    "aarch64-darwin" = {
      slug = "darwin-arm64";
-      hash = "sha256-jmB4t11BI1LKanuuXRJv5IBe8a9gSrFvTMP3KarsioU=";
+      hash = "sha256-ytZaKnfrz5KIRbyK+ztlH9lepjiPS7P2JvvJE1EbNgU=";
    };
  };
Author	SHA1	Message	Date
Matej Janežič	c5c9dc4c75	temp: stylix kmscon disable	2026-06-02 09:59:26 +02:00
Matej Janežič	92a7584664	chore: bump lockfile - bump claude-code to v2.1.160	2026-06-02 09:05:37 +02:00
Matej Janežič	606ff55d69	feat: unify pnpm/yarn node version with shell	2026-05-31 15:22:49 +02:00
Matej Janežič	dd07b22b06	feat: disable luks unlock timeout	2026-05-27 10:44:47 +02:00
Matej Janežič	1cfd0d43af	revert: `f4b9eff715`	2026-05-26 21:29:17 +02:00
Matej Janežič	26c71089c4	chore: bump lockfile - bump claude-code to v2.1.150	2026-05-26 21:21:18 +02:00
Matej Janežič	ee0873c8bf	feat: set DefaultTimeoutStopSec to 10s	2026-05-26 21:12:31 +02:00
Matej Janežič	a9378ca8b5	feat: merge bootloader related features	2026-05-26 21:11:59 +02:00