commit ac1a27c8f4486f489d8e0dc5bc8bf134edb8818b
parent d0173f401e50ed09cb3f2b43824d8b66f43973a5
Author: Toni Brown <me@tb148.net>
Date: Wed, 18 Mar 2026 23:36:09 +0800
install fh
Diffstat:
3 files changed, 105 insertions(+), 14 deletions(-)
diff --git a/configuration.nix b/configuration.nix
@@ -184,7 +184,7 @@
"nix-command"
"flakes"
];
- substituters = ["https://mirrors.tuna.tsinghua.edu.cn/nix-channels/store"];
+ substituters = ["https://mirrors.tuna.tsinghua.edu.cn/nix-channels/store?priority=38"];
};
# Copy the NixOS configuration file and link it from the resulting system
diff --git a/flake.lock b/flake.lock
@@ -9,15 +9,29 @@
"locked": {
"lastModified": 1773403535,
"narHash": "sha256-47MZaFrHxNO8tVUAmtVnerXUw2WWVluBOiU9MulN/yM=",
- "owner": "catppuccin",
- "repo": "nix",
+ "ref": "refs/heads/main",
"rev": "d45b5665cc638bad1b794350de02f4dd41b0bb47",
- "type": "github"
+ "revCount": 616,
+ "type": "git",
+ "url": "ssh://git@github.com/catppuccin/nix.git"
},
"original": {
- "owner": "catppuccin",
- "repo": "nix",
- "type": "github"
+ "type": "git",
+ "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": {
@@ -77,6 +91,46 @@
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.17.0/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": {
@@ -242,6 +296,20 @@
},
"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": 1773734432,
"narHash": "sha256-IF5ppUWh6gHGHYDbtVUyhwy/i7D261P7fWD1bPefOsw=",
"ref": "nixos-unstable",
@@ -261,11 +329,29 @@
"inputs": {
"catppuccin": "catppuccin",
"determinate": "determinate",
+ "fh": "fh",
"home-manager": "home-manager",
- "nixpkgs": "nixpkgs_3",
+ "nixpkgs": "nixpkgs_4",
"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": [
diff --git a/flake.nix b/flake.nix
@@ -3,15 +3,16 @@
inputs = {
nixpkgs.url = "git+https://mirrors.tuna.tsinghua.edu.cn/git/nixpkgs.git?ref=nixos-unstable&shallow=1";
+ catppuccin = {
+ url = "git+ssh://git@github.com/catppuccin/nix.git";
+ inputs.nixpkgs.follows = "nixpkgs";
+ };
determinate.url = "https://flakehub.com/f/DeterminateSystems/determinate/*";
+ fh.url = "https://flakehub.com/f/DeterminateSystems/fh/*";
home-manager = {
url = "https://flakehub.com/f/nix-community/home-manager/0.1";
inputs.nixpkgs.follows = "nixpkgs";
};
- catppuccin = {
- url = "github:catppuccin/nix";
- inputs.nixpkgs.follows = "nixpkgs";
- };
sops-nix = {
url = "https://flakehub.com/f/Mic92/sops-nix/0.1";
inputs.nixpkgs.follows = "nixpkgs";
@@ -21,9 +22,10 @@
outputs = {
self,
nixpkgs,
+ catppuccin,
determinate,
+ fh,
home-manager,
- catppuccin,
sops-nix,
...
} @ inputs: {
@@ -33,9 +35,9 @@
specialArgs = {inherit inputs;};
modules = [
./configuration.nix
+ catppuccin.nixosModules.catppuccin
determinate.nixosModules.default
home-manager.nixosModules.home-manager
- catppuccin.nixosModules.catppuccin
sops-nix.nixosModules.sops
{
home-manager.useGlobalPkgs = true;
@@ -47,6 +49,9 @@
];
};
}
+ {
+ environment.systemPackages = [fh.packages.x86_64-linux.default];
+ }
];
};
};
