From 55342f4912c121bf08cfbc05dc19cb4d4ce337e7 Mon Sep 17 00:00:00 2001 From: Kabbone Date: Sat, 6 Dec 2025 16:48:39 +0100 Subject: [PATCH] update to 25.11 with config changes --- flake.lock | 64 +++++++++++++++--------------- flake.nix | 4 +- hosts/lifebook/default.nix | 2 +- modules/services/server/mealie.nix | 2 +- modules/shell/git.nix | 18 +++++---- modules/shell/zsh.nix | 1 - modules/wm/sway/home.nix | 2 +- 7 files changed, 47 insertions(+), 46 deletions(-) diff --git a/flake.lock b/flake.lock index 7833eeb..af825b9 100644 --- a/flake.lock +++ b/flake.lock @@ -63,11 +63,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "type": "github" }, "original": { @@ -144,11 +144,11 @@ ] }, "locked": { - "lastModified": 1764510518, - "narHash": "sha256-hDFkciyjhjMLRC/qXCREWX1dgq8kopiuJdwXdfVlJuQ=", + "lastModified": 1764998300, + "narHash": "sha256-fZatn/KLfHLDXnF0wy7JxXqGaZmGDTVufT4o/AOlj44=", "owner": "nix-community", "repo": "home-manager", - "rev": "83053e1d337f33e0b48250588006e4b9df2f0d9d", + "rev": "27a6182347ccae90a88231ae0dc5dfa7d15815bb", "type": "github" }, "original": { @@ -164,16 +164,16 @@ ] }, "locked": { - "lastModified": 1763992789, - "narHash": "sha256-WHkdBlw6oyxXIra/vQPYLtqY+3G8dUVZM8bEXk0t8x4=", + "lastModified": 1764866045, + "narHash": "sha256-0GsEtXV9OquDQ1VclQfP16cU5VZh7NEVIOjSH4UaJuM=", "owner": "nix-community", "repo": "home-manager", - "rev": "44831a7eaba4360fb81f2acc5ea6de5fde90aaa3", + "rev": "f63d0fe9d81d36e5fc95497217a72e02b8b7bcab", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.05", + "ref": "release-25.11", "repo": "home-manager", "type": "github" } @@ -201,11 +201,11 @@ ] }, "locked": { - "lastModified": 1764275117, - "narHash": "sha256-DRcv8Y0BnWm4ZhUQnaYk1dNzC6ZhA2W9Vv5Jl4n0RbE=", + "lastModified": 1764922999, + "narHash": "sha256-LSvUxKm6S6ZAd/otQSkAHd3+8KJhi8OwGJGSe0K//B8=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "96023dcc9a0febaaa3b91f447b9ae2fbe86f2923", + "rev": "9b9ead1b5591b68f4048e7205ba1397bc85ce6c4", "type": "github" }, "original": { @@ -224,11 +224,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1763975256, - "narHash": "sha256-IhdDL+0YwlLz5Ty0EnAxWN/btemN9FxcQbYs/V/8jvs=", + "lastModified": 1764622702, + "narHash": "sha256-HggOVvg2U3EwT44wPHEwFKromf9qR9rTqfV1i3q7rYs=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "6803b15c4ab9df2dcc478254b4adb55524746ac7", + "rev": "6242b3b2b5e5afcf329027ed4eb5fa6e2eab10f1", "type": "github" }, "original": { @@ -247,11 +247,11 @@ "spectrum": "spectrum" }, "locked": { - "lastModified": 1764025263, - "narHash": "sha256-eoDUO0WYzfHwKnlDtNT0+zvdwRzOtVYNkd09oRjiXzE=", + "lastModified": 1764625594, + "narHash": "sha256-RwtPzq4rqDCLki3oOLuUUkKcuaZPy4IDUBb5tAWl4Xk=", "owner": "astro", "repo": "microvm.nix", - "rev": "9349244757df337616a1a44e75104d0ae08a7488", + "rev": "6dab9a797f262a352eed55078597582ed2ded336", "type": "github" }, "original": { @@ -300,27 +300,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1764316264, - "narHash": "sha256-82L+EJU+40+FIdeG4gmUlOF1jeSwlf2AwMarrpdHF6o=", + "lastModified": 1764831616, + "narHash": "sha256-OtzF5wBvO0jgW1WW1rQU9cMGx7zuvkF7CAVJ1ypzkxA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9a7b80b6f82a71ea04270d7ba11b48855681c4b0", + "rev": "c97c47f2bac4fa59e2cbdeba289686ae615f8ed4", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1764242076, - "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", + "lastModified": 1764950072, + "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", + "rev": "f61125a668a320878494449750330ca58b78c557", "type": "github" }, "original": { @@ -340,11 +340,11 @@ ] }, "locked": { - "lastModified": 1763741496, - "narHash": "sha256-uIRqs/H18YEtMOn1OkbnPH+aNTwXKx+iU3qnxEkVUd0=", + "lastModified": 1763988335, + "narHash": "sha256-QlcnByMc8KBjpU37rbq5iP7Cp97HvjRP0ucfdh+M4Qc=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "20e71a403c5de9ce5bd799031440da9728c1cda1", + "rev": "50b9238891e388c9fdc6a5c49e49c42533a1b5ce", "type": "github" }, "original": { @@ -375,11 +375,11 @@ ] }, "locked": { - "lastModified": 1763865987, - "narHash": "sha256-DJpzM8Jz3B0azJcAoF+YFHr8rEbxYLJ0wy1kWZ29HOw=", + "lastModified": 1764470739, + "narHash": "sha256-sa9f81B1dWO16QtgDTWHX8DQbiHKzHndpaunY5EQtwE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "042d905c01a6eec3bcae8530dacb19cda9758a63", + "rev": "3bfa664055e1a09c6aedab5533c5fc8d6ca5741a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 5eb8539..5b7c3a2 100644 --- a/flake.nix +++ b/flake.nix @@ -11,7 +11,7 @@ inputs = { nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; # Nix Packages - nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; microvm = { @@ -22,7 +22,7 @@ impermanence.url = "github:nix-community/impermanence"; home-manager = { # User Package Management - url = "github:nix-community/home-manager/release-25.05"; + url = "github:nix-community/home-manager/release-25.11"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/hosts/lifebook/default.nix b/hosts/lifebook/default.nix index bcc306c..35d72a1 100644 --- a/hosts/lifebook/default.nix +++ b/hosts/lifebook/default.nix @@ -64,7 +64,7 @@ systemd.sleep.extraConfig = "HibernateDelaySec=1h"; services = { - logind.lidSwitch = "suspend-then-hibernate"; # Laptop does not go to sleep when lid is closed + logind.settings.Login.HandleLidSwitch = "suspend-then-hibernate"; # Laptop does not go to sleep when lid is closed blueman.enable = true; avahi = { # Needed to find wireless printer enable = true; diff --git a/modules/services/server/mealie.nix b/modules/services/server/mealie.nix index 3a3951c..d60d8b5 100644 --- a/modules/services/server/mealie.nix +++ b/modules/services/server/mealie.nix @@ -4,7 +4,7 @@ services.mealie = { enable = true; - package = pkgs-unstable.mealie; + #package = pkgs-unstable.mealie; listenAddress = "127.0.0.1"; credentialsFile = config.age.secrets."services/mealie/credentialsFile".path; settings = { diff --git a/modules/shell/git.nix b/modules/shell/git.nix index 7e49fb4..7cf7ae6 100644 --- a/modules/shell/git.nix +++ b/modules/shell/git.nix @@ -7,18 +7,20 @@ programs = { git = { enable = true; - userName = "Kabbone"; - userEmail = "tobias@opel-online.de"; - lfs.enable = true; + settings = { + user.name = "Kabbone"; + user.email = "tobias@opel-online.de"; + }; + lfs = { + enable = true; + skipSmudge = true; + }; signing = { + format = "ssh"; key = "/home/${user}/.ssh/id_ed25519_sk_rk_red"; signByDefault = true; }; - extraConfig = { - gpg = { format = "ssh"; }; - credential = { helper = "cache --timeout=3600"; }; - }; - difftastic.enable = true; }; + difftastic.enable = true; }; } diff --git a/modules/shell/zsh.nix b/modules/shell/zsh.nix index 51d197f..cc09303 100644 --- a/modules/shell/zsh.nix +++ b/modules/shell/zsh.nix @@ -8,7 +8,6 @@ programs = { zsh = { enable = true; - dotDir = "~/.config/zsh_nix"; autosuggestion.enable = true; # Auto suggest options and highlights syntact, searches in history for options syntaxHighlighting.enable = true; history.size = 10000; diff --git a/modules/wm/sway/home.nix b/modules/wm/sway/home.nix index f5a51fb..8164220 100644 --- a/modules/wm/sway/home.nix +++ b/modules/wm/sway/home.nix @@ -301,7 +301,7 @@ { event = "lock"; command = "${pkgs.swaylock}/bin/swaylock -fF"; } { event = "after-resume"; command = "${pkgs.sway}/bin/swaymsg 'output * dpms on'"; } { event = "unlock"; command = "${pkgs.sway}/bin/swaymsg 'output * dpms on'"; } - ]; + ]; timeouts = [ { timeout = 300; command = "${pkgs.swaylock}/bin/swaylock -fF"; } { timeout = 600; command = "${pkgs.sway}/bin/swaymsg 'output * dpms off'"; resumeCommand = "${pkgs.sway}/bin/swaymsg 'output * dpms on'"; }