diff --git a/flake.lock b/flake.lock index e0c1171..912db39 100644 --- a/flake.lock +++ b/flake.lock @@ -17,8 +17,8 @@ ] }, "locked": { - "lastModified": 1770869519, - "narHash": "sha256-3NyegyJeuQQSFuQMZKNCJhTw2qhJUjUL6ep432EOgJY=", + "lastModified": 1770938216, + "narHash": "sha256-BSsm9Lsqk0Rv5bk0jknms1+RPnfDiHk8m2IZ4BeoDIw=", "path": "/home/me/agribit/nexus/Cerulean", "type": "path" }, @@ -195,7 +195,7 @@ }, "original": { "owner": "gmodena", - "ref": "v0.7.0", + "ref": "latest", "repo": "nix-flatpak", "type": "github" } @@ -354,8 +354,8 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1770855466, - "narHash": "sha256-hZyD4m2Iix0FKWiRtzNFhbgdaULq52oysD68LmtT5H4=", + "lastModified": 1770920652, + "narHash": "sha256-GkHYl2+lQ4go7jSHheIfjRdRVVvjl3LysdVNxWXcoec=", "path": "/home/me/agribit/nexus/nt", "type": "path" }, diff --git a/flake.nix b/flake.nix index 168993f..c833943 100644 --- a/flake.nix +++ b/flake.nix @@ -51,76 +51,6 @@ extra-experimental-features = "pipe-operators"; }; - outputs = { - cerulean, - home-manager, - grub2-themes, - dobutterfliescry-net, - ... - }: - cerulean.mkNexus ./. (self: { - nexus = { - overlays = - import ./overlays - ++ [ - dobutterfliescry-net.overlays.default - ]; - - groups = { - cryos = { - # oh frick i cried again - cryde = {}; - }; - server = {}; - }; - - nodes = let - inherit - (self.nexus) - groups - ; - in { - # my laptop <3 :3 - lolcathost = { - system = "x86_64-linux"; - groups = [groups.cryos.cryde]; - extraModules = [ - home-manager.nixosModules.default - grub2-themes.nixosModules.default - ]; - }; - - # i be on my puter frfr - myputer = { - system = "x86_64-linux"; - groups = [groups.cryos.cryde]; - extraModules = [ - home-manager.nixosModules.default - grub2-themes.nixosModules.default - ]; - }; - - # courtesy of aurora <3 - butterfly = { - system = "x86_64-linux"; - groups = [groups.server]; - deploy.ssh.host = "dobutterfliescry.net"; - }; - - # pls dont sue me im broke - hyrule = { - system = "x86_64-linux"; - groups = [groups.server]; - deploy.ssh.host = "hyrule.dobutterfliescry.net"; - }; - - # call me a statistician the way she spreads in my sheets - # matcha = { - # system = "x86_64-linux"; - # groups = [groups.server]; - # deploy.ssh.host = "bedroom.dobutterfliescry.net"; - # }; - }; - }; - }); + outputs = inputs: + import ./snow.nix inputs; } diff --git a/groups/all/default.nix b/groups/all/default.nix index 090cc7b..70b682d 100644 --- a/groups/all/default.nix +++ b/groups/all/default.nix @@ -1,13 +1,12 @@ { - root, inputs, - config, pkgs, - upkgs, lib, ... }: { imports = [ + inputs.dobutterfliescry-net.overlays.default + ./modules/flatpak.nix ]; diff --git a/snow.nix b/snow.nix new file mode 100644 index 0000000..5fe3054 --- /dev/null +++ b/snow.nix @@ -0,0 +1,66 @@ +{cerulean, ...} @ inputs: +cerulean.mkNexus ./. (self: { + nexus = { + specialArgs = {inherit inputs;}; + + groups = { + # wait.. that's too cold... + cryos = { + # oh frick i cried again + cryde = {}; + }; + # + server = {}; + }; + + nodes = let + inherit + (self.nexus) + groups + ; + in { + # my laptop <3 :3 + lolcathost = { + system = "x86_64-linux"; + groups = [groups.cryos.cryde]; + extraModules = with inputs; [ + home-manager.nixosModules.default + grub2-themes.nixosModules.default + nix-flatpak.nixosModules.nix-flatpak + ]; + }; + + # i be on my puter frfr + myputer = { + system = "x86_64-linux"; + groups = [groups.cryos.cryde]; + extraModules = with inputs; [ + home-manager.nixosModules.default + grub2-themes.nixosModules.default + nix-flatpak.nixosModules.nix-flatpak + ]; + }; + + # courtesy of aurora <3 + butterfly = { + system = "x86_64-linux"; + groups = [groups.server]; + deploy.ssh.host = "dobutterfliescry.net"; + }; + + # pls dont sue me im broke + hyrule = { + system = "x86_64-linux"; + groups = [groups.server]; + deploy.ssh.host = "hyrule.dobutterfliescry.net"; + }; + + # call me a statistician the way she spreads in my sheets + # matcha = { + # system = "x86_64-linux"; + # groups = [groups.server]; + # deploy.ssh.host = "bedroom.dobutterfliescry.net"; + # }; + }; + }; +})