From f3e7b29a98cad34f6042f3b21605c0be42d01c7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?= Date: Thu, 23 Jan 2025 15:58:05 +0100 Subject: [PATCH] Upgrade --- flake.lock | 212 ++++++++++++++++++++++++++++----------------- flake.nix | 21 ++++- hm/common.nix | 6 +- hm/git/default.nix | 4 +- 4 files changed, 151 insertions(+), 92 deletions(-) diff --git a/flake.lock b/flake.lock index eaa1299..a215bba 100644 --- a/flake.lock +++ b/flake.lock @@ -74,11 +74,11 @@ ] }, "locked": { - "lastModified": 1728330715, - "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", + "lastModified": 1735644329, + "narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=", "owner": "numtide", "repo": "devshell", - "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", + "rev": "f7795ede5b02664b57035b3b757876703e2c3eac", "type": "github" }, "original": { @@ -94,11 +94,11 @@ ] }, "locked": { - "lastModified": 1735048446, - "narHash": "sha256-Tc35Y8H+krA6rZeOIczsaGAtobSSBPqR32AfNTeHDRc=", + "lastModified": 1737038063, + "narHash": "sha256-rMEuiK69MDhjz1JgbaeQ9mBDXMJ2/P8vmOYRbFndXsk=", "owner": "nix-community", "repo": "disko", - "rev": "3a4de9fa3a78ba7b7170dda6bd8b4cdab87c0b21", + "rev": "bf0abfde48f469c256f2b0f481c6281ff04a5db2", "type": "github" }, "original": { @@ -106,6 +106,22 @@ "type": "indirect" } }, + "firefox-gnome-theme": { + "flake": false, + "locked": { + "lastModified": 1734969791, + "narHash": "sha256-A9PxLienMYJ/WUvqFie9qXrNC2MeRRYw7TG/q7DRjZg=", + "owner": "rafaelmardojai", + "repo": "firefox-gnome-theme", + "rev": "92f4890bd150fc9d97b61b3583680c0524a8cafe", + "type": "github" + }, + "original": { + "owner": "rafaelmardojai", + "repo": "firefox-gnome-theme", + "type": "github" + } + }, "flake-compat": { "locked": { "lastModified": 1696426674, @@ -144,11 +160,11 @@ ] }, "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "lastModified": 1736143030, + "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", "type": "github" }, "original": { @@ -261,18 +277,45 @@ "nixpkgs": [ "nixvim", "nixpkgs" + ] + }, + "locked": { + "lastModified": 1737043064, + "narHash": "sha256-I/OuxGwXwRi5gnFPsyCvVR+IfFstA+QXEpHu1hvsgD8=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "94ee657f6032d913fe0ef49adaa743804635b0bb", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "git-hooks_2": { + "inputs": { + "flake-compat": [ + "stylix", + "flake-compat" + ], + "gitignore": "gitignore_2", + "nixpkgs": [ + "stylix", + "nixpkgs" ], "nixpkgs-stable": [ - "nixvim", + "stylix", + "git-hooks", "nixpkgs" ] }, "locked": { - "lastModified": 1734425854, - "narHash": "sha256-nzE5UbJ41aPEKf8R2ZFYtLkqPmF7EIUbNEdHMBLg0Ig=", + "lastModified": 1731363552, + "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "0ddd26d0925f618c3a5d85a4fa5eb1e23a09491d", + "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", "type": "github" }, "original": { @@ -303,6 +346,28 @@ "type": "github" } }, + "gitignore_2": { + "inputs": { + "nixpkgs": [ + "stylix", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "gnome-shell": { "flake": false, "locked": { @@ -327,11 +392,11 @@ ] }, "locked": { - "lastModified": 1734366194, - "narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=", + "lastModified": 1736373539, + "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=", "owner": "nix-community", "repo": "home-manager", - "rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f", + "rev": "bd65bc3cde04c16755955630b344bc9e35272c56", "type": "github" }, "original": { @@ -348,11 +413,11 @@ ] }, "locked": { - "lastModified": 1734366194, - "narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=", + "lastModified": 1736373539, + "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=", "owner": "nix-community", "repo": "home-manager", - "rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f", + "rev": "bd65bc3cde04c16755955630b344bc9e35272c56", "type": "github" }, "original": { @@ -412,38 +477,6 @@ "type": "github" } }, - "jjuinixpkgs": { - "locked": { - "lastModified": 1734688116, - "narHash": "sha256-Ex3o8880p+yZ9915s46/4XtnN4jS6tqp2TlfGR1+l1w=", - "owner": "Adda0", - "repo": "nixpkgs", - "rev": "c951613d3cb3d61b14c890238017d0685ff359f9", - "type": "github" - }, - "original": { - "owner": "Adda0", - "ref": "jjui", - "repo": "nixpkgs", - "type": "github" - } - }, - "labellenixpkgs": { - "locked": { - "lastModified": 1733305049, - "narHash": "sha256-j3L36nA0PTjVA6gtMVILBhrBSMxuhevlDW9Nfws1oII=", - "owner": "FabianRig", - "repo": "nixpkgs", - "rev": "88ac05665bc6a85aabe78070b99fd23ad1675409", - "type": "github" - }, - "original": { - "owner": "FabianRig", - "ref": "update-labelle-1.3.2", - "repo": "nixpkgs", - "type": "github" - } - }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -452,15 +485,16 @@ ] }, "locked": { - "lastModified": 1733570843, - "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=", + "lastModified": 1736820923, + "narHash": "sha256-SDuKLOWAh8VJRXlNWQn9QE99bjeEUAAbYXqrKGbsiyk=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "a35b08d09efda83625bef267eb24347b446c80b8", + "rev": "944c2b181792ae7ae6b20c0df3f44879c11706c9", "type": "github" }, "original": { "owner": "lnl7", + "ref": "nix-darwin-24.11", "repo": "nix-darwin", "type": "github" } @@ -520,11 +554,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1734954597, - "narHash": "sha256-QIhd8/0x30gEv8XEE1iAnrdMlKuQ0EzthfDR7Hwl+fk=", + "lastModified": 1737590910, + "narHash": "sha256-qM/y6Dtpu9Wmf5HqeZajQdn+cS0aljdYQQQnrvx+LJE=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "def1d472c832d77885f174089b0d34854b007198", + "rev": "9368027715d8dde4b84c79c374948b5306fdd2db", "type": "github" }, "original": { @@ -534,11 +568,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1734991663, - "narHash": "sha256-8T660guvdaOD+2/Cj970bWlQwAyZLKrrbkhYOFcY1YE=", + "lastModified": 1737569578, + "narHash": "sha256-6qY0pk2QmUtBT9Mywdvif0i/CLVgpCjMUn6g9vB+f3M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6c90912761c43e22b6fb000025ab96dd31c971ff", + "rev": "47addd76727f42d351590c905d9d1905ca895b82", "type": "github" }, "original": { @@ -581,11 +615,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1734649271, - "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", + "lastModified": 1737469691, + "narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", + "rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab", "type": "github" }, "original": { @@ -610,11 +644,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1734784342, - "narHash": "sha256-uap4LcvjpTz5WTgDfQYtL3QCpGmtee7DuD5mB8AIiLw=", + "lastModified": 1737283156, + "narHash": "sha256-FyHmM6vvz+UxCrPZo/poIaZBZejLHVKkAH4cjtUxZDA=", "owner": "nix-community", "repo": "nixvim", - "rev": "334947672f1eb05488e69657b9c412230bd658b4", + "rev": "abcbd250b8a2c7aab1f4b2b9e01598ee24b42337", "type": "github" }, "original": { @@ -669,11 +703,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1735130532, - "narHash": "sha256-efntkb+ydFSI2kvLn6SURQEp4KnThRGZ2eeJHiKL93o=", + "lastModified": 1737643235, + "narHash": "sha256-wv3JCT3vfYUodDmBbRxtOxkWxMQ605K9viJ1AmZlU7I=", "owner": "nix-community", "repo": "NUR", - "rev": "b9f4b07220fa430240dba1825cdac9d673dedf55", + "rev": "2eb191a4ca7354482dca8a55ce4fa73b986f9617", "type": "github" }, "original": { @@ -692,11 +726,11 @@ ] }, "locked": { - "lastModified": 1733773348, - "narHash": "sha256-Y47y+LesOCkJaLvj+dI/Oa6FAKj/T9sKVKDXLNsViPw=", + "lastModified": 1735854821, + "narHash": "sha256-Iv59gMDZajNfezTO0Fw6LHE7uKAShxbvMidmZREit7c=", "owner": "NuschtOS", "repo": "search", - "rev": "3051be7f403bff1d1d380e4612f0c70675b44fc9", + "rev": "836908e3bddd837ae0f13e215dd48767aee355f0", "type": "github" }, "original": { @@ -710,14 +744,13 @@ "disko": "disko", "flake-utils": "flake-utils", "home-manager": "home-manager", - "jjuinixpkgs": "jjuinixpkgs", - "labellenixpkgs": "labellenixpkgs", "nix-on-droid": "nix-on-droid", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "nixvim": "nixvim", "nur": "nur", - "stylix": "stylix" + "stylix": "stylix", + "unixpkgs": "unixpkgs" } }, "scss-reset": { @@ -742,8 +775,10 @@ "base16-fish": "base16-fish", "base16-helix": "base16-helix", "base16-vim": "base16-vim", + "firefox-gnome-theme": "firefox-gnome-theme", "flake-compat": "flake-compat_2", "flake-utils": "flake-utils_3", + "git-hooks": "git-hooks_2", "gnome-shell": "gnome-shell", "home-manager": "home-manager_3", "nixpkgs": [ @@ -755,11 +790,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1734110444, - "narHash": "sha256-fp1iV2JldCSvz+7ODzXYUkQ+H7zyiWw5E0MQ4ILC4vw=", + "lastModified": 1737585583, + "narHash": "sha256-lU00TEdqCCWJNtMbR0l779xRJHtMf5FKCGKcsC+/Hr8=", "owner": "danth", "repo": "stylix", - "rev": "9015d5d0d5d100f849129c43d257b827d300b089", + "rev": "9409ae8a925aacc7ea9a794e0bde159b876572a3", "type": "github" }, "original": { @@ -872,11 +907,11 @@ ] }, "locked": { - "lastModified": 1734704479, - "narHash": "sha256-MMi74+WckoyEWBRcg/oaGRvXC9BVVxDZNRMpL+72wBI=", + "lastModified": 1737103437, + "narHash": "sha256-uPNWcYbhY2fjY3HOfRCR5jsfzdzemhfxLSxwjXYXqNc=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "65712f5af67234dad91a5a4baee986a8b62dbf8f", + "rev": "d1ed3b385f8130e392870cfb1dbfaff8a63a1899", "type": "github" }, "original": { @@ -905,6 +940,21 @@ "repo": "treefmt-nix", "type": "github" } + }, + "unixpkgs": { + "locked": { + "lastModified": 1737644226, + "narHash": "sha256-75r2eJS7PKc+ZCdaIeF0PKQ9JM3w0YQvfzfsQfJq6EY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "09b24484a773a6632f0234b10a33a300ceed73dc", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "master", + "type": "indirect" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 41cca1c..25493bb 100644 --- a/flake.nix +++ b/flake.nix @@ -4,8 +4,7 @@ inputs = { # Packages nixpkgs.url = "nixpkgs/nixos-24.11"; - jjuinixpkgs.url = "github:Adda0/nixpkgs/jjui"; # Testing PR - labellenixpkgs.url = "github:FabianRig/nixpkgs/update-labelle-1.3.2"; # Current 24.11 version doesn't match dependencies + unixpkgs.url = "nixpkgs/master"; # OS disko = { url = "disko"; @@ -40,6 +39,7 @@ { self, nixpkgs, + unixpkgs, disko, nix-on-droid, flake-utils, @@ -56,6 +56,17 @@ overlays = [ (import ./common/update-local-flakes/overlay.nix) nur.overlays.default + ( + # Cherry-pick packages from future + self: super: + let + upkgs = import unixpkgs { inherit (super) system; }; + in + { + jjui = upkgs.jjui; + labelle = upkgs.labelle; + } + ) ]; }; homeManagerConfig = { @@ -70,7 +81,11 @@ }: nixpkgs.lib.nixosSystem { inherit system; - specialArgs = attrs; + specialArgs = attrs // { + upkgs = import unixpkgs { + inherit system; + }; + }; modules = modules ++ [ self.nixosModules.dotfiles # nur.modules.nixos.default diff --git a/hm/common.nix b/hm/common.nix index 3ecc5f2..6d7f697 100644 --- a/hm/common.nix +++ b/hm/common.nix @@ -2,12 +2,8 @@ pkgs, config, lib, - labellenixpkgs, ... }: -let - labellepkgs = import labellenixpkgs { inherit (pkgs) system; }; -in { frogeye.hooks.lock = '' ${pkgs.coreutils}/bin/rm -rf "/tmp/cached_pass_$UID" @@ -239,7 +235,7 @@ in usbutils dmidecode lshw - labellepkgs.labelle # Label printer + labelle # Label printer # Locker (pkgs.writeShellApplication { diff --git a/hm/git/default.nix b/hm/git/default.nix index cd67060..1a16d7e 100644 --- a/hm/git/default.nix +++ b/hm/git/default.nix @@ -2,17 +2,15 @@ pkgs, lib, config, - jjuinixpkgs, ... }: let cfg = config.programs.git; - jjuipkgs = import jjuinixpkgs { inherit (pkgs) system; }; in { config = lib.mkIf cfg.enable { home.packages = [ - jjuipkgs.jjui + pkgs.jjui pkgs.lazyjj (pkgs.writeShellApplication { name = "git-sync";