From e1a08c72463bc6368a49e1120109d119831585b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Tue, 9 Dec 2025 22:41:14 +0100 Subject: [PATCH] chore: upgrade to NixOS 25.11 --- desktop/cosmic.nix | 4 ++-- desktop/gnome.nix | 9 ++++----- flake.lock | 16 ++++++++-------- flake.nix | 4 ++-- home/ausweisapp.nix | 2 +- home/browsers/firefox.nix | 2 +- home/browsers/mullvad-browser.nix | 2 +- home/editors/lsp.nix | 4 ++-- home/felschr-work.nix | 2 +- home/felschr.nix | 2 +- home/git.nix | 20 ++++++++++---------- home/modules/firefox/mullvad-browser.nix | 1 + home/modules/firefox/tor-browser.nix | 1 + home/modules/git.nix | 10 ++++++---- hosts/home-pc/default.nix | 2 +- hosts/home-server/default.nix | 1 - services/opencloud.nix | 4 ---- services/pcscd.nix | 2 +- system/fonts.nix | 3 +-- virtualisation/libvirt.nix | 1 - 20 files changed, 44 insertions(+), 48 deletions(-) diff --git a/desktop/cosmic.nix b/desktop/cosmic.nix index 335fe10..2e61ea0 100644 --- a/desktop/cosmic.nix +++ b/desktop/cosmic.nix @@ -5,8 +5,8 @@ specialisation = { cosmic.configuration = { - services.xserver.displayManager.gdm.enable = lib.mkForce false; - services.xserver.desktopManager.gnome.enable = lib.mkForce false; + services.displayManager.gdm.enable = lib.mkForce false; + services.desktopManager.gnome.enable = lib.mkForce false; services.desktopManager.cosmic.enable = true; services.displayManager.cosmic-greeter.enable = true; diff --git a/desktop/gnome.nix b/desktop/gnome.nix index 98463ec..393054b 100644 --- a/desktop/gnome.nix +++ b/desktop/gnome.nix @@ -16,10 +16,10 @@ tailscale-qs ]; - services.xserver.displayManager.gdm.enable = true; - services.xserver.displayManager.gdm.wayland = true; - services.xserver.desktopManager.gnome.enable = true; - services.xserver.desktopManager.gnome.extraGSettingsOverrides = '' + services.displayManager.gdm.enable = true; + services.displayManager.gdm.wayland = true; + services.desktopManager.gnome.enable = true; + services.desktopManager.gnome.extraGSettingsOverrides = '' [org.gnome.desktop.input-sources] sources=[('xkb', 'gb'), ('xkb', 'mozc-jp')] @@ -40,7 +40,6 @@ gnome-software totem epiphany - evince ]; programs.gnome-terminal.enable = false; programs.geary.enable = false; diff --git a/flake.lock b/flake.lock index 3a16753..3ef2de6 100644 --- a/flake.lock +++ b/flake.lock @@ -299,16 +299,16 @@ ] }, "locked": { - "lastModified": 1763992789, - "narHash": "sha256-WHkdBlw6oyxXIra/vQPYLtqY+3G8dUVZM8bEXk0t8x4=", + "lastModified": 1765170903, + "narHash": "sha256-O8VTGey1xxiRW+Fpb+Ps9zU7ShmxUA1a7cMTcENCVNg=", "owner": "nix-community", "repo": "home-manager", - "rev": "44831a7eaba4360fb81f2acc5ea6de5fde90aaa3", + "rev": "20561be440a11ec57a89715480717baf19fe6343", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.05", + "ref": "release-25.11", "repo": "home-manager", "type": "github" } @@ -368,16 +368,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1764939437, - "narHash": "sha256-4TLFHUwXraw9Df5mXC/vCrJgb50CRr3CzUzF0Mn3CII=", + "lastModified": 1764983851, + "narHash": "sha256-y7RPKl/jJ/KAP/VKLMghMgXTlvNIJMHKskl8/Uuar7o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "00d2457e2f608b4be6fe8b470b0a36816324b0ae", + "rev": "d9bc5c7dceb30d8d6fafa10aeb6aa8a48c218454", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index cf2c29e..3817bb2 100644 --- a/flake.nix +++ b/flake.nix @@ -13,7 +13,7 @@ rec { }; 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"; @@ -32,7 +32,7 @@ rec { flake-utils.url = "github:numtide/flake-utils"; home-manager = { - 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/home/ausweisapp.nix b/home/ausweisapp.nix index abc9aee..439b820 100644 --- a/home/ausweisapp.nix +++ b/home/ausweisapp.nix @@ -2,5 +2,5 @@ with pkgs; { - home.packages = [ AusweisApp2 ]; + home.packages = [ ausweisapp ]; } diff --git a/home/browsers/firefox.nix b/home/browsers/firefox.nix index 7f551a3..51b34f4 100644 --- a/home/browsers/firefox.nix +++ b/home/browsers/firefox.nix @@ -8,7 +8,7 @@ with lib; let - firefox-addons = inputs.firefox-addons.packages.${pkgs.system}; + firefox-addons = inputs.firefox-addons.packages.${pkgs.stdenv.hostPlatform.system}; inherit (import ../modules/firefox/common.nix { inherit config lib pkgs; }) mkConfig; diff --git a/home/browsers/mullvad-browser.nix b/home/browsers/mullvad-browser.nix index 887e85e..5d3fce2 100644 --- a/home/browsers/mullvad-browser.nix +++ b/home/browsers/mullvad-browser.nix @@ -6,7 +6,7 @@ }: let - firefox-addons = inputs.firefox-addons.packages.${pkgs.system}; + firefox-addons = inputs.firefox-addons.packages.${pkgs.stdenv.hostPlatform.system}; commonSettings = { # Disable DNS over HTTPS (use system DNS, i.e. VPN's DNS) diff --git a/home/editors/lsp.nix b/home/editors/lsp.nix index a002117..b4f0e93 100644 --- a/home/editors/lsp.nix +++ b/home/editors/lsp.nix @@ -17,10 +17,10 @@ nodePackages.typescript-language-server # not working like variant from node_modules # nodePackages.graphql-language-service-cli - nodePackages.dockerfile-language-server-nodejs + dockerfile-language-server haskellPackages.haskell-language-server rust-analyzer - sumneko-lua-language-server + lua-language-server marksman # linters & formatters diff --git a/home/felschr-work.nix b/home/felschr-work.nix index 9b9d7fa..369452f 100644 --- a/home/felschr-work.nix +++ b/home/felschr-work.nix @@ -42,7 +42,7 @@ with pkgs; home.packages = with pkgs; [ # system gparted - gnome-firmware-updater + gnome-firmware mission-center # productivity diff --git a/home/felschr.nix b/home/felschr.nix index 08cbe7b..0dd9116 100644 --- a/home/felschr.nix +++ b/home/felschr.nix @@ -43,7 +43,7 @@ home.packages = with pkgs; [ # system gparted - gnome-firmware-updater + gnome-firmware resources # productivity diff --git a/home/git.nix b/home/git.nix index 8103a51..91a5463 100644 --- a/home/git.nix +++ b/home/git.nix @@ -28,7 +28,7 @@ signing = { signByDefault = true; }; - extraConfig = { + settings = { init = { defaultBranch = "main"; }; @@ -41,15 +41,15 @@ abbreviateCommands = true; missingCommitsCheck = "warn"; }; - }; - aliases = { - # usage: git mr (git mr origin 1010) - mr = "!sh -c 'git fetch $1 merge-requests/$2/head:mr-$1-$2 && git checkout mr-$1-$2' -"; - # usage: git pr (git pr origin 1010) - pr = "!sh -c 'git fetch $1 pull/$2/head:pr/$2 && git checkout pr/$2' -"; - # delete branches locally that have already been merged - # usage: git clean-branches (branch to check against, defaults to main) - clean-branches = ''!sh -c 'git branch --merged "''${1:-main}" | egrep -v "(^\*|master|main|staging|production)" | xargs git branch -d' -''; + alias = { + # usage: git mr (git mr origin 1010) + mr = "!sh -c 'git fetch $1 merge-requests/$2/head:mr-$1-$2 && git checkout mr-$1-$2' -"; + # usage: git pr (git pr origin 1010) + pr = "!sh -c 'git fetch $1 pull/$2/head:pr/$2 && git checkout pr/$2' -"; + # delete branches locally that have already been merged + # usage: git clean-branches (branch to check against, defaults to main) + clean-branches = ''!sh -c 'git branch --merged "''${1:-main}" | egrep -v "(^\*|master|main|staging|production)" | xargs git branch -d' -''; + }; }; }; } diff --git a/home/modules/firefox/mullvad-browser.nix b/home/modules/firefox/mullvad-browser.nix index 8542da4..8a5864f 100644 --- a/home/modules/firefox/mullvad-browser.nix +++ b/home/modules/firefox/mullvad-browser.nix @@ -22,6 +22,7 @@ in vendorPath = ".mullvad"; configPath = "${vendorPath}/mullvadbrowser"; }; + platforms.darwin = null; }) (mkFirefoxProfileBinModule { inherit modulePath name packageName; diff --git a/home/modules/firefox/tor-browser.nix b/home/modules/firefox/tor-browser.nix index ee9ec23..59b0a74 100644 --- a/home/modules/firefox/tor-browser.nix +++ b/home/modules/firefox/tor-browser.nix @@ -22,6 +22,7 @@ in vendorPath = ".tor project"; configPath = "${vendorPath}/firefox"; }; + platforms.darwin = null; }) (mkFirefoxProfileBinModule { inherit modulePath name packageName; diff --git a/home/modules/git.nix b/home/modules/git.nix index 3bf7236..1c26211 100644 --- a/home/modules/git.nix +++ b/home/modules/git.nix @@ -36,10 +36,12 @@ in { programs.git = { # fix/workaround for https://github.com/NixOS/nixpkgs/issues/169193 - extraConfig.safe.directory = "/etc/nixos"; - - userName = profiles."${cfg.defaultProfile}".name; - userEmail = profiles."${cfg.defaultProfile}".email; + settings = { + safe.directory = "/etc/nixos"; + user = { + inherit (profiles."${cfg.defaultProfile}") name email; + }; + }; signing = { key = profiles."${cfg.defaultProfile}".signingKey; }; diff --git a/hosts/home-pc/default.nix b/hosts/home-pc/default.nix index ec0c12b..b4866af 100644 --- a/hosts/home-pc/default.nix +++ b/hosts/home-pc/default.nix @@ -59,7 +59,7 @@ ]; networking.firewall.allowedUDPPorts = [ - 24727 # AusweisApp2 + 24727 # ausweisapp ]; networking.hosts = { # force IPv4, see: https://github.com/transmission/transmission/issues/407 diff --git a/hosts/home-server/default.nix b/hosts/home-server/default.nix index 60b9285..d346a9c 100644 --- a/hosts/home-server/default.nix +++ b/hosts/home-server/default.nix @@ -109,7 +109,6 @@ in recommendedTlsSettings = true; recommendedOptimisation = true; recommendedProxySettings = true; - recommendedZstdSettings = true; recommendedGzipSettings = true; recommendedBrotliSettings = true; }; diff --git a/services/opencloud.nix b/services/opencloud.nix index c1bfa74..0a7e538 100644 --- a/services/opencloud.nix +++ b/services/opencloud.nix @@ -11,10 +11,6 @@ let cfg = config.services.opencloud; in { - imports = [ - "${inputs.nixpkgs-unstable}/nixos/modules/services/web-apps/opencloud.nix" - ]; - # required when using unstable NixOS module documentation.nixos.enable = false; diff --git a/services/pcscd.nix b/services/pcscd.nix index 082f7f9..ec4829c 100644 --- a/services/pcscd.nix +++ b/services/pcscd.nix @@ -1,7 +1,7 @@ { config, pkgs, ... }: { - # for reader used with AusweisApp2 + # for reader used with ausweisapp services.pcscd.enable = true; services.pcscd.plugins = with pkgs; [ ccid diff --git a/system/fonts.nix b/system/fonts.nix index b3fbb75..558ed6c 100644 --- a/system/fonts.nix +++ b/system/fonts.nix @@ -3,9 +3,8 @@ { fonts.packages = with pkgs; [ noto-fonts - noto-fonts-extra noto-fonts-cjk-sans - noto-fonts-emoji + noto-fonts-color-emoji nerd-fonts.symbols-only fira-code ]; diff --git a/virtualisation/libvirt.nix b/virtualisation/libvirt.nix index ae08fdb..26e7d50 100644 --- a/virtualisation/libvirt.nix +++ b/virtualisation/libvirt.nix @@ -11,7 +11,6 @@ # Users need to be in groups: libvirtd, qemu-libvirtd virtualisation.libvirtd.enable = true; virtualisation.libvirtd.qemu.runAsRoot = false; - virtualisation.libvirtd.qemu.ovmf.enable = true; virtualisation.libvirtd.qemu.swtpm.enable = true; virtualisation.libvirtd.onBoot = "ignore"; virtualisation.libvirtd.onShutdown = "shutdown";