From e09a41ec98be9349413ea3f51557326ce1068693 Mon Sep 17 00:00:00 2001 From: "getchoo-bot[bot]" <183349775+getchoo-bot[bot]@users.noreply.github.com> Date: Sat, 1 Mar 2025 01:19:27 +0000 Subject: [PATCH 1/2] flake: update all inputs --- flake.lock | 94 +++++++++++++++++++-------------------- users/seth/mixins/git.nix | 3 -- 2 files changed, 47 insertions(+), 50 deletions(-) diff --git a/flake.lock b/flake.lock index 04d28e2e..ba55dced 100644 --- a/flake.lock +++ b/flake.lock @@ -50,11 +50,11 @@ "codeberg-infra": { "flake": false, "locked": { - "lastModified": 1739581536, - "narHash": "sha256-WEavzTxEfDVpaknBkkk02Dt8uNEvrHyOHsiGyH5zdvU=", - "rev": "5ff907f7ba14996cc2d6f7c97e7d44b58810479f", + "lastModified": 1740408885, + "narHash": "sha256-bTyyKsktkpqV39umP2LQ+CqXUFO+ZydAIFAxa94xjCM=", + "rev": "600db842e6e033c8c3a1e7da72eb1b054cc4e6a5", "type": "tarball", - "url": "https://codeberg.org/api/v1/repos/Codeberg-Infrastructure/build-deploy-forgejo/archive/5ff907f7ba14996cc2d6f7c97e7d44b58810479f.tar.gz" + "url": "https://codeberg.org/api/v1/repos/Codeberg-Infrastructure/build-deploy-forgejo/archive/600db842e6e033c8c3a1e7da72eb1b054cc4e6a5.tar.gz" }, "original": { "type": "tarball", @@ -111,12 +111,12 @@ ] }, "locked": { - "lastModified": 1740171504, - "narHash": "sha256-ZD/fUHcOBuQeGI6dhW9y5aT1iu9KWC4jEyYZSKgUMyI=", - "rev": "051873cb3a2290bfa64631cd2184f7b49f346727", - "revCount": 201, + "lastModified": 1740621356, + "narHash": "sha256-siZ2A2wrWff4hEdk8GoGYNzS2v8A6Sq1w9jUfO6PF34=", + "rev": "8181ddb0f1574484bad4f0ef737f47492518b54d", + "revCount": 204, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/0.1.201%2Brev-051873cb3a2290bfa64631cd2184f7b49f346727/01952a50-92f6-78f7-b609-eac2259ab27a/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/0.1.204%2Brev-8181ddb0f1574484bad4f0ef737f47492518b54d/01954520-9fe5-73c6-85c5-ba0c7316d622/source.tar.gz" }, "original": { "type": "tarball", @@ -126,37 +126,37 @@ "determinate-nixd-aarch64-darwin": { "flake": false, "locked": { - "narHash": "sha256-GE2pMfgBR+t1w0TKtVnzqLLFHGHOCuSuzN+jz81DFzU=", + "narHash": "sha256-BWgJNJvsFnIL8PPJ0FQBsTphGJBeWPH5pip30/GCfxo=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v0.37.1/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v0.38.1/macOS" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v0.37.1/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v0.38.1/macOS" } }, "determinate-nixd-aarch64-linux": { "flake": false, "locked": { - "narHash": "sha256-yXwaE51koZI1VG4pXiUjNCInd1dBJ6XeBynAPmRLKNY=", + "narHash": "sha256-qgwh45CQMQF2UbEqtt4bOFF+jRZuXF0ww+Qj2bQuWW8=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v0.37.1/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v0.38.1/aarch64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v0.37.1/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v0.38.1/aarch64-linux" } }, "determinate-nixd-x86_64-linux": { "flake": false, "locked": { - "narHash": "sha256-KzOTXBRjKi984jWLkvPU7arM0H4KmqjTmtaw54j9ENo=", + "narHash": "sha256-cmddLhfYZOwB7u4Y4JuFOCAY5i/ENMG6HNnJAR2WLec=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v0.37.1/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v0.38.1/x86_64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v0.37.1/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v0.38.1/x86_64-linux" } }, "flake-parts": { @@ -225,11 +225,11 @@ ] }, "locked": { - "lastModified": 1739582246, - "narHash": "sha256-czLKpTB3Wb9EQW5P3DTMsB+efI/GjnOhFlbPDBRKTyc=", + "lastModified": 1740186992, + "narHash": "sha256-Ca0P8Kf7/X8HwmyP1qEmaog8Jd0ced7xRe4uoa0hN8k=", "owner": "getchoo", "repo": "getchvim", - "rev": "6468e1024032ffba15c4498fc4fbe36fa91c527b", + "rev": "6777641a1b3220ea43a6c872d061c5a08f76ff63", "type": "github" }, "original": { @@ -245,11 +245,11 @@ ] }, "locked": { - "lastModified": 1740183880, - "narHash": "sha256-bvX0BguY9gHVBg+Dlaa4L8Vj0P/zqO0ZoOrHeCjnO4w=", + "lastModified": 1740699498, + "narHash": "sha256-r9hkKzX99CGiP1ZqH0e+SWKK4CMsRNRLyotuwrUjhTI=", "owner": "nix-community", "repo": "home-manager", - "rev": "62d038f499b94d406df790dec04e201d222e5098", + "rev": "b71edac7a3167026aabea82a54d08b1794088c21", "type": "github" }, "original": { @@ -292,11 +292,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1739186342, - "narHash": "sha256-2j+sln9RwQn+g7J4GmdFFgvqXnLkvWBNMaUzONlkzUE=", + "lastModified": 1740440383, + "narHash": "sha256-w8ixbqOGrVWMQZFFs4uAwZpuwuGMzFoKjocMFxTR5Ts=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "3bdeebbc484a09391c4f0ec8a37bb77809426660", + "rev": "6321bc060d757c137c1fbae2057c7e941483878f", "type": "github" }, "original": { @@ -308,11 +308,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1740629216, - "narHash": "sha256-i6fadzFVD7B8XWXa2ycPoVlpSJ5SeWcZ8LLzfzYedKs=", - "rev": "8082f0b8434a81db309ac8abf1cf32532ba9168e", + "lastModified": 1740781229, + "narHash": "sha256-H8i+LhDQr6PbAxFt37TXYoRkwHvGlSTuNJUrlE5bb0w=", + "rev": "99bc6867e8913ad8f5fa7d63fefd885743eac4c1", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/8082f0b8434a81db309ac8abf1cf32532ba9168e.tar.gz?rev=8082f0b8434a81db309ac8abf1cf32532ba9168e" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/99bc6867e8913ad8f5fa7d63fefd885743eac4c1.tar.gz" }, "original": { "type": "tarball", @@ -335,7 +335,7 @@ "narHash": "sha256-NG3IRvRs3u3btVCN861FqHvgOwqcNT/Oy6PBG86F5/E=", "rev": "621aae0f3cceaffa6d73a4fb0f89c08d338d729e", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/621aae0f3cceaffa6d73a4fb0f89c08d338d729e.tar.gz?rev=621aae0f3cceaffa6d73a4fb0f89c08d338d729e" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/621aae0f3cceaffa6d73a4fb0f89c08d338d729e.tar.gz" }, "original": { "type": "tarball", @@ -369,11 +369,11 @@ ] }, "locked": { - "lastModified": 1739933872, - "narHash": "sha256-UhuvTR4OrWR+WBaRCZm4YMkvjJhZ1KZo/jRjE41m+Ek=", + "lastModified": 1740755725, + "narHash": "sha256-amZbqP84H/ApugaT+TADXTB3NbjkVHI9Vac1saIk0kE=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "6ab392f626a19f1122d1955c401286e1b7cf6b53", + "rev": "5d6e0851b60508cffd66b4a6982440a40720338d", "type": "github" }, "original": { @@ -404,11 +404,11 @@ ] }, "locked": { - "lastModified": 1739676768, - "narHash": "sha256-U1HQ7nzhJyVVXUgjU028UCkbLQLEIkg42+G7iIiBmlU=", + "lastModified": 1740281615, + "narHash": "sha256-dZWcbAQ1sF8oVv+zjSKkPVY0ebwENQEkz5vc6muXbKY=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "ae15068e79e22b76c344f0d7f8aed1bb1c5b0b63", + "rev": "465792533d03e6bb9dc849d58ab9d5e31fac9023", "type": "github" }, "original": { @@ -425,11 +425,11 @@ ] }, "locked": { - "lastModified": 1740046902, - "narHash": "sha256-Xbhz8eEqBmNpvqaGFbF5JopmfNJccWUr8eExtU/iGX4=", + "lastModified": 1740567864, + "narHash": "sha256-eTS2wrC1jKR6PKXC9jZqQy5PwqbIOBLSLF3dwLiFJ8M=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "c4f6ae89468939d9fcf1a317c062cf5dd02004ea", + "rev": "1f40b43d01626ce994eb47150afa0d7215f396ca", "type": "github" }, "original": { @@ -482,11 +482,11 @@ "treefmt-nix": [] }, "locked": { - "lastModified": 1737404626, - "narHash": "sha256-uTIt3Nd4K7hWJ6TynUeo0ekdZUO+sBz//d0Jzmne6ts=", + "lastModified": 1740431650, + "narHash": "sha256-WBdHGqMHHF7O9GCSnY+fBu76hxN5nEzpVdYa9AkHd4E=", "owner": "getchoo", "repo": "nixpkgs-tracker-bot", - "rev": "60486a9f8087712527b6726557315863d5a6fb9f", + "rev": "a5f993e021189593bddc296e84fd6aa100319664", "type": "github" }, "original": { @@ -509,11 +509,11 @@ ] }, "locked": { - "lastModified": 1740129736, - "narHash": "sha256-exrrOaEy43ixs6CPnLbeZJpuRym4X9bMbseP41kBdjo=", + "lastModified": 1740733979, + "narHash": "sha256-hp+cyHsOQ+A0n5KslIDzSZtd4L+IPc+2faItKXPcoqs=", "owner": "astro", "repo": "nix-openwrt-imagebuilder", - "rev": "f9faebdbf15326b2d55b84e291d7f15e87a1bf7e", + "rev": "6a8cd8558e8eea596f6cb6191b72fe7afa5313cf", "type": "github" }, "original": { diff --git a/users/seth/mixins/git.nix b/users/seth/mixins/git.nix index 97464250..03ffc7d3 100644 --- a/users/seth/mixins/git.nix +++ b/users/seth/mixins/git.nix @@ -2,13 +2,10 @@ config, lib, pkgs, - inputs, ... }: { - imports = [ inputs.getchpkgs.homeModules.riff ]; - config = lib.mkMerge [ { programs.git = { From bf4ed109a19a2f62d934a7d5296a4029f4a9f237 Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Thu, 27 Feb 2025 06:11:38 -0500 Subject: [PATCH 2/2] revert: "seth/jj: drop" Refs: 1067034 --- users/seth/mixins/default.nix | 1 + users/seth/mixins/jj.nix | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 users/seth/mixins/jj.nix diff --git a/users/seth/mixins/default.nix b/users/seth/mixins/default.nix index e898b0ee..1668f234 100644 --- a/users/seth/mixins/default.nix +++ b/users/seth/mixins/default.nix @@ -11,6 +11,7 @@ ./git.nix ./gnome.nix ./gpg.nix + ./jj.nix ./mangohud.nix ./niri.nix ./nu.nix diff --git a/users/seth/mixins/jj.nix b/users/seth/mixins/jj.nix new file mode 100644 index 00000000..54b83a1e --- /dev/null +++ b/users/seth/mixins/jj.nix @@ -0,0 +1,33 @@ +{ config, lib, ... }: + +{ + assertions = [ + { + assertion = + config.programs.jujutsu.enable -> (config.programs.git.enable && config.programs.gh.enable); + message = "`programs.git` and `programs.gh` are required to use `programs.jujutsu`"; + } + ]; + + programs = { + jujutsu = { + enable = lib.mkDefault config.programs.git.enable; + + settings = { + user = { + name = "Seth Flynn"; + email = "getchoo@tuta.io"; + + # https://github.com/jj-vcs/jj/issues/4979 + git.subprocess = true; + }; + + signing = { + sign-all = true; + backend = "gpg"; + key = "D31BD0D494BBEE86"; + }; + }; + }; + }; +}