From 1f9f0463e5f901d6c1d1f819acc788121b905602 Mon Sep 17 00:00:00 2001 From: Dave Gallant Date: Sun, 18 May 2025 10:04:59 -0400 Subject: [PATCH] Remove fh --- flake.lock | 144 ++++++++----------------------------------- flake.nix | 5 +- hosts/hephaestus.nix | 2 - 3 files changed, 27 insertions(+), 124 deletions(-) diff --git a/flake.lock b/flake.lock index 0247a15..08a3ca2 100644 --- a/flake.lock +++ b/flake.lock @@ -170,46 +170,6 @@ "type": "github" } }, - "fenix": { - "inputs": { - "nixpkgs": [ - "fh", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src" - }, - "locked": { - "lastModified": 1740810935, - "narHash": "sha256-6RzWfxENGlO73jQb3uQNgOvubUFwvveeIg+PZxhAu6s=", - "rev": "f44d7c3596ff028ad9f7fcc31d1941ed585f11b3", - "revCount": 2184, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/nix-community/fenix/0.1.2184%2Brev-f44d7c3596ff028ad9f7fcc31d1941ed585f11b3/019550c8-7792-7766-8dd2-80fad5595f70/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/nix-community/fenix/0.1.%2A" - } - }, - "fh": { - "inputs": { - "fenix": "fenix", - "naersk": "naersk", - "nixpkgs": "nixpkgs_3" - }, - "locked": { - "lastModified": 1746473843, - "narHash": "sha256-t7IZlG7rKNbkt2DIU5H0/B0+b4e9YEVJx14ijpOycCw=", - "rev": "f8319fc6a1424db090e8c3e9284ef8f48d6cf111", - "revCount": 726, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/fh/0.1.24/0196a1f6-04df-7f72-8882-ddcd7de892e2/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/DeterminateSystems/fh/%2A" - } - }, "firefox-gnome-theme": { "flake": false, "locked": { @@ -572,7 +532,7 @@ }, "home-manager": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1747331121, @@ -584,7 +544,7 @@ }, "original": { "type": "tarball", - "url": "https://flakehub.com/f/nix-community/home-manager/%2A" + "url": "https://flakehub.com/f/nix-community/home-manager/0.2411.3913" } }, "home-manager_2": { @@ -659,26 +619,6 @@ "type": "github" } }, - "naersk": { - "inputs": { - "nixpkgs": [ - "fh", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1745925850, - "narHash": "sha256-cyAAMal0aPrlb1NgzMxZqeN1mAJ2pJseDhm2m6Um8T0=", - "rev": "38bc60bbc157ae266d4a0c96671c6c742ee17a5f", - "revCount": 359, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/nix-community/naersk/0.1.359%2Brev-38bc60bbc157ae266d4a0c96671c6c742ee17a5f/0196814b-3fe7-7501-996a-40369627cec0/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/nix-community/naersk/0.1.%2A" - } - }, "nix": { "inputs": { "flake-parts": "flake-parts", @@ -772,12 +712,12 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1747179050, - "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=", - "rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e", - "revCount": 799423, + "lastModified": 1747327360, + "narHash": "sha256-LSmTbiq/nqZR9B2t4MRnWG7cb0KVNU70dB7RT4+wYK4=", + "rev": "e06158e58f3adee28b139e9c2bcfcc41f8625b46", + "revCount": 801034, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.799423%2Brev-adaa24fbf46737f3f1b5497bf64bae750f82942e/0196d1c3-1974-7bf1-bcf6-06620ac40c8c/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.801034%2Brev-e06158e58f3adee28b139e9c2bcfcc41f8625b46/0196dcb0-347d-72e4-9e49-72254d6d1366/source.tar.gz" }, "original": { "type": "tarball", @@ -800,25 +740,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1746183838, - "narHash": "sha256-kwaaguGkAqTZ1oK0yXeQ3ayYjs8u/W7eEfrFpFfIDFA=", - "rev": "bf3287dac860542719fe7554e21e686108716879", - "revCount": 717608, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2411.717608%2Brev-bf3287dac860542719fe7554e21e686108716879/0196927e-0862-7e0b-a84b-fbc51a400e7c/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/NixOS/nixpkgs/0.2411.%2A" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1746055187, - "narHash": "sha256-3dqArYSMP9hM7Qpy5YWhnSjiqniSaT2uc5h2Po7tmg0=", + "lastModified": 1747335874, + "narHash": "sha256-IKKIXTSYJMmUtE+Kav5Rob8SgLPnfnq4Qu8LyT4gdqQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3e362ce63e16b9572d8c2297c04f7c19ab6725a5", + "rev": "ba8b70ee098bc5654c459d6a95dfc498b91ff858", "type": "github" }, "original": { @@ -828,21 +754,21 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { - "lastModified": 1747209494, - "narHash": "sha256-fLise+ys+bpyjuUUkbwqo5W/UyIELvRz9lPBPoB0fbM=", - "rev": "5d736263df906c5da72ab0f372427814de2f52f8", - "revCount": 717921, + "lastModified": 1747335874, + "narHash": "sha256-IKKIXTSYJMmUtE+Kav5Rob8SgLPnfnq4Qu8LyT4gdqQ=", + "rev": "ba8b70ee098bc5654c459d6a95dfc498b91ff858", + "revCount": 717984, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2411.717921%2Brev-5d736263df906c5da72ab0f372427814de2f52f8/0196d315-0a63-71d6-a78e-702da2501e28/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2411.717984%2Brev-ba8b70ee098bc5654c459d6a95dfc498b91ff858/0196dd77-d378-7a03-b3b2-5436d37b2c99/source.tar.gz" }, "original": { "type": "tarball", "url": "https://flakehub.com/f/NixOS/nixpkgs/%2A" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1730768919, "narHash": "sha256-8AKquNnnSaJRXZxc5YmF/WfmxiHX6MMZZasRP6RRQkE=", @@ -858,7 +784,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1743703532, "narHash": "sha256-s1KLDALEeqy+ttrvqV3jx9mBZEvmthQErTVOAzbjHZs=", @@ -874,7 +800,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { "lastModified": 1743814133, "narHash": "sha256-drDyYyUmjeYGiHmwB9eOPTQRjmrq3Yz26knwmMPLZFk=", @@ -946,7 +872,7 @@ "inputs": { "flake-compat": "flake-compat_3", "gitignore": "gitignore_2", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1747372754, @@ -966,9 +892,8 @@ "inputs": { "darwin": "darwin", "determinate": "determinate", - "fh": "fh", "home-manager": "home-manager", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nixpkgs-unstable": "nixpkgs-unstable", "nixvim": "nixvim", "pre-commit-hooks": "pre-commit-hooks", @@ -976,23 +901,6 @@ "vpngate": "vpngate" } }, - "rust-analyzer-src": { - "flake": false, - "locked": { - "lastModified": 1740737930, - "narHash": "sha256-2AW/FJQI/i6bbRB/8HR9l9SjxjuiukJpHdMPgwApPKA=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "fe8444616679f8e50ff9696f4750df1f10e7433d", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, "stylix": { "inputs": { "base16": "base16", @@ -1005,18 +913,18 @@ "git-hooks": "git-hooks_2", "gnome-shell": "gnome-shell", "home-manager": "home-manager_3", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_6", "systems": "systems_2", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1746143246, - "narHash": "sha256-O8rZjqJUIkUva66XTOZy0wcgfBP2eaxU9+Xt7ZHtfhI=", + "lastModified": 1747543250, + "narHash": "sha256-NuT/y8zMRFG0I3KeMSLxCXCO/d9TEEB0ZTXcYdYENWw=", "owner": "danth", "repo": "stylix", - "rev": "20ace60f9cb5e179cb2256abaee505780df8e804", + "rev": "5ff94fe0108bb361bddfbe1541713c93f369554a", "type": "github" }, "original": { @@ -1145,7 +1053,7 @@ "vpngate": { "inputs": { "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1743991519, diff --git a/flake.nix b/flake.nix index 4fdc9e4..6e2248a 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,6 @@ inputs = { determinate.url = "https://flakehub.com/f/DeterminateSystems/determinate/*"; - fh.url = "https://flakehub.com/f/DeterminateSystems/fh/*"; nixpkgs-unstable.url = "https://flakehub.com/f/NixOS/nixpkgs/0.1"; nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/*"; pre-commit-hooks.url = "github:cachix/git-hooks.nix"; @@ -11,7 +10,7 @@ url = "github:lnl7/nix-darwin/nix-darwin-24.11"; inputs.nixpkgs.follows = "nixpkgs"; }; - home-manager.url = "https://flakehub.com/f/nix-community/home-manager/*"; + home-manager.url = "https://flakehub.com/f/nix-community/home-manager/0.2411.3913"; nixvim = { url = "github:nix-community/nixvim/nixos-24.11"; inputs.nixpkgs.follows = "nixpkgs"; @@ -24,7 +23,6 @@ { self, darwin, - fh, determinate, home-manager, nixpkgs, @@ -68,7 +66,6 @@ { hephaestus = nixpkgs.lib.nixosSystem { specialArgs = { - inherit fh; inherit unstable; inherit vpngate; }; diff --git a/hosts/hephaestus.nix b/hosts/hephaestus.nix index e13a31d..058d6c2 100644 --- a/hosts/hephaestus.nix +++ b/hosts/hephaestus.nix @@ -1,6 +1,5 @@ { config, - fh, lib, modulesPath, pkgs, @@ -96,7 +95,6 @@ in cryptsetup discord docker-compose - fh.packages.x86_64-linux.default freefilesync gimp-with-plugins gnome-tweaks