From 03b50ccb9fb722e2e86fc10ab1318b27b29ac7da Mon Sep 17 00:00:00 2001 From: Timo Bingmann Date: Tue, 2 Dec 2025 17:03:31 -0800 Subject: [PATCH] upgrade to 25.11 --- flake.nix | 2 +- home/default/git.nix | 2 +- home/private/git.nix | 2 +- system/develop/packages.nix | 1 - system/linux/system.nix | 5 ----- 5 files changed, 3 insertions(+), 9 deletions(-) diff --git a/flake.nix b/flake.nix index f14fc8a..e00a5f6 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Timo's Shared Nix Modules"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; }; outputs = { self, nixpkgs, ... }: { diff --git a/home/default/git.nix b/home/default/git.nix index 727a747..b079f24 100644 --- a/home/default/git.nix +++ b/home/default/git.nix @@ -4,7 +4,7 @@ enable = true; lfs.enable = true; - extraConfig = { + settings = { pull.ff = "only"; merge.conflictstyle = "zdiff3"; diff --git a/home/private/git.nix b/home/private/git.nix index 9c807b9..fd925e4 100644 --- a/home/private/git.nix +++ b/home/private/git.nix @@ -3,7 +3,7 @@ programs.git = { enable = true; - extraConfig = { + settings = { credential.helper = "store --file ~/.git-credentials"; "url \"https://g.t1.xyz/github-mirror/\"" = { diff --git a/system/develop/packages.nix b/system/develop/packages.nix index ac1df71..3ace295 100644 --- a/system/develop/packages.nix +++ b/system/develop/packages.nix @@ -69,7 +69,6 @@ # === SCALA DEVELOPMENT === # Scala ecosystem tools and frameworks - dotty # Scala 3 compiler scala_3 # Scala 3 language sbt # Scala Build Tool bloop # Scala build server diff --git a/system/linux/system.nix b/system/linux/system.nix index 90cfa32..1db2bb4 100644 --- a/system/linux/system.nix +++ b/system/linux/system.nix @@ -17,9 +17,4 @@ security.pam.loginLimits = [ { domain = "*"; item = "core"; type = "hard"; value = "0"; } ]; - - # Don't shutdown when power button is short-pressed. - services.logind.extraConfig = '' - HandlePowerKey=ignore - ''; }