diff --git a/README.md b/README.md index 020af327..2d7fd359 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Stargazers - + diff --git a/flake.lock b/flake.lock index da257f6f..b3fff81c 100644 --- a/flake.lock +++ b/flake.lock @@ -133,11 +133,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1712105825, - "narHash": "sha256-v3VCRwOE4qaNNLTW8YaGzBxGyQr4BHAbrbUlSDT8lJo=", + "lastModified": 1714638472, + "narHash": "sha256-6x/uskMYjtu/0D6DoudhxaVCEdpDoJHBOihlk+oSk/0=", "owner": "daeuniverse", "repo": "flake.nix", - "rev": "ed270befb65251a6d6ad88403980a5186813464f", + "rev": "0ca155a907fb349e286bc0df96fcdc6c31b08844", "type": "github" }, "original": { @@ -195,15 +195,16 @@ ] }, "locked": { - "lastModified": 1714043827, - "narHash": "sha256-PJbmbf+5z924b/wq7jzEFCUtrOc7s1J+8qRZu3fVAQc=", + "lastModified": 1715070411, + "narHash": "sha256-5CNvkH0Nf7yMwgKhjUNg/lUK40C7DXB4zKOuA2jVO90=", "owner": "nix-community", "repo": "disko", - "rev": "a816daa384dd754b7586f51157fc2e1a44e76073", + "rev": "4677f6c53482a8b01ee93957e3bdd569d51261d6", "type": "github" }, "original": { "owner": "nix-community", + "ref": "v1.6.1", "repo": "disko", "type": "github" } @@ -358,11 +359,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "lastModified": 1717285511, + "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", "type": "github" }, "original": { @@ -445,7 +446,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_8" + "systems": "systems_7" }, "locked": { "lastModified": 1681202837, @@ -463,7 +464,7 @@ }, "flake-utils_6": { "inputs": { - "systems": "systems_9" + "systems": "systems_8" }, "locked": { "lastModified": 1705309234, @@ -481,7 +482,7 @@ }, "flake-utils_7": { "inputs": { - "systems": "systems_10" + "systems": "systems_9" }, "locked": { "lastModified": 1701680307, @@ -499,7 +500,7 @@ }, "flake-utils_8": { "inputs": { - "systems": "systems_11" + "systems": "systems_10" }, "locked": { "lastModified": 1681202837, @@ -515,24 +516,6 @@ "type": "github" } }, - "flake-utils_9": { - "inputs": { - "systems": "systems_12" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -670,23 +653,26 @@ ] }, "locked": { - "lastModified": 1714042918, - "narHash": "sha256-4AItZA3EQIiSNAxliuYEJumw/LaVfrMv84gYyrs0r3U=", + "lastModified": 1716736833, + "narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=", "owner": "nix-community", "repo": "home-manager", - "rev": "0c5704eceefcb7bb238a958f532a86e3b59d76db", + "rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6", "type": "github" }, "original": { "owner": "nix-community", - "ref": "master", + "ref": "release-24.05", "repo": "home-manager", "type": "github" } }, "hyprcursor": { "inputs": { - "hyprlang": "hyprlang", + "hyprlang": [ + "hyprland", + "hyprlang" + ], "nixpkgs": [ "hyprland", "nixpkgs" @@ -714,25 +700,25 @@ "inputs": { "hyprcursor": "hyprcursor", "hyprland-protocols": "hyprland-protocols", - "hyprlang": "hyprlang_2", + "hyprlang": "hyprlang", "nixpkgs": [ "nixpkgs" ], - "systems": "systems_7", + "systems": "systems_6", "wlroots": "wlroots", "xdph": "xdph" }, "locked": { - "lastModified": 1712413453, - "narHash": "sha256-6y422rx8ScSkjR1dNYGYUxBmFewRYlCz9XZZ+XrVZng=", + "lastModified": 1713283263, + "narHash": "sha256-Urb/njWiHYUudXpmK8EKl9Z58esTIG0PxXw5LuM2r5g=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "360ede79d124ffdeebbe8401f1ac4bc0dbec2c91", + "rev": "fe7b748eb668136dd0558b7c8279bfcd7ab4d759", "type": "github" }, "original": { "owner": "hyprwm", - "ref": "v0.38.1", + "ref": "v0.39.1", "repo": "Hyprland", "type": "github" } @@ -763,29 +749,6 @@ } }, "hyprlang": { - "inputs": { - "nixpkgs": [ - "hyprland", - "hyprcursor", - "nixpkgs" - ], - "systems": "systems_6" - }, - "locked": { - "lastModified": 1709914708, - "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprlang_2": { "inputs": { "nixpkgs": [ "hyprland", @@ -861,11 +824,11 @@ "spectrum": "spectrum" }, "locked": { - "lastModified": 1713463636, - "narHash": "sha256-IPdnR0Rs7XoffnCn6rExYDlft/GHD/UFgQ11lTVEK48=", + "lastModified": 1717281900, + "narHash": "sha256-NBwB16qOv8TKaPg62UXfy+RojsDC+DLZPtohUqUyIM4=", "owner": "astro", "repo": "microvm.nix", - "rev": "6a4f822a817180be03fcdceb654088d002c9ec5e", + "rev": "16ec47e1fae62bcc2a76e164b7101152ad98849c", "type": "github" }, "original": { @@ -898,11 +861,11 @@ ] }, "locked": { - "lastModified": 1713946171, - "narHash": "sha256-lc75rgRQLdp4Dzogv5cfqOg6qYc5Rp83oedF2t0kDp8=", + "lastModified": 1716993688, + "narHash": "sha256-vo5k2wQekfeoq/2aleQkBN41dQiQHNTniZeVONWiWLs=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "230a197063de9287128e2c68a7a4b0cd7d0b50a7", + "rev": "c0d5b8c54d6828516c97f6be9f2d00c63a363df4", "type": "github" }, "original": { @@ -938,11 +901,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1713921309, - "narHash": "sha256-9/5xt3019W55Vu8MX9LlaFTFoNd4dwLqwvUEDWjn+KU=", + "lastModified": 1717291091, + "narHash": "sha256-mqIW9h5Nl4gupXMWf/0TOD+D6gTaiQ8dHsYVg5eCq5s=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "a21a6f3321682226e47f7ead4d2eba59a3f63654", + "rev": "26fb5cc81525a6ba2bb7bfd4b6ecd92cc161afdc", "type": "github" }, "original": { @@ -1011,11 +974,11 @@ ] }, "locked": { - "lastModified": 1713783234, - "narHash": "sha256-3yh0nqI1avYUmmtqqTW3EVfwaLE+9ytRWxsA5aWtmyI=", + "lastModified": 1716210724, + "narHash": "sha256-iqQa3omRcHGpWb1ds75jS9ruA5R39FTmAkeR3J+ve1w=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "722b512eb7e6915882f39fff0e4c9dd44f42b77e", + "rev": "d14b286322c7f4f897ca4b1726ce38cb68596c94", "type": "github" }, "original": { @@ -1048,11 +1011,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1713864415, - "narHash": "sha256-/BPDMJEkrsFAFOsQWhwm31wezlgshPFlLBn34KEUdVA=", + "lastModified": 1717248095, + "narHash": "sha256-e8X2eWjAHJQT82AAN+mCI0B68cIDBJpqJ156+VRrFO0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "797f8d8082c7cc3259cba7275c699d4991b09ecc", + "rev": "7b49d3967613d9aacac5b340ef158d493906ba79", "type": "github" }, "original": { @@ -1088,11 +1051,11 @@ "pre-commit-hooks": "pre-commit-hooks_2" }, "locked": { - "lastModified": 1711336411, - "narHash": "sha256-0JZPbUB6LjcRilXhZdtsVHtb0V9Vy1bmVjVoeQAPJhQ=", + "lastModified": 1715737248, + "narHash": "sha256-DFh9cEWypbcitiuQ+pazHrY2z0qq2XYzPFsqZg7oZ5M=", "owner": "ryan4yin", "repo": "nixos-rk3588", - "rev": "349f39dcaafeb41250544bcc066db8668a7762ce", + "rev": "c4fef04d8c124146e6e99138283e0c57b2ad8e29", "type": "github" }, "original": { @@ -1119,16 +1082,16 @@ }, "nixpkgs-darwin": { "locked": { - "lastModified": 1713995372, - "narHash": "sha256-fFE3M0vCoiSwCX02z8VF58jXFRj9enYUSTqjyHAjrds=", + "lastModified": 1717100421, + "narHash": "sha256-T+0Q1QHBDCoa4yBJrY7cG3vDEhqm4PwOLmNI6mzEwVc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dd37924974b9202f8226ed5d74a252a9785aedf8", + "rev": "75000c2cf4422c8a1776284314921ac1289c02c9", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixpkgs-23.11-darwin", + "ref": "nixpkgs-24.05-darwin", "repo": "nixpkgs", "type": "github" } @@ -1153,20 +1116,14 @@ }, "nixpkgs-lib_2": { "locked": { - "dir": "lib", - "lastModified": 1711703276, - "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", - "type": "github" + "lastModified": 1717284937, + "narHash": "sha256-lIbdfCsf8LMFloheeE6N31+BMIeixqyQWbSr2vk79EQ=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" }, "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" } }, "nixpkgs-stable": { @@ -1202,22 +1159,6 @@ } }, "nixpkgs-stable_3": { - "locked": { - "lastModified": 1713828541, - "narHash": "sha256-KtvQeE12MSkCOhvVmnmcZCjnx7t31zWin2XVSDOwBDE=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "b500489fd3cf653eafc075f9362423ad5cdd8676", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_4": { "locked": { "lastModified": 1710695816, "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", @@ -1235,16 +1176,16 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1713895582, - "narHash": "sha256-cfh1hi+6muQMbi9acOlju3V1gl8BEaZBXBR9jQfQi4U=", + "lastModified": 1717258601, + "narHash": "sha256-gMvWwxNTVDcYWEpdW1YXiA3oKaMU4dFkUmUAEo3RNNU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "572af610f6151fd41c212f897c71f7056e3fb518", + "rev": "a66aecff8795337adf83e16be9dd070fab95c341", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixos-unstable-small", "repo": "nixpkgs", "type": "github" } @@ -1283,11 +1224,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1713596654, - "narHash": "sha256-LJbHQQ5aX1LVth2ST+Kkse/DRzgxlVhTL1rxthvyhZc=", + "lastModified": 1717112898, + "narHash": "sha256-7R2ZvOnvd9h8fDd65p0JnB7wXfUvreox3xFdYWd1BnY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fd16bb6d3bcca96039b11aa52038fafeb6e4f4be", + "rev": "6132b0f6e344ce2fe34fc051b72fb46e34f668e0", "type": "github" }, "original": { @@ -1331,16 +1272,16 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1713895582, - "narHash": "sha256-cfh1hi+6muQMbi9acOlju3V1gl8BEaZBXBR9jQfQi4U=", + "lastModified": 1717144377, + "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "572af610f6151fd41c212f897c71f7056e3fb518", + "rev": "805a384895c696f802a9bf5bf4720f37385df547", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } @@ -1381,11 +1322,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1712063232, - "narHash": "sha256-L4bq1b79DzovEMt6Hvsb//G0r/ysWklXSfsbiDZ8bjY=", + "lastModified": 1714761851, + "narHash": "sha256-I0xDxQddlCT+R+YkLxg6eRSceFSCQFz8RL1clqKkr0g=", "owner": "DeterminateSystems", "repo": "nuenv", - "rev": "2162f67a6decb952954868d0188ccb6cc5886f7e", + "rev": "970bfd5321a5ff55135993f956aa7ad445778151", "type": "github" }, "original": { @@ -1399,11 +1340,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1705366605, - "narHash": "sha256-dtqRDMUIHENtk+phT2ZlMpvjwoL/NSqooYUHGzbTYAI=", + "lastModified": 1716254884, + "narHash": "sha256-hD81HKsakexq9d1au5bUr7zdt+hl2WphQfJzzZl1Z1I=", "owner": "ryan4yin", "repo": "nur-packages", - "rev": "5d78b74e08398b02344edd462c1cf95febab841e", + "rev": "91884156a05dca68fb2b30883af819c39a6ac910", "type": "github" }, "original": { @@ -1437,11 +1378,11 @@ "polybar-themes": { "flake": false, "locked": { - "lastModified": 1710946857, - "narHash": "sha256-jaXlCuw8Wg6lOdUpFw7CTRCBSSXeXF6bG+50Snq9Gvo=", + "lastModified": 1716044464, + "narHash": "sha256-n5UcGHU/DQYezIma9w3zAQ2QZ7q6TmnbWYghT0EIETU=", "owner": "adi1090x", "repo": "polybar-themes", - "rev": "adb6a4546a8351a469fa779df173e46b69aa1ac3", + "rev": "ebfc6eabdf68e9af0f160dc88df20e7a8813d3dd", "type": "github" }, "original": { @@ -1542,19 +1483,18 @@ "pre-commit-hooks_3": { "inputs": { "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_9", "gitignore": "gitignore_4", "nixpkgs": [ "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_4" + "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1713954846, - "narHash": "sha256-RWFafuSb5nkWGu8dDbW7gVb8FOQOPqmX/9MlxUUDguw=", + "lastModified": 1716213921, + "narHash": "sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "6fb82e44254d6a0ece014ec423cb62d92435336f", + "rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0", "type": "github" }, "original": { @@ -1585,7 +1525,6 @@ "nixos-rk3588": "nixos-rk3588", "nixpkgs": "nixpkgs_7", "nixpkgs-darwin": "nixpkgs-darwin", - "nixpkgs-stable": "nixpkgs-stable_3", "nixpkgs-unstable": "nixpkgs-unstable", "nuenv": "nuenv", "nur-ryan4yin": "nur-ryan4yin", @@ -1712,36 +1651,6 @@ "type": "github" } }, - "systems_11": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_12": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -1819,16 +1728,16 @@ }, "systems_7": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -1903,20 +1812,18 @@ "wlroots": { "flake": false, "locked": { - "host": "gitlab.freedesktop.org", - "lastModified": 1709983277, - "narHash": "sha256-wXWIJLd4F2JZeMaihWVDW/yYXCLEC8OpeNJZg9a9ly8=", - "owner": "wlroots", - "repo": "wlroots", - "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b", - "type": "gitlab" + "lastModified": 1713124002, + "narHash": "sha256-vPeZCY+sdiGsz4fl3AVVujfyZyQBz6+vZdkUE4hQ+HI=", + "owner": "hyprwm", + "repo": "wlroots-hyprland", + "rev": "611a4f24cd2384378f6e500253983107c6656c64", + "type": "github" }, "original": { - "host": "gitlab.freedesktop.org", - "owner": "wlroots", - "repo": "wlroots", - "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b", - "type": "gitlab" + "owner": "hyprwm", + "repo": "wlroots-hyprland", + "rev": "611a4f24cd2384378f6e500253983107c6656c64", + "type": "github" } }, "xdph": { diff --git a/flake.nix b/flake.nix index b5a0c038..f04dba31 100644 --- a/flake.nix +++ b/flake.nix @@ -36,12 +36,12 @@ # which represents the GitHub repository URL + branch/commit-id/tag. # Official NixOS package source, using nixos's unstable branch by default - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; - nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; + nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable-small"; + # nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.05"; # for macos - nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-23.11-darwin"; + nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-24.05-darwin"; nix-darwin = { url = "github:lnl7/nix-darwin"; inputs.nixpkgs.follows = "nixpkgs-darwin"; @@ -50,8 +50,8 @@ # home-manager, used for managing user configuration home-manager = { - # url = "github:nix-community/home-manager/release-23.11"; - url = "github:nix-community/home-manager/master"; + url = "github:nix-community/home-manager/release-24.05"; + # url = "github:nix-community/home-manager/master"; # The `follows` keyword in inputs is used for inheritance. # Here, `inputs.nixpkgs` of home-manager is kept consistent with the `inputs.nixpkgs` of the current flake, @@ -67,7 +67,7 @@ impermanence.url = "github:nix-community/impermanence"; hyprland = { - url = "github:hyprwm/Hyprland/v0.38.1"; + url = "github:hyprwm/Hyprland/v0.39.1"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -96,7 +96,7 @@ nix-gaming.url = "github:fufexan/nix-gaming"; disko = { - url = "github:nix-community/disko"; + url = "github:nix-community/disko/v1.6.1"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/home/base/gui/dev-tools.nix b/home/base/gui/dev-tools.nix index 35c95b8f..6597c15c 100644 --- a/home/base/gui/dev-tools.nix +++ b/home/base/gui/dev-tools.nix @@ -1,8 +1,5 @@ {pkgs, ...}: { home.packages = with pkgs; [ - # db related - dbeaver - mitmproxy # http/https proxy tool insomnia # REST client wireshark # network analyzer diff --git a/home/base/gui/terminal/README.md b/home/base/gui/terminal/README.md index 5ae5f616..0292da3a 100644 --- a/home/base/gui/terminal/README.md +++ b/home/base/gui/terminal/README.md @@ -54,7 +54,7 @@ Error opening terminal: xterm-kitty. NixOS preserve the `TERMINFO` and `TERMINFO_DIRS` environment variables, for `root` and the `wheel` group: -[nixpkgs/nixos/modules/config/terminfo.nix](https://github.com/NixOS/nixpkgs/blob/nixos-23.11/nixos/modules/config/terminfo.nix#L18) +[nixpkgs/nixos/modules/config/terminfo.nix](https://github.com/NixOS/nixpkgs/blob/nixos-24.05/nixos/modules/config/terminfo.nix#L18) For nix-darwin, take a look at diff --git a/home/base/home.nix b/home/base/home.nix index 68c0284d..1375d4b6 100644 --- a/home/base/home.nix +++ b/home/base/home.nix @@ -12,7 +12,7 @@ # You can update Home Manager without changing this value. See # the Home Manager release notes for a list of state version # changes in each release. - stateVersion = "23.11"; + stateVersion = "24.05"; }; # Let Home Manager install and manage itself. diff --git a/home/base/tui/dev-tools.nix b/home/base/tui/dev-tools.nix index c625fabb..797d8a4d 100644 --- a/home/base/tui/dev-tools.nix +++ b/home/base/tui/dev-tools.nix @@ -18,8 +18,8 @@ colmena # nixos's remote deployment tool # db related - mycli - pgcli + pkgs-unstable.mycli + pkgs-unstable.pgcli mongosh sqlite @@ -27,7 +27,7 @@ minicom # ai related - python311Packages.huggingface-hub # huggingface-cli + pkgs-unstable.python312Packages.huggingface-hub # huggingface-cli # misc pkgs-unstable.devbox diff --git a/home/base/tui/editors/packages.nix b/home/base/tui/editors/packages.nix index 16c7f3bd..91135aa3 100644 --- a/home/base/tui/editors/packages.nix +++ b/home/base/tui/editors/packages.nix @@ -25,7 +25,7 @@ with ps; [ ruff-lsp black # python formatter - debugpy + # debugpy # my commonly used python packages jupyter @@ -37,13 +37,13 @@ boto3 ## emacs's lsp-bridge dependenciesge - epc - orjson - sexpdata - six - setuptools - paramiko - rapidfuzz + # epc + # orjson + # sexpdata + # six + # setuptools + # paramiko + # rapidfuzz ] )) diff --git a/home/linux/gui/base/creative.nix b/home/linux/gui/base/creative.nix index 9abeffff..a9d319cf 100644 --- a/home/linux/gui/base/creative.nix +++ b/home/linux/gui/base/creative.nix @@ -19,7 +19,7 @@ # kicad # 3d printing, eletrical engineering # fpga - pkgs-unstable.python311Packages.apycula # gowin fpga + pkgs-unstable.python312Packages.apycula # gowin fpga pkgs-unstable.yosys # fpga synthesis pkgs-unstable.nextpnr # fpga place and route pkgs-unstable.openfpgaloader # fpga programming diff --git a/hosts/12kingdoms-rakushun/default.nix b/hosts/12kingdoms-rakushun/default.nix index 00fc3500..53fcffb4 100644 --- a/hosts/12kingdoms-rakushun/default.nix +++ b/hosts/12kingdoms-rakushun/default.nix @@ -34,5 +34,5 @@ in { # this value at the release version of the first install of this system. # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "23.11"; # Did you read the comment? + system.stateVersion = "24.05"; # Did you read the comment? } diff --git a/hosts/12kingdoms-rakushun/gitea.nix b/hosts/12kingdoms-rakushun/gitea.nix index 884bf918..3b920dfd 100644 --- a/hosts/12kingdoms-rakushun/gitea.nix +++ b/hosts/12kingdoms-rakushun/gitea.nix @@ -1,6 +1,6 @@ {pkgs, ...}: let in { - # https://github.com/NixOS/nixpkgs/blob/nixos-23.11/nixos/modules/services/misc/gitea.nix + # https://github.com/NixOS/nixpkgs/blob/nixos-24.05/nixos/modules/services/misc/gitea.nix services.gitea = { enable = true; user = "gitea"; diff --git a/hosts/12kingdoms-rakushun/oci-containers/dashy/default.nix b/hosts/12kingdoms-rakushun/oci-containers/dashy/default.nix index e05f9ae1..470cd6ff 100644 --- a/hosts/12kingdoms-rakushun/oci-containers/dashy/default.nix +++ b/hosts/12kingdoms-rakushun/oci-containers/dashy/default.nix @@ -6,7 +6,7 @@ # install -Dm 600 ${./dashy_conf.yml} /etc/dashy/dashy_conf.yml # ''; # - # # https://github.com/NixOS/nixpkgs/blob/nixos-23.11/nixos/modules/virtualisation/oci-containers.nix + # # https://github.com/NixOS/nixpkgs/blob/nixos-24.05/nixos/modules/virtualisation/oci-containers.nix # virtualisation.oci-containers.containers = { # # check its logs via `journalctl -u podman-dashy` # dashy = { diff --git a/hosts/12kingdoms-rakushun/proxy.nix b/hosts/12kingdoms-rakushun/proxy.nix index 4e1df7e2..c2348616 100644 --- a/hosts/12kingdoms-rakushun/proxy.nix +++ b/hosts/12kingdoms-rakushun/proxy.nix @@ -78,7 +78,7 @@ }; }; - # https://github.com/NixOS/nixpkgs/blob/nixos-23.11/nixos/modules/services/monitoring/prometheus/exporters/v2ray.nix + # https://github.com/NixOS/nixpkgs/blob/nixos-24.05/nixos/modules/services/monitoring/prometheus/exporters/v2ray.nix # https://github.com/wi1dcard/v2ray-exporter services.prometheus.exporters.v2ray = { enable = true; diff --git a/hosts/12kingdoms-rakushun/restic.nix b/hosts/12kingdoms-rakushun/restic.nix index 77197875..abf8bb4c 100644 --- a/hosts/12kingdoms-rakushun/restic.nix +++ b/hosts/12kingdoms-rakushun/restic.nix @@ -3,7 +3,7 @@ sshKeyPath = "/etc/agenix/ssh-key-for-restic-backup"; rcloneConfigFile = "/etc/agenix/rclone-conf-for-restic-backup"; in { - # https://github.com/NixOS/nixpkgs/blob/nixos-23.11/nixos/modules/services/backup/restic.nix + # https://github.com/NixOS/nixpkgs/blob/nixos-24.05/nixos/modules/services/backup/restic.nix services.restic.backups = { homelab-backup = { inherit passwordFile; diff --git a/hosts/12kingdoms-rakushun/transmission.nix b/hosts/12kingdoms-rakushun/transmission.nix index b2fa1649..ea58eefc 100644 --- a/hosts/12kingdoms-rakushun/transmission.nix +++ b/hosts/12kingdoms-rakushun/transmission.nix @@ -7,7 +7,7 @@ name = "transmission"; in { # the headless Transmission BitTorrent daemon - # https://github.com/NixOS/nixpkgs/blob/nixos-23.11/nixos/modules/services/torrent/transmission.nix + # https://github.com/NixOS/nixpkgs/blob/nixos-24.05/nixos/modules/services/torrent/transmission.nix # https://wiki.archlinux.org/title/transmission services.transmission = { enable = true; @@ -81,7 +81,7 @@ in { lpd-enabled = true; # The peer port to listen for incoming connections. peer-port = 51413; - # Enable UPnP or NAT-PMP to forward a port through your firewall(NAT). + # Enable UOnP or NAT-PMP to forward a port through your firewall(NAT). # https://github.com/transmission/transmission/blob/main/docs/Port-Forwarding-Guide.md port-forwarding-enabled = true; diff --git a/hosts/12kingdoms-rakushun/uptime-kuma.nix b/hosts/12kingdoms-rakushun/uptime-kuma.nix index bc9b7039..825bb1be 100644 --- a/hosts/12kingdoms-rakushun/uptime-kuma.nix +++ b/hosts/12kingdoms-rakushun/uptime-kuma.nix @@ -1,5 +1,5 @@ { - # https://github.com/NixOS/nixpkgs/blob/nixos-23.11/nixos/modules/services/monitoring/uptime-kuma.nix + # https://github.com/NixOS/nixpkgs/blob/nixos-24.05/nixos/modules/services/monitoring/uptime-kuma.nix services.uptime-kuma = { enable = true; # https://github.com/louislam/uptime-kuma/wiki/Environment-Variables diff --git a/hosts/12kingdoms-shoukei/brcm-firmware/flake.lock b/hosts/12kingdoms-shoukei/brcm-firmware/flake.lock index 5e0824ec..19a480ab 100644 --- a/hosts/12kingdoms-shoukei/brcm-firmware/flake.lock +++ b/hosts/12kingdoms-shoukei/brcm-firmware/flake.lock @@ -11,7 +11,7 @@ }, "original": { "owner": "nixos", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } diff --git a/hosts/12kingdoms-shoukei/brcm-firmware/flake.nix b/hosts/12kingdoms-shoukei/brcm-firmware/flake.nix index a2c58def..d397aa27 100644 --- a/hosts/12kingdoms-shoukei/brcm-firmware/flake.nix +++ b/hosts/12kingdoms-shoukei/brcm-firmware/flake.nix @@ -1,6 +1,6 @@ { # a flake for testing - inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; + inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; outputs = {nixpkgs, ...}: let system = "x86_64-linux"; pkgs = import nixpkgs {inherit system;}; diff --git a/hosts/12kingdoms-shoukei/default.nix b/hosts/12kingdoms-shoukei/default.nix index c93a5028..76f6787f 100644 --- a/hosts/12kingdoms-shoukei/default.nix +++ b/hosts/12kingdoms-shoukei/default.nix @@ -38,5 +38,5 @@ in { # this value at the release version of the first install of this system. # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "23.11"; # Did you read the comment? + system.stateVersion = "24.05"; # Did you read the comment? } diff --git a/hosts/12kingdoms-suzu/default.nix b/hosts/12kingdoms-suzu/default.nix index d165b0ca..feddfa81 100644 --- a/hosts/12kingdoms-suzu/default.nix +++ b/hosts/12kingdoms-suzu/default.nix @@ -30,5 +30,5 @@ in { # this value at the release version of the first install of this system. # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "23.11"; # Did you read the comment? + system.stateVersion = "24.05"; # Did you read the comment? } diff --git a/hosts/12kingdoms-suzu/microvm/mitsuha/default.nix b/hosts/12kingdoms-suzu/microvm/mitsuha/default.nix index 8e54f883..4a9414d6 100644 --- a/hosts/12kingdoms-suzu/microvm/mitsuha/default.nix +++ b/hosts/12kingdoms-suzu/microvm/mitsuha/default.nix @@ -63,5 +63,5 @@ socket = "control.socket"; }; - system.stateVersion = "23.11"; + system.stateVersion = "24.05"; } diff --git a/hosts/12kingdoms-suzu/microvm/mitsuha/tailscale.nix b/hosts/12kingdoms-suzu/microvm/mitsuha/tailscale.nix index 0156e442..359d1148 100644 --- a/hosts/12kingdoms-suzu/microvm/mitsuha/tailscale.nix +++ b/hosts/12kingdoms-suzu/microvm/mitsuha/tailscale.nix @@ -21,7 +21,7 @@ # which is already persistent across reboots(via impermanence.nix) # # References: -# https://github.com/NixOS/nixpkgs/blob/nixos-23.11/nixos/modules/services/networking/tailscale.nix +# https://github.com/NixOS/nixpkgs/blob/nixos-24.05/nixos/modules/services/networking/tailscale.nix # # ============================================================= { diff --git a/hosts/12kingdoms-suzu/microvm/suzi/default.nix b/hosts/12kingdoms-suzu/microvm/suzi/default.nix index e817d330..67e9eee0 100644 --- a/hosts/12kingdoms-suzu/microvm/suzi/default.nix +++ b/hosts/12kingdoms-suzu/microvm/suzi/default.nix @@ -66,5 +66,5 @@ socket = "control.socket"; }; - system.stateVersion = "23.11"; + system.stateVersion = "24.05"; } diff --git a/hosts/12kingdoms-suzu/microvm/suzi/networking.nix b/hosts/12kingdoms-suzu/microvm/suzi/networking.nix index a7ff90e9..1bbc922b 100644 --- a/hosts/12kingdoms-suzu/microvm/suzi/networking.nix +++ b/hosts/12kingdoms-suzu/microvm/suzi/networking.nix @@ -37,7 +37,7 @@ in { nat.enable = false; firewall.enable = false; - # https://github.com/NixOS/nixpkgs/blob/nixos-23.11/nixos/modules/services/networking/nftables.nix + # https://github.com/NixOS/nixpkgs/blob/nixos-24.05/nixos/modules/services/networking/nftables.nix nftables = { enable = true; # Check the applied rules with `nft -a list ruleset`. @@ -164,7 +164,7 @@ in { }; # monitoring with prometheus - # https://github.com/NixOS/nixpkgs/blob/nixos-23.11/nixos/modules/services/monitoring/prometheus/exporters/dnsmasq.nix + # https://github.com/NixOS/nixpkgs/blob/nixos-24.05/nixos/modules/services/monitoring/prometheus/exporters/dnsmasq.nix services.prometheus.exporters.dnsmasq = { enable = true; listenAddress = "0.0.0.0"; diff --git a/hosts/idols-ai/default.nix b/hosts/idols-ai/default.nix index 280d9278..3748966d 100644 --- a/hosts/idols-ai/default.nix +++ b/hosts/idols-ai/default.nix @@ -55,5 +55,5 @@ in { # this value at the release version of the first install of this system. # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "23.11"; # Did you read the comment? + system.stateVersion = "24.05"; # Did you read the comment? } diff --git a/hosts/idols-aquamarine/default.nix b/hosts/idols-aquamarine/default.nix index 9ee46cc8..7b0d4a91 100644 --- a/hosts/idols-aquamarine/default.nix +++ b/hosts/idols-aquamarine/default.nix @@ -34,5 +34,5 @@ in { # this value at the release version of the first install of this system. # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "23.11"; # Did you read the comment? + system.stateVersion = "24.05"; # Did you read the comment? } diff --git a/hosts/idols-kana/default.nix b/hosts/idols-kana/default.nix index d227ae8a..aecd875e 100644 --- a/hosts/idols-kana/default.nix +++ b/hosts/idols-kana/default.nix @@ -41,5 +41,5 @@ in { # this value at the release version of the first install of this system. # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "23.11"; # Did you read the comment? + system.stateVersion = "24.05"; # Did you read the comment? } diff --git a/hosts/idols-ruby/default.nix b/hosts/idols-ruby/default.nix index 72effb0b..456ef97d 100644 --- a/hosts/idols-ruby/default.nix +++ b/hosts/idols-ruby/default.nix @@ -43,5 +43,5 @@ in { # this value at the release version of the first install of this system. # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "23.11"; # Did you read the comment? + system.stateVersion = "24.05"; # Did you read the comment? } diff --git a/lib/genKubeVirtGuestModule.nix b/lib/genKubeVirtGuestModule.nix index 24b73b5d..bf180f5e 100644 --- a/lib/genKubeVirtGuestModule.nix +++ b/lib/genKubeVirtGuestModule.nix @@ -40,5 +40,5 @@ in { # this value at the release version of the first install of this system. # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "23.11"; # Did you read the comment? + system.stateVersion = "24.05"; # Did you read the comment? } diff --git a/lib/genKubeVirtHostModule.nix b/lib/genKubeVirtHostModule.nix index 9a7e3484..58c16037 100644 --- a/lib/genKubeVirtHostModule.nix +++ b/lib/genKubeVirtHostModule.nix @@ -99,5 +99,5 @@ in { # this value at the release version of the first install of this system. # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "23.11"; # Did you read the comment? + system.stateVersion = "24.05"; # Did you read the comment? } diff --git a/lib/macosSystem.nix b/lib/macosSystem.nix index e69cb415..ef17b47a 100644 --- a/lib/macosSystem.nix +++ b/lib/macosSystem.nix @@ -9,7 +9,7 @@ specialArgs ? (genSpecialArgs system), ... }: let - inherit (inputs) nixpkgs home-manager nix-darwin; + inherit (inputs) nixpkgs-darwin home-manager nix-darwin; in nix-darwin.lib.darwinSystem { inherit system specialArgs; @@ -17,7 +17,7 @@ in darwin-modules ++ [ ({lib, ...}: { - nixpkgs.pkgs = import nixpkgs {inherit system;}; + nixpkgs.pkgs = import nixpkgs-darwin {inherit system;}; }) ] ++ ( diff --git a/modules/base.nix b/modules/base.nix index 7b91321e..73fa508e 100644 --- a/modules/base.nix +++ b/modules/base.nix @@ -17,7 +17,7 @@ # auto upgrade nix to the unstable version # https://github.com/NixOS/nixpkgs/blob/nixos-unstable/pkgs/tools/package-management/nix/default.nix#L284 - nix.package = pkgs.nixVersions.unstable; + nix.package = pkgs.nixVersions.latest; environment.systemPackages = with pkgs; [ git # used by nix flakes diff --git a/modules/darwin/system.nix b/modules/darwin/system.nix index f3c2fd92..f9296ccc 100644 --- a/modules/darwin/system.nix +++ b/modules/darwin/system.nix @@ -13,7 +13,7 @@ # 1. To avoid conflicts with neovim, disable ctrl + up/down/left/right to switch spaces in: # [System Preferences] -> [Keyboard] -> [Keyboard Shortcuts] -> [Mission Control] # 2. Disable use Caps Lock as 中/英 switch in: -# [System Preferences] -> [Keyboard] -> [Input Sources] -> [Edit] -> [Use 中/英 key to switch ] -> [Disble] +# [System Preferences] -> [Keyboard] -> [Input Sources] -> [Edit] -> [Use 中/英 key to switch ] -> [Disable] ################################################################################### { # Add ability to used TouchID for sudo authentication @@ -118,7 +118,7 @@ DSDontWriteUSBStores = true; }; "com.apple.spaces" = { - "spans-displays" = 0; # Display have seperate spaces + "spans-displays" = 0; # Display have separate spaces }; "com.apple.WindowManager" = { EnableStandardClickToShowDesktop = 0; # Click wallpaper to reveal desktop @@ -202,7 +202,7 @@ source-han-serif # 思源宋体 # nerdfonts - # https://github.com/NixOS/nixpkgs/blob/nixos-23.11/pkgs/data/fonts/nerdfonts/shas.nix + # https://github.com/NixOS/nixpkgs/blob/nixos-24.05/pkgs/data/fonts/nerdfonts/shas.nix (nerdfonts.override { fonts = [ # symbols icon only diff --git a/modules/darwin/wm/yabai.nix b/modules/darwin/wm/yabai.nix index 8ea7e22e..1eee6e1c 100644 --- a/modules/darwin/wm/yabai.nix +++ b/modules/darwin/wm/yabai.nix @@ -1,34 +1,13 @@ { - pkgs, config, - lib, myvars, - pkgs-unstable, ... }: let homeDir = config.users.users."${myvars.username}".home; in { - # https://github.com/NixOS/nixpkgs/blob/nixos-unstable/pkgs/os-specific/darwin/yabai/default.nix + # https://github.com/NixOS/nixpkgs/blob/nixos-unstable/pkgs/by-name/ya/yabai/package.nix services.yabai = { enable = true; - # temporary workaround for https://github.com/ryan4yin/nix-config/issues/51 - package = pkgs-unstable.yabai.overrideAttrs (oldAttrs: rec { - version = "6.0.7"; - src = - if pkgs.stdenv.isAarch64 - then - (pkgs.fetchzip { - url = "https://github.com/koekeishiya/yabai/releases/download/v${version}/yabai-v${version}.tar.gz"; - hash = "sha256-hZMBXSCiTlx/37jt2yLquCQ8AZ2LS3heIFPKolLub1c="; - }) - else - (pkgs.fetchFromGitHub { - owner = "koekeishiya"; - repo = "yabai"; - rev = "v${version}"; - hash = "sha256-vWL2KA+Rhj78I2J1kGItJK+OdvhVo1ts0NoOHIK65Hg="; - }); - }); # Whether to enable yabai's scripting-addition. # SIP must be disabled for this to work. diff --git a/modules/nixos/base/monitoring.nix b/modules/nixos/base/monitoring.nix index 2048fac2..591d3ede 100644 --- a/modules/nixos/base/monitoring.nix +++ b/modules/nixos/base/monitoring.nix @@ -1,6 +1,6 @@ { # enable the node exporter on all nixos hosts - # https://github.com/NixOS/nixpkgs/blob/nixos-23.11/nixos/modules/services/monitoring/prometheus/exporters/node.nix + # https://github.com/NixOS/nixpkgs/blob/nixos-24.05/nixos/modules/services/monitoring/prometheus/exporters/node.nix services.prometheus.exporters.node = { enable = true; listenAddress = "0.0.0.0"; diff --git a/modules/nixos/base/ssh.nix b/modules/nixos/base/ssh.nix index d8d38a30..2dd09970 100644 --- a/modules/nixos/base/ssh.nix +++ b/modules/nixos/base/ssh.nix @@ -23,6 +23,6 @@ }; # Add terminfo database of all known terminals to the system profile. - # https://github.com/NixOS/nixpkgs/blob/nixos-23.11/nixos/modules/config/terminfo.nix + # https://github.com/NixOS/nixpkgs/blob/nixos-24.05/nixos/modules/config/terminfo.nix environment.enableAllTerminfo = true; } diff --git a/modules/nixos/desktop/fonts.nix b/modules/nixos/desktop/fonts.nix index ae57db3b..4bbb4090 100644 --- a/modules/nixos/desktop/fonts.nix +++ b/modules/nixos/desktop/fonts.nix @@ -25,7 +25,7 @@ source-han-serif # 思源宋体 # nerdfonts - # https://github.com/NixOS/nixpkgs/blob/nixos-23.11/pkgs/data/fonts/nerdfonts/shas.nix + # https://github.com/NixOS/nixpkgs/blob/nixos-24.05/pkgs/data/fonts/nerdfonts/shas.nix (nerdfonts.override { fonts = [ # symbols icon only diff --git a/modules/nixos/desktop/remote-desktop/tailscale.nix b/modules/nixos/desktop/remote-desktop/tailscale.nix index dff4ba55..020dfb91 100644 --- a/modules/nixos/desktop/remote-desktop/tailscale.nix +++ b/modules/nixos/desktop/remote-desktop/tailscale.nix @@ -25,7 +25,7 @@ # which is already persistent across reboots(via impermanence.nix) # # References: -# https://github.com/NixOS/nixpkgs/blob/nixos-23.11/nixos/modules/services/networking/tailscale.nix +# https://github.com/NixOS/nixpkgs/blob/nixos-24.05/nixos/modules/services/networking/tailscale.nix # # ============================================================= { diff --git a/nixos-installer/configuration.nix b/nixos-installer/configuration.nix index e810c34e..22212b01 100644 --- a/nixos-installer/configuration.nix +++ b/nixos-installer/configuration.nix @@ -18,5 +18,5 @@ networkmanager.enable = true; defaultGateway = "192.168.5.101"; }; - system.stateVersion = "23.11"; + system.stateVersion = "24.05"; } diff --git a/nixos-installer/flake.lock b/nixos-installer/flake.lock index bb27d90c..bc112ee9 100644 --- a/nixos-installer/flake.lock +++ b/nixos-installer/flake.lock @@ -40,7 +40,7 @@ }, "original": { "owner": "nixos", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } diff --git a/nixos-installer/flake.nix b/nixos-installer/flake.nix index be6fa567..9ca890b2 100644 --- a/nixos-installer/flake.nix +++ b/nixos-installer/flake.nix @@ -2,7 +2,7 @@ description = "NixOS configuration of Ryan Yin"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; impermanence.url = "github:nix-community/impermanence"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; }; diff --git a/outputs/default.nix b/outputs/default.nix index 195bbab6..4a6457c1 100644 --- a/outputs/default.nix +++ b/outputs/default.nix @@ -21,11 +21,11 @@ # To use chrome, we need to allow the installation of non-free software config.allowUnfree = true; }; - pkgs-stable = import inputs.nixpkgs-stable { - inherit system; - # To use chrome, we need to allow the installation of non-free software - config.allowUnfree = true; - }; + # pkgs-stable = import inputs.nixpkgs-stable { + # inherit system; + # # To use chrome, we need to allow the installation of non-free software + # config.allowUnfree = true; + # }; }; # This is the args for all the haumea modules in this folder.