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

recreate lock file

Browse Source
This commit is contained in:
blacknull
2024-10-10 15:48:30 -05:00
parent bf08d28785
commit aabb26b1c5
6 changed files with 85 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
flake.lock generated
View File

@@ -187,7 +187,11 @@
}, },
"disko": { "disko": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_9" "nixpkgs": [
"system",
"diskoConfig",
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1728334376, "lastModified": 1728334376,
@@ -198,7 +202,24 @@
"type": "github" "type": "github"
}, },
"original": { "original": {
"path": "/nix/store/0vbi7ydq3snblz8zjw9jdhx36c8qis8y-source/disko", "owner": "nix-community",
"repo": "disko",
"type": "github"
}
},
"diskoConfig": {
"inputs": {
"disko": "disko",
"nixpkgs": "nixpkgs_9"
},
"locked": {
"lastModified": 1,
"narHash": "sha256-p0w6mKHEYmWJF+2GAcug7yKXzjOhKTWIV4YAoVV6NaM=",
"path": "/nix/store/2v9fyg6kws0i1cgvxb3ry91zfrnqzhyv-source/disko",
"type": "path"
},
"original": {
"path": "/nix/store/2v9fyg6kws0i1cgvxb3ry91zfrnqzhyv-source/disko",
"type": "path" "type": "path"
} }
}, },
@@ -970,12 +991,12 @@
}, },
"locked": { "locked": {
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-Y+1PqDnNncMOtfzxU3d69VtMGRgCOnmgzruIA8UAL38=", "narHash": "sha256-7aqujZhN/iKH7WYa1gCR3H60IMxfmh17AxEP7G2NAAA=",
"path": "/nix/store/0vbi7ydq3snblz8zjw9jdhx36c8qis8y-source/impermanence", "path": "/nix/store/2v9fyg6kws0i1cgvxb3ry91zfrnqzhyv-source/impermanence",
"type": "path" "type": "path"
}, },
"original": { "original": {
"path": "/nix/store/0vbi7ydq3snblz8zjw9jdhx36c8qis8y-source/impermanence", "path": "/nix/store/2v9fyg6kws0i1cgvxb3ry91zfrnqzhyv-source/impermanence",
"type": "path" "type": "path"
} }
}, },
@@ -1027,11 +1048,11 @@
"locked": { "locked": {
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-44GWVRPvMv2i9dkN0/eSCBkSW2xOGC32KWQYF0gOdc8=", "narHash": "sha256-44GWVRPvMv2i9dkN0/eSCBkSW2xOGC32KWQYF0gOdc8=",
"path": "/nix/store/4ph3kjb0v3abp5i24yx8bdaj81mlnbh2-source/home", "path": "/nix/store/614181rkgzsqwgwg41ymc1w3j6i3qsxc-source/home",
"type": "path" "type": "path"
}, },
"original": { "original": {
"path": "/nix/store/4ph3kjb0v3abp5i24yx8bdaj81mlnbh2-source/home", "path": "/nix/store/614181rkgzsqwgwg41ymc1w3j6i3qsxc-source/home",
"type": "path" "type": "path"
} }
}, },
@@ -1277,11 +1298,11 @@
}, },
"nixpkgs_8": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1727672256, "lastModified": 1728500571,
"narHash": "sha256-9/79hjQc9+xyH+QxeMcRsA6hDyw6Z9Eo1/oxjvwirLk=", "narHash": "sha256-dOymOQ3AfNI4Z337yEwHGohrVQb4yPODCW9MDUyAc4w=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1719f27dd95fd4206afb9cec9f415b539978827e", "rev": "d51c28603def282a24fa034bcb007e2bcb5b5dd0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1293,16 +1314,16 @@
}, },
"nixpkgs_9": { "nixpkgs_9": {
"locked": { "locked": {
"lastModified": 1725194671, "lastModified": 1728500571,
"narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=", "narHash": "sha256-dOymOQ3AfNI4Z337yEwHGohrVQb4yPODCW9MDUyAc4w=",
"owner": "NixOS", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c", "rev": "d51c28603def282a24fa034bcb007e2bcb5b5dd0",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "nixos",
"ref": "nixpkgs-unstable", "ref": "nixos-24.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@@ -1413,11 +1434,11 @@
"locked": { "locked": {
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-6oCDKhDSqJMWeODXDHD5XorN7/+KXBBIPZ2z+obwUNY=", "narHash": "sha256-6oCDKhDSqJMWeODXDHD5XorN7/+KXBBIPZ2z+obwUNY=",
"path": "/nix/store/0vbi7ydq3snblz8zjw9jdhx36c8qis8y-source/packages", "path": "/nix/store/2v9fyg6kws0i1cgvxb3ry91zfrnqzhyv-source/packages",
"type": "path" "type": "path"
}, },
"original": { "original": {
"path": "/nix/store/0vbi7ydq3snblz8zjw9jdhx36c8qis8y-source/packages", "path": "/nix/store/2v9fyg6kws0i1cgvxb3ry91zfrnqzhyv-source/packages",
"type": "path" "type": "path"
} }
}, },
@@ -1503,11 +1524,11 @@
"locked": { "locked": {
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-96Dpr1ejZUBA7m2x2YfNJJxwDRj7Z8r5QV4UrGGxdoU=", "narHash": "sha256-96Dpr1ejZUBA7m2x2YfNJJxwDRj7Z8r5QV4UrGGxdoU=",
"path": "/nix/store/0vbi7ydq3snblz8zjw9jdhx36c8qis8y-source/programs", "path": "/nix/store/2v9fyg6kws0i1cgvxb3ry91zfrnqzhyv-source/programs",
"type": "path" "type": "path"
}, },
"original": { "original": {
"path": "/nix/store/0vbi7ydq3snblz8zjw9jdhx36c8qis8y-source/programs", "path": "/nix/store/2v9fyg6kws0i1cgvxb3ry91zfrnqzhyv-source/programs",
"type": "path" "type": "path"
} }
}, },
@@ -1584,11 +1605,11 @@
"locked": { "locked": {
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-1lPCRKFKK2qmdS+akk6dkrSjXOBe0iBgQp6oTi5vCWM=", "narHash": "sha256-1lPCRKFKK2qmdS+akk6dkrSjXOBe0iBgQp6oTi5vCWM=",
"path": "/nix/store/0vbi7ydq3snblz8zjw9jdhx36c8qis8y-source/sddm", "path": "/nix/store/2v9fyg6kws0i1cgvxb3ry91zfrnqzhyv-source/sddm",
"type": "path" "type": "path"
}, },
"original": { "original": {
"path": "/nix/store/0vbi7ydq3snblz8zjw9jdhx36c8qis8y-source/sddm", "path": "/nix/store/2v9fyg6kws0i1cgvxb3ry91zfrnqzhyv-source/sddm",
"type": "path" "type": "path"
} }
}, },
@@ -1649,17 +1670,17 @@
"locked": { "locked": {
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-77xH7oSwHTKWMPseY3d8isc0oV0SgNM+CdrIxhRBOzQ=", "narHash": "sha256-77xH7oSwHTKWMPseY3d8isc0oV0SgNM+CdrIxhRBOzQ=",
"path": "/nix/store/0vbi7ydq3snblz8zjw9jdhx36c8qis8y-source/services", "path": "/nix/store/2v9fyg6kws0i1cgvxb3ry91zfrnqzhyv-source/services",
"type": "path" "type": "path"
}, },
"original": { "original": {
"path": "/nix/store/0vbi7ydq3snblz8zjw9jdhx36c8qis8y-source/services", "path": "/nix/store/2v9fyg6kws0i1cgvxb3ry91zfrnqzhyv-source/services",
"type": "path" "type": "path"
} }
}, },
"system": { "system": {
"inputs": { "inputs": {
"disko": "disko", "diskoConfig": "diskoConfig",
"impermanence": "impermanence", "impermanence": "impermanence",
"pckgs": "pckgs", "pckgs": "pckgs",
"prgms": "prgms_2", "prgms": "prgms_2",
@@ -1668,12 +1689,12 @@
}, },
"locked": { "locked": {
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-TiB1Oc14weyDgkA0rI9aAOwuMb4s2tnGayCekZXUTWY=", "narHash": "sha256-yvZBqs68CVsRhNIXV0NGZpmBtOHzbCenOmIs/ov1eMo=",
"path": "/nix/store/4ph3kjb0v3abp5i24yx8bdaj81mlnbh2-source/system", "path": "/nix/store/614181rkgzsqwgwg41ymc1w3j6i3qsxc-source/system",
"type": "path" "type": "path"
}, },
"original": { "original": {
"path": "/nix/store/4ph3kjb0v3abp5i24yx8bdaj81mlnbh2-source/system", "path": "/nix/store/614181rkgzsqwgwg41ymc1w3j6i3qsxc-source/system",
"type": "path" "type": "path"
} }
}, },

