tb/nix-shared
1
0
Fork 0
Code Activity

upgrade to 25.11

Browse Source
This commit is contained in:
Timo Bingmann
2025-12-02 17:03:31 -08:00
parent d28a6049ca
commit 03b50ccb9f
5 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
flake.nix
View File

@@ -2,7 +2,7 @@
description = "Timo's Shared Nix Modules"; description = "Timo's Shared Nix Modules";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
}; };
outputs = { self, nixpkgs, ... }: { outputs = { self, nixpkgs, ... }: {

2
home/default/git.nix
View File

@@ -4,7 +4,7 @@
enable = true; enable = true;
lfs.enable = true; lfs.enable = true;
extraConfig = { settings = {
pull.ff = "only"; pull.ff = "only";
merge.conflictstyle = "zdiff3"; merge.conflictstyle = "zdiff3";

2
home/private/git.nix
View File

@@ -3,7 +3,7 @@
programs.git = { programs.git = {
enable = true; enable = true;
extraConfig = { settings = {
credential.helper = "store --file ~/.git-credentials"; credential.helper = "store --file ~/.git-credentials";
"url \"https://g.t1.xyz/github-mirror/\"" = { "url \"https://g.t1.xyz/github-mirror/\"" = {

1
system/develop/packages.nix
View File

@@ -69,7 +69,6 @@
# === SCALA DEVELOPMENT === # === SCALA DEVELOPMENT ===
# Scala ecosystem tools and frameworks # Scala ecosystem tools and frameworks
dotty # Scala 3 compiler
scala_3 # Scala 3 language scala_3 # Scala 3 language
sbt # Scala Build Tool sbt # Scala Build Tool
bloop # Scala build server bloop # Scala build server

5
system/linux/system.nix
View File

@@ -17,9 +17,4 @@
security.pam.loginLimits = [ security.pam.loginLimits = [
{ domain = "*"; item = "core"; type = "hard"; value = "0"; } { domain = "*"; item = "core"; type = "hard"; value = "0"; }
]; ];
# Don't shutdown when power button is short-pressed.
services.logind.extraConfig = ''
HandlePowerKey=ignore
'';
} }