From 67b18d9c1d3c54ec296ca1c62a0541e3402074f3 Mon Sep 17 00:00:00 2001 From: SebastianStork Date: Thu, 22 May 2025 20:14:55 +0200 Subject: [PATCH] Upgrade to nixos 25.05 --- flake.lock | 16 +++++++------- flake.nix | 4 ++-- modules/home/de-utils/hypridle.nix | 2 -- modules/home/de-utils/hyprlock.nix | 2 -- modules/home/de/hyprland/default.nix | 5 ----- modules/home/de/hyprland/settings.nix | 2 +- modules/home/firefox.nix | 2 -- modules/home/shell/default.nix | 2 +- modules/home/shell/p10k/default.nix | 2 +- modules/home/vscode.nix | 28 +++++++++++------------- modules/system/actualbudget/default.nix | 6 ----- modules/system/de/hyprland.nix | 16 +------------- modules/system/geoclue.nix | 1 - modules/system/sound.nix | 16 ++++++++------ modules/system/tailscale/caddy-serve.nix | 4 ++-- users/seb/home.nix | 19 ++++++---------- 16 files changed, 45 insertions(+), 82 deletions(-) diff --git a/flake.lock b/flake.lock index 2dcaeb4..0ff184f 100644 --- a/flake.lock +++ b/flake.lock @@ -177,16 +177,16 @@ ] }, "locked": { - "lastModified": 1747688870, - "narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=", + "lastModified": 1747556831, + "narHash": "sha256-Qb84nbYFFk0DzFeqVoHltS2RodAYY5/HZQKE8WnBDsc=", "owner": "nix-community", "repo": "home-manager", - "rev": "d5f1f641b289553927b3801580598d200a501863", + "rev": "d0bbd221482c2713cccb80220f3c9d16a6e20a33", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.11", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } @@ -284,16 +284,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1747676747, - "narHash": "sha256-LXkWBVqilgx7Pohwqu/ABxDVw+Cmi5/Mj2S2mpUH0Fw=", + "lastModified": 1747825515, + "narHash": "sha256-BWpMQymVI73QoKZdcVCxUCCK3GNvr/xa2Dc4DM1o2BE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "72841a4a8761d1aed92ef6169a636872c986c76d", + "rev": "cd2812de55cf87df88a9e09bf3be1ce63d50c1a6", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index afded82..2eadd1f 100644 --- a/flake.nix +++ b/flake.nix @@ -2,14 +2,14 @@ inputs = { flake-parts.url = "github:hercules-ci/flake-parts"; - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; home-manager = { - url = "github:nix-community/home-manager/release-24.11"; + url = "github:nix-community/home-manager/release-25.05"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/modules/home/de-utils/hypridle.nix b/modules/home/de-utils/hypridle.nix index 097f746..75db5c6 100644 --- a/modules/home/de-utils/hypridle.nix +++ b/modules/home/de-utils/hypridle.nix @@ -1,6 +1,5 @@ { config, - pkgs-unstable, lib, ... }: @@ -10,7 +9,6 @@ config = lib.mkIf config.myConfig.deUtils.hypridle.enable { services.hypridle = { enable = true; - package = pkgs-unstable.hypridle; settings = { general = { diff --git a/modules/home/de-utils/hyprlock.nix b/modules/home/de-utils/hyprlock.nix index 327ec4b..9aa814a 100644 --- a/modules/home/de-utils/hyprlock.nix +++ b/modules/home/de-utils/hyprlock.nix @@ -1,6 +1,5 @@ { config, - pkgs-unstable, lib, ... }@moduleArgs: @@ -18,7 +17,6 @@ in config = lib.mkIf cfg.enable { programs.hyprlock = { enable = true; - package = pkgs-unstable.hyprlock; settings = { general.immediate_render = true; diff --git a/modules/home/de/hyprland/default.nix b/modules/home/de/hyprland/default.nix index b3db853..099b684 100644 --- a/modules/home/de/hyprland/default.nix +++ b/modules/home/de/hyprland/default.nix @@ -1,15 +1,10 @@ { config, - inputs, pkgs, lib, ... }@moduleArgs: { - # Use unstable hyprland module for nullable package - disabledModules = [ "services/window-managers/hyprland.nix" ]; - imports = [ "${inputs.home-manager-unstable}/modules/services/window-managers/hyprland.nix" ]; - options.myConfig.de.hyprland.enable = lib.mkEnableOption "" // { default = moduleArgs.osConfig.myConfig.de.hyprland.enable or false; }; diff --git a/modules/home/de/hyprland/settings.nix b/modules/home/de/hyprland/settings.nix index cb0a1c6..02eff90 100644 --- a/modules/home/de/hyprland/settings.nix +++ b/modules/home/de/hyprland/settings.nix @@ -69,7 +69,7 @@ "special:music, gapsout:30, on-created-empty:spotify" "special:chat, gapsout:30, on-created-empty:discord" - "special:flake, gapsout:30, on-created-empty:kitty --directory ${config.home.sessionVariables.FLAKE}" + "special:flake, gapsout:30, on-created-empty:kitty --directory ${config.home.sessionVariables.NH_FLAKE}" "special:monitor, gapsout:30, on-created-empty:kitty btm" "special:files, gapsout:30, on-created-empty:nemo" ]; diff --git a/modules/home/firefox.nix b/modules/home/firefox.nix index 5ec8576..4380473 100644 --- a/modules/home/firefox.nix +++ b/modules/home/firefox.nix @@ -2,7 +2,6 @@ config, inputs, pkgs, - pkgs-unstable, lib, ... }: @@ -12,7 +11,6 @@ config = lib.mkIf config.myConfig.firefox.enable { programs.firefox = { enable = true; - package = pkgs-unstable.firefox; profiles.default = { settings = diff --git a/modules/home/shell/default.nix b/modules/home/shell/default.nix index cda32a9..2c0a186 100644 --- a/modules/home/shell/default.nix +++ b/modules/home/shell/default.nix @@ -29,7 +29,7 @@ } ]; - initExtra = '' + initContent = '' zstyle ':completion:*' matcher-list 'm:{a-z}={A-Za-Z}' zstyle ':completion:*' list-colors ''${(s.:.)LS_COLORS} zstyle ':completion:*' menu no diff --git a/modules/home/shell/p10k/default.nix b/modules/home/shell/p10k/default.nix index 9500dd6..ea4fe1e 100644 --- a/modules/home/shell/p10k/default.nix +++ b/modules/home/shell/p10k/default.nix @@ -20,7 +20,7 @@ } ]; - initExtraFirst = '' + initContent = lib.mkBefore '' (( ''${+commands[direnv]} )) && emulate zsh -c "$(direnv export zsh)" if [[ -r "''${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-''${(%):-%n}.zsh" ]]; then diff --git a/modules/home/vscode.nix b/modules/home/vscode.nix index f1a7ee7..b03716d 100644 --- a/modules/home/vscode.nix +++ b/modules/home/vscode.nix @@ -12,22 +12,20 @@ config = lib.mkIf config.myConfig.vscode.enable { programs.vscode = { enable = true; - package = pkgs-unstable.vscode-with-extensions.override { - vscode = pkgs-unstable.vscodium; - vscodeExtensions = - let - inherit (inputs.nix-vscode-extensions.extensions.${pkgs.system}) open-vsx; - in - [ - open-vsx.jnoortheen.nix-ide - open-vsx.aaron-bond.better-comments - open-vsx.llvm-vs-code-extensions.vscode-clangd - open-vsx.nefrob.vscode-just-syntax + package = pkgs-unstable.vscodium; + profiles.default.extensions = + let + inherit (inputs.nix-vscode-extensions.extensions.${pkgs.system}) open-vsx; + in + [ + open-vsx.jnoortheen.nix-ide + open-vsx.aaron-bond.better-comments + open-vsx.llvm-vs-code-extensions.vscode-clangd + open-vsx.nefrob.vscode-just-syntax - open-vsx.github.github-vscode-theme - open-vsx.pkief.material-icon-theme - ]; - }; + open-vsx.github.github-vscode-theme + open-vsx.pkief.material-icon-theme + ]; }; systemd.user.tmpfiles.rules = diff --git a/modules/system/actualbudget/default.nix b/modules/system/actualbudget/default.nix index dc31a87..365b863 100644 --- a/modules/system/actualbudget/default.nix +++ b/modules/system/actualbudget/default.nix @@ -1,7 +1,5 @@ { config, - inputs, - pkgs-unstable, lib, ... }: @@ -9,9 +7,6 @@ let cfg = config.myConfig.actualbudget; in { - disabledModules = [ "services/web-apps/actual.nix" ]; - imports = [ "${inputs.nixpkgs-unstable}/nixos/modules/services/web-apps/actual.nix" ]; - options.myConfig.actualbudget = { enable = lib.mkEnableOption ""; subdomain = lib.mkOption { @@ -33,7 +28,6 @@ in services.actual = { enable = true; - package = pkgs-unstable.actual-server; settings = { hostname = "localhost"; diff --git a/modules/system/de/hyprland.nix b/modules/system/de/hyprland.nix index 28e65b8..cb9b1c2 100644 --- a/modules/system/de/hyprland.nix +++ b/modules/system/de/hyprland.nix @@ -1,6 +1,5 @@ { config, - pkgs-unstable, lib, ... }: @@ -8,20 +7,7 @@ options.myConfig.de.hyprland.enable = lib.mkEnableOption ""; config = lib.mkIf config.myConfig.de.hyprland.enable { - programs = { - hyprland = { - enable = true; - package = pkgs-unstable.hyprland; - portalPackage = pkgs-unstable.xdg-desktop-portal-hyprland; - }; - - xwayland.package = pkgs-unstable.xwayland; - }; - - hardware.graphics = { - package = pkgs-unstable.mesa; - package32 = pkgs-unstable.pkgsi686Linux.mesa; - }; + programs.hyprland.enable = true; environment.sessionVariables.NIXOS_OZONE_WL = "1"; diff --git a/modules/system/geoclue.nix b/modules/system/geoclue.nix index f2ca748..3b27c27 100644 --- a/modules/system/geoclue.nix +++ b/modules/system/geoclue.nix @@ -5,7 +5,6 @@ config = lib.mkIf config.myConfig.geoclue.enable { services.geoclue2 = { enable = true; - geoProviderUrl = "https://beacondb.net/v1/geolocate"; appConfig.gammastep = { isAllowed = true; diff --git a/modules/system/sound.nix b/modules/system/sound.nix index e7e2bb5..2307520 100644 --- a/modules/system/sound.nix +++ b/modules/system/sound.nix @@ -4,14 +4,16 @@ config = lib.mkIf config.myConfig.sound.enable { security.rtkit.enable = true; - hardware.pulseaudio.enable = false; - services.pipewire = { - enable = true; - wireplumber.enable = true; - pulse.enable = true; - alsa = { + services = { + pulseaudio.enable = false; + pipewire = { enable = true; - support32Bit = true; + wireplumber.enable = true; + pulse.enable = true; + alsa = { + enable = true; + support32Bit = true; + }; }; }; }; diff --git a/modules/system/tailscale/caddy-serve.nix b/modules/system/tailscale/caddy-serve.nix index dbc8e6f..25b6fba 100644 --- a/modules/system/tailscale/caddy-serve.nix +++ b/modules/system/tailscale/caddy-serve.nix @@ -1,13 +1,13 @@ { config, - pkgs-unstable, + pkgs, lib, ... }: let nodes = config.myConfig.tailscale.caddyServe |> lib.filterAttrs (_: value: value.enable); - caddy-tailscale = pkgs-unstable.caddy.withPlugins { + caddy-tailscale = pkgs.caddy.withPlugins { plugins = [ "github.com/tailscale/caddy-tailscale@v0.0.0-20250207163903-69a970c84556" ]; hash = "sha256-wt3+xCsT83RpPySbL7dKVwgqjKw06qzrP2Em+SxEPto="; }; diff --git a/users/seb/home.nix b/users/seb/home.nix index bc72cae..8529ce2 100644 --- a/users/seb/home.nix +++ b/users/seb/home.nix @@ -1,7 +1,6 @@ { inputs, pkgs, - pkgs-unstable, ... }: let @@ -22,7 +21,7 @@ in { imports = [ ../shared-home.nix ]; - home.sessionVariables.FLAKE = "~/Projects/nixos-config"; + home.sessionVariables.NH_FLAKE = "~/Projects/nixos-config"; myConfig = { kitty.enable = true; @@ -41,17 +40,17 @@ in pkgs.nemo-with-extensions pkgs.celluloid - pkgs-unstable.spotify + pkgs.spotify pkgs.obsidian - pkgs-unstable.anki - pkgs-unstable.discord + pkgs.anki + pkgs.discord (lazyDesktopApp pkgs.brave) pkgs.jetbrains.idea-community pkgs.jetbrains.goland pkgs.jetbrains.clion pkgs.qtcreator - pkgs-unstable.logisim-evolution + pkgs.logisim-evolution pkgs.libreoffice pkgs.hunspell @@ -61,12 +60,8 @@ in pkgs.corefonts pkgs.roboto pkgs.open-sans - (pkgs.nerdfonts.override { - fonts = [ - "JetBrainsMono" - "NerdFontsSymbolsOnly" - ]; - }) + pkgs.nerd-fonts.jetbrains-mono + pkgs.nerd-fonts.symbols-only ]; fonts.fontconfig.enable = true;