trying flakes

This commit is contained in:
ari committed 2024-04-27 11:44:41 -04:00
1 parent e161742bb9
commit 0c9abbd660
4 files changed
+13 -115

No files matched your search

Generated
+3 -106
View File
@@ -1,61 +1,8 @@
{
"nodes": {
"fenix": {
"inputs": {
"nixpkgs": [
"fh",
"nixpkgs"
],
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"narHash": "sha256-0dZpggYjjmWEk+rGixiBHOHuQfLzEzNfrtjSig04s6Q=",
"rev": "9ccae1754eec0341b640d5705302ac0923d22875",
"revCount": 1618,
"type": "tarball",
"url": "https://api.flakehub.com/f/pinned/nix-community/fenix/0.1.1618%2Brev-9ccae1754eec0341b640d5705302ac0923d22875/018aea4c-03c9-7734-95d5-b84cc8881e3d/source.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://flakehub.com/f/nix-community/fenix/0.1.1565.tar.gz"
}
},
"fh": {
"inputs": {
"fenix": "fenix",
"flake-compat": "flake-compat",
"naersk": "naersk",
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1711118970,
"narHash": "sha256-fRaKydMSwd1zl6ptBKvn5ej2pqtI8xi9dioFmR8QA+g=",
"rev": "73fed26f0231ae650122beb3ac1b7654b5cc682c",
"revCount": 425,
"type": "tarball",
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/fh/0.1.10/018e66b1-a218-7f23-949d-ace71c4e4c8b/source.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://flakehub.com/f/DeterminateSystems/fh/%2A.tar.gz"
}
},
"flake-compat": {
"locked": {
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"revCount": 57,
"type": "tarball",
"url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://flakehub.com/f/edolstra/flake-compat/1.0.1.tar.gz"
}
},
"home-manager": {
"inputs": {
"nixpkgs": "nixpkgs_2"
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1714203603,
@@ -71,25 +18,6 @@
"type": "github"
}
},
"naersk": {
"inputs": {
"nixpkgs": [
"fh",
"nixpkgs"
]
},
"locked": {
"narHash": "sha256-TunvZMCxXHvU6fz5kq3XTLfojIvTDlbFGfPUFtwCU5o=",
"rev": "06a99941d72e2202ed62b8aa08b9869817fea56f",
"revCount": 332,
"type": "tarball",
"url": "https://api.flakehub.com/f/pinned/nix-community/naersk/0.1.332%2Brev-06a99941d72e2202ed62b8aa08b9869817fea56f/018b61d4-48e5-77e8-8893-9f917732b11a/source.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://flakehub.com/f/nix-community/naersk/0.1.332.tar.gz"
}
},
"nixos-hardware": {
"locked": {
"lastModified": 1714201532,
@@ -107,19 +35,6 @@
}
},
"nixpkgs": {
"locked": {
"narHash": "sha256-9NJcFF9CEYPvHJ5ckE8kvINvI84SZZ87PvqMbH6pro0=",
"rev": "5e4c2ada4fcd54b99d56d7bd62f384511a7e2593",
"revCount": 534806,
"type": "tarball",
"url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.534806%2Brev-5e4c2ada4fcd54b99d56d7bd62f384511a7e2593/018b29e9-ae6d-72f2-993b-19cb9a64a3b5/source.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://flakehub.com/f/NixOS/nixpkgs/0.1.514192.tar.gz"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1713714899,
"narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=",
@@ -135,7 +50,7 @@
"type": "github"
}
},
"nixpkgs_3": {
"nixpkgs_2": {
"locked": {
"lastModified": 1713995372,
"narHash": "sha256-fFE3M0vCoiSwCX02z8VF58jXFRj9enYUSTqjyHAjrds=",
@@ -153,27 +68,9 @@
},
"root": {
"inputs": {
"fh": "fh",
"home-manager": "home-manager",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_3"
}
},
"rust-analyzer-src": {
"flake": false,
"locked": {
"lastModified": 1696050837,
"narHash": "sha256-2K3Aq4gjPZBDnkAMJaMA4ElE+BNbmrqtSBWtt9kPGaM=",
"owner": "rust-lang",
"repo": "rust-analyzer",
"rev": "0840038f02daec6ba3238f05d8caa037d28701a0",
"type": "github"
},
"original": {
"owner": "rust-lang",
"ref": "nightly",
"repo": "rust-analyzer",
"type": "github"
"nixpkgs": "nixpkgs_2"
}
}
},
+9 -8
View File
@@ -1,7 +1,7 @@
{
inputs.nixpkgs.url = github:NixOS/nixpkgs/nixos-23.11;
inputs.home-manager.url = github:nix-community/home-manager;
inputs.fh.url = "https://flakehub.com/f/DeterminateSystems/fh/*.tar.gz";
# inputs.fh.url = "https://flakehub.com/f/DeterminateSystems/fh/*.tar.gz";
inputs.nixos-hardware.url = "github:NixOS/nixos-hardware/master";
@@ -9,7 +9,7 @@
{ self
, nixpkgs
, home-manager
, fh
# , fh
, nixos-hardware
}@attrs:
let
@@ -28,14 +28,15 @@
system = "x86_64-linux";
modules = [
./hardware-configs/fwbook.nix
nixos-hardware.nixosModules.framework-13-7040-amd
(import ./modules/os/nix.nix {
systemStateVersion = systemStateVersion;
(import ./main.nix {
enableFingerPrint = true;
hostName = "fwbook";
user = user;
})
(import ./modules/os/core.nix {
./modules/optional/amd-packages.nix
./modules/optional/gnome.nix
(import ./modules/optional/hyprland.nix {
user = user;
hostName = hostName;
firewall = { enable = true; };
})
];
};
+1
View File
@@ -11,6 +11,7 @@ in
imports =
[
/etc/nixos/cachix.nix
/etc/nixos/hardware-configuration.nix
<nixos-hardware/framework/13-inch/7040-amd>
(import /home/ari/nixos-setup/main.nix {
enableFingerPrint = true;
-1
View File
@@ -14,7 +14,6 @@ let
in
{
imports = [
/etc/nixos/hardware-configuration.nix
(import ./modules/os/nix.nix {
systemStateVersion = systemStateVersion;
})