4
flake.nix
View File

@@ -13,7 +13,7 @@
nathan.url = "./home"; nathan.url = "./home";
system.url = "./system"; system.url = "./system";
system.inputs.diskoConfig.inputs.nixpkgs.follows = "nixpkgs"; #system.inputs.diskoConfig.inputs.nixpkgs.follows = "nixpkgs";
}; };
@@ -53,7 +53,7 @@
}; };
nixosConfigurations.iso = nixpkgs.lib.nixosSystem { nixosConfigurations.iso = nixpkgs.lib.nixosSystem {
inherit iso_system; #inherit iso_system;
specialArgs = { specialArgs = {
core_inputs = (core_inputs // { inherit host username; }); core_inputs = (core_inputs // { inherit host username; });

4
system/disko/default.nix
View File

@@ -32,5 +32,9 @@
./impermanent.nix ./impermanent.nix
]; ];
}) })
(lib.mkIf (!config.disko.enable) {
disko.impermanent = lib.mkForce false;
})
]); ]);
} }

2
system/disko/flake.nix
View File

@@ -11,7 +11,7 @@
module = { config, lib, pkgs, devices, ... }: { module = { config, lib, pkgs, devices, ... }: {
imports = [ imports = [
(./default.nix { inherit devices; }) (import ./default.nix { inherit config lib pkgs devices; })
inputs.disko.nixosModules.default inputs.disko.nixosModules.default
]; ];
}; };

10
system/impermanence/default.nix
View File

@@ -2,10 +2,15 @@
options = {}; options = {};
config = lib.mkIf config.disko.impermanent { config = lib.mkMerge [
{
imports = [ imports = [
self.inputs.impermanence.nixosModules.impermanence self.inputs.impermanence.nixosModules.impermanence
]; ];
}
(lib.mkIf config.disko.impermanent {
fileSystems."/persist".neededForBoot = true; fileSystems."/persist".neededForBoot = true;
environment.persistence."/persist/system" = { environment.persistence."/persist/system" = {
@@ -25,5 +30,6 @@
}; };
programs.fuse.userAllowOther = true; programs.fuse.userAllowOther = true;
}; })
];
} }

2
system/impermanence/flake.nix
View File

@@ -5,6 +5,6 @@
outputs = { self, ... }: { outputs = { self, ... }: {
module = import ./. { inherit self; }; module = { config, lib, ... }: import ./. { inherit config lib self; };
}; };
} }