Update flake inputs (except clan-core)
This commit is contained in:
parent
a27ca4aeec
commit
0c1c823afc
2 changed files with 58 additions and 35 deletions
75
clan.nix
75
clan.nix
|
|
@ -3,38 +3,61 @@
|
|||
|
||||
inventory.machines = {
|
||||
aresix = {
|
||||
tags = ["server" "headless" "spain"];
|
||||
tags = [
|
||||
"server"
|
||||
"headless"
|
||||
"spain"
|
||||
];
|
||||
};
|
||||
frues-pc = {
|
||||
tags = ["desktop" "spain" "gaming"];
|
||||
tags = [
|
||||
"desktop"
|
||||
"spain"
|
||||
"gaming"
|
||||
];
|
||||
};
|
||||
frues-port = {
|
||||
tags = ["desktop" "spain"];
|
||||
tags = [
|
||||
"desktop"
|
||||
"spain"
|
||||
];
|
||||
};
|
||||
frues-surface3 = {
|
||||
tags = ["desktop" "spain"];
|
||||
tags = [
|
||||
"desktop"
|
||||
"spain"
|
||||
];
|
||||
};
|
||||
terrier = {
|
||||
tags = ["server" "headless" "raspberry"];
|
||||
tags = [
|
||||
"server"
|
||||
"headless"
|
||||
"raspberry"
|
||||
];
|
||||
};
|
||||
beagle = {
|
||||
tags = ["server" "headless" "vm"];
|
||||
tags = [
|
||||
"server"
|
||||
"headless"
|
||||
"vm"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
# Docs: See https://docs.clan.lol/reference/clanServices
|
||||
inventory.instances = {
|
||||
admin = {
|
||||
roles.default.tags.all = {};
|
||||
roles.default.tags.all = { };
|
||||
roles.default.settings.allowedKeys = {
|
||||
"pedro" = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJji4h4bgzgmp7YoRX/8ePN0TcCYRfI2wlrEeZkBQ/y2 personal@peprolinbot.com";
|
||||
"pedro" =
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJji4h4bgzgmp7YoRX/8ePN0TcCYRfI2wlrEeZkBQ/y2 personal@peprolinbot.com";
|
||||
};
|
||||
};
|
||||
|
||||
pedro-user = {
|
||||
module.name = "users";
|
||||
|
||||
roles.default.tags.all = {};
|
||||
roles.default.tags.all = { };
|
||||
|
||||
roles.default.settings = {
|
||||
user = "pedro";
|
||||
|
|
@ -49,59 +72,59 @@
|
|||
];
|
||||
};
|
||||
|
||||
roles.default.extraModules = [./users/pedro/home.nix];
|
||||
roles.default.extraModules = [ ./users/pedro/home.nix ];
|
||||
};
|
||||
|
||||
base-all = {
|
||||
module.name = "importer";
|
||||
roles.default.tags.all = {};
|
||||
roles.default.extraModules = ["modules/base.nix"];
|
||||
roles.default.tags.all = { };
|
||||
roles.default.extraModules = [ modules/base.nix ];
|
||||
};
|
||||
|
||||
vm-base = {
|
||||
module.name = "importer";
|
||||
roles.default.tags.vm = {};
|
||||
roles.default.extraModules = ["modules/vm.nix"];
|
||||
roles.default.tags.vm = { };
|
||||
roles.default.extraModules = [ modules/vm.nix ];
|
||||
};
|
||||
|
||||
podman = {
|
||||
module.name = "importer";
|
||||
roles.default.tags.desktop = {};
|
||||
roles.default.extraModules = ["modules/podman.nix"];
|
||||
roles.default.tags.desktop = { };
|
||||
roles.default.extraModules = [ modules/podman.nix ];
|
||||
};
|
||||
|
||||
virtualisation = {
|
||||
module.name = "importer";
|
||||
roles.default.tags.desktop = {};
|
||||
roles.default.extraModules = ["modules/virtualisation.nix"];
|
||||
roles.default.tags.desktop = { };
|
||||
roles.default.extraModules = [ modules/virtualisation.nix ];
|
||||
};
|
||||
|
||||
spain-located = {
|
||||
module.name = "importer";
|
||||
roles.default.tags.all = {};
|
||||
roles.default.extraModules = ["modules/spain.nix"];
|
||||
roles.default.tags.all = { };
|
||||
roles.default.extraModules = [ modules/spain.nix ];
|
||||
};
|
||||
|
||||
desktop-base = {
|
||||
module.name = "importer";
|
||||
roles.default.tags.desktop = {};
|
||||
roles.default.extraModules = ["modules/desktop/base"];
|
||||
roles.default.tags.desktop = { };
|
||||
roles.default.extraModules = [ modules/desktop/base ];
|
||||
};
|
||||
|
||||
desktop-gaming = {
|
||||
module.name = "importer";
|
||||
roles.default.tags.gaming = {};
|
||||
roles.default.extraModules = ["modules/desktop/gaming.nix"];
|
||||
roles.default.tags.gaming = { };
|
||||
roles.default.extraModules = [ modules/desktop/gaming.nix ];
|
||||
};
|
||||
|
||||
# Docs: https://docs.clan.lol/reference/clanServices/mycelium/
|
||||
mycelium = {
|
||||
roles.peer.tags.server = {};
|
||||
roles.peer.tags.server = { };
|
||||
};
|
||||
|
||||
# Fallback: Secure connections via Tor
|
||||
tor = {
|
||||
roles.server.tags.server = {};
|
||||
roles.server.tags.server = { };
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
18
flake.lock
generated
18
flake.lock
generated
|
|
@ -151,11 +151,11 @@
|
|||
},
|
||||
"locked": {
|
||||
"dir": "pkgs/firefox-addons",
|
||||
"lastModified": 1760673822,
|
||||
"narHash": "sha256-h+liPhhMw1yYvkDGLHzQJQShQs+yLjNgjfAyZX+sRrM=",
|
||||
"lastModified": 1761969823,
|
||||
"narHash": "sha256-YqUB0AYD4KbeqvSZqPhXhHBj3mLKTyuYrofyRgG3+Xc=",
|
||||
"owner": "rycee",
|
||||
"repo": "nur-expressions",
|
||||
"rev": "5cca27f1bb30a26140d0cf60ab34daa45b4fa11f",
|
||||
"rev": "aecae658b04384b2f87249c6b93fdbfd97ef249d",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -416,11 +416,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1760580664,
|
||||
"narHash": "sha256-/YdfibIrnqXAL8p5kqCU345mzpHoOtuVIkMiI2pF4Dc=",
|
||||
"lastModified": 1761597516,
|
||||
"narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "98ff3f9af2684f6136c24beef08f5e2033fc5389",
|
||||
"rev": "daf6dc47aa4b44791372d6139ab7b25269184d55",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -543,11 +543,11 @@
|
|||
"tinted-zed": "tinted-zed"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1760478648,
|
||||
"narHash": "sha256-Y4l+Y3zUvqIDbyLrtOrzNvp1o50Fp9TYK+iwtwweFU4=",
|
||||
"lastModified": 1761668239,
|
||||
"narHash": "sha256-b0+7/5hBUsLjd/gMY9/LSEsvuWFFolHdpUAOlG73zmw=",
|
||||
"owner": "nix-community",
|
||||
"repo": "stylix",
|
||||
"rev": "1ec254101285777db13922303cc47ded06e10bb3",
|
||||
"rev": "a149a557dc306e76d53e7dd488826e61ef9c6289",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue