From 5633bc6656ef0f45d93be6639f1ffabae3462092 Mon Sep 17 00:00:00 2001 From: Seven of Nine Date: Fri, 17 May 2024 13:01:57 +0000 Subject: [PATCH 1/4] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'disko': 'github:nix-community/disko/476eef8d85aa09389ae7baf6e6b60357f6a01432' (2024-05-16) → 'github:nix-community/disko/5f6dbcce99d60dd77f96dfc66d06bbea149a40e1' (2024-05-16) • Updated input 'dream2nix': 'github:nix-community/dream2nix/995e831dac8c2c843f1289d15dfec526cb84afdd' (2024-05-14) → 'github:nix-community/dream2nix/6a169a73bde7a914563641fa8cf7290d5349d20d' (2024-05-16) • Updated input 'dream2nix/nixpkgs': 'github:NixOS/nixpkgs/abd6d48f8c77bea7dc51beb2adfa6ed3950d2585' (2024-05-14) → 'github:NixOS/nixpkgs/b3fcfcfabd01b947a1e4f36622bbffa3985bdac6' (2024-05-15) • Updated input 'flakeParts': 'github:hercules-ci/flake-parts/e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e' (2024-05-02) → 'github:hercules-ci/flake-parts/8dc45382d5206bd292f9c2768b8058a8fd8311d9' (2024-05-16) • Updated input 'hercules-ci-agent': 'github:hercules-ci/hercules-ci-agent/eb5298b1b57e8e817f7c2a05a09c17bf98ffe329' (2024-05-13) → 'github:hercules-ci/hercules-ci-agent/459c8a35a501f0d7d9d4a842505c61bd36b119e3' (2024-05-16) • Updated input 'hercules-ci-agent/nixpkgs': 'github:NixOS/nixpkgs/25865a40d14b3f9cf19f19b924e2ab4069b09588' (2024-05-05) → 'github:NixOS/nixpkgs/2057814051972fa1453ddfb0d98badbea9b83c06' (2024-05-12) • Updated input 'homeManager': 'github:nix-community/home-manager/44677a1c96810a8e8c4ffaeaad10c842402647c1' (2024-05-12) → 'github:nix-community/home-manager/e3ad5108f54177e6520535768ddbf1e6af54b59d' (2024-05-17) • Updated input 'lix-module': 'git+https://git.lix.systems/lix-project/nixos-module?ref=refs/heads/main&rev=36dbb9dbfbac2b72c431a3a934258079931d0065' (2024-05-16) → 'git+https://git.lix.systems/lix-project/nixos-module?ref=refs/heads/main&rev=53d713eb486f21d653af3ef3528e9a19ecfc45e5' (2024-05-16) • Updated input 'nixDarwin': 'github:LnL7/nix-darwin/de8b0d60d6fd34f35abffc46adc94ebaa6996ce2' (2024-05-14) → 'github:LnL7/nix-darwin/ffc01182f90118119930bdfc528c1ee9a39ecef8' (2024-05-16) • Updated input 'nixd': 'github:nix-community/nixd/af6bb716038eecf5bad0ead6ed14a4c1e5b74c13' (2024-05-02) → 'github:nix-community/nixd/51adffb162b3fce43b92808599b1ef6891483108' (2024-05-17) • Updated input 'nixosHardware': 'github:NixOS/nixos-hardware/a4e2b7909fc1bdf30c30ef21d388fde0b5cdde4a' (2024-05-08) → 'github:NixOS/nixos-hardware/ff1be1e3cdf884df0935ab28745ab13c3c26d828' (2024-05-16) • Updated input 'pre-commit-hooks': 'github:cachix/pre-commit-hooks.nix/963646978438e31c0925e16c4eca089fda69bac2' (2024-05-16) → 'github:cachix/pre-commit-hooks.nix/fa606cccd7b0ccebe2880051208e4a0f61bfc8c1' (2024-05-16) • Removed input 'pre-commit-hooks/flake-utils' • Removed input 'pre-commit-hooks/flake-utils/systems' • Updated input 'treefmt-nix': 'github:numtide/treefmt-nix/c6aaf729f34a36c445618580a9f95a48f5e4e03f' (2024-04-25) → 'github:numtide/treefmt-nix/2fba33a182602b9d49f0b2440513e5ee091d838b' (2024-05-17) --- flake.lock | 114 +++++++++++++++++++---------------------------------- 1 file changed, 40 insertions(+), 74 deletions(-) diff --git a/flake.lock b/flake.lock index 53e149f..a853d8f 100644 --- a/flake.lock +++ b/flake.lock @@ -81,11 +81,11 @@ ] }, "locked": { - "lastModified": 1715822638, - "narHash": "sha256-Z4ZoyK8jYRmBZwMaEZLEmAilrfdpekwwwohliqC14/E=", + "lastModified": 1715872464, + "narHash": "sha256-mkZ3hrPG7d+qL7B6pQcrNfPh2mnQEJR3FHK93qCp6Uk=", "owner": "nix-community", "repo": "disko", - "rev": "476eef8d85aa09389ae7baf6e6b60357f6a01432", + "rev": "5f6dbcce99d60dd77f96dfc66d06bbea149a40e1", "type": "github" }, "original": { @@ -101,11 +101,11 @@ "pyproject-nix": "pyproject-nix" }, "locked": { - "lastModified": 1715711628, - "narHash": "sha256-MwkdhFpFBABp6IZWy/A2IwDe5Y1z0qZXInTO6AtvGZY=", + "lastModified": 1715900409, + "narHash": "sha256-LfXL7pFlGfiEQlzVttw7/Vrx4dAb1koyADjWvC0GmaQ=", "owner": "nix-community", "repo": "dream2nix", - "rev": "995e831dac8c2c843f1289d15dfec526cb84afdd", + "rev": "6a169a73bde7a914563641fa8cf7290d5349d20d", "type": "github" }, "original": { @@ -487,34 +487,16 @@ "type": "github" } }, - "flake-utils_3": { - "inputs": { - "systems": "systems_4" - }, - "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" - } - }, "flakeParts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1714641030, - "narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=", + "lastModified": 1715865404, + "narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e", + "rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9", "type": "github" }, "original": { @@ -582,11 +564,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1715626852, - "narHash": "sha256-ig33Osi+Kp36TyGS1S4eu1K9FEXJXCh5CdU+eHekTPI=", + "lastModified": 1715869560, + "narHash": "sha256-X040hL0QF2uDhOqTrGIFqrpb9bTH/OOYLa34pjqT6NY=", "owner": "hercules-ci", "repo": "hercules-ci-agent", - "rev": "eb5298b1b57e8e817f7c2a05a09c17bf98ffe329", + "rev": "459c8a35a501f0d7d9d4a842505c61bd36b119e3", "type": "github" }, "original": { @@ -701,11 +683,11 @@ ] }, "locked": { - "lastModified": 1715486357, - "narHash": "sha256-4pRuzsHZOW5W4CsXI9uhKtiJeQSUoe1d2M9mWU98HC4=", + "lastModified": 1715930644, + "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=", "owner": "nix-community", "repo": "home-manager", - "rev": "44677a1c96810a8e8c4ffaeaad10c842402647c1", + "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d", "type": "github" }, "original": { @@ -781,11 +763,11 @@ ] }, "locked": { - "lastModified": 1715863402, - "narHash": "sha256-WbNIHMe+NPRtn7AwFhIDYwMWwgTNJ5pVUXfcdhxv8ek=", + "lastModified": 1715885250, + "narHash": "sha256-IUFYAl3158Ig5vySnRBHoPReb2/S97bjodCo6FhzJv4=", "ref": "refs/heads/main", - "rev": "36dbb9dbfbac2b72c431a3a934258079931d0065", - "revCount": 80, + "rev": "53d713eb486f21d653af3ef3528e9a19ecfc45e5", + "revCount": 81, "type": "git", "url": "https://git.lix.systems/lix-project/nixos-module" }, @@ -869,11 +851,11 @@ ] }, "locked": { - "lastModified": 1715653378, - "narHash": "sha256-6kbg/PI3+SBP17f4T0js3CBsMLVtlD0JqJhDKgzk1mQ=", + "lastModified": 1715901937, + "narHash": "sha256-eMyvWP56ZOdraC2IOvZo0/RTDcrrsqJ0oJWDC76JTak=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "de8b0d60d6fd34f35abffc46adc94ebaa6996ce2", + "rev": "ffc01182f90118119930bdfc528c1ee9a39ecef8", "type": "github" }, "original": { @@ -913,11 +895,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1714622771, - "narHash": "sha256-fZs0u4ep+RH7U69Jo/GAjwd1iSVFSByeAOju8ucsPx8=", + "lastModified": 1715912543, + "narHash": "sha256-OuelDLSiXmrKezDcwddsTT8p4cb84yWYKTR5tRfA4/M=", "owner": "nix-community", "repo": "nixd", - "rev": "af6bb716038eecf5bad0ead6ed14a4c1e5b74c13", + "rev": "51adffb162b3fce43b92808599b1ef6891483108", "type": "github" }, "original": { @@ -928,11 +910,11 @@ }, "nixosHardware": { "locked": { - "lastModified": 1715148395, - "narHash": "sha256-lRxjTxY3103LGMjWdVqntKZHhlmMX12QUjeFrQMmGaE=", + "lastModified": 1715881912, + "narHash": "sha256-e4LJk5uV1wvrRkffGFZekPWvFUx29NnnOahBlLaq8Ek=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a4e2b7909fc1bdf30c30ef21d388fde0b5cdde4a", + "rev": "ff1be1e3cdf884df0935ab28745ab13c3c26d828", "type": "github" }, "original": { @@ -1215,11 +1197,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1715653339, - "narHash": "sha256-7lR9tpVXviSccl07GXI0+ve/natd24HAkuy1sQp0OlI=", + "lastModified": 1715774670, + "narHash": "sha256-iJYnKMtLi5u6hZhJm94cRNSDG5Rz6ZzIkGbhPFtDRm0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "abd6d48f8c77bea7dc51beb2adfa6ed3950d2585", + "rev": "b3fcfcfabd01b947a1e4f36622bbffa3985bdac6", "type": "github" }, "original": { @@ -1231,11 +1213,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1714906307, - "narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=", + "lastModified": 1715534503, + "narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588", + "rev": "2057814051972fa1453ddfb0d98badbea9b83c06", "type": "github" }, "original": { @@ -1413,7 +1395,6 @@ "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat", - "flake-utils": "flake-utils_3", "gitignore": "gitignore", "nixpkgs": [ "nixpkgsUnstable" @@ -1423,11 +1404,11 @@ ] }, "locked": { - "lastModified": 1715850717, - "narHash": "sha256-HGY8w2Glb5xe4/l69Auv6R1kxbAQehB1vWFGnvzvSR8=", + "lastModified": 1715870890, + "narHash": "sha256-nacSOeXtUEM77Gn0G4bTdEOeFIrkCBXiyyFZtdGwuH0=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "963646978438e31c0925e16c4eca089fda69bac2", + "rev": "fa606cccd7b0ccebe2880051208e4a0f61bfc8c1", "type": "github" }, "original": { @@ -1611,21 +1592,6 @@ "type": "github" } }, - "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tow-boot": { "flake": false, "locked": { @@ -1692,11 +1658,11 @@ ] }, "locked": { - "lastModified": 1714058656, - "narHash": "sha256-Qv4RBm4LKuO4fNOfx9wl40W2rBbv5u5m+whxRYUMiaA=", + "lastModified": 1715940852, + "narHash": "sha256-wJqHMg/K6X3JGAE9YLM0LsuKrKb4XiBeVaoeMNlReZg=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "c6aaf729f34a36c445618580a9f95a48f5e4e03f", + "rev": "2fba33a182602b9d49f0b2440513e5ee091d838b", "type": "github" }, "original": { From 116474d8a8ecb4bacce30a484dcd16bb0d047aaf Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Fri, 17 May 2024 16:08:14 +0200 Subject: [PATCH 2/4] Add `calibre` --- hmModules/calibre/default.nix | 3 +++ hosts/picard/default.nix | 1 + 2 files changed, 4 insertions(+) create mode 100644 hmModules/calibre/default.nix diff --git a/hmModules/calibre/default.nix b/hmModules/calibre/default.nix new file mode 100644 index 0000000..dca9687 --- /dev/null +++ b/hmModules/calibre/default.nix @@ -0,0 +1,3 @@ +{pkgs, ...}: { + home.packages = [pkgs.calibre]; +} diff --git a/hosts/picard/default.nix b/hosts/picard/default.nix index c3c2798..6f840ed 100644 --- a/hosts/picard/default.nix +++ b/hosts/picard/default.nix @@ -78,6 +78,7 @@ "zulip" "teams" "obs-studio" + "calibre" ]; extraGroups = []; backupPaths = []; From 9e38d06d55c6458659d4d2f1788a06f217656d9c Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Fri, 17 May 2024 16:08:36 +0200 Subject: [PATCH 3/4] Switch to catppuccin --- hmModules/btop/default.nix | 12 ++++++++++-- hmModules/helix/default.nix | 2 +- hmModules/shell/default.nix | 34 ++++++++++++++++++++++++---------- hmModules/wezterm/default.nix | 2 +- 4 files changed, 36 insertions(+), 14 deletions(-) diff --git a/hmModules/btop/default.nix b/hmModules/btop/default.nix index 370fbd2..08fc3a7 100644 --- a/hmModules/btop/default.nix +++ b/hmModules/btop/default.nix @@ -1,10 +1,18 @@ -{config, ...}: { +{pkgs, ...}: { programs.btop = { enable = true; settings = { update_ms = 100; theme_background = false; - color_theme = "${config.programs.btop.package}/share/btop/themes/dracula.theme"; + # color_theme = "${config.programs.btop.package}/share/btop/themes/dracula.theme"; + color_theme = let + catppuccin-theme = pkgs.fetchFromGitHub { + owner = "catppuccin"; + repo = "btop"; + rev = "21b8d5956a8b07fa52519e3267fb3a2d2e693d17"; + hash = "sha256-UXeTypc15MhjgGUiCrDUZ40m32yH2o1N+rcrEgY6sME="; + }; + in "${catppuccin-theme}/themes/catppuccin_mocha.theme"; }; }; } diff --git a/hmModules/helix/default.nix b/hmModules/helix/default.nix index 6fa8ad9..89f0e01 100644 --- a/hmModules/helix/default.nix +++ b/hmModules/helix/default.nix @@ -2,7 +2,7 @@ programs.helix = { enable = true; settings = { - theme = "dracula"; + theme = "catppuccin_mocha"; editor = { indent-guides.render = true; cursor-shape = { diff --git a/hmModules/shell/default.nix b/hmModules/shell/default.nix index 022bae5..8a44296 100644 --- a/hmModules/shell/default.nix +++ b/hmModules/shell/default.nix @@ -96,22 +96,36 @@ # ''; # }; - xdg.configFile."dracula-theme" = { - target = "fish/themes/dracula.theme"; - source = let - theme = pkgs.fetchFromGitHub { - owner = "dracula"; - repo = "fish"; - rev = "269cd7d76d5104fdc2721db7b8848f6224bdf554"; - hash = "sha256-Hyq4EfSmWmxwCYhp3O8agr7VWFAflcUe8BUKh50fNfY="; - }; - in "${theme}/themes/Dracula\ Official.theme"; + xdg.configFile = { + "dracula-theme" = { + target = "fish/themes/dracula.theme"; + source = let + theme = pkgs.fetchFromGitHub { + owner = "dracula"; + repo = "fish"; + rev = "269cd7d76d5104fdc2721db7b8848f6224bdf554"; + hash = "sha256-Hyq4EfSmWmxwCYhp3O8agr7VWFAflcUe8BUKh50fNfY="; + }; + in "${theme}/themes/Dracula\ Official.theme"; + }; + "catppuccin-theme" = { + target = "fish/themes/Catppuccin\ Mocha.theme"; + source = let + theme = pkgs.fetchFromGitHub { + owner = "catppuccin"; + repo = "fish"; + rev = "a3b9eb5eaf2171ba1359fe98f20d226c016568cf"; + hash = "sha256-shQxlyoauXJACoZWtRUbRMxmm10R8vOigXwjxBhG8ng="; + }; + in "${theme}/themes/Catppuccin\ Mocha.theme"; + }; }; programs.fish = { enable = true; shellInit = '' fish_config theme choose "dracula" + fish_config theme choose "Catppuccin Mocha" export CACHIX_AUTH_TOKEN=$(cat ${age.secrets.cachix-personal-token.path}) ''; shellAliases = { diff --git a/hmModules/wezterm/default.nix b/hmModules/wezterm/default.nix index b6ad88b..0575359 100644 --- a/hmModules/wezterm/default.nix +++ b/hmModules/wezterm/default.nix @@ -14,7 +14,7 @@ }; font_size = 13; allow_square_glyphs_to_overflow_width = "Always"; - color_scheme = "Dracula (Official)"; + color_scheme = "Catppuccin Mocha"; window_background_opacity = 1; enable_tab_bar = false; hide_mouse_cursor_when_typing = false; From d6d5ecf47890f47bd75f4155507e53f18129fddc Mon Sep 17 00:00:00 2001 From: Seven of Nine Date: Mon, 20 May 2024 08:45:40 +0000 Subject: [PATCH 4/4] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'ccrEmacs': 'git+https://git.aciceri.dev/aciceri/emacs.git?ref=refs/heads/master&rev=cd9fc69f3d2dbd1799953c6a22eb679113baec93' (2024-05-11) → 'git+https://git.aciceri.dev/aciceri/emacs.git?ref=refs/heads/master&rev=08d4bdc74fad1934fcd68e606c7b864514f3a15c' (2024-05-17) • Updated input 'disko': 'github:nix-community/disko/476eef8d85aa09389ae7baf6e6b60357f6a01432' (2024-05-16) → 'github:nix-community/disko/6f01b9710bc4d3bf006eb8df928b4b15e0430901' (2024-05-20) • Updated input 'dream2nix': 'github:nix-community/dream2nix/995e831dac8c2c843f1289d15dfec526cb84afdd' (2024-05-14) → 'github:nix-community/dream2nix/f28d1cc6898532ac331a1625628090dc7c5b02e2' (2024-05-19) • Updated input 'dream2nix/nixpkgs': 'github:NixOS/nixpkgs/abd6d48f8c77bea7dc51beb2adfa6ed3950d2585' (2024-05-14) → 'github:NixOS/nixpkgs/8535fb92661f37ff9f0da3007fbc942f7d134b41' (2024-05-19) • Updated input 'flakeParts': 'github:hercules-ci/flake-parts/e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e' (2024-05-02) → 'github:hercules-ci/flake-parts/8dc45382d5206bd292f9c2768b8058a8fd8311d9' (2024-05-16) • Updated input 'hercules-ci-agent': 'github:hercules-ci/hercules-ci-agent/eb5298b1b57e8e817f7c2a05a09c17bf98ffe329' (2024-05-13) → 'github:hercules-ci/hercules-ci-agent/459c8a35a501f0d7d9d4a842505c61bd36b119e3' (2024-05-16) • Updated input 'hercules-ci-agent/nixpkgs': 'github:NixOS/nixpkgs/25865a40d14b3f9cf19f19b924e2ab4069b09588' (2024-05-05) → 'github:NixOS/nixpkgs/2057814051972fa1453ddfb0d98badbea9b83c06' (2024-05-12) • Updated input 'homeManager': 'github:nix-community/home-manager/44677a1c96810a8e8c4ffaeaad10c842402647c1' (2024-05-12) → 'github:nix-community/home-manager/e3ad5108f54177e6520535768ddbf1e6af54b59d' (2024-05-17) • Updated input 'lix-module': 'git+https://git.lix.systems/lix-project/nixos-module?ref=refs/heads/main&rev=36dbb9dbfbac2b72c431a3a934258079931d0065' (2024-05-16) → 'git+https://git.lix.systems/lix-project/nixos-module?ref=refs/heads/main&rev=53d713eb486f21d653af3ef3528e9a19ecfc45e5' (2024-05-16) • Updated input 'nixDarwin': 'github:LnL7/nix-darwin/de8b0d60d6fd34f35abffc46adc94ebaa6996ce2' (2024-05-14) → 'github:LnL7/nix-darwin/ffc01182f90118119930bdfc528c1ee9a39ecef8' (2024-05-16) • Updated input 'nixd': 'github:nix-community/nixd/af6bb716038eecf5bad0ead6ed14a4c1e5b74c13' (2024-05-02) → 'github:nix-community/nixd/ff3eb7117ea030d8d466d364513394cf47b58715' (2024-05-20) • Updated input 'nixosHardware': 'github:NixOS/nixos-hardware/a4e2b7909fc1bdf30c30ef21d388fde0b5cdde4a' (2024-05-08) → 'github:NixOS/nixos-hardware/d9e0b26202fd500cf3e79f73653cce7f7d541191' (2024-05-20) • Updated input 'nixpkgsStable': 'github:NixOS/nixpkgs/9ddcaffecdf098822d944d4147dd8da30b4e6843' (2024-05-14) → 'github:NixOS/nixpkgs/e7cc61784ddf51c81487637b3031a6dd2d6673a2' (2024-05-18) • Updated input 'nixpkgsUnstable': 'github:NixOS/nixpkgs/33d1e753c82ffc557b4a585c77de43d4c922ebb5' (2024-05-15) → 'github:NixOS/nixpkgs/4a6b83b05df1a8bd7d99095ec4b4d271f2956b64' (2024-05-17) • Updated input 'pre-commit-hooks': 'github:cachix/pre-commit-hooks.nix/963646978438e31c0925e16c4eca089fda69bac2' (2024-05-16) → 'github:cachix/pre-commit-hooks.nix/fa606cccd7b0ccebe2880051208e4a0f61bfc8c1' (2024-05-16) • Removed input 'pre-commit-hooks/flake-utils' • Removed input 'pre-commit-hooks/flake-utils/systems' • Updated input 'treefmt-nix': 'github:numtide/treefmt-nix/c6aaf729f34a36c445618580a9f95a48f5e4e03f' (2024-04-25) → 'github:numtide/treefmt-nix/2fba33a182602b9d49f0b2440513e5ee091d838b' (2024-05-17) --- flake.lock | 134 ++++++++++++++++++++--------------------------------- 1 file changed, 50 insertions(+), 84 deletions(-) diff --git a/flake.lock b/flake.lock index 53e149f..2119a64 100644 --- a/flake.lock +++ b/flake.lock @@ -39,11 +39,11 @@ ] }, "locked": { - "lastModified": 1715468401, - "narHash": "sha256-JYDr4Pg7orKXOTc/3BLAaCl5wtcIq9UU+Aku39D7xos=", + "lastModified": 1715955015, + "narHash": "sha256-IqhYsqdLyKIWmP6s+ZtuUjkzENStCygu9spdiqSzEZY=", "ref": "refs/heads/master", - "rev": "cd9fc69f3d2dbd1799953c6a22eb679113baec93", - "revCount": 182, + "rev": "08d4bdc74fad1934fcd68e606c7b864514f3a15c", + "revCount": 183, "type": "git", "url": "https://git.aciceri.dev/aciceri/emacs.git" }, @@ -81,11 +81,11 @@ ] }, "locked": { - "lastModified": 1715822638, - "narHash": "sha256-Z4ZoyK8jYRmBZwMaEZLEmAilrfdpekwwwohliqC14/E=", + "lastModified": 1716168343, + "narHash": "sha256-82oT27w9smpItZ+PyN2C0PjIwZYbIocwXSM4u1igXuc=", "owner": "nix-community", "repo": "disko", - "rev": "476eef8d85aa09389ae7baf6e6b60357f6a01432", + "rev": "6f01b9710bc4d3bf006eb8df928b4b15e0430901", "type": "github" }, "original": { @@ -101,11 +101,11 @@ "pyproject-nix": "pyproject-nix" }, "locked": { - "lastModified": 1715711628, - "narHash": "sha256-MwkdhFpFBABp6IZWy/A2IwDe5Y1z0qZXInTO6AtvGZY=", + "lastModified": 1716143526, + "narHash": "sha256-Pk77RzfAlrr1iR81zFJA/puxr2OeBifd0Yb0ETWMVKE=", "owner": "nix-community", "repo": "dream2nix", - "rev": "995e831dac8c2c843f1289d15dfec526cb84afdd", + "rev": "f28d1cc6898532ac331a1625628090dc7c5b02e2", "type": "github" }, "original": { @@ -487,34 +487,16 @@ "type": "github" } }, - "flake-utils_3": { - "inputs": { - "systems": "systems_4" - }, - "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" - } - }, "flakeParts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1714641030, - "narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=", + "lastModified": 1715865404, + "narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e", + "rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9", "type": "github" }, "original": { @@ -582,11 +564,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1715626852, - "narHash": "sha256-ig33Osi+Kp36TyGS1S4eu1K9FEXJXCh5CdU+eHekTPI=", + "lastModified": 1715869560, + "narHash": "sha256-X040hL0QF2uDhOqTrGIFqrpb9bTH/OOYLa34pjqT6NY=", "owner": "hercules-ci", "repo": "hercules-ci-agent", - "rev": "eb5298b1b57e8e817f7c2a05a09c17bf98ffe329", + "rev": "459c8a35a501f0d7d9d4a842505c61bd36b119e3", "type": "github" }, "original": { @@ -701,11 +683,11 @@ ] }, "locked": { - "lastModified": 1715486357, - "narHash": "sha256-4pRuzsHZOW5W4CsXI9uhKtiJeQSUoe1d2M9mWU98HC4=", + "lastModified": 1715930644, + "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=", "owner": "nix-community", "repo": "home-manager", - "rev": "44677a1c96810a8e8c4ffaeaad10c842402647c1", + "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d", "type": "github" }, "original": { @@ -781,11 +763,11 @@ ] }, "locked": { - "lastModified": 1715863402, - "narHash": "sha256-WbNIHMe+NPRtn7AwFhIDYwMWwgTNJ5pVUXfcdhxv8ek=", + "lastModified": 1715885250, + "narHash": "sha256-IUFYAl3158Ig5vySnRBHoPReb2/S97bjodCo6FhzJv4=", "ref": "refs/heads/main", - "rev": "36dbb9dbfbac2b72c431a3a934258079931d0065", - "revCount": 80, + "rev": "53d713eb486f21d653af3ef3528e9a19ecfc45e5", + "revCount": 81, "type": "git", "url": "https://git.lix.systems/lix-project/nixos-module" }, @@ -869,11 +851,11 @@ ] }, "locked": { - "lastModified": 1715653378, - "narHash": "sha256-6kbg/PI3+SBP17f4T0js3CBsMLVtlD0JqJhDKgzk1mQ=", + "lastModified": 1715901937, + "narHash": "sha256-eMyvWP56ZOdraC2IOvZo0/RTDcrrsqJ0oJWDC76JTak=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "de8b0d60d6fd34f35abffc46adc94ebaa6996ce2", + "rev": "ffc01182f90118119930bdfc528c1ee9a39ecef8", "type": "github" }, "original": { @@ -913,11 +895,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1714622771, - "narHash": "sha256-fZs0u4ep+RH7U69Jo/GAjwd1iSVFSByeAOju8ucsPx8=", + "lastModified": 1716179952, + "narHash": "sha256-YYAkj/wBEMO75nnJbcB4cjSfGzlkmaRao1WeULDIdGc=", "owner": "nix-community", "repo": "nixd", - "rev": "af6bb716038eecf5bad0ead6ed14a4c1e5b74c13", + "rev": "ff3eb7117ea030d8d466d364513394cf47b58715", "type": "github" }, "original": { @@ -928,11 +910,11 @@ }, "nixosHardware": { "locked": { - "lastModified": 1715148395, - "narHash": "sha256-lRxjTxY3103LGMjWdVqntKZHhlmMX12QUjeFrQMmGaE=", + "lastModified": 1716173274, + "narHash": "sha256-FC21Bn4m6ctajMjiUof30awPBH/7WjD0M5yqrWepZbY=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a4e2b7909fc1bdf30c30ef21d388fde0b5cdde4a", + "rev": "d9e0b26202fd500cf3e79f73653cce7f7d541191", "type": "github" }, "original": { @@ -1119,11 +1101,11 @@ }, "nixpkgsStable": { "locked": { - "lastModified": 1715668745, - "narHash": "sha256-xp62OkRkbUDNUc6VSqH02jB0FbOS+MsfMb7wL1RJOfA=", + "lastModified": 1716061101, + "narHash": "sha256-H0eCta7ahEgloGIwE/ihkyGstOGu+kQwAiHvwVoXaA0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9ddcaffecdf098822d944d4147dd8da30b4e6843", + "rev": "e7cc61784ddf51c81487637b3031a6dd2d6673a2", "type": "github" }, "original": { @@ -1135,11 +1117,11 @@ }, "nixpkgsUnstable": { "locked": { - "lastModified": 1715787315, - "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=", + "lastModified": 1715961556, + "narHash": "sha256-+NpbZRCRisUHKQJZF3CT+xn14ZZQO+KjxIIanH3Pvn4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5", + "rev": "4a6b83b05df1a8bd7d99095ec4b4d271f2956b64", "type": "github" }, "original": { @@ -1215,11 +1197,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1715653339, - "narHash": "sha256-7lR9tpVXviSccl07GXI0+ve/natd24HAkuy1sQp0OlI=", + "lastModified": 1716097317, + "narHash": "sha256-1UMrLtgzielG/Sop6gl6oTSM4pDt7rF9j9VuxhDWDlY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "abd6d48f8c77bea7dc51beb2adfa6ed3950d2585", + "rev": "8535fb92661f37ff9f0da3007fbc942f7d134b41", "type": "github" }, "original": { @@ -1231,11 +1213,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1714906307, - "narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=", + "lastModified": 1715534503, + "narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588", + "rev": "2057814051972fa1453ddfb0d98badbea9b83c06", "type": "github" }, "original": { @@ -1413,7 +1395,6 @@ "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat", - "flake-utils": "flake-utils_3", "gitignore": "gitignore", "nixpkgs": [ "nixpkgsUnstable" @@ -1423,11 +1404,11 @@ ] }, "locked": { - "lastModified": 1715850717, - "narHash": "sha256-HGY8w2Glb5xe4/l69Auv6R1kxbAQehB1vWFGnvzvSR8=", + "lastModified": 1715870890, + "narHash": "sha256-nacSOeXtUEM77Gn0G4bTdEOeFIrkCBXiyyFZtdGwuH0=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "963646978438e31c0925e16c4eca089fda69bac2", + "rev": "fa606cccd7b0ccebe2880051208e4a0f61bfc8c1", "type": "github" }, "original": { @@ -1611,21 +1592,6 @@ "type": "github" } }, - "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tow-boot": { "flake": false, "locked": { @@ -1692,11 +1658,11 @@ ] }, "locked": { - "lastModified": 1714058656, - "narHash": "sha256-Qv4RBm4LKuO4fNOfx9wl40W2rBbv5u5m+whxRYUMiaA=", + "lastModified": 1715940852, + "narHash": "sha256-wJqHMg/K6X3JGAE9YLM0LsuKrKb4XiBeVaoeMNlReZg=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "c6aaf729f34a36c445618580a9f95a48f5e4e03f", + "rev": "2fba33a182602b9d49f0b2440513e5ee091d838b", "type": "github" }, "original": {