flake: update to nixos stable 25.11
This commit is contained in:
parent
ef89338871
commit
432d424167
9 changed files with 46 additions and 43 deletions
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@
|
|||
|
||||
services.kanidm = {
|
||||
enableServer = true;
|
||||
package = pkgs.kanidmWithSecretProvisioning_1_7;
|
||||
package = pkgs.kanidmWithSecretProvisioning_1_8;
|
||||
|
||||
serverSettings = {
|
||||
version = "2";
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
{ config, ... }:
|
||||
|
||||
{
|
||||
services.logind = {
|
||||
lidSwitch = "suspend";
|
||||
lidSwitchExternalPower = "lock";
|
||||
lidSwitchDocked = "ignore";
|
||||
services.logind.settings.Login = {
|
||||
HandleLidSwitch = "suspend";
|
||||
HandleLidSwitchExternalPower = "lock";
|
||||
HandleLidSwitchDocked = "ignore";
|
||||
};
|
||||
|
||||
services = {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue