chore: upgrade to NixOS 25.11

2025-12-09 22:41:14 +01:00 · 2025-12-09 22:41:14 +01:00 · e1a08c7246
commit e1a08c7246
parent 75d3736626
20 changed files with 44 additions and 48 deletions
--- 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;
--- 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;
--- 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"
      }
--- 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";
    };

--- a/home/ausweisapp.nix
+++ b/home/ausweisapp.nix
@ -2,5 +2,5 @@

 with pkgs;
 {
-  home.packages = [ AusweisApp2 ];
+  home.packages = [ ausweisapp ];
 }
--- 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;

--- 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)
--- 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
--- 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
--- 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
--- 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 <source> <MR number> (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 <source> <PR number> (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> (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 <source> <MR number> (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 <source> <PR number> (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> (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' -'';
+      };
    };
  };
 }
--- 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;
--- 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;
--- 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;
        };
--- 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
--- 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;
  };
--- 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;

--- 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
--- 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
  ];
--- 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";