From daef2d5b84bdba0ee6595cb91419b8af9a1c70b5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 7 Apr 2024 09:40:59 +0000 Subject: [PATCH] chore: update lockfiles (#90) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: update dev flake inputs Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/2f0db7d418e781354d8a3c50e611e3b1cd413087' (2024-03-13) → 'github:nix-community/home-manager/b787726a8413e11b074cde42704b4af32d95545c' (2024-04-06) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/0ad13a6833440b8e238947e47bea7f11071dc2b2' (2024-03-12) → 'github:NixOS/nixpkgs/ff0dbd94265ac470dda06a657d5fe49de93b4599' (2024-04-06) * chore: update nvfetcher sources hyprland: fc228737d3d0c12e34a7fa155a0fc3192e5e4017 → b57375545f5da1f7790341905d1049b1873a8bb3 swaylock: ac089b8b8ae7852816fa709f6d97659221b75e18 → 77246bbbbf8926bdb8962cffab6616bc2b9e8a06 helix: 4bf31e995ead4e5f6e8cd4a08ea0497f1d35695b → 0164c4ca888084df4f511da22c6a0a664b5061d2 palette: e44233ceae6809d50cba3c0c95332cc87ffff022 → 408f081b6402d5d17b8324b75c6db5998100757d neovim: 045e3499d9ec8d84635fb08877ae44fd33f6a38d → aebe43db9cb26e1c70fc5b2fd4158169c405e720 sway: c7e54561a2539024020837f23068f70c6d2ae424 → 9c430d7010d73444af5272a596e3a2c058612f71 glamour: 3ef2c9533b6d3c4d6309a850765500179cf32d1c → 66d7b09325af67b1c5cdb063343e829c04ad7d5f tmux: cece0c36772483d1343bcace2b1cedb007057c2e → 5ed4e8a6a20c928688da268dfcdf460ac9c3cb49 zathura: 1bda9d8274dd327b7931886ef0c5c1eb33903814 → 0adc53028d81bf047461bc61c43a484d11b15220 bat: 2bafe4454d8db28491e9087ff3a1382c336e7d27 → b19bea35a85a32294ac4732cad5b0dc6495bed32 lazygit: a544cef9a18c3a94e0344281e0ddcf99a18a8ede → 30bff2e6d14ca12a09d71e5ce4e6a086b3e48aa6 gtk: 26b0d12b1b3f0d3266581f08e428d335eba8b2b2 → edef76faba00f1f8bd8311fc487f0f0b2670dd0d * fix(home-manager): use nvfetcher source for glamour * chore: call-flake -> get-flake --------- Co-authored-by: github-actions[bot] Co-authored-by: seth --- _sources/generated.json | 96 ++++++++++++++++---------------- _sources/generated.nix | 96 ++++++++++++++++---------------- dev/flake.lock | 12 ++-- dev/flake.nix | 7 +-- modules/home-manager/glamour.nix | 16 +----- 5 files changed, 107 insertions(+), 120 deletions(-) diff --git a/_sources/generated.json b/_sources/generated.json index 44c9edd..78063ce 100644 --- a/_sources/generated.json +++ b/_sources/generated.json @@ -21,7 +21,7 @@ }, "bat": { "cargoLocks": null, - "date": "2024-03-11", + "date": "2024-03-14", "extract": null, "name": "bat", "passthru": null, @@ -33,11 +33,11 @@ "name": null, "owner": "catppuccin", "repo": "bat", - "rev": "2bafe4454d8db28491e9087ff3a1382c336e7d27", - "sha256": "sha256-yHt3oIjUnljARaihalcWSNldtaJfVDfmfiecYfbzGs0=", + "rev": "b19bea35a85a32294ac4732cad5b0dc6495bed32", + "sha256": "sha256-POoW2sEM6jiymbb+W/9DKIjDM1Buu1HAmrNP0yC2JPg=", "type": "github" }, - "version": "2bafe4454d8db28491e9087ff3a1382c336e7d27" + "version": "b19bea35a85a32294ac4732cad5b0dc6495bed32" }, "bottom": { "cargoLocks": null, @@ -121,7 +121,7 @@ }, "glamour": { "cargoLocks": null, - "date": "2023-05-01", + "date": "2024-04-02", "extract": null, "name": "glamour", "passthru": null, @@ -133,11 +133,11 @@ "name": null, "owner": "catppuccin", "repo": "glamour", - "rev": "3ef2c9533b6d3c4d6309a850765500179cf32d1c", - "sha256": "sha256-HD7g9unpRYLIj00FOqLiiInMYgGgYujjvAeYOa+V76Y=", + "rev": "66d7b09325af67b1c5cdb063343e829c04ad7d5f", + "sha256": "sha256-f3JFgqL3K/u8U/UzmBohJLDBPlT446bosRQDca9+4oA=", "type": "github" }, - "version": "3ef2c9533b6d3c4d6309a850765500179cf32d1c" + "version": "66d7b09325af67b1c5cdb063343e829c04ad7d5f" }, "grub": { "cargoLocks": null, @@ -161,7 +161,7 @@ }, "gtk": { "cargoLocks": null, - "date": "2024-02-24", + "date": "2024-04-06", "extract": null, "name": "gtk", "passthru": null, @@ -173,15 +173,15 @@ "name": null, "owner": "catppuccin", "repo": "gtk", - "rev": "26b0d12b1b3f0d3266581f08e428d335eba8b2b2", - "sha256": "sha256-Ok/lv9VoZ1CpQnmq4JiC9TgOyxPZl4hqozoerIczuQQ=", + "rev": "edef76faba00f1f8bd8311fc487f0f0b2670dd0d", + "sha256": "sha256-pGL8vaE63ss2ZT2FoNDfDkeuCxjcbl02RmwwfHC/Vxg=", "type": "github" }, - "version": "26b0d12b1b3f0d3266581f08e428d335eba8b2b2" + "version": "edef76faba00f1f8bd8311fc487f0f0b2670dd0d" }, "helix": { "cargoLocks": null, - "date": "2024-03-12", + "date": "2024-03-30", "extract": null, "name": "helix", "passthru": null, @@ -193,15 +193,15 @@ "name": null, "owner": "catppuccin", "repo": "helix", - "rev": "4bf31e995ead4e5f6e8cd4a08ea0497f1d35695b", - "sha256": "sha256-ImrgF7xKD4gMBLI6m5CLChJEW82+nLJ2fVsPeZ58VVE=", + "rev": "0164c4ca888084df4f511da22c6a0a664b5061d2", + "sha256": "sha256-8d+cGlyW0vurrww0vPETCr077JHibUQTpnTUOLjeObs=", "type": "github" }, - "version": "4bf31e995ead4e5f6e8cd4a08ea0497f1d35695b" + "version": "0164c4ca888084df4f511da22c6a0a664b5061d2" }, "hyprland": { "cargoLocks": null, - "date": "2023-12-15", + "date": "2024-04-03", "extract": null, "name": "hyprland", "passthru": null, @@ -213,11 +213,11 @@ "name": null, "owner": "catppuccin", "repo": "hyprland", - "rev": "fc228737d3d0c12e34a7fa155a0fc3192e5e4017", - "sha256": "sha256-9BhZq9J1LmHfAPBqOr64chiAEzS+YV6zqe9ma95V3no=", + "rev": "b57375545f5da1f7790341905d1049b1873a8bb3", + "sha256": "sha256-XTqpmucOeHUgSpXQ0XzbggBFW+ZloRD/3mFhI+Tq4O8=", "type": "github" }, - "version": "fc228737d3d0c12e34a7fa155a0fc3192e5e4017" + "version": "b57375545f5da1f7790341905d1049b1873a8bb3" }, "kitty": { "cargoLocks": null, @@ -241,7 +241,7 @@ }, "lazygit": { "cargoLocks": null, - "date": "2024-02-04", + "date": "2024-03-31", "extract": null, "name": "lazygit", "passthru": null, @@ -253,11 +253,11 @@ "name": null, "owner": "catppuccin", "repo": "lazygit", - "rev": "a544cef9a18c3a94e0344281e0ddcf99a18a8ede", - "sha256": "sha256-gM0HplHhcpvtpmIVdlX/p59h0v+ihKEidS1imqPYlBg=", + "rev": "30bff2e6d14ca12a09d71e5ce4e6a086b3e48aa6", + "sha256": "sha256-mmNA7MpORvdCb37myo2QqagPK46rxRxD0dvUMsHegEM=", "type": "github" }, - "version": "a544cef9a18c3a94e0344281e0ddcf99a18a8ede" + "version": "30bff2e6d14ca12a09d71e5ce4e6a086b3e48aa6" }, "mako": { "cargoLocks": null, @@ -301,7 +301,7 @@ }, "neovim": { "cargoLocks": null, - "date": "2024-03-05", + "date": "2024-03-29", "extract": null, "name": "neovim", "passthru": null, @@ -313,15 +313,15 @@ "name": null, "owner": "catppuccin", "repo": "nvim", - "rev": "045e3499d9ec8d84635fb08877ae44fd33f6a38d", - "sha256": "sha256-arOnsTg+q14qMI24QrcA/ca3tU7qxhoenRksRk1xBtE=", + "rev": "aebe43db9cb26e1c70fc5b2fd4158169c405e720", + "sha256": "sha256-GQjxE8lQj52pheJtHCS+9v2lsJY7wMj2IXVCoNRmQSQ=", "type": "github" }, - "version": "045e3499d9ec8d84635fb08877ae44fd33f6a38d" + "version": "aebe43db9cb26e1c70fc5b2fd4158169c405e720" }, "palette": { "cargoLocks": null, - "date": "2024-02-12", + "date": "2024-03-25", "extract": null, "name": "palette", "passthru": null, @@ -333,11 +333,11 @@ "name": null, "owner": "catppuccin", "repo": "palette", - "rev": "e44233ceae6809d50cba3c0c95332cc87ffff022", - "sha256": "sha256-96ZO0LBN9z0+sIg3mdFI6kNSgX3R2x3bND9KzyYpFy4=", + "rev": "408f081b6402d5d17b8324b75c6db5998100757d", + "sha256": "sha256-JxwBb2JtDBVm8JPeshQfnjwEPZRbUqgKlDHybJ7LQrs=", "type": "github" }, - "version": "e44233ceae6809d50cba3c0c95332cc87ffff022" + "version": "408f081b6402d5d17b8324b75c6db5998100757d" }, "polybar": { "cargoLocks": null, @@ -381,7 +381,7 @@ }, "sway": { "cargoLocks": null, - "date": "2023-12-20", + "date": "2024-04-03", "extract": null, "name": "sway", "passthru": null, @@ -393,15 +393,15 @@ "name": null, "owner": "catppuccin", "repo": "sway", - "rev": "c7e54561a2539024020837f23068f70c6d2ae424", - "sha256": "sha256-DmwszeXRWt7LkCP8xqRIOgr/U3soTi7pbNHKTUCorcw=", + "rev": "9c430d7010d73444af5272a596e3a2c058612f71", + "sha256": "sha256-EHZ/D4PrFqwyTpfcst3+hSx6z4saVD1M9CfFqnWI6io=", "type": "github" }, - "version": "c7e54561a2539024020837f23068f70c6d2ae424" + "version": "9c430d7010d73444af5272a596e3a2c058612f71" }, "swaylock": { "cargoLocks": null, - "date": "2024-01-17", + "date": "2024-04-01", "extract": null, "name": "swaylock", "passthru": null, @@ -413,15 +413,15 @@ "name": null, "owner": "catppuccin", "repo": "swaylock", - "rev": "ac089b8b8ae7852816fa709f6d97659221b75e18", - "sha256": "sha256-e17JVWyj+ES9qII8Ukj6JxZh4bWUK+gOKsTvUIu3Qq4=", + "rev": "77246bbbbf8926bdb8962cffab6616bc2b9e8a06", + "sha256": "sha256-AKiOeV9ggvsreC/lq2qXytUsR+x66Q0kpN2F4/Oh2Ao=", "type": "github" }, - "version": "ac089b8b8ae7852816fa709f6d97659221b75e18" + "version": "77246bbbbf8926bdb8962cffab6616bc2b9e8a06" }, "tmux": { "cargoLocks": null, - "date": "2024-03-13", + "date": "2024-03-30", "extract": null, "name": "tmux", "passthru": null, @@ -433,15 +433,15 @@ "name": null, "owner": "catppuccin", "repo": "tmux", - "rev": "cece0c36772483d1343bcace2b1cedb007057c2e", - "sha256": "sha256-dB2bS/TG0ptXCCTfrm75xaDLaA29SYV5cv77YqSdLRk=", + "rev": "5ed4e8a6a20c928688da268dfcdf460ac9c3cb49", + "sha256": "sha256-k9Ihfk8C1jYkGUvOcgLwS4UdXR8d/4Nu/Dyh03FpDZc=", "type": "github" }, - "version": "cece0c36772483d1343bcace2b1cedb007057c2e" + "version": "5ed4e8a6a20c928688da268dfcdf460ac9c3cb49" }, "zathura": { "cargoLocks": null, - "date": "2024-02-12", + "date": "2024-04-04", "extract": null, "name": "zathura", "passthru": null, @@ -453,10 +453,10 @@ "name": null, "owner": "catppuccin", "repo": "zathura", - "rev": "1bda9d8274dd327b7931886ef0c5c1eb33903814", - "sha256": "sha256-HWOc5tnVgU/HUcVcIXACeuu3RDH1pHO/8DQRsWqumIA=", + "rev": "0adc53028d81bf047461bc61c43a484d11b15220", + "sha256": "sha256-/vD/hOi6KcaGyAp6Az7jL5/tQSGRzIrf0oHjAJf4QbI=", "type": "github" }, - "version": "1bda9d8274dd327b7931886ef0c5c1eb33903814" + "version": "0adc53028d81bf047461bc61c43a484d11b15220" } } \ No newline at end of file diff --git a/_sources/generated.nix b/_sources/generated.nix index 481b930..4247c81 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -15,15 +15,15 @@ }; bat = { pname = "bat"; - version = "2bafe4454d8db28491e9087ff3a1382c336e7d27"; + version = "b19bea35a85a32294ac4732cad5b0dc6495bed32"; src = fetchFromGitHub { owner = "catppuccin"; repo = "bat"; - rev = "2bafe4454d8db28491e9087ff3a1382c336e7d27"; + rev = "b19bea35a85a32294ac4732cad5b0dc6495bed32"; fetchSubmodules = false; - sha256 = "sha256-yHt3oIjUnljARaihalcWSNldtaJfVDfmfiecYfbzGs0="; + sha256 = "sha256-POoW2sEM6jiymbb+W/9DKIjDM1Buu1HAmrNP0yC2JPg="; }; - date = "2024-03-11"; + date = "2024-03-14"; }; bottom = { pname = "bottom"; @@ -75,15 +75,15 @@ }; glamour = { pname = "glamour"; - version = "3ef2c9533b6d3c4d6309a850765500179cf32d1c"; + version = "66d7b09325af67b1c5cdb063343e829c04ad7d5f"; src = fetchFromGitHub { owner = "catppuccin"; repo = "glamour"; - rev = "3ef2c9533b6d3c4d6309a850765500179cf32d1c"; + rev = "66d7b09325af67b1c5cdb063343e829c04ad7d5f"; fetchSubmodules = false; - sha256 = "sha256-HD7g9unpRYLIj00FOqLiiInMYgGgYujjvAeYOa+V76Y="; + sha256 = "sha256-f3JFgqL3K/u8U/UzmBohJLDBPlT446bosRQDca9+4oA="; }; - date = "2023-05-01"; + date = "2024-04-02"; }; grub = { pname = "grub"; @@ -99,39 +99,39 @@ }; gtk = { pname = "gtk"; - version = "26b0d12b1b3f0d3266581f08e428d335eba8b2b2"; + version = "edef76faba00f1f8bd8311fc487f0f0b2670dd0d"; src = fetchFromGitHub { owner = "catppuccin"; repo = "gtk"; - rev = "26b0d12b1b3f0d3266581f08e428d335eba8b2b2"; + rev = "edef76faba00f1f8bd8311fc487f0f0b2670dd0d"; fetchSubmodules = false; - sha256 = "sha256-Ok/lv9VoZ1CpQnmq4JiC9TgOyxPZl4hqozoerIczuQQ="; + sha256 = "sha256-pGL8vaE63ss2ZT2FoNDfDkeuCxjcbl02RmwwfHC/Vxg="; }; - date = "2024-02-24"; + date = "2024-04-06"; }; helix = { pname = "helix"; - version = "4bf31e995ead4e5f6e8cd4a08ea0497f1d35695b"; + version = "0164c4ca888084df4f511da22c6a0a664b5061d2"; src = fetchFromGitHub { owner = "catppuccin"; repo = "helix"; - rev = "4bf31e995ead4e5f6e8cd4a08ea0497f1d35695b"; + rev = "0164c4ca888084df4f511da22c6a0a664b5061d2"; fetchSubmodules = false; - sha256 = "sha256-ImrgF7xKD4gMBLI6m5CLChJEW82+nLJ2fVsPeZ58VVE="; + sha256 = "sha256-8d+cGlyW0vurrww0vPETCr077JHibUQTpnTUOLjeObs="; }; - date = "2024-03-12"; + date = "2024-03-30"; }; hyprland = { pname = "hyprland"; - version = "fc228737d3d0c12e34a7fa155a0fc3192e5e4017"; + version = "b57375545f5da1f7790341905d1049b1873a8bb3"; src = fetchFromGitHub { owner = "catppuccin"; repo = "hyprland"; - rev = "fc228737d3d0c12e34a7fa155a0fc3192e5e4017"; + rev = "b57375545f5da1f7790341905d1049b1873a8bb3"; fetchSubmodules = false; - sha256 = "sha256-9BhZq9J1LmHfAPBqOr64chiAEzS+YV6zqe9ma95V3no="; + sha256 = "sha256-XTqpmucOeHUgSpXQ0XzbggBFW+ZloRD/3mFhI+Tq4O8="; }; - date = "2023-12-15"; + date = "2024-04-03"; }; kitty = { pname = "kitty"; @@ -147,15 +147,15 @@ }; lazygit = { pname = "lazygit"; - version = "a544cef9a18c3a94e0344281e0ddcf99a18a8ede"; + version = "30bff2e6d14ca12a09d71e5ce4e6a086b3e48aa6"; src = fetchFromGitHub { owner = "catppuccin"; repo = "lazygit"; - rev = "a544cef9a18c3a94e0344281e0ddcf99a18a8ede"; + rev = "30bff2e6d14ca12a09d71e5ce4e6a086b3e48aa6"; fetchSubmodules = false; - sha256 = "sha256-gM0HplHhcpvtpmIVdlX/p59h0v+ihKEidS1imqPYlBg="; + sha256 = "sha256-mmNA7MpORvdCb37myo2QqagPK46rxRxD0dvUMsHegEM="; }; - date = "2024-02-04"; + date = "2024-03-31"; }; mako = { pname = "mako"; @@ -183,27 +183,27 @@ }; neovim = { pname = "neovim"; - version = "045e3499d9ec8d84635fb08877ae44fd33f6a38d"; + version = "aebe43db9cb26e1c70fc5b2fd4158169c405e720"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "045e3499d9ec8d84635fb08877ae44fd33f6a38d"; + rev = "aebe43db9cb26e1c70fc5b2fd4158169c405e720"; fetchSubmodules = false; - sha256 = "sha256-arOnsTg+q14qMI24QrcA/ca3tU7qxhoenRksRk1xBtE="; + sha256 = "sha256-GQjxE8lQj52pheJtHCS+9v2lsJY7wMj2IXVCoNRmQSQ="; }; - date = "2024-03-05"; + date = "2024-03-29"; }; palette = { pname = "palette"; - version = "e44233ceae6809d50cba3c0c95332cc87ffff022"; + version = "408f081b6402d5d17b8324b75c6db5998100757d"; src = fetchFromGitHub { owner = "catppuccin"; repo = "palette"; - rev = "e44233ceae6809d50cba3c0c95332cc87ffff022"; + rev = "408f081b6402d5d17b8324b75c6db5998100757d"; fetchSubmodules = false; - sha256 = "sha256-96ZO0LBN9z0+sIg3mdFI6kNSgX3R2x3bND9KzyYpFy4="; + sha256 = "sha256-JxwBb2JtDBVm8JPeshQfnjwEPZRbUqgKlDHybJ7LQrs="; }; - date = "2024-02-12"; + date = "2024-03-25"; }; polybar = { pname = "polybar"; @@ -231,50 +231,50 @@ }; sway = { pname = "sway"; - version = "c7e54561a2539024020837f23068f70c6d2ae424"; + version = "9c430d7010d73444af5272a596e3a2c058612f71"; src = fetchFromGitHub { owner = "catppuccin"; repo = "sway"; - rev = "c7e54561a2539024020837f23068f70c6d2ae424"; + rev = "9c430d7010d73444af5272a596e3a2c058612f71"; fetchSubmodules = false; - sha256 = "sha256-DmwszeXRWt7LkCP8xqRIOgr/U3soTi7pbNHKTUCorcw="; + sha256 = "sha256-EHZ/D4PrFqwyTpfcst3+hSx6z4saVD1M9CfFqnWI6io="; }; - date = "2023-12-20"; + date = "2024-04-03"; }; swaylock = { pname = "swaylock"; - version = "ac089b8b8ae7852816fa709f6d97659221b75e18"; + version = "77246bbbbf8926bdb8962cffab6616bc2b9e8a06"; src = fetchFromGitHub { owner = "catppuccin"; repo = "swaylock"; - rev = "ac089b8b8ae7852816fa709f6d97659221b75e18"; + rev = "77246bbbbf8926bdb8962cffab6616bc2b9e8a06"; fetchSubmodules = false; - sha256 = "sha256-e17JVWyj+ES9qII8Ukj6JxZh4bWUK+gOKsTvUIu3Qq4="; + sha256 = "sha256-AKiOeV9ggvsreC/lq2qXytUsR+x66Q0kpN2F4/Oh2Ao="; }; - date = "2024-01-17"; + date = "2024-04-01"; }; tmux = { pname = "tmux"; - version = "cece0c36772483d1343bcace2b1cedb007057c2e"; + version = "5ed4e8a6a20c928688da268dfcdf460ac9c3cb49"; src = fetchFromGitHub { owner = "catppuccin"; repo = "tmux"; - rev = "cece0c36772483d1343bcace2b1cedb007057c2e"; + rev = "5ed4e8a6a20c928688da268dfcdf460ac9c3cb49"; fetchSubmodules = false; - sha256 = "sha256-dB2bS/TG0ptXCCTfrm75xaDLaA29SYV5cv77YqSdLRk="; + sha256 = "sha256-k9Ihfk8C1jYkGUvOcgLwS4UdXR8d/4Nu/Dyh03FpDZc="; }; - date = "2024-03-13"; + date = "2024-03-30"; }; zathura = { pname = "zathura"; - version = "1bda9d8274dd327b7931886ef0c5c1eb33903814"; + version = "0adc53028d81bf047461bc61c43a484d11b15220"; src = fetchFromGitHub { owner = "catppuccin"; repo = "zathura"; - rev = "1bda9d8274dd327b7931886ef0c5c1eb33903814"; + rev = "0adc53028d81bf047461bc61c43a484d11b15220"; fetchSubmodules = false; - sha256 = "sha256-HWOc5tnVgU/HUcVcIXACeuu3RDH1pHO/8DQRsWqumIA="; + sha256 = "sha256-/vD/hOi6KcaGyAp6Az7jL5/tQSGRzIrf0oHjAJf4QbI="; }; - date = "2024-02-12"; + date = "2024-04-04"; }; } diff --git a/dev/flake.lock b/dev/flake.lock index f4aa2c7..6d890b1 100644 --- a/dev/flake.lock +++ b/dev/flake.lock @@ -23,11 +23,11 @@ ] }, "locked": { - "lastModified": 1710349883, - "narHash": "sha256-bjbdS2mC76xNJwt1d/uZa+JdHR8CCyYbF4Ey/NgOJus=", + "lastModified": 1712390667, + "narHash": "sha256-ebq+fJZfobqpsAdGDGpxNWSySbQejRwW9cdiil6krCo=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f0db7d418e781354d8a3c50e611e3b1cd413087", + "rev": "b787726a8413e11b074cde42704b4af32d95545c", "type": "github" }, "original": { @@ -38,11 +38,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1710272261, - "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", + "lastModified": 1712439257, + "narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2", + "rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599", "type": "github" }, "original": { diff --git a/dev/flake.nix b/dev/flake.nix index fb7a25e..aeb44c9 100644 --- a/dev/flake.nix +++ b/dev/flake.nix @@ -9,11 +9,10 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - # https://github.com/divnix/call-flake/issues/4 - call-flake.url = "github:divnix/call-flake/a9bc85f5bd939734655327a824b4e7ceb4ccaba9"; + get-flake.url = "github:ursi/get-flake"; }; - outputs = { self, nixpkgs, call-flake, ... }@inputs: + outputs = { self, nixpkgs, get-flake, ... }@inputs: let systems = [ "x86_64-linux" @@ -25,7 +24,7 @@ inherit (nixpkgs) lib; forAllSystems = fn: lib.genAttrs systems (s: fn nixpkgs.legacyPackages.${s}); - ctp = call-flake ../.; + ctp = get-flake ../.; in { checks = forAllSystems (pkgs: lib.optionalAttrs pkgs.stdenv.isLinux { diff --git a/modules/home-manager/glamour.nix b/modules/home-manager/glamour.nix index b2b286f..11b0fbb 100644 --- a/modules/home-manager/glamour.nix +++ b/modules/home-manager/glamour.nix @@ -1,20 +1,11 @@ { config -, pkgs , lib +, sources , ... }: let cfg = config.programs.glamour.catppuccin; inherit (cfg) enable; - - version = "1.0.0"; - - hashes = { - latte = "sha256-V0LsRStF1vL+Tz8G6VaKiwiY/ZIsSkMc+f1WJAITYXU="; - frappe = "sha256-YOatgYCJKuesVERHZVmF1xtzuLjyxCYstoWYqATq+NU="; - macchiato = "sha256-CeSJvhjzHVTtlqgQLKOrdLXtp2OQlMh24IaA1QQiQCk="; - mocha = "sha256-Tx2fQteL4wxhV+qHYZibakiYoEhS4HjyMO0yBcU/F6Q="; - }; in { options.programs.glamour.catppuccin = @@ -22,10 +13,7 @@ in config = { home.sessionVariables = lib.mkIf enable { - GLAMOUR_STYLE = pkgs.fetchurl { - url = "https://github.com/catppuccin/glamour/releases/download/v${version}/${cfg.flavour}.json"; - hash = hashes.${cfg.flavour}; - }; + GLAMOUR_STYLE = "${sources.glamour}/themes/catppuccin-${cfg.flavour}.json"; }; }; }