Compare commits

..

No commits in common. "af2f9c57a3fd397096fe66f2f985201770f628ac" and "01b1b13b6aae521ffb6a0ba8aac19e29011f57f9" have entirely different histories.

3 changed files with 43 additions and 46 deletions

View file

@ -653,11 +653,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729894599, "lastModified": 1729551526,
"narHash": "sha256-nL9nzNE5/re/P+zOv7NX6bRm5e+DeS1HIufQUJ01w20=", "narHash": "sha256-7LAGY32Xl14OVQp3y6M43/0AtHYYvV6pdyBcp3eoz0s=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "93435d27d250fa986bfec6b2ff263161ff8288cb", "rev": "5ec753a1fc4454df9285d8b3ec0809234defb975",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -669,11 +669,11 @@
"homebrew-cask": { "homebrew-cask": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1729900819, "lastModified": 1729656386,
"narHash": "sha256-YqvmJRpZu6R+raEjImEFGANRTsQn6AuYW7pQGsD3yD8=", "narHash": "sha256-FQmb/elC1YcrsFROnnqtyxGbsruK+6qJ65KMPuds4H8=",
"owner": "homebrew", "owner": "homebrew",
"repo": "homebrew-cask", "repo": "homebrew-cask",
"rev": "65a1b4716d52c885426c76b8f7856216999c6015", "rev": "d0974a206135baa63a26d118eaf2d399b4e8db3d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -685,11 +685,11 @@
"homebrew-core": { "homebrew-core": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1729900645, "lastModified": 1729662824,
"narHash": "sha256-bFtFqn/g+Acpisl6gVYIzNjE8xPnaNMbqEEefNySXP8=", "narHash": "sha256-hZ0o4t0axM93b5RmutvVPefp2tfiE3rBLaUl04V83iM=",
"owner": "homebrew", "owner": "homebrew",
"repo": "homebrew-core", "repo": "homebrew-core",
"rev": "fdf55dc7f1c7b676bd895e6f2398f74f67f8f718", "rev": "c2faaa674379b154b10dd92cdebb983cee3cea01",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -813,11 +813,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729826725, "lastModified": 1729579044,
"narHash": "sha256-w3WNlYxqWYsuzm/jgFPyhncduoDNjot28aC8j39TW0U=", "narHash": "sha256-0kEUVl5s8LHbK4/xEePflsdYVwG+RRFSIofSvITYmIU=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "7840909b00fbd5a183008a6eb251ea307fe4a76e", "rev": "64d9d1ae25215c274c37e3e4016977a6779cf0d3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1112,11 +1112,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1729850857, "lastModified": 1729501122,
"narHash": "sha256-WvLXzNNnnw+qpFOmgaM3JUlNEH+T4s22b5i2oyyCpXE=", "narHash": "sha256-tScdcYQ37kMqlyqb5yizNDTKXZASLB4zHitlHwOg+/o=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "41dea55321e5a999b17033296ac05fe8a8b5a257", "rev": "56c7c4a3f5fdbef5bf81c7d9c28fbb45dc626611",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1424,11 +1424,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729890230, "lastModified": 1729657027,
"narHash": "sha256-r3VJy1tkkTf+lDo8cvdrILDjpPTqYhoybpwM0ME8STA=", "narHash": "sha256-olxRDZg+/cQZQPW9pEcKfyubHEzqvQsGRrQBw9kTBGg=",
"owner": "Gerg-L", "owner": "Gerg-L",
"repo": "spicetify-nix", "repo": "spicetify-nix",
"rev": "ebbc0161954fbba0c3b5873f9b63f51f58f59a83", "rev": "b9d886969141231ca687a915a2c33b3e85c3085c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1581,11 +1581,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729903226, "lastModified": 1729149755,
"narHash": "sha256-osT3czlWUsRQq0Tz2HCGcQqJ1bwuLtpp8Fmb2qNJPLo=", "narHash": "sha256-xMTPiqUb8FEo5yK1UnjnzdRUzd/IGVA7r5hypNBOjtY=",
"owner": "youwen5", "owner": "youwen5",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "a673e3204ab425bd427bd5b6e310fd89e9b682f7", "rev": "c1fe7804b7c7a01094bc2ce62b8f0b51c1c931a3",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -90,9 +90,6 @@
flake-parts, flake-parts,
... ...
}: }:
let
buildLiminalOS = import ./lib/buildLiminalOS.nix;
in
flake-parts.lib.mkFlake { inherit inputs; } { flake-parts.lib.mkFlake { inherit inputs; } {
systems = [ systems = [
"x86_64-linux" "x86_64-linux"
@ -101,17 +98,30 @@
]; ];
flake = { flake = {
nixosConfigurations = { nixosConfigurations = {
demeter = buildLiminalOS { demeter = nixpkgs.lib.nixosSystem {
inherit inputs nixpkgs; specialArgs = {
systemModule = ./hosts/demeter; inherit inputs;
}; };
callisto = buildLiminalOS { modules = [
inherit nixpkgs inputs; ./hosts/demeter
systemModule = ./hosts/callisto; ];
}; };
adrastea = buildLiminalOS {
inherit inputs nixpkgs; callisto = nixpkgs.lib.nixosSystem {
systemModule = ./hosts/adrastea; specialArgs = {
inherit inputs;
};
modules = [
./hosts/callisto
];
};
adrastea = nixpkgs.lib.nixosSystem {
specialArgs = {
inherit inputs;
};
modules = [
./hosts/adrastea
];
}; };
}; };
darwinConfigurations.phobos = nix-darwin.lib.darwinSystem { darwinConfigurations.phobos = nix-darwin.lib.darwinSystem {

View file

@ -1,13 +0,0 @@
{
nixpkgs,
inputs,
systemModule,
}:
nixpkgs.lib.nixosSystem {
specialArgs = {
inherit inputs;
};
modules = [
systemModule
];
}