peprolinbot/frues-clan
1
0
Fork 0
Code Issues Pull requests 1 Wiki Activity Actions

Compare commits

base: peprolinbot:b19cdb1c5b64e918c0287ef26849a4c4f3df88c8
Branches Tags
peprolinbot:main
peprolinbot:flake-update
..
compare: peprolinbot:a27ca4aeec918e2c1a9cd48e4ac4f723d380ce33
Branches Tags
peprolinbot:main
peprolinbot:flake-update

No commits in common. "b19cdb1c5b64e918c0287ef26849a4c4f3df88c8" and "a27ca4aeec918e2c1a9cd48e4ac4f723d380ce33" have entirely different histories.
b19cdb1c5b ... a27ca4aeec

3 changed files with 37 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

75
clan.nix
View file

@ -3,61 +3,38 @@
inventory.machines = { inventory.machines = {
aresix = { aresix = {
tags = [ tags = ["server" "headless" "spain"];
"server"
"headless"
"spain"
];
}; };
frues-pc = { frues-pc = {
tags = [ tags = ["desktop" "spain" "gaming"];
"desktop"
"spain"
"gaming"
];
}; };
frues-port = { frues-port = {
tags = [ tags = ["desktop" "spain"];
"desktop"
"spain"
];
}; };
frues-surface3 = { frues-surface3 = {
tags = [ tags = ["desktop" "spain"];
"desktop"
"spain"
];
}; };
terrier = { terrier = {
tags = [ tags = ["server" "headless" "raspberry"];
"server"
"headless"
"raspberry"
];
}; };
beagle = { beagle = {
tags = [ tags = ["server" "headless" "vm"];
"server"
"headless"
"vm"
];
}; };
}; };
# Docs: See https://docs.clan.lol/reference/clanServices # Docs: See https://docs.clan.lol/reference/clanServices
inventory.instances = { inventory.instances = {
admin = { admin = {
roles.default.tags.all = { }; roles.default.tags.all = {};
roles.default.settings.allowedKeys = { roles.default.settings.allowedKeys = {
"pedro" = "pedro" = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJji4h4bgzgmp7YoRX/8ePN0TcCYRfI2wlrEeZkBQ/y2 personal@peprolinbot.com";
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJji4h4bgzgmp7YoRX/8ePN0TcCYRfI2wlrEeZkBQ/y2 personal@peprolinbot.com";
}; };
}; };
pedro-user = { pedro-user = {
module.name = "users"; module.name = "users";
roles.default.tags.all = { }; roles.default.tags.all = {};
roles.default.settings = { roles.default.settings = {
user = "pedro"; user = "pedro";
@ -72,59 +49,59 @@
]; ];
}; };
roles.default.extraModules = [ ./users/pedro/home.nix ]; roles.default.extraModules = [./users/pedro/home.nix];
}; };
base-all = { base-all = {
module.name = "importer"; module.name = "importer";
roles.default.tags.all = { }; roles.default.tags.all = {};
roles.default.extraModules = [ modules/base.nix ]; roles.default.extraModules = ["modules/base.nix"];
}; };
vm-base = { vm-base = {
module.name = "importer"; module.name = "importer";
roles.default.tags.vm = { }; roles.default.tags.vm = {};
roles.default.extraModules = [ modules/vm.nix ]; roles.default.extraModules = ["modules/vm.nix"];
}; };
podman = { podman = {
module.name = "importer"; module.name = "importer";
roles.default.tags.desktop = { }; roles.default.tags.desktop = {};
roles.default.extraModules = [ modules/podman.nix ]; roles.default.extraModules = ["modules/podman.nix"];
}; };
virtualisation = { virtualisation = {
module.name = "importer"; module.name = "importer";
roles.default.tags.desktop = { }; roles.default.tags.desktop = {};
roles.default.extraModules = [ modules/virtualisation.nix ]; roles.default.extraModules = ["modules/virtualisation.nix"];
}; };
spain-located = { spain-located = {
module.name = "importer"; module.name = "importer";
roles.default.tags.all = { }; roles.default.tags.all = {};
roles.default.extraModules = [ modules/spain.nix ]; roles.default.extraModules = ["modules/spain.nix"];
}; };
desktop-base = { desktop-base = {
module.name = "importer"; module.name = "importer";
roles.default.tags.desktop = { }; roles.default.tags.desktop = {};
roles.default.extraModules = [ modules/desktop/base ]; roles.default.extraModules = ["modules/desktop/base"];
}; };
desktop-gaming = { desktop-gaming = {
module.name = "importer"; module.name = "importer";
roles.default.tags.gaming = { }; roles.default.tags.gaming = {};
roles.default.extraModules = [ modules/desktop/gaming.nix ]; roles.default.extraModules = ["modules/desktop/gaming.nix"];
}; };
# Docs: https://docs.clan.lol/reference/clanServices/mycelium/ # Docs: https://docs.clan.lol/reference/clanServices/mycelium/
mycelium = { mycelium = {
roles.peer.tags.server = { }; roles.peer.tags.server = {};
}; };
# Fallback: Secure connections via Tor # Fallback: Secure connections via Tor
tor = { tor = {
roles.server.tags.server = { }; roles.server.tags.server = {};
}; };
}; };
} }

18
flake.lock generated
View file

@ -151,11 +151,11 @@
}, },
"locked": { "locked": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"lastModified": 1761969823, "lastModified": 1760673822,
"narHash": "sha256-YqUB0AYD4KbeqvSZqPhXhHBj3mLKTyuYrofyRgG3+Xc=", "narHash": "sha256-h+liPhhMw1yYvkDGLHzQJQShQs+yLjNgjfAyZX+sRrM=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "aecae658b04384b2f87249c6b93fdbfd97ef249d", "rev": "5cca27f1bb30a26140d0cf60ab34daa45b4fa11f",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -416,11 +416,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1761597516, "lastModified": 1760580664,
"narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=", "narHash": "sha256-/YdfibIrnqXAL8p5kqCU345mzpHoOtuVIkMiI2pF4Dc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "daf6dc47aa4b44791372d6139ab7b25269184d55", "rev": "98ff3f9af2684f6136c24beef08f5e2033fc5389",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -543,11 +543,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1761668239, "lastModified": 1760478648,
"narHash": "sha256-b0+7/5hBUsLjd/gMY9/LSEsvuWFFolHdpUAOlG73zmw=", "narHash": "sha256-Y4l+Y3zUvqIDbyLrtOrzNvp1o50Fp9TYK+iwtwweFU4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "stylix", "repo": "stylix",
"rev": "a149a557dc306e76d53e7dd488826e61ef9c6289", "rev": "1ec254101285777db13922303cc47ded06e10bb3",
"type": "github" "type": "github"
}, },
"original": { "original": {

6
modules/virtualisation.nix
View file

@ -1,5 +1,4 @@
{ pkgs, ... }: {pkgs, ...}: {
{
# Install necessary packages # Install necessary packages
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
virt-manager virt-manager
@ -10,7 +9,6 @@
win-virtio win-virtio
win-spice win-spice
adwaita-icon-theme adwaita-icon-theme
lxqt.lxqt-openssh-askpass
]; ];
# Manage the virtualisation services # Manage the virtualisation services
@ -20,7 +18,7 @@
qemu = { qemu = {
swtpm.enable = true; swtpm.enable = true;
ovmf.enable = true; ovmf.enable = true;
ovmf.packages = [ pkgs.OVMFFull.fd ]; ovmf.packages = [pkgs.OVMFFull.fd];
}; };
}; };