wo2w/nixos-config
1
0
Fork 0
Code Issues Pull requests Activity

flake: update to nixos stable 25.11

Browse source
This commit is contained in:
wo2wz 2025-11-30 19:49:01 -05:00
parent ef89338871
commit 432d424167
9 changed files with 46 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

52
flake.lock generated
View file

@ -7,16 +7,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1763992789, "lastModified": 1764536451,
"narHash": "sha256-WHkdBlw6oyxXIra/vQPYLtqY+3G8dUVZM8bEXk0t8x4=", "narHash": "sha256-BgtcUkBfItu9/yU14IgUaj4rYOanTOUZjUfBP20/ZB4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "44831a7eaba4360fb81f2acc5ea6de5fde90aaa3", "rev": "3fdd076e08049a9c7a83149b270440d9787d2df5",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-25.05", "ref": "release-25.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -35,11 +35,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1764081740, "lastModified": 1764488513,
"narHash": "sha256-eeQzyHJjSQTxcjSCy1OgOgNAUjdBnIjSYntfJK0Z4+I=", "narHash": "sha256-xBUnv+ndZxRbY9mYSPEP0afaZRUVXDFcJx0WMD4ypfs=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "e579b1a51f26341eeeb41e32d5b5c6e2a032e339", "rev": "9e3bbd170669d10846bae68d23dabef11832f8f2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -68,11 +68,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1764046829, "lastModified": 1764485473,
"narHash": "sha256-XFSR43nAKXDMhtNa+V2sd6Url/bCPGwawkmCqUKKRfI=", "narHash": "sha256-RlGEcuZFB/IdvYLrYsf0RpgvNtCMyIuBLt3lS+GZvP8=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "54c7fdcd1adcfade596aca1070062f3f0fb5d4d0", "rev": "311ca6b5da19f5acd7d3e481620de57240ce8f7c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -103,11 +103,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1764080039, "lastModified": 1764440730,
"narHash": "sha256-b1MtLQsQc4Ji1u08f+C6g5XrmLPkJQ1fhNkCt+0AERQ=", "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "da17006633ca9cda369be82893ae36824a2ddf1a", "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -119,16 +119,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1763948260, "lastModified": 1764494334,
"narHash": "sha256-dY9qLD0H0zOUgU3vWacPY6Qc421BeQAfm8kBuBtPVE0=", "narHash": "sha256-x2xCEXUlU4Ap56+t5HaoReOQ/bV/bIQ5rzTn/m+V3HQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1c8ba8d3f7634acac4a2094eef7c32ad9106532c", "rev": "d542db745310b6929708d9abea513f3ff19b1341",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-25.05", "ref": "nixos-25.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -151,11 +151,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1763966396, "lastModified": 1764242076,
"narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=", "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5ae3b07d8d6527c42f17c876e404993199144b6a", "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -184,11 +184,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1764021963, "lastModified": 1764483358,
"narHash": "sha256-1m84V2ROwNEbqeS9t37/mkry23GBhfMt8qb6aHHmjuc=", "narHash": "sha256-EyyvCzXoHrbL467YSsQBTWWg4sR96MH1sPpKoSOelB4=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "c482a1c1bbe030be6688ed7dc84f7213f304f1ec", "rev": "5aca6ff67264321d47856a2ed183729271107c9c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -217,11 +217,11 @@
"xwayland-satellite-unstable": { "xwayland-satellite-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1763704521, "lastModified": 1764366786,
"narHash": "sha256-ceYEV6PnvUN8Zixao4gpPuN+VT3B0SlAXKuPNHZhqUY=", "narHash": "sha256-yVCJ4Qe/JkdKDu0DddFdAQgDQVeF12nxH7zv3jtooV4=",
"owner": "Supreeeme", "owner": "Supreeeme",
"repo": "xwayland-satellite", "repo": "xwayland-satellite",
"rev": "f379ff5722a821212eb59ada9cf8e51cb3654aad", "rev": "b362a3873710a42f7ac2d8ba03772d8290733934",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
flake.nix
View file

@ -2,7 +2,7 @@
description = "My configuration(s) for the NixOS Linux Distribution"; description = "My configuration(s) for the NixOS Linux Distribution";
inputs = { 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-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
nixpkgs-pin.url = "github:NixOS/nixpkgs/336eda0d07dc5e2be1f923990ad9fdb6bc8e28e3"; nixpkgs-pin.url = "github:NixOS/nixpkgs/336eda0d07dc5e2be1f923990ad9fdb6bc8e28e3";
@ -14,7 +14,7 @@
nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixos-hardware.url = "github:NixOS/nixos-hardware/master";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-25.05"; url = "github:nix-community/home-manager/release-25.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };

9
modules/home/git.nix
View file

@ -3,9 +3,12 @@
{ {
programs.git = { programs.git = {
enable = true; enable = true;
userName = "wo2wz"; settings = {
userEmail = "189177184+wo2wz@users.noreply.github.com"; user = {
extraConfig = { name = "wo2wz";
email = "189177184+wo2wz@users.noreply.github.com";
};
init.defaultBranch = "main"; init.defaultBranch = "main";
safe.directory = "/etc/nixos"; safe.directory = "/etc/nixos";
}; };

2
modules/nixos/programs/desktop/niri/tuigreet.nix
View file

@ -11,7 +11,7 @@
enable = true; enable = true;
settings.default_session = { settings.default_session = {
command = '' command = ''
${lib.getExe pkgs.greetd.tuigreet} \ ${lib.getExe pkgs.tuigreet} \
--cmd niri-session \ --cmd niri-session \
--power-shutdown poweroff \ --power-shutdown poweroff \
--power-reboot reboot \ --power-reboot reboot \

2
modules/nixos/programs/gaming.nix
View file

@ -15,7 +15,7 @@
jdks = [ jdks = [
jdk8 jdk8
graalvmPackages.graalvm-oracle_17 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 alsa-oss # fix audio bug on some instances

4
modules/nixos/services/gameserver/minecraft-server.nix
View file

@ -23,7 +23,7 @@
pkgs.screen pkgs.screen
pkgs.graalvmPackages.graalvm-oracle_17 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 = { environment.etc = {
@ -125,7 +125,7 @@
after = [ "network-online.target" ]; after = [ "network-online.target" ];
path = [ pkgs.screen ]; 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 = { serviceConfig = {
User = "minecraft"; User = "minecraft";

6
modules/nixos/services/homeserver/caddy.nix
View file

@ -20,12 +20,12 @@
caddy = { caddy = {
enable = true; enable = true;
# use unstable for caddy-tailscale # 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 = [ plugins = [
"github.com/WeidiDeng/caddy-cloudflare-ip@v0.0.0-20231130002422-f53b62aa13cb" "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; environmentFile = config.sops.secrets."caddy/secrets.env".path;

2
modules/nixos/services/homeserver/kanidm.nix
View file

@ -50,7 +50,7 @@
services.kanidm = { services.kanidm = {
enableServer = true; enableServer = true;
package = pkgs.kanidmWithSecretProvisioning_1_7; package = pkgs.kanidmWithSecretProvisioning_1_8;
serverSettings = { serverSettings = {
version = "2"; version = "2";

8
modules/nixos/system/laptop.nix
View file

@ -1,10 +1,10 @@
{ config, ... }: { config, ... }:
{ {
services.logind = { services.logind.settings.Login = {
lidSwitch = "suspend"; HandleLidSwitch = "suspend";
lidSwitchExternalPower = "lock"; HandleLidSwitchExternalPower = "lock";
lidSwitchDocked = "ignore"; HandleLidSwitchDocked = "ignore";
}; };
services = { services = {