commit 91e253702d130f6596a6c2366902574ddc196580
parent ec0adb1e8a1187643ada235a371d361a91cefe9a
Author: Toni Brown <me@tb148.net>
Date: Tue, 24 Mar 2026 13:10:31 +0800
get rid of flakehub
Diffstat:
| M | flake.lock | | | 128 | ++++++++++++++----------------------------------------------------------------- |
| M | flake.nix | | | 9 | ++------- |
2 files changed, 24 insertions(+), 113 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -20,20 +20,6 @@
"url": "ssh://git@github.com/catppuccin/nix.git"
}
},
- "crane": {
- "locked": {
- "lastModified": 1758758545,
- "narHash": "sha256-NU5WaEdfwF6i8faJ2Yh+jcK9vVFrofLcwlD/mP65JrI=",
- "rev": "95d528a5f54eaba0d12102249ce42f4d01f4e364",
- "revCount": 764,
- "type": "tarball",
- "url": "https://api.flakehub.com/f/pinned/ipetkov/crane/0.21.1/01997e40-19a9-7bc6-9dba-0585d6ed9a98/source.tar.gz"
- },
- "original": {
- "type": "tarball",
- "url": "https://flakehub.com/f/ipetkov/crane/0"
- }
- },
"determinate": {
"inputs": {
"determinate-nixd-aarch64-darwin": "determinate-nixd-aarch64-darwin",
@@ -91,46 +77,6 @@
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.17.1/x86_64-linux"
}
},
- "fenix": {
- "inputs": {
- "nixpkgs": [
- "fh",
- "nixpkgs"
- ],
- "rust-analyzer-src": "rust-analyzer-src"
- },
- "locked": {
- "lastModified": 1756709111,
- "narHash": "sha256-xv2u5dnQpdWkrIy5TBSomr055odWtRSoECSGBzNpp3w=",
- "rev": "113eba389317407992ea219d5aaced44bf6407f9",
- "revCount": 2375,
- "type": "tarball",
- "url": "https://api.flakehub.com/f/pinned/nix-community/fenix/0.1.2375%2Brev-113eba389317407992ea219d5aaced44bf6407f9/0199045f-8452-723d-b201-deb22d41c75e/source.tar.gz"
- },
- "original": {
- "type": "tarball",
- "url": "https://flakehub.com/f/nix-community/fenix/%3D0.1.2375"
- }
- },
- "fh": {
- "inputs": {
- "crane": "crane",
- "fenix": "fenix",
- "nixpkgs": "nixpkgs_3"
- },
- "locked": {
- "lastModified": 1761780713,
- "narHash": "sha256-EUCV7/J9wJRroCGW5JqonFJIqcvJEBAwB7l3eWYxiSk=",
- "rev": "4f001f2e1de4776f01cf22d1de815f1016a4c4c9",
- "revCount": 786,
- "type": "tarball",
- "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/fh/0.1.27/019a355b-4c74-769d-a9ad-232df447089d/source.tar.gz"
- },
- "original": {
- "type": "tarball",
- "url": "https://flakehub.com/f/DeterminateSystems/fh/%2A"
- }
- },
"flake-compat": {
"flake": false,
"locked": {
@@ -201,16 +147,17 @@
]
},
"locked": {
- "lastModified": 1774135471,
- "narHash": "sha256-TVeIGOxnfSPM6JvkRkXHpJECnj1OG2dXkWMSA4elzzQ=",
- "rev": "856b01ebd1de3f53c3929ce8082d9d67d799d816",
- "revCount": 6382,
- "type": "tarball",
- "url": "https://api.flakehub.com/f/pinned/nix-community/home-manager/0.1.6382%2Brev-856b01ebd1de3f53c3929ce8082d9d67d799d816/019d12b7-ed94-797f-a180-aad3254a9adc/source.tar.gz"
+ "lastModified": 1774293042,
+ "narHash": "sha256-OEBV+Y5I4Ldu98k0KvGXRfJYh+jjE8ocCSL/dxTGs1s=",
+ "ref": "refs/heads/master",
+ "rev": "bc357c75e3142a31b849ba49c5299fb52c61cf59",
+ "revCount": 6399,
+ "type": "git",
+ "url": "ssh://git@github.com/nix-community/home-manager"
},
"original": {
- "type": "tarball",
- "url": "https://flakehub.com/f/nix-community/home-manager/0.1"
+ "type": "git",
+ "url": "ssh://git@github.com/nix-community/home-manager"
}
},
"nix": {
@@ -296,24 +243,10 @@
},
"nixpkgs_3": {
"locked": {
- "lastModified": 1761468971,
- "narHash": "sha256-vY2OLVg5ZTobdroQKQQSipSIkHlxOTrIF1fsMzPh8w8=",
- "rev": "78e34d1667d32d8a0ffc3eba4591ff256e80576e",
- "revCount": 811770,
- "type": "tarball",
- "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2505.811770%2Brev-78e34d1667d32d8a0ffc3eba4591ff256e80576e/019a23fb-89f0-7302-a573-f6bf7dde9cf5/source.tar.gz"
- },
- "original": {
- "type": "tarball",
- "url": "https://flakehub.com/f/NixOS/nixpkgs/0"
- }
- },
- "nixpkgs_4": {
- "locked": {
- "lastModified": 1773821835,
- "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=",
+ "lastModified": 1774106199,
+ "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=",
"ref": "nixos-unstable",
- "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0",
+ "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655",
"shallow": true,
"type": "git",
"url": "https://mirrors.tuna.tsinghua.edu.cn/git/nixpkgs.git"
@@ -329,29 +262,11 @@
"inputs": {
"catppuccin": "catppuccin",
"determinate": "determinate",
- "fh": "fh",
"home-manager": "home-manager",
- "nixpkgs": "nixpkgs_4",
+ "nixpkgs": "nixpkgs_3",
"sops-nix": "sops-nix"
}
},
- "rust-analyzer-src": {
- "flake": false,
- "locked": {
- "lastModified": 1756597274,
- "narHash": "sha256-wfaKRKsEVQDB7pQtAt04vRgFphkVscGRpSx3wG1l50E=",
- "owner": "rust-lang",
- "repo": "rust-analyzer",
- "rev": "21614ed2d3279a9aa1f15c88d293e65a98991b30",
- "type": "github"
- },
- "original": {
- "owner": "rust-lang",
- "ref": "nightly",
- "repo": "rust-analyzer",
- "type": "github"
- }
- },
"sops-nix": {
"inputs": {
"nixpkgs": [
@@ -359,16 +274,17 @@
]
},
"locked": {
- "lastModified": 1762659808,
- "narHash": "sha256-2Kv2mANf+FRisqhpfeZ8j9firBxb23ZvEXwdcunbpGI=",
- "rev": "524312bc62e3f34bd9231a2f66622663d3355133",
- "revCount": 1059,
- "type": "tarball",
- "url": "https://api.flakehub.com/f/pinned/Mic92/sops-nix/0.1.1059%2Brev-524312bc62e3f34bd9231a2f66622663d3355133/019a66b7-d4f9-79eb-9a56-10831630dfaf/source.tar.gz"
+ "lastModified": 1774303811,
+ "narHash": "sha256-fhG4JAcLgjKwt+XHbjs8brpWnyKUfU4LikLm3s0Q/ic=",
+ "ref": "refs/heads/master",
+ "rev": "614e256310e0a4f8a9ccae3fa80c11844fba7042",
+ "revCount": 1184,
+ "type": "git",
+ "url": "ssh://git@github.com/Mic92/sops-nix.git"
},
"original": {
- "type": "tarball",
- "url": "https://flakehub.com/f/Mic92/sops-nix/0.1"
+ "type": "git",
+ "url": "ssh://git@github.com/Mic92/sops-nix.git"
}
}
},
diff --git a/flake.nix b/flake.nix
@@ -4,17 +4,16 @@
inputs = {
nixpkgs.url = "git+https://mirrors.tuna.tsinghua.edu.cn/git/nixpkgs.git?ref=nixos-unstable&shallow=1";
determinate.url = "https://flakehub.com/f/DeterminateSystems/determinate/*";
- fh.url = "https://flakehub.com/f/DeterminateSystems/fh/*";
catppuccin = {
url = "git+ssh://git@github.com/catppuccin/nix.git";
inputs.nixpkgs.follows = "nixpkgs";
};
home-manager = {
- url = "https://flakehub.com/f/nix-community/home-manager/0.1";
+ url = "git+ssh://git@github.com/nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
};
sops-nix = {
- url = "https://flakehub.com/f/Mic92/sops-nix/0.1";
+ url = "git+ssh://git@github.com/Mic92/sops-nix.git";
inputs.nixpkgs.follows = "nixpkgs";
};
};
@@ -23,7 +22,6 @@
self,
nixpkgs,
determinate,
- fh,
catppuccin,
home-manager,
sops-nix,
@@ -49,9 +47,6 @@
];
};
}
- {
- environment.systemPackages = [fh.packages.x86_64-linux.default];
- }
];
};
};