From b53ab9c854a2b8e20a4e6900e99f39d594be365a Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Tue, 20 Oct 2026 23:30:28 -0400 Subject: [PATCH] clean up & bump of skyg --- flake.lock | 117 +++++++++++++------------------------- flake.nix | 3 - hosts/fwbook/packages.nix | 3 +- 3 files changed, 42 insertions(+), 81 deletions(-) diff --git a/flake.lock b/flake.lock index 7cc1d38..56a5b2d 100644 --- a/flake.lock +++ b/flake.lock @@ -18,24 +18,6 @@ "type": "github" } }, - "ai-usagebar": { - "inputs": { - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1792165365, - "narHash": "sha256-Uffpcw7fb9nYGNSryPlYkSTOUFWlsHIUHEuQ7gY1HqE=", - "owner": "akitaonrails", - "repo": "ai-usagebar", - "rev": "902e9750a8c8d0ac74297f6f562e389474e02eea", - "type": "github" - }, - "original": { - "owner": "akitaonrails", - "repo": "ai-usagebar", - "type": "github" - } - }, "aquamarine": { "inputs": { "hyprutils": [ @@ -469,7 +451,7 @@ "determinate-nixd-aarch64-linux": "determinate-nixd-aarch64-linux_2", "determinate-nixd-x86_64-linux": "determinate-nixd-x86_64-linux_2", "nix": "nix_2", - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1788427446, @@ -872,7 +854,7 @@ "inputs": { "crane": "crane", "fenix": "fenix", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "pre-commit-hooks": "pre-commit-hooks" }, "locked": { @@ -1079,7 +1061,7 @@ }, "herdr": { "inputs": { - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "rust-overlay": "rust-overlay" }, "locked": { @@ -1102,7 +1084,7 @@ "devenv": "devenv", "git-hooks": "git-hooks_3", "nixos-generators": "nixos-generators", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_7", "nutest": "nutest", "treefmt-nix": "treefmt-nix_3" }, @@ -1124,7 +1106,7 @@ "inputs": { "flake-parts": "flake-parts_4", "home-manager": "home-manager", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_8", "npm-lockfile-fix": "npm-lockfile-fix", "pyproject-build-systems": "pyproject-build-systems", "pyproject-nix": "pyproject-nix", @@ -1413,7 +1395,7 @@ "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", "hyprwire": "hyprwire", - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_9", "pre-commit-hooks": "pre-commit-hooks_2", "systems": "systems", "xdph": "xdph" @@ -1597,7 +1579,7 @@ "hyprutils": "hyprutils_3", "hyprwayland-scanner": "hyprwayland-scanner_3", "hyprwire": "hyprwire_3", - "nixpkgs": "nixpkgs_12", + "nixpkgs": "nixpkgs_11", "pre-commit-hooks": "pre-commit-hooks_3", "systems": "systems_3", "xdph": "xdph_2" @@ -1747,7 +1729,7 @@ "hyprutils": "hyprutils_2", "hyprwayland-scanner": "hyprwayland-scanner_2", "hyprwire": "hyprwire_2", - "nixpkgs": "nixpkgs_11", + "nixpkgs": "nixpkgs_10", "systems": "systems_2" }, "locked": { @@ -2220,7 +2202,7 @@ "bdwgc": "bdwgc", "flake-parts": "flake-parts", "git-hooks-nix": "git-hooks-nix", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "nixpkgs-23-11": "nixpkgs-23-11", "nixpkgs-regression": "nixpkgs-regression" }, @@ -2335,7 +2317,7 @@ "inputs": { "flake-parts": "flake-parts_2", "git-hooks-nix": "git-hooks-nix_2", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "nixpkgs-23-11": "nixpkgs-23-11_2", "nixpkgs-regression": "nixpkgs-regression_2" }, @@ -2549,7 +2531,7 @@ }, "nixos-hardware_2": { "inputs": { - "nixpkgs": "nixpkgs_13" + "nixpkgs": "nixpkgs_12" }, "locked": { "lastModified": 1791721963, @@ -2677,22 +2659,6 @@ } }, "nixpkgs_10": { - "locked": { - "lastModified": 1791734076, - "narHash": "sha256-i5qk1kLiit98rRbh1AXmWBNT9QXC/y4l5Wk/u5EdpDQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "7fd4004d0511991fff3a0524856a9be09e28c5f0", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_11": { "locked": { "lastModified": 1786247143, "narHash": "sha256-8S3Kcxs7D4UtxJxSJZz0m14CGhuW0MxfrIwJxeGWGnQ=", @@ -2708,7 +2674,7 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_11": { "locked": { "lastModified": 1788404924, "narHash": "sha256-lhEhY8X5EgkQ/eg6IFz4cc8jRuSYSvnxx1al7d1dvZ0=", @@ -2724,7 +2690,7 @@ "type": "github" } }, - "nixpkgs_13": { + "nixpkgs_12": { "locked": { "lastModified": 1789546076, "narHash": "sha256-vWkSk5bbfTqdtMoSgD9FshACO8JCvXTFi+3cqEp0mH0=", @@ -2737,7 +2703,7 @@ "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" } }, - "nixpkgs_14": { + "nixpkgs_13": { "locked": { "lastModified": 1792030654, "narHash": "sha256-OaQwAtPMTjQiY2sT/2/62UbSPhzP/0aDnWzMm/NCiUw=", @@ -2752,22 +2718,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1787323337, - "narHash": "sha256-PqomwlB2WugM9MC4tV1L2/yosMOfug3KBDjmqOqD1bU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "6062ba1a1b8b6281b12533c9075a2dbeb38f7e49", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-26.05-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1787962033, "narHash": "sha256-u6z9VTZA4Kf3RkHQo9sQI7NI4Ei/uiU9vrMqOiwWP1Y=", @@ -2781,7 +2731,7 @@ "url": "https://flakehub.com/f/NixOS/nixpkgs/0.2605" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1774386573, "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=", @@ -2797,7 +2747,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1779911860, "narHash": "sha256-ubcLAcKBDCZjhxw/kH5DL5GdBZQdzLqpkTe7HonvJVs=", @@ -2813,7 +2763,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1787962033, "narHash": "sha256-u6z9VTZA4Kf3RkHQo9sQI7NI4Ei/uiU9vrMqOiwWP1Y=", @@ -2827,7 +2777,7 @@ "url": "https://flakehub.com/f/NixOS/nixpkgs/0.2605" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1787498568, "narHash": "sha256-9i/VTdusq/+NM/tz+J1Re+ojkMB8MBf0QshnYfzHz30=", @@ -2841,7 +2791,7 @@ "url": "https://flakehub.com/f/DeterminateSystems/nixpkgs-weekly/0.1" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { "lastModified": 1789286504, "narHash": "sha256-eiEK7cKZORNEvX0GeF3RtNEF/JXhgf2RqSp3230q13E=", @@ -2855,7 +2805,7 @@ "url": "https://flakehub.com/f/NixOS/nixpkgs/0.1" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { "lastModified": 1785318670, "narHash": "sha256-dN6Ou5x/+23FZLEpYP3IffO+NyJFzUlGumt1uu3MMaY=", @@ -2871,6 +2821,22 @@ "type": "github" } }, + "nixpkgs_9": { + "locked": { + "lastModified": 1791734076, + "narHash": "sha256-i5qk1kLiit98rRbh1AXmWBNT9QXC/y4l5Wk/u5EdpDQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "7fd4004d0511991fff3a0524856a9be09e28c5f0", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "noctalia": { "inputs": { "nixpkgs": [ @@ -3092,7 +3058,6 @@ "root": { "inputs": { "agenix": "agenix", - "ai-usagebar": "ai-usagebar", "buildbot-nix": "buildbot-nix", "dank-greeter": "dank-greeter", "determinate": "determinate", @@ -3113,7 +3078,7 @@ "nix-index-database": "nix-index-database", "nixarchy": "nixarchy", "nixos-hardware": "nixos-hardware_2", - "nixpkgs": "nixpkgs_14", + "nixpkgs": "nixpkgs_13", "nixpkgs-unstable": "nixpkgs-unstable", "noctalia": "noctalia", "skyg-linux-tracker": "skyg-linux-tracker", @@ -3190,11 +3155,11 @@ ] }, "locked": { - "lastModified": 1792243194, - "narHash": "sha256-GYgEoGZOoqJjebzMZ+SFr/i47QmQdp5/uUbDPjzzakU=", + "lastModified": 1792553170, + "narHash": "sha256-wajyEzplVR8XWkjAZFPiGp+1aVcZjC14pspWy+pl5qw=", "ref": "refs/heads/main", - "rev": "81e99f86673a478be4b57c47f75db77a743ee7a1", - "revCount": 66, + "rev": "020fa4871fac5517490fd51e914d539cffbf8afd", + "revCount": 213, "type": "git", "url": "https://gitea.skyg.ca/ari/skyg-linux-tracker.git" }, diff --git a/flake.nix b/flake.nix index 64eb1e2..1f433da 100644 --- a/flake.nix +++ b/flake.nix @@ -93,7 +93,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; herdr.url = "github:herdrdev/herdr"; - ai-usagebar.url = "github:akitaonrails/ai-usagebar"; # Declarative disk partitioning (for nixos-anywhere installs) disko = { url = "github:nix-community/disko"; @@ -135,7 +134,6 @@ , tether , herdr , disko - , ai-usagebar , buildbot-nix }: let @@ -201,7 +199,6 @@ determinate tether herdr - ai-usagebar ; }; } diff --git a/hosts/fwbook/packages.nix b/hosts/fwbook/packages.nix index cf55473..bd249f9 100644 --- a/hosts/fwbook/packages.nix +++ b/hosts/fwbook/packages.nix @@ -1,4 +1,4 @@ -{ pkgs, unstablePkgs, ai-usagebar, hermes-agent, nixarchy, skygUtils, config, ... }: +{ pkgs, unstablePkgs, hermes-agent, nixarchy, skygUtils, config, ... }: let # Omarchy (nixarchy) shell, hand-wired — no nixarchy modules. The shell is # launched from configs/fwbook/hypr/conf/autostart.lua (omarchy-launch-shell). @@ -173,7 +173,6 @@ in bubblewrap delta-editor herdr - ai-usagebar.packages.${pkgs.stdenv.hostPlatform.system}.default hermes-agent.packages.${pkgs.stdenv.hostPlatform.system}.default skygqts