From 432d424167cf8831976f7028367d6084d2d467ee Mon Sep 17 00:00:00 2001 From: wo2wz <189177184+wo2wz@users.noreply.github.com> Date: Sun, 30 Nov 2025 19:49:01 -0500 Subject: [PATCH] flake: update to nixos stable 25.11 --- flake.lock | 52 +++++++++---------- flake.nix | 4 +- modules/home/git.nix | 9 ++-- .../nixos/programs/desktop/niri/tuigreet.nix | 2 +- modules/nixos/programs/gaming.nix | 2 +- .../services/gameserver/minecraft-server.nix | 4 +- modules/nixos/services/homeserver/caddy.nix | 6 +-- modules/nixos/services/homeserver/kanidm.nix | 2 +- modules/nixos/system/laptop.nix | 8 +-- 9 files changed, 46 insertions(+), 43 deletions(-) diff --git a/flake.lock b/flake.lock index 3f2f825..f56017b 100755 --- a/flake.lock +++ b/flake.lock @@ -7,16 +7,16 @@ ] }, "locked": { - "lastModified": 1763992789, - "narHash": "sha256-WHkdBlw6oyxXIra/vQPYLtqY+3G8dUVZM8bEXk0t8x4=", + "lastModified": 1764536451, + "narHash": "sha256-BgtcUkBfItu9/yU14IgUaj4rYOanTOUZjUfBP20/ZB4=", "owner": "nix-community", "repo": "home-manager", - "rev": "44831a7eaba4360fb81f2acc5ea6de5fde90aaa3", + "rev": "3fdd076e08049a9c7a83149b270440d9787d2df5", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.05", + "ref": "release-25.11", "repo": "home-manager", "type": "github" } @@ -35,11 +35,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1764081740, - "narHash": "sha256-eeQzyHJjSQTxcjSCy1OgOgNAUjdBnIjSYntfJK0Z4+I=", + "lastModified": 1764488513, + "narHash": "sha256-xBUnv+ndZxRbY9mYSPEP0afaZRUVXDFcJx0WMD4ypfs=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "e579b1a51f26341eeeb41e32d5b5c6e2a032e339", + "rev": "9e3bbd170669d10846bae68d23dabef11832f8f2", "type": "github" }, "original": { @@ -68,11 +68,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1764046829, - "narHash": "sha256-XFSR43nAKXDMhtNa+V2sd6Url/bCPGwawkmCqUKKRfI=", + "lastModified": 1764485473, + "narHash": "sha256-RlGEcuZFB/IdvYLrYsf0RpgvNtCMyIuBLt3lS+GZvP8=", "owner": "YaLTeR", "repo": "niri", - "rev": "54c7fdcd1adcfade596aca1070062f3f0fb5d4d0", + "rev": "311ca6b5da19f5acd7d3e481620de57240ce8f7c", "type": "github" }, "original": { @@ -103,11 +103,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1764080039, - "narHash": "sha256-b1MtLQsQc4Ji1u08f+C6g5XrmLPkJQ1fhNkCt+0AERQ=", + "lastModified": 1764440730, + "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "da17006633ca9cda369be82893ae36824a2ddf1a", + "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3", "type": "github" }, "original": { @@ -119,16 +119,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1763948260, - "narHash": "sha256-dY9qLD0H0zOUgU3vWacPY6Qc421BeQAfm8kBuBtPVE0=", + "lastModified": 1764494334, + "narHash": "sha256-x2xCEXUlU4Ap56+t5HaoReOQ/bV/bIQ5rzTn/m+V3HQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1c8ba8d3f7634acac4a2094eef7c32ad9106532c", + "rev": "d542db745310b6929708d9abea513f3ff19b1341", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } @@ -151,11 +151,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1763966396, - "narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=", + "lastModified": 1764242076, + "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5ae3b07d8d6527c42f17c876e404993199144b6a", + "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", "type": "github" }, "original": { @@ -184,11 +184,11 @@ ] }, "locked": { - "lastModified": 1764021963, - "narHash": "sha256-1m84V2ROwNEbqeS9t37/mkry23GBhfMt8qb6aHHmjuc=", + "lastModified": 1764483358, + "narHash": "sha256-EyyvCzXoHrbL467YSsQBTWWg4sR96MH1sPpKoSOelB4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c482a1c1bbe030be6688ed7dc84f7213f304f1ec", + "rev": "5aca6ff67264321d47856a2ed183729271107c9c", "type": "github" }, "original": { @@ -217,11 +217,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1763704521, - "narHash": "sha256-ceYEV6PnvUN8Zixao4gpPuN+VT3B0SlAXKuPNHZhqUY=", + "lastModified": 1764366786, + "narHash": "sha256-yVCJ4Qe/JkdKDu0DddFdAQgDQVeF12nxH7zv3jtooV4=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "f379ff5722a821212eb59ada9cf8e51cb3654aad", + "rev": "b362a3873710a42f7ac2d8ba03772d8290733934", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 3c817b4..23bab0a 100755 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "My configuration(s) for the NixOS Linux Distribution"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-pin.url = "github:NixOS/nixpkgs/336eda0d07dc5e2be1f923990ad9fdb6bc8e28e3"; @@ -14,7 +14,7 @@ nixos-hardware.url = "github:NixOS/nixos-hardware/master"; home-manager = { - url = "github:nix-community/home-manager/release-25.05"; + url = "github:nix-community/home-manager/release-25.11"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/modules/home/git.nix b/modules/home/git.nix index 48b1730..062a602 100755 --- a/modules/home/git.nix +++ b/modules/home/git.nix @@ -3,9 +3,12 @@ { programs.git = { enable = true; - userName = "wo2wz"; - userEmail = "189177184+wo2wz@users.noreply.github.com"; - extraConfig = { + settings = { + user = { + name = "wo2wz"; + email = "189177184+wo2wz@users.noreply.github.com"; + }; + init.defaultBranch = "main"; safe.directory = "/etc/nixos"; }; diff --git a/modules/nixos/programs/desktop/niri/tuigreet.nix b/modules/nixos/programs/desktop/niri/tuigreet.nix index 6fd69b7..09cc859 100644 --- a/modules/nixos/programs/desktop/niri/tuigreet.nix +++ b/modules/nixos/programs/desktop/niri/tuigreet.nix @@ -11,7 +11,7 @@ enable = true; settings.default_session = { command = '' - ${lib.getExe pkgs.greetd.tuigreet} \ + ${lib.getExe pkgs.tuigreet} \ --cmd niri-session \ --power-shutdown poweroff \ --power-reboot reboot \ diff --git a/modules/nixos/programs/gaming.nix b/modules/nixos/programs/gaming.nix index f363e35..df7f818 100755 --- a/modules/nixos/programs/gaming.nix +++ b/modules/nixos/programs/gaming.nix @@ -15,7 +15,7 @@ jdks = [ jdk8 graalvmPackages.graalvm-oracle_17 - inputs.nixpkgs-pin.legacyPackages.${pkgs.system}.graalvm-ce + inputs.nixpkgs-pin.legacyPackages.${pkgs.stdenv.hostPlatform.system}.graalvm-ce ]; }) alsa-oss # fix audio bug on some instances diff --git a/modules/nixos/services/gameserver/minecraft-server.nix b/modules/nixos/services/gameserver/minecraft-server.nix index bee7573..2b06991 100644 --- a/modules/nixos/services/gameserver/minecraft-server.nix +++ b/modules/nixos/services/gameserver/minecraft-server.nix @@ -23,7 +23,7 @@ pkgs.screen pkgs.graalvmPackages.graalvm-oracle_17 - inputs.nixpkgs-pin.legacyPackages.${pkgs.system}.graalvm-ce + inputs.nixpkgs-pin.legacyPackages.${pkgs.stdenv.hostPlatform.system}.graalvm-ce ]; environment.etc = { @@ -125,7 +125,7 @@ after = [ "network-online.target" ]; path = [ pkgs.screen ]; - script = "screen -dmS minecraft -- ${lib.getExe inputs.nixpkgs-pin.legacyPackages.${pkgs.system}.graalvm-ce} @/etc/minecraft/java21_args -jar server.jar nogui"; + script = "screen -dmS minecraft -- ${lib.getExe inputs.nixpkgs-pin.legacyPackages.${pkgs.stdenv.hostPlatform.system}.graalvm-ce} @/etc/minecraft/java21_args -jar server.jar nogui"; serviceConfig = { User = "minecraft"; diff --git a/modules/nixos/services/homeserver/caddy.nix b/modules/nixos/services/homeserver/caddy.nix index 80f4ac6..0ccb285 100755 --- a/modules/nixos/services/homeserver/caddy.nix +++ b/modules/nixos/services/homeserver/caddy.nix @@ -20,12 +20,12 @@ caddy = { enable = true; # use unstable for caddy-tailscale - package = inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}.caddy.withPlugins { + package = inputs.nixpkgs-unstable.legacyPackages.${pkgs.stdenv.hostPlatform.system}.caddy.withPlugins { plugins = [ "github.com/WeidiDeng/caddy-cloudflare-ip@v0.0.0-20231130002422-f53b62aa13cb" - "github.com/tailscale/caddy-tailscale@v0.0.0-20251102144943-aea8960a2d3c" + "github.com/tailscale/caddy-tailscale@v0.0.0-20251117033914-662ef34c64b1" ]; - hash = "sha256-PVYV9aNVP6CGvoyq3DaChSCkaXGPaCpfSD4SnSNlcEc="; + hash = "sha256-4A61SjbnaQNVbbhfGsr+WUtpmm1YGY1n0wjfDdrcYWg="; }; environmentFile = config.sops.secrets."caddy/secrets.env".path; diff --git a/modules/nixos/services/homeserver/kanidm.nix b/modules/nixos/services/homeserver/kanidm.nix index 2ebfed5..988186e 100644 --- a/modules/nixos/services/homeserver/kanidm.nix +++ b/modules/nixos/services/homeserver/kanidm.nix @@ -50,7 +50,7 @@ services.kanidm = { enableServer = true; - package = pkgs.kanidmWithSecretProvisioning_1_7; + package = pkgs.kanidmWithSecretProvisioning_1_8; serverSettings = { version = "2"; diff --git a/modules/nixos/system/laptop.nix b/modules/nixos/system/laptop.nix index 285f2ef..23babe7 100644 --- a/modules/nixos/system/laptop.nix +++ b/modules/nixos/system/laptop.nix @@ -1,10 +1,10 @@ { config, ... }: { - services.logind = { - lidSwitch = "suspend"; - lidSwitchExternalPower = "lock"; - lidSwitchDocked = "ignore"; + services.logind.settings.Login = { + HandleLidSwitch = "suspend"; + HandleLidSwitchExternalPower = "lock"; + HandleLidSwitchDocked = "ignore"; }; services = {