diff --git a/clan.nix b/clan.nix index f45ab25..a46eb09 100644 --- a/clan.nix +++ b/clan.nix @@ -3,61 +3,38 @@ 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"; @@ -72,59 +49,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 = {}; }; }; } diff --git a/flake.lock b/flake.lock index 98484c5..ece77ba 100644 --- a/flake.lock +++ b/flake.lock @@ -151,11 +151,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1761969823, - "narHash": "sha256-YqUB0AYD4KbeqvSZqPhXhHBj3mLKTyuYrofyRgG3+Xc=", + "lastModified": 1760673822, + "narHash": "sha256-h+liPhhMw1yYvkDGLHzQJQShQs+yLjNgjfAyZX+sRrM=", "owner": "rycee", "repo": "nur-expressions", - "rev": "aecae658b04384b2f87249c6b93fdbfd97ef249d", + "rev": "5cca27f1bb30a26140d0cf60ab34daa45b4fa11f", "type": "gitlab" }, "original": { @@ -416,11 +416,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1761597516, - "narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=", + "lastModified": 1760580664, + "narHash": "sha256-/YdfibIrnqXAL8p5kqCU345mzpHoOtuVIkMiI2pF4Dc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "daf6dc47aa4b44791372d6139ab7b25269184d55", + "rev": "98ff3f9af2684f6136c24beef08f5e2033fc5389", "type": "github" }, "original": { @@ -543,11 +543,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1761668239, - "narHash": "sha256-b0+7/5hBUsLjd/gMY9/LSEsvuWFFolHdpUAOlG73zmw=", + "lastModified": 1760478648, + "narHash": "sha256-Y4l+Y3zUvqIDbyLrtOrzNvp1o50Fp9TYK+iwtwweFU4=", "owner": "nix-community", "repo": "stylix", - "rev": "a149a557dc306e76d53e7dd488826e61ef9c6289", + "rev": "1ec254101285777db13922303cc47ded06e10bb3", "type": "github" }, "original": { diff --git a/modules/virtualisation.nix b/modules/virtualisation.nix index a6205a9..4b0c3f1 100644 --- a/modules/virtualisation.nix +++ b/modules/virtualisation.nix @@ -1,5 +1,4 @@ -{ pkgs, ... }: -{ +{pkgs, ...}: { # Install necessary packages environment.systemPackages = with pkgs; [ virt-manager @@ -10,7 +9,6 @@ win-virtio win-spice adwaita-icon-theme - lxqt.lxqt-openssh-askpass ]; # Manage the virtualisation services @@ -20,7 +18,7 @@ qemu = { swtpm.enable = true; ovmf.enable = true; - ovmf.packages = [ pkgs.OVMFFull.fd ]; + ovmf.packages = [pkgs.OVMFFull.fd]; }; };