commit b06c48566e39e1e33f9e461fe6e335e0cf47ce2e
parent 2595de2b8ff9d3023e3ed5ef5b55fc0a62ddf21f
Author: Katja (zaphyra) <git@ctu.cx>
Date: Sat, 24 May 2025 09:45:53 +0200
parent 2595de2b8ff9d3023e3ed5ef5b55fc0a62ddf21f
Author: Katja (zaphyra) <git@ctu.cx>
Date: Sat, 24 May 2025 09:45:53 +0200
flake: update to 25.05
6 files changed, 93 insertions(+), 70 deletions(-)
diff --git a/config/home/katja/programs/gpg.nix b/config/home/katja/programs/gpg.nix @@ -98,7 +98,7 @@ enableSshSupport = true; enableExtraSocket = true; - pinentryPackage = pkgs.pinentry-gnome3; + pinentry.package = pkgs.pinentry-gnome3; defaultCacheTtl = 600; defaultCacheTtlSsh = 600;
diff --git a/config/nixos/modules/gnomeMinimal.nix b/config/nixos/modules/gnomeMinimal.nix @@ -134,11 +134,8 @@ in revert = true; }) - inputs.self.resources.patches.gdm-fix-wayland - # Change hardcoded paths to nix store paths. - (prev.substituteAll { - src = inputs.self.resources.patches.gdm-fix-paths; + (prev.replaceVars inputs.self.resources.patches.gdm-fix-paths { coreutils = final.coreutils; plymouth = final.plymouth; dbus = final.dbus;
diff --git a/config/nixos/modules/programs/shellUtilities.nix b/config/nixos/modules/programs/shellUtilities.nix @@ -37,7 +37,7 @@ in ]; programs = { - # bat.enable = true; + bat.enable = true; direnv.enable = true; nano.enable = true; };
diff --git a/flake.lock b/flake.lock @@ -2,10 +2,7 @@ "nodes": { "crane": { "inputs": { - "nixpkgs": [ - "lanzaboote", - "nixpkgs" - ] + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1717535930, @@ -74,11 +71,11 @@ ] }, "locked": { - "lastModified": 1747274630, - "narHash": "sha256-87RJwXbfOHyzTB9LYagAQ6vOZhszCvd8Gvudu+gf3qo=", + "lastModified": 1747742835, + "narHash": "sha256-kYL4GCwwznsypvsnA20oyvW8zB/Dvn6K5G/tgMjVMT4=", "owner": "nix-community", "repo": "disko", - "rev": "ec7c109a4f794fce09aad87239eab7f66540b888", + "rev": "df522e787fdffc4f32ed3e1fca9ed0968a384d62", "type": "github" }, "original": { @@ -94,11 +91,11 @@ ] }, "locked": { - "lastModified": 1747274630, - "narHash": "sha256-87RJwXbfOHyzTB9LYagAQ6vOZhszCvd8Gvudu+gf3qo=", + "lastModified": 1747742835, + "narHash": "sha256-kYL4GCwwznsypvsnA20oyvW8zB/Dvn6K5G/tgMjVMT4=", "owner": "nix-community", "repo": "disko", - "rev": "ec7c109a4f794fce09aad87239eab7f66540b888", + "rev": "df522e787fdffc4f32ed3e1fca9ed0968a384d62", "type": "github" }, "original": { @@ -144,6 +141,24 @@ "type": "github" } }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "flakeCompat": { "locked": { "lastModified": 1747046372, @@ -283,16 +298,16 @@ ] }, "locked": { - "lastModified": 1747331121, - "narHash": "sha256-3MmiUN/jOHBHQUnjqzg6qKArc17j2OS6jisEppDY4g8=", + "lastModified": 1747556831, + "narHash": "sha256-Qb84nbYFFk0DzFeqVoHltS2RodAYY5/HZQKE8WnBDsc=", "owner": "nix-community", "repo": "home-manager", - "rev": "1eec32f0efe3b830927989767a9e6ece0d82d608", + "rev": "d0bbd221482c2713cccb80220f3c9d16a6e20a33", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.11", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } @@ -304,11 +319,11 @@ ] }, "locked": { - "lastModified": 1747374689, - "narHash": "sha256-JT/aBZqmK1LbExzwT9cPkvxKc0IC4i6tZKOPjsSWFbI=", + "lastModified": 1747978958, + "narHash": "sha256-pQQnbxWpY3IiZqgelXHIe/OAE/Yv4NSQq7fch7M6nXQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "d2263ce5f4c251c0f7608330e8fdb7d1f01f0667", + "rev": "7419250703fd5eb50e99bdfb07a86671939103ea", "type": "github" }, "original": { @@ -327,9 +342,6 @@ "flake-parts": [ "flakeParts" ], - "flake-utils": [ - "flakeUtils" - ], "nixpkgs": [ "nixpkgs" ], @@ -337,16 +349,16 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1718178907, - "narHash": "sha256-eSZyrQ9uoPB9iPQ8Y5H7gAmAgAvCw3InStmU3oEjqsE=", + "lastModified": 1737639419, + "narHash": "sha256-AEEDktApTEZ5PZXNDkry2YV2k6t0dTgLPEmAZbnigXU=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "b627ccd97d0159214cee5c7db1412b75e4be6086", + "rev": "a65905a09e2c43ff63be8c0e86a93712361f871e", "type": "github" }, "original": { "owner": "nix-community", - "ref": "v0.4.1", + "ref": "v0.4.2", "repo": "lanzaboote", "type": "github" } @@ -354,11 +366,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1747347117, - "narHash": "sha256-wsPOuwczt+kJ4vuf3mm6uMv4wnfWP/RNV5Cp/P5nqQw=", - "rev": "3f355b8fd1ffbe670d756bcf976a38cbe80bb77b", + "lastModified": 1748003224, + "narHash": "sha256-ip8bnJN8+Q4RCCt1lXKXUEwBH8ijk2WCMudiVWmXk4I=", + "rev": "bbc9aaf8a6766daf9b48b7d9f6bb677d35060990", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/3f355b8fd1ffbe670d756bcf976a38cbe80bb77b.tar.gz?rev=3f355b8fd1ffbe670d756bcf976a38cbe80bb77b" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/bbc9aaf8a6766daf9b48b7d9f6bb677d35060990.tar.gz?rev=bbc9aaf8a6766daf9b48b7d9f6bb677d35060990" }, "original": { "type": "tarball", @@ -381,11 +393,11 @@ ] }, "locked": { - "lastModified": 1746839253, - "narHash": "sha256-pRwi8Wn8Yofj459gq+3oIRy8F3SXeEJ6mzfIAUgM9nA=", - "rev": "58baedd53f9da81fd728a4f3b08c378e5ba9ae58", + "lastModified": 1747667424, + "narHash": "sha256-7EICjbmG6lApWKhFtwvZovdcdORY1CEe6/K7JwtpYfs=", + "rev": "3c23c6ae2aecc1f76ae7993efe1a78b5316f0700", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/58baedd53f9da81fd728a4f3b08c378e5ba9ae58.tar.gz?rev=58baedd53f9da81fd728a4f3b08c378e5ba9ae58" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/3c23c6ae2aecc1f76ae7993efe1a78b5316f0700.tar.gz?rev=3c23c6ae2aecc1f76ae7993efe1a78b5316f0700" }, "original": { "type": "tarball", @@ -424,16 +436,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1747209494, - "narHash": "sha256-fLise+ys+bpyjuUUkbwqo5W/UyIELvRz9lPBPoB0fbM=", + "lastModified": 1747958103, + "narHash": "sha256-qmmFCrfBwSHoWw7cVK4Aj+fns+c54EBP8cGqp/yK410=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5d736263df906c5da72ab0f372427814de2f52f8", + "rev": "fe51d34885f7b5e3e7b59572796e1bcb427eccb1", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -456,11 +468,11 @@ }, "nixpkgsUnstable": { "locked": { - "lastModified": 1747312588, - "narHash": "sha256-MmJvj6mlWzeRwKGLcwmZpKaOPZ5nJb/6al5CXqJsgjo=", + "lastModified": 1747958103, + "narHash": "sha256-qmmFCrfBwSHoWw7cVK4Aj+fns+c54EBP8cGqp/yK410=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b1bebd0fe266bbd1820019612ead889e96a8fa2d", + "rev": "fe51d34885f7b5e3e7b59572796e1bcb427eccb1", "type": "github" }, "original": { @@ -470,6 +482,22 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1747953325, + "narHash": "sha256-y2ZtlIlNTuVJUZCqzZAhIw5rrKP4DOSklev6c8PyCkQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "55d1f923c480dadce40f5231feb472e81b0bab48", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, "pre-commit-hooks-nix": { "inputs": { "flake-compat": [ @@ -518,7 +546,7 @@ "lixModule": "lixModule", "nixStd": "nixStd", "nixSystemsDefault": "nixSystemsDefault", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixpkgsUnstable": "nixpkgsUnstable", "sopsNix": "sopsNix", "stagit": "stagit" @@ -526,10 +554,7 @@ }, "rust-overlay": { "inputs": { - "flake-utils": [ - "lanzaboote", - "flake-utils" - ], + "flake-utils": "flake-utils", "nixpkgs": [ "lanzaboote", "nixpkgs" @@ -556,11 +581,11 @@ ] }, "locked": { - "lastModified": 1746485181, - "narHash": "sha256-PxrrSFLaC7YuItShxmYbMgSuFFuwxBB+qsl9BZUnRvg=", + "lastModified": 1747603214, + "narHash": "sha256-lAblXm0VwifYCJ/ILPXJwlz0qNY07DDYdLD+9H+Wc8o=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e93ee1d900ad264d65e9701a5c6f895683433386", + "rev": "8d215e1c981be3aa37e47aeabd4e61bb069548fd", "type": "github" }, "original": { @@ -588,6 +613,21 @@ "type": "git", "url": "https://git.zaphyra.eu/stagit" } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root",
diff --git a/flake.nix b/flake.nix @@ -136,7 +136,7 @@ flakeParts.inputs.nixpkgs-lib.follows = "nixpkgs"; # nixpkgs - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; nixpkgsUnstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; nixStd.url = "github:chessai/nix-std"; @@ -156,16 +156,15 @@ diskoUnstable.url = "github:nix-community/disko"; diskoUnstable.inputs.nixpkgs.follows = "nixpkgsUnstable"; - homeManager.url = "github:nix-community/home-manager/release-24.11"; + homeManager.url = "github:nix-community/home-manager/release-25.05"; homeManager.inputs.nixpkgs.follows = "nixpkgs"; homeManagerUnstable.url = "github:nix-community/home-manager/master"; homeManagerUnstable.inputs.nixpkgs.follows = "nixpkgsUnstable"; - lanzaboote.url = "github:nix-community/lanzaboote/v0.4.1"; + lanzaboote.url = "github:nix-community/lanzaboote/v0.4.2"; lanzaboote.inputs.nixpkgs.follows = "nixpkgs"; lanzaboote.inputs.flake-parts.follows = "flakeParts"; - lanzaboote.inputs.flake-utils.follows = "flakeUtils"; lanzaboote.inputs.flake-compat.follows = "flakeCompat"; lix.url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz";
diff --git a/resources/patches/gdm-fix-wayland.patch b/resources/patches/gdm-fix-wayland.patch @@ -1,13 +0,0 @@ ---- a/daemon/gdm-local-display-factory.c 2024-11-05 19:24:43.441435388 +0100 -+++ b/daemon/gdm-local-display-factory.c 2024-11-05 19:26:39.455865220 +0100 -@@ -289,8 +289,10 @@ - return FALSE; - #endif - -+#ifdef ENABLE_X11_SUPPORT - if (!g_file_test (binary, G_FILE_TEST_IS_EXECUTABLE)) - return FALSE; -+#endif - - return TRUE; - }