Blunkall-Technologies/Olympus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move disko input up the tree

Browse Source
This commit is contained in:
blaknull
2024-10-18 19:30:32 -05:00
parent 50f4f37a8c
commit 782086e95a
3 changed files with 18 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
flake.lock generated
View File

@@ -215,11 +215,11 @@
"locked": { "locked": {
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-SakyZnAhoToQmui5hozmLqkoLw6N/AHCgKF4tCP/sTQ=", "narHash": "sha256-SakyZnAhoToQmui5hozmLqkoLw6N/AHCgKF4tCP/sTQ=",
"path": "/mnt/nix/store/4y5l241pnwi2qh4wxcfmxlpdnjq8nsac-source/disko", "path": "/mnt/nix/store/6632xfzj8dykclkxzhjbigh06hkvia70-source/disko",
"type": "path" "type": "path"
}, },
"original": { "original": {
"path": "/mnt/nix/store/4y5l241pnwi2qh4wxcfmxlpdnjq8nsac-source/disko", "path": "/mnt/nix/store/6632xfzj8dykclkxzhjbigh06hkvia70-source/disko",
"type": "path" "type": "path"
} }
}, },
@@ -1044,11 +1044,11 @@
"locked": { "locked": {
"lastModified": 0, "lastModified": 0,
"narHash": "sha256-Hz1a2OgtlwgdQhI6hiUvityjVURsoY6oXkXq25RyiBM=", "narHash": "sha256-Hz1a2OgtlwgdQhI6hiUvityjVURsoY6oXkXq25RyiBM=",
"path": "/mnt/nix/store/x4s89c2jcsnfwqjbj5zcpb233i9x31i0-source/home", "path": "/mnt/nix/store/v3m4p7s1ncm6x2qdbfn8h7816rfidrww-source/home",
"type": "path" "type": "path"
}, },
"original": { "original": {
"path": "/mnt/nix/store/x4s89c2jcsnfwqjbj5zcpb233i9x31i0-source/home", "path": "/mnt/nix/store/v3m4p7s1ncm6x2qdbfn8h7816rfidrww-source/home",
"type": "path" "type": "path"
} }
}, },
@@ -1434,11 +1434,11 @@
"locked": { "locked": {
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-6oCDKhDSqJMWeODXDHD5XorN7/+KXBBIPZ2z+obwUNY=", "narHash": "sha256-6oCDKhDSqJMWeODXDHD5XorN7/+KXBBIPZ2z+obwUNY=",
"path": "/mnt/nix/store/4y5l241pnwi2qh4wxcfmxlpdnjq8nsac-source/packages", "path": "/mnt/nix/store/6632xfzj8dykclkxzhjbigh06hkvia70-source/packages",
"type": "path" "type": "path"
}, },
"original": { "original": {
"path": "/mnt/nix/store/4y5l241pnwi2qh4wxcfmxlpdnjq8nsac-source/packages", "path": "/mnt/nix/store/6632xfzj8dykclkxzhjbigh06hkvia70-source/packages",
"type": "path" "type": "path"
} }
}, },
@@ -1524,11 +1524,11 @@
"locked": { "locked": {
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-hg0wqQn6BxQXLmfBINzZoaWpdSIlwwZxKbYz+4df83o=", "narHash": "sha256-hg0wqQn6BxQXLmfBINzZoaWpdSIlwwZxKbYz+4df83o=",
"path": "/mnt/nix/store/4y5l241pnwi2qh4wxcfmxlpdnjq8nsac-source/programs", "path": "/mnt/nix/store/6632xfzj8dykclkxzhjbigh06hkvia70-source/programs",
"type": "path" "type": "path"
}, },
"original": { "original": {
"path": "/mnt/nix/store/4y5l241pnwi2qh4wxcfmxlpdnjq8nsac-source/programs", "path": "/mnt/nix/store/6632xfzj8dykclkxzhjbigh06hkvia70-source/programs",
"type": "path" "type": "path"
} }
}, },
@@ -1655,11 +1655,11 @@
"locked": { "locked": {
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-VZKans7CW3BgyWaVgi9mGKvJsCvyse2zLPRB5fJnlfA=", "narHash": "sha256-VZKans7CW3BgyWaVgi9mGKvJsCvyse2zLPRB5fJnlfA=",
"path": "/mnt/nix/store/4y5l241pnwi2qh4wxcfmxlpdnjq8nsac-source/services", "path": "/mnt/nix/store/6632xfzj8dykclkxzhjbigh06hkvia70-source/services",
"type": "path" "type": "path"
}, },
"original": { "original": {
"path": "/mnt/nix/store/4y5l241pnwi2qh4wxcfmxlpdnjq8nsac-source/services", "path": "/mnt/nix/store/6632xfzj8dykclkxzhjbigh06hkvia70-source/services",
"type": "path" "type": "path"
} }
}, },
@@ -1673,12 +1673,12 @@
}, },
"locked": { "locked": {
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-6D9Qya9I2fNjDLasG/DH3OQwSGoFbMkU7ZpvPEIEPqs=", "narHash": "sha256-4o+6OFouADJTS6Q5yawUGFLMoOUX8Mf/zIIlTARisj4=",
"path": "/mnt/nix/store/x4s89c2jcsnfwqjbj5zcpb233i9x31i0-source/system", "path": "/mnt/nix/store/v3m4p7s1ncm6x2qdbfn8h7816rfidrww-source/system",
"type": "path" "type": "path"
}, },
"original": { "original": {
"path": "/mnt/nix/store/x4s89c2jcsnfwqjbj5zcpb233i9x31i0-source/system", "path": "/mnt/nix/store/v3m4p7s1ncm6x2qdbfn8h7816rfidrww-source/system",
"type": "path" "type": "path"
} }
}, },

19
system/disko/flake.nix
View File

@@ -1,19 +0,0 @@
{
description = "disko config";
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
disko.url = "github:nix-community/disko";
disko.inputs.nixpkgs.follows = "nixpkgs";
};
outputs = { self, ... }@inputs: {
module = { config, lib, pkgs, ... }: {
imports = [
(import ./default.nix { inherit config lib pkgs; })
inputs.disko.nixosModules.default
];
};
};
}

7
system/flake.nix
View File

@@ -9,7 +9,9 @@
prgms.url = "./programs"; prgms.url = "./programs";
diskoConfig.url = "./disko"; nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
disko.url = "github:nix-community/disko";
disko.inputs.nixpkgs.follows = "nixpkgs";
impermanence.url = "github:nix-community/impermanence"; impermanence.url = "github:nix-community/impermanence";
@@ -21,7 +23,8 @@
imports = [ imports = [
./configuration ./configuration
./configuration/${core_inputs.host}/hardware-configuration.nix ./configuration/${core_inputs.host}/hardware-configuration.nix
inputs.diskoConfig.module ./disko
inputs.disko.nixosModules.default
./impermanence ./impermanence
inputs.impermanence.nixosModules.impermanence inputs.impermanence.nixosModules.impermanence
inputs.srvcs.module inputs.srvcs.module