From f179ce7869a18f9fbbb68b0d2ede9905a8fb46cd Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 25 Jun 2025 19:22:16 -0700 Subject: [PATCH] 25.05 --- deploy.sh | 2 +- etcnixos/common.nix | 6 +-- flake.lock | 125 ++++--------------------------------------- flake.nix | 10 +--- home-manager/gui.nix | 2 +- 5 files changed, 15 insertions(+), 130 deletions(-) diff --git a/deploy.sh b/deploy.sh index c7fa778..76a0e9a 100755 --- a/deploy.sh +++ b/deploy.sh @@ -5,4 +5,4 @@ if [ "$ARG" = "" ]; then ARG="boot" fi -nixos-rebuild "$ARG" --flake . --sudo +nixos-rebuild "$ARG" --flake . --use-remote-sudo diff --git a/etcnixos/common.nix b/etcnixos/common.nix index 96c17cf..511cd92 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -16,7 +16,6 @@ ./networking.nix inputs.nixos-hardware.nixosModules.common-pc-ssd - inputs.chaotic.nixosModules.default inputs.disko.nixosModules.disko inputs.lanzaboote.nixosModules.lanzaboote ]; @@ -52,8 +51,7 @@ # kernel options boot = { - kernelPackages = pkgs.linuxPackages_cachyos-lto; - # kernelPackages = pkgs.linuxPackages_latest; + kernelPackages = pkgs.linuxPackages_latest; # kernelPackages = pkgs.linuxPackages; lanzaboote = { @@ -234,7 +232,7 @@ ''; }; - system.stateVersion = "25.11"; + system.stateVersion = "25.05"; nixpkgs.hostPlatform = "x86_64-linux"; documentation.enable = true; diff --git a/flake.lock b/flake.lock index 8005e5e..d1a3614 100644 --- a/flake.lock +++ b/flake.lock @@ -1,32 +1,5 @@ { "nodes": { - "chaotic": { - "inputs": { - "flake-schemas": "flake-schemas", - "home-manager": [ - "home-manager" - ], - "jovian": "jovian", - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1750642025, - "narHash": "sha256-ZixZpSMtrf2MFw7Ztg6JUbMRkoxxvDDipQCPqnlCDgE=", - "owner": "chaotic-cx", - "repo": "nyx", - "rev": "2b666bb8aca306397ef6abb68dec67e78680882b", - "type": "github" - }, - "original": { - "owner": "chaotic-cx", - "ref": "nyxpkgs-unstable", - "repo": "nyx", - "type": "github" - } - }, "crane": { "locked": { "lastModified": 1748970125, @@ -123,20 +96,6 @@ "type": "github" } }, - "flake-schemas": { - "locked": { - "lastModified": 1721999734, - "narHash": "sha256-G5CxYeJVm4lcEtaO87LKzOsVnWeTcHGKbKxNamNWgOw=", - "rev": "0a5c42297d870156d9c57d8f99e476b738dcd982", - "revCount": 75, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.5/0190ef2f-61e0-794b-ba14-e82f225e55e6/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.1.5.tar.gz" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -166,41 +125,20 @@ ] }, "locked": { - "lastModified": 1750690749, - "narHash": "sha256-x6fRPeqdgDKVTCyvbp4J8Q5UQ3DV3oWYSoyM444N8cY=", + "lastModified": 1750792728, + "narHash": "sha256-Lh3dopA8DdY+ZoaAJPrtkZOZaFEJGSYjOdAYYgOPgE4=", "owner": "nix-community", "repo": "home-manager", - "rev": "05b8c9506452349d8be854ac46e5a7630fa7917d", + "rev": "366f00797b1efb70f2882d3da485e3c10fd3d557", "type": "github" }, "original": { "owner": "nix-community", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } }, - "jovian": { - "inputs": { - "nix-github-actions": "nix-github-actions", - "nixpkgs": [ - "chaotic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1750403547, - "narHash": "sha256-XDDINMbHTtKQeSRpX5mwq20z23Wg/I/G4JUinA3V8Xg=", - "owner": "Jovian-Experiments", - "repo": "Jovian-NixOS", - "rev": "52b86b86d925ec00c836ecc6d36f9c947bb15736", - "type": "github" - }, - "original": { - "owner": "Jovian-Experiments", - "repo": "Jovian-NixOS", - "type": "github" - } - }, "lanzaboote": { "inputs": { "crane": "crane", @@ -288,29 +226,6 @@ "type": "github" } }, - "nix-github-actions": { - "inputs": { - "nixpkgs": [ - "chaotic", - "jovian", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1729697500, - "narHash": "sha256-VFTWrbzDlZyFHHb1AlKRiD/qqCJIripXKiCSFS8fAOY=", - "owner": "zhaofengli", - "repo": "nix-github-actions", - "rev": "e418aeb728b6aa5ca8c5c71974e7159c2df1d8cf", - "type": "github" - }, - "original": { - "owner": "zhaofengli", - "ref": "matrix-name", - "repo": "nix-github-actions", - "type": "github" - } - }, "nixos-hardware": { "locked": { "lastModified": 1750431636, @@ -329,16 +244,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1750506804, - "narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=", + "lastModified": 1750622754, + "narHash": "sha256-kMhs+YzV4vPGfuTpD3mwzibWUE6jotw5Al2wczI0Pv8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4206c4cb56751df534751b058295ea61357bbbaa", + "rev": "c7ab75210cb8cb16ddd8f290755d9558edde7ee1", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } @@ -371,7 +286,6 @@ }, "root": { "inputs": { - "chaotic": "chaotic", "disko": "disko", "emacs-overlay": "emacs-overlay", "home-manager": "home-manager", @@ -379,32 +293,11 @@ "niri": "niri", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", - "rust-overlay": "rust-overlay_2", + "rust-overlay": "rust-overlay", "zen-browser": "zen-browser" } }, "rust-overlay": { - "inputs": { - "nixpkgs": [ - "chaotic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1750560265, - "narHash": "sha256-jQCojKl1/TzqE6ANOu6rP2qqxOcGK2xs6hpxZ77wrR8=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "076fdb0d45a9de3f379a626f51a62c78afe7efb1", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_2": { "inputs": { "nixpkgs": [ "nixpkgs" diff --git a/flake.nix b/flake.nix index ebde352..3396c36 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "System nixOS flake"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; lanzaboote = { url = "github:nix-community/lanzaboote"; @@ -13,16 +13,10 @@ nixos-hardware.url = "github:NixOS/nixos-hardware/master"; home-manager = { - url = "github:nix-community/home-manager"; + url = "github:nix-community/home-manager/release-25.05"; inputs.nixpkgs.follows = "nixpkgs"; }; - chaotic = { - url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.home-manager.follows = "home-manager"; - }; - disko = { url = "github:nix-community/disko/latest"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home-manager/gui.nix b/home-manager/gui.nix index 5b4d321..cfac791 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -63,7 +63,7 @@ finamp # music player delfin # jellyfin client - signal-desktop + signal-desktop-bin #accounting # gnucash