From db69b419b60e5ff423e19d03395d28423b1da335 Mon Sep 17 00:00:00 2001 From: soraefir Date: Sun, 8 Jun 2025 15:58:40 +0200 Subject: [PATCH] Upgrade to 25.05 --- flake.lock | 28 +++++++++---------- flake.nix | 4 +-- modules/home/cli/zsh/default.nix | 2 +- .../gui/apps/develop/vscodium/default.nix | 2 +- modules/nixos/gui/audio/default.nix | 2 +- overlays/eww/default.nix | 6 ++-- overlays/openttd-jgrpp/default.nix | 4 +-- 7 files changed, 24 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index b754db4..d25f09b 100644 --- a/flake.lock +++ b/flake.lock @@ -139,16 +139,16 @@ ] }, "locked": { - "lastModified": 1747688870, - "narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=", + "lastModified": 1749154018, + "narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=", "owner": "nix-community", "repo": "home-manager", - "rev": "d5f1f641b289553927b3801580598d200a501863", + "rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.11", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } @@ -174,11 +174,11 @@ }, "nixUnstable": { "locked": { - "lastModified": 1749213349, - "narHash": "sha256-UAaWOyQhdp7nXzsbmLVC67fo+QetzoTm9hsPf9X3yr4=", + "lastModified": 1749369410, + "narHash": "sha256-P1eYm8bewiyWg3QaPCHrOp6iWg/7ESi/aGHT4yilyNo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a4ff0e3c64846abea89662bfbacf037ef4b34207", + "rev": "8207ad0d501dd3590e0e81a7c56b386a5c4342c9", "type": "github" }, "original": { @@ -190,16 +190,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1749173751, - "narHash": "sha256-ENY3y3v6S9ZmLDDLI3LUT8MXmfXg/fSt2eA4GCnMVCE=", + "lastModified": 1749237914, + "narHash": "sha256-N5waoqWt8aMr/MykZjSErOokYH6rOsMMXu3UOVH5kiw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ed29f002b6d6e5e7e32590deb065c34a31dc3e91", + "rev": "70c74b02eac46f4e4aa071e45a6189ce0f6d9265", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } @@ -242,11 +242,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1749334897, - "narHash": "sha256-EC30zWG/tCKgEbjLplrjQMbhydLm46833/u9viGKbKQ=", + "lastModified": 1749388083, + "narHash": "sha256-WVbICtwfjwr/dPeWjvJkPpI6kaE2Aeg+nDM6faRKZME=", "owner": "nix-community", "repo": "nur", - "rev": "e3a61a9079d9808cb69e19051e7410d45cefe2dc", + "rev": "7502ee791dfee0ed3f32382eaabb4d73451f472b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 341c571..48ef33b 100755 --- a/flake.nix +++ b/flake.nix @@ -3,12 +3,12 @@ inputs = { # Trick renovate into working: "github:NixOS/nixpkgs/nixpkgs-unstable" nixUnstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; hardware.url = "github:nixos/nixos-hardware"; nur.url = "github:nix-community/nur"; 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/cli/zsh/default.nix b/modules/home/cli/zsh/default.nix index d98eb27..8f55ef3 100755 --- a/modules/home/cli/zsh/default.nix +++ b/modules/home/cli/zsh/default.nix @@ -14,7 +14,7 @@ in { "ssh" = "TERM=xterm-256color ${pkgs.openssh}/bin/ssh"; "top" = "btop"; }; - initExtra = '' + initContent = '' sopsu() {nix-shell -p sops --run "sops updatekeys $1";} sopsn() {nix-shell -p sops --run "sops $1";} ''; diff --git a/modules/home/gui/apps/develop/vscodium/default.nix b/modules/home/gui/apps/develop/vscodium/default.nix index ba7d2e4..868cacf 100644 --- a/modules/home/gui/apps/develop/vscodium/default.nix +++ b/modules/home/gui/apps/develop/vscodium/default.nix @@ -5,7 +5,7 @@ enable = true; package = pkgs.vscodium; #profiles.default = { - extensions = with pkgs.vscode-extensions; [ + profiles.default.extensions = with pkgs.vscode-extensions; [ bbenoist.nix esbenp.prettier-vscode golang.go diff --git a/modules/nixos/gui/audio/default.nix b/modules/nixos/gui/audio/default.nix index bd96c71..70d5926 100644 --- a/modules/nixos/gui/audio/default.nix +++ b/modules/nixos/gui/audio/default.nix @@ -4,7 +4,7 @@ in { config = lib.mkIf cfg { # sound.enable = true; security.rtkit.enable = true; - hardware.pulseaudio.enable = false; #25.05 change to services + services.pulseaudio.enable = false; #25.05 change to services services.pipewire = { enable = true; alsa.enable = true; diff --git a/overlays/eww/default.nix b/overlays/eww/default.nix index 441d292..267b55c 100644 --- a/overlays/eww/default.nix +++ b/overlays/eww/default.nix @@ -2,16 +2,16 @@ let old = prev.eww; in final.rustPlatform.buildRustPackage rec { pname = "eww"; - version = "8661abf2bf07f5a809fc995233d93810cc1ac871"; + version = "98c220126d912b935987766f56650b55f3e226eb"; src = prev.fetchFromGitHub { owner = "elkowar"; repo = "eww"; rev = "${version}"; - hash = "sha256-q82u3/pcP5T++TMdDmaeDKYuCyky1Bo5BjHY1/NVHbY="; + hash = "sha256-zi+5G05aakh8GBdfHL1qcNo/15VEm5mXtHGgKMAyp1U="; }; - cargoHash = "sha256-wKTaskKRyPfzKSLxhfyn6DybmUVFMHV5MrixKUBhno4="; + cargoHash = "sha256-SEdr9nW5nBm1g6fjC5fZhqPbHQ7H6Kk0RL1V6OEQRdA="; nativeBuildInputs = old.nativeBuildInputs; buildInputs = old.buildInputs ++ [ final.libdbusmenu-gtk3 ]; diff --git a/overlays/openttd-jgrpp/default.nix b/overlays/openttd-jgrpp/default.nix index 918eef6..b51fbdc 100644 --- a/overlays/openttd-jgrpp/default.nix +++ b/overlays/openttd-jgrpp/default.nix @@ -1,10 +1,10 @@ { final, prev, ... }: prev.openttd-jgrpp.overrideAttrs (old: rec { - version = "0.55.3"; + version = "0.65.3"; src = prev.fetchFromGitHub rec { owner = "JGRennison"; repo = "OpenTTD-patches"; rev = "jgrpp-${version}"; - hash = "sha256-E1+pXpXNHOu9nPTGSY8baVaKf1Um6IGDjpi1MmENez8="; + hash = "sha256-lmDkYrk7qjUSTtCQQCN/pbuLDt3+2RI1K8A1H1GJRjw="; }; })