From 586af7a61f703eb761175da2702db593fdf7a119 Mon Sep 17 00:00:00 2001 From: wo2wz <189177184+wo2wz@users.noreply.github.com> Date: Sun, 11 Jan 2026 14:54:27 -0500 Subject: [PATCH] flake: switch to nixos-unstable --- flake.lock | 56 +++++++------------ flake.nix | 5 +- modules/nixos/programs/scrcpy.nix | 7 ++- .../nixos/services/gameserver/velocity.nix | 2 +- modules/nixos/services/homeserver/caddy.nix | 8 +-- 5 files changed, 30 insertions(+), 48 deletions(-) diff --git a/flake.lock b/flake.lock index ebd13b9..0b12e41 100755 --- a/flake.lock +++ b/flake.lock @@ -7,16 +7,15 @@ ] }, "locked": { - "lastModified": 1767280655, - "narHash": "sha256-YmaYMduV5ko8zURUT1VLGDbVC1L/bxHS0NsiPoZ6bBM=", + "lastModified": 1768068402, + "narHash": "sha256-bAXnnJZKJiF7Xr6eNW6+PhBf1lg2P1aFUO9+xgWkXfA=", "owner": "nix-community", "repo": "home-manager", - "rev": "d49d2543f02dbd789ed032188c84570d929223cb", + "rev": "8bc5473b6bc2b6e1529a9c4040411e1199c43b4c", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.11", "repo": "home-manager", "type": "github" } @@ -35,11 +34,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1767257541, - "narHash": "sha256-eAZD0o5eC85jES3k8S0e1NlJJv+rTgofhl0QajhFjyM=", + "lastModified": 1768153577, + "narHash": "sha256-iR54iiyM4UtQCfAZVsI/BRwIrDUO1oNeiA1h/Jp+nro=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "0eb70f38f02923ff59743a0978fed88f04c98c7d", + "rev": "c65d3c7adfe488122c2c9b7ececb1d7fc893dc5b", "type": "github" }, "original": { @@ -68,11 +67,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1767160009, - "narHash": "sha256-aTj88rDBdhmzaGXoFPOsHjXYM2OjNttixsGftT/X0dI=", + "lastModified": 1768150783, + "narHash": "sha256-1gtx2la5f8RphvN+BUZuZjiGh25WdO0Hf9+kJKIu3rA=", "owner": "YaLTeR", "repo": "niri", - "rev": "cf0b4bc0ca93ab5c18b562ada1d8609b67b3c4e3", + "rev": "e9d888cd52f8a783b07e0d6c0ec9a341a81031ca", "type": "github" }, "original": { @@ -119,16 +118,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1767047869, - "narHash": "sha256-tzYsEzXEVa7op1LTnrLSiPGrcCY6948iD0EcNLWcmzo=", + "lastModified": 1767892417, + "narHash": "sha256-dhhvQY67aboBk8b0/u0XB6vwHdgbROZT3fJAjyNh5Ww=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "89dbf01df72eb5ebe3b24a86334b12c27d68016a", + "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.11", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -149,22 +148,6 @@ "type": "github" } }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1767116409, - "narHash": "sha256-5vKw92l1GyTnjoLzEagJy5V5mDFck72LiQWZSOnSicw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "cad22e7d996aea55ecab064e84834289143e44a0", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { "home-manager": "home-manager", @@ -173,7 +156,6 @@ "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "nixpkgs-pin": "nixpkgs-pin", - "nixpkgs-unstable": "nixpkgs-unstable", "sops-nix": "sops-nix" } }, @@ -184,11 +166,11 @@ ] }, "locked": { - "lastModified": 1766894905, - "narHash": "sha256-pn8AxxfajqyR/Dmr1wnZYdUXHgM3u6z9x0Z1Ijmz2UQ=", + "lastModified": 1768104471, + "narHash": "sha256-HdnXWQsA1EI27IJlaENUEEug58trUrh6+MT0cFiDHmY=", "owner": "Mic92", "repo": "sops-nix", - "rev": "61b39c7b657081c2adc91b75dd3ad8a91d6f07a7", + "rev": "94f9cbd20f680ebb2ad6cdf39da97cbcfaedf004", "type": "github" }, "original": { @@ -217,11 +199,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1766429945, - "narHash": "sha256-9Kv4gWagx/u4RfZJzBMAoagW9ava5waxd+XoTkzqF7E=", + "lastModified": 1768106915, + "narHash": "sha256-HlLo9zH4ULRXlmlIK948cHmdVhxyHgTHxGaoCRlW4k8=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "0dde7ca1d3a8e8c5082533d76084e2aa02bef70e", + "rev": "72245e108f3b03c3c4474d2de9de2d1830849603", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 23bab0a..04837a6 100755 --- a/flake.nix +++ b/flake.nix @@ -2,8 +2,7 @@ description = "My configuration(s) for the NixOS Linux Distribution"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; - nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-pin.url = "github:NixOS/nixpkgs/336eda0d07dc5e2be1f923990ad9fdb6bc8e28e3"; nixos-avf = { @@ -14,7 +13,7 @@ nixos-hardware.url = "github:NixOS/nixos-hardware/master"; home-manager = { - url = "github:nix-community/home-manager/release-25.11"; + url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/modules/nixos/programs/scrcpy.nix b/modules/nixos/programs/scrcpy.nix index 934ed2d..dd949ec 100644 --- a/modules/nixos/programs/scrcpy.nix +++ b/modules/nixos/programs/scrcpy.nix @@ -1,7 +1,8 @@ { config, pkgs, ... }: { - programs.adb.enable = true; - - environment.systemPackages = [ pkgs.scrcpy ]; + environment.systemPackages = [ + pkgs.android-tools + pkgs.scrcpy + ]; } \ No newline at end of file diff --git a/modules/nixos/services/gameserver/velocity.nix b/modules/nixos/services/gameserver/velocity.nix index 98bcc4f..7d92093 100644 --- a/modules/nixos/services/gameserver/velocity.nix +++ b/modules/nixos/services/gameserver/velocity.nix @@ -125,7 +125,7 @@ "${lib.getExe inputs.nixpkgs-pin.legacyPackages.${pkgs.stdenv.hostPlatform.system}.graalvm-ce}" "-Xmx1G -Xms1G -XX:+UseG1GC -XX:G1HeapRegionSize=4M -XX:+UnlockExperimentalVMOptions -XX:+ParallelRefProcEnabled -XX:+AlwaysPreTouch -XX:MaxInlineLevel=15" "-Dvelocity.max-known-packs=264" - "-jar /var/lib/velocity/velocity-3.4.0-SNAPSHOT-558.jar" + "-jar ${pkgs.velocity}/share/velocity/velocity.jar" ]; Type = "exec"; Restart = "always"; diff --git a/modules/nixos/services/homeserver/caddy.nix b/modules/nixos/services/homeserver/caddy.nix index cc9321b..72257a6 100755 --- a/modules/nixos/services/homeserver/caddy.nix +++ b/modules/nixos/services/homeserver/caddy.nix @@ -1,4 +1,4 @@ -{ inputs, config, pkgs, ... }: +{ config, pkgs, ... }: { sops.secrets = { @@ -20,12 +20,12 @@ caddy = { enable = true; # use unstable for caddy-tailscale - package = inputs.nixpkgs-unstable.legacyPackages.${pkgs.stdenv.hostPlatform.system}.caddy.withPlugins { + package = pkgs.caddy.withPlugins { plugins = [ "github.com/WeidiDeng/caddy-cloudflare-ip@v0.0.0-20231130002422-f53b62aa13cb" - "github.com/tailscale/caddy-tailscale@v0.0.0-20251117033914-662ef34c64b1" + "github.com/tailscale/caddy-tailscale@v0.0.0-20260106222316-bb080c4414ac" ]; - hash = "sha256-4A61SjbnaQNVbbhfGsr+WUtpmm1YGY1n0wjfDdrcYWg="; + hash = "sha256-ST0MYExPlBbZt2xyFfyMdQRq5n06dgwOZkEeGO8dDeA="; }; environmentFile = config.sops.secrets."caddy/secrets.env".path;