feat(desktop): add tumbler support for thunar thumbnails

.sops.yaml

@@ -4,7 +4,9 @@ keys:
 
   - &hosts
     - &sirius age1maxsx5tq2h3d92rfyl8ekcdan5gu5cpch4qs3c56cu7qag02xgvs3h0gqc
+    - &canopus age1x36yr8h993srfj29sfpzt4wyz52nztvncpmhgmfs0j26qvfecq3qvcm0an
     - &arcturus age1huqa3hc7wcxk4dpelrzny437nzrx4fnll3d8g9ahznzk268yju5qufapxy
+    - &alpha age1mzxxxzhy3us3rd960ufqv7vlxj5cnug86md6x69llg9ujzw2pqws057llf
 
 creation_rules:
   - path_regex: hosts/sirius/secrets.yaml$
@@ -12,8 +14,18 @@ creation_rules:
       - age:
           - *tux
           - *sirius
+  - path_regex: hosts/canopus/secrets.yaml$
+    key_groups:
+      - age:
+          - *tux
+          - *canopus
   - path_regex: hosts/arcturus/secrets.yaml$
     key_groups:
       - age:
           - *tux
           - *arcturus
+  - path_regex: hosts/alpha/secrets.yaml$
+    key_groups:
+      - age:
+          - *tux
+          - *alpha

flake.lock

@@ -273,11 +273,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1777678872,
-        "narHash": "sha256-EPIFsulyon7Z1vLQq5Fk64GR8L7cQsT+IPhcsukVbgk=",
+        "lastModified": 1777988971,
+        "narHash": "sha256-qIoWPDs+0/8JecyYgE3gpKQxW/4bLW/gp45vow9ioCQ=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "5250617bffd85403b14dbf43c3870e7f255d2c16",
+        "rev": "0678d8986be1661af6bb555f3489f2fdfc31f6ff",
         "type": "github"
       },
       "original": {
@@ -446,11 +446,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1777846259,
-        "narHash": "sha256-jzln9xcpVcmEB1zfhJ+FIHd7/kaVHgGF+gQQHxj2fGI=",
+        "lastModified": 1778444552,
+        "narHash": "sha256-f18pIiR9q/p1vHY93gmAum7aHhQOG49oGvAB9+lptRo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "4625f26228f4f7ea3cf65eee3023359a8221fcff",
+        "rev": "dcebe66f958673729896eec2de4abfd86ef22d21",
         "type": "github"
       },
       "original": {
@@ -555,11 +555,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1778072172,
-        "narHash": "sha256-onx/6cN1tHDnMH0oCQCnpQPKv9VijeLtfOh7PStp2f0=",
+        "lastModified": 1778442165,
+        "narHash": "sha256-SEwIBVG4RPEVBqRbEZadGteMlndFqIJD/9HOkPRIBm0=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "1681bea42dd2f11ba3fe6df05560d0b231de3c76",
+        "rev": "3e21a68bd0a81c2fc45f2c843c9d02c47350ef44",
         "type": "github"
       },
       "original": {
@@ -732,11 +732,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1777492286,
-        "narHash": "sha256-PwuoEJQcjSKJNP5T55qhfDwIP0tw5zxEhfu8GDfKfeg=",
+        "lastModified": 1778234770,
+        "narHash": "sha256-jAcsogZwWMfXT9MfXxZzkwliAqIuZUV0p71h6Ba9ReE=",
         "owner": "hyprwm",
         "repo": "hyprutils",
-        "rev": "ec5c0c709706bad5b82f667fd8758eae442577ce",
+        "rev": "a2dbd8a4cc51f7cbe4224732668392bb1aa79df2",
         "type": "github"
       },
       "original": {
@@ -900,11 +900,11 @@
         "scenefx": "scenefx"
       },
       "locked": {
-        "lastModified": 1778073611,
-        "narHash": "sha256-6rNTdQZq4x/F2bHQsk7qo4OhXs5Y0xsQrTR1hgKZOqw=",
+        "lastModified": 1778376841,
+        "narHash": "sha256-mUSCkFQGrcdVitwx0fDajWxxgvAV5BmppP4ShV3JOyY=",
         "owner": "DreamMaoMao",
         "repo": "mango",
-        "rev": "42c02e3dc20eb09c0191b027e387c0268f8e0fb5",
+        "rev": "cabafb2393ff71615af4959a51885c8d1eefc9a0",
         "type": "github"
       },
       "original": {
@@ -921,11 +921,11 @@
         "nixpkgs-nixcord": "nixpkgs-nixcord"
       },
       "locked": {
-        "lastModified": 1778145028,
-        "narHash": "sha256-tJHyzazrh9cnL72lPiDCnLDOOP95vDb37PprmgiqHtw=",
+        "lastModified": 1778346777,
+        "narHash": "sha256-7gpzB8MDCMcRE0wDr7jjxK7/obfeiyAulsfQEsK9pi4=",
         "owner": "kaylorben",
         "repo": "nixcord",
-        "rev": "b53c871a9c3d4d450ffbcac71d54f3e0ca1bbafc",
+        "rev": "43930a83206bcdcf3ba4fc10aa4fb9c5f7a677e6",
         "type": "github"
       },
       "original": {
@@ -936,11 +936,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1777796046,
-        "narHash": "sha256-bEJp/zaQApzynGRaAO62BZSz9tFikKtIHCn2yIA/s7Q=",
+        "lastModified": 1778143761,
+        "narHash": "sha256-lkesY6x2X2qxlqLM7CT2iM/0rP2JB7fruPN3h8POXmI=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "eeb02f6e29fc8139c0b15af5ff0fdfdc6d0d3d90",
+        "rev": "3bcaa367d4c550d687a17ac792fd5cda214ee871",
         "type": "github"
       },
       "original": {
@@ -1014,11 +1014,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1777805331,
-        "narHash": "sha256-jINoZUP2tJEBLuVoMEhJn9qWQgpriGorwlgnBc1QAPg=",
+        "lastModified": 1778353088,
+        "narHash": "sha256-5yu6kIgn+hO0V7pomciXixWAnMcuwQvqFD5Dgb2K9L4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "8cbe20ad0f64f9f9619b871dfdf57022beccef65",
+        "rev": "071465abe725f841e610a52b194c3b86b288316a",
         "type": "github"
       },
       "original": {
@@ -1030,11 +1030,11 @@
     },
     "nixpkgs_10": {
       "locked": {
-        "lastModified": 1777918403,
-        "narHash": "sha256-7QiZv0LcW1yIOLo2LNuCQjWon1Z1r99FwK24hbtBOF4=",
+        "lastModified": 1775888245,
+        "narHash": "sha256-nwASzrRDD1JBEu/o8ekKYEXm/oJW6EMCzCRdrwcLe90=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "afc5551119aae6eab73a95c1960891cfe63204f6",
+        "rev": "13043924aaa7375ce482ebe2494338e058282925",
         "type": "github"
       },
       "original": {
@@ -1158,11 +1158,11 @@
     },
     "nixpkgs_8": {
       "locked": {
-        "lastModified": 1777578337,
-        "narHash": "sha256-Ad49moKWeXtKBJNy2ebiTQUEgdLyvGmTeykAQ9xM+Z4=",
+        "lastModified": 1777954456,
+        "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "15f4ee454b1dce334612fa6843b3e05cf546efab",
+        "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1",
         "type": "github"
       },
       "original": {
@@ -1194,11 +1194,11 @@
         "nixpkgs": "nixpkgs_9"
       },
       "locked": {
-        "lastModified": 1778156530,
-        "narHash": "sha256-4VhPk2NQKyYptNw1x/HG23sFmR4iYTOTZhGhzzYDQOs=",
+        "lastModified": 1778454210,
+        "narHash": "sha256-U6wleXwWGNDX588cqrz+Kg+7GrlB003JHQ0CVHj+3yA=",
         "owner": "nix-community",
         "repo": "nur",
-        "rev": "1b24f43e7f25d9c297a2ed45c654a72fc68d3d29",
+        "rev": "c7c431a1bd1360cb568d309c2c18aa4785c254c8",
         "type": "github"
       },
       "original": {
@@ -1575,11 +1575,11 @@
         "vicinae": "vicinae"
       },
       "locked": {
-        "lastModified": 1777930825,
-        "narHash": "sha256-0hVf9yH+v+0YaCqmr0aX0nR4pfmXjW1XhJcJyblJqE0=",
+        "lastModified": 1778369365,
+        "narHash": "sha256-Qxu3wUKqOJGJzj1RFvXw2StqHBDs+tVWvhKg9OZY87I=",
         "owner": "vicinaehq",
         "repo": "extensions",
-        "rev": "20d6a13d2a389e61619b8540b8af746705409322",
+        "rev": "de5313f14242dda1f88f6e8443eb349ed2b2cdb1",
         "type": "github"
       },
       "original": {

modules/hm/desktop/cursor.nix

@@ -1,11 +0,0 @@
-{
-  flake.modules.homeManager.desktop =
-    { pkgs, ... }:
-    {
-      home.pointerCursor = {
-        package = pkgs.bibata-cursors;
-        name = "Bibata-Modern-Ice";
-        size = 28;
-      };
-    };
-}

modules/hm/desktop/easyeffects.nix

@@ -0,0 +1,5 @@
+{
+  flake.modules.homeManager.desktop = {
+    services.easyeffects.enable = true;
+  };
+}

modules/hm/desktop/ghostty.nix

@@ -0,0 +1,47 @@
+{
+  flake.modules.homeManager.desktop = {
+    programs.ghostty = {
+      enable = true;
+      enableZshIntegration = true;
+      systemd.enable = true;
+
+      settings = {
+        confirm-close-surface = false;
+        gtk-titlebar = false;
+        window-padding-x = 10;
+        window-padding-y = 10;
+        font-size = 12;
+        font-family = "JetBrainsMono Nerd Font";
+        theme = "poimandres";
+      };
+
+      themes = {
+        poimandres = {
+          background = "#0f0f0f";
+          foreground = "#a6accd";
+          cursor-color = "#f2eacf";
+          selection-background = "#1a1a1a";
+          selection-foreground = "#f1f1f1";
+          palette = [
+            "0=#252b37"
+            "1=#d0679d"
+            "2=#5de4c7"
+            "3=#fffac2"
+            "4=#89ddff"
+            "5=#fae4fc"
+            "6=#add7ff"
+            "7=#ffffff"
+            "8=#a6accd"
+            "9=#d0679d"
+            "10=#5de4c7"
+            "11=#fffac2"
+            "12=#add7ff"
+            "13=#89ddff"
+            "14=#fcc5e9"
+            "15=#ffffff"
+          ];
+        };
+      };
+    };
+  };
+}

modules/hm/desktop/hyprland.nix

@@ -1,13 +1,7 @@
 {
   flake.modules.homeManager.desktop =
-    { pkgs, ... }:
+    { config, pkgs, ... }:
     {
-
-      home.packages = with pkgs; [
-        ags
-        awww
-      ];
-
       wayland.windowManager.hyprland = {
         enable = true;
         package = null;
@@ -15,5 +9,31 @@
         xwayland.enable = true;
         systemd.variables = [ "--all" ];
       };
+
+      # TODO: Hyprland 0.55 switched to Lua-based configuration.
+      # Until the Home Manager module is updated, we symlink our config instead.
+      home.file = {
+        ".config/hypr/config".source =
+          config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/Projects/hypr/config";
+        ".config/hypr/hyprland.lua".source =
+          config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/Projects/hypr/hyprland.lua";
+      };
+
+      home.packages = with pkgs; [
+        ags
+        awww
+        grim
+        slurp
+        hyprshot
+        wl-clipboard
+        wl-screenrec
+        (writeShellScriptBin "hypr-screenshot" ''
+          hyprshot -m region -r ppm - | satty --filename -
+        '')
+
+        (writeShellScriptBin "hypr-screenrecord" ''
+          wl-screenrec -g "$(slurp)"
+        '')
+      ];
     };
 }

modules/hm/desktop/mango.nix

@@ -1,21 +1,41 @@
 { inputs, ... }:
 {
   flake.modules.homeManager.desktop =
-    { pkgs, ... }:
+    {
+      config,
+      pkgs,
+      lib,
+      ...
+    }:
+    with lib;
+    let
+      cfg = config.tnix.desktop.mangowm;
+    in
     {
       imports = [
         inputs.mango.hmModules.mango
       ];
 
+      options.tnix.desktop.mangowm = {
+        enable = mkEnableOption "Enable MangoWM";
+
+        monitorRule = mkOption {
+          type = with types; listOf str;
+          default = [ ];
+        };
+
+        tagRule = mkOption {
+          type = with types; listOf str;
+          default = [ ];
+        };
+      };
+
+      config = mkIf cfg.enable {
         wayland.windowManager.mango = {
           enable = true;
           settings = {
             # Monitors
-          monitorrule = [
-            "name:DP-2, width:1440, height:2560, refresh:144, x:0, y:0, vrr:0, rr:1"
-            "name:DP-3, width:2560, height:1440, refresh:144, x:1440, y:0, vrr:0"
-            "name:DP-1, width:1080, height:1920, refresh:144, x:4000, y:0, vrr:0, rr:3"
-          ];
+            monitorrule = cfg.monitorRule;
 
             focus_cross_monitor = 1;
             exchange_cross_monitor = 1;
@@ -68,25 +88,7 @@
             overviewgappo = 15;
 
             # layouts
-          tagrule = [
-            "id:1, layout_name:vertical_tile, monitor_name:DP-2, no_hide:1"
-            "id:2, layout_name:vertical_tile, monitor_name:DP-2, no_hide:1"
-            "id:3, layout_name:vertical_tile, monitor_name:DP-2, no_hide:1"
-            "id:4, layout_name:vertical_tile, monitor_name:DP-2, no_hide:1"
-            "id:5, layout_name:vertical_tile, monitor_name:DP-2, no_hide:1"
-
-            "id:1, layout_name:tile, monitor_name:DP-3, no_hide:1"
-            "id:2, layout_name:tile, monitor_name:DP-3, no_hide:1"
-            "id:3, layout_name:tile, monitor_name:DP-3, no_hide:1"
-            "id:4, layout_name:tile, monitor_name:DP-3, no_hide:1"
-            "id:5, layout_name:tile, monitor_name:DP-3, no_hide:1"
-
-            "id:1, layout_name:vertical_tile, monitor_name:DP-1, no_hide:1"
-            "id:2, layout_name:vertical_tile, monitor_name:DP-1, no_hide:1"
-            "id:3, layout_name:vertical_tile, monitor_name:DP-1, no_hide:1"
-            "id:4, layout_name:vertical_tile, monitor_name:DP-1, no_hide:1"
-            "id:5, layout_name:vertical_tile, monitor_name:DP-1, no_hide:1"
-          ];
+            tagrule = cfg.tagRule;
 
             # Keybindings
             mousebind = [
@@ -115,11 +117,13 @@
               "SUPER+SHIFT, R, reload_config"
               "SUPER+SHIFT, F, togglefullscreen"
               "SUPER+SHIFT, Space, togglefloating"
+              "SUPER+SHIFT, Space, centerwin"
 
               "ALT, Tab, toggleoverview"
               "ALT+SHIFT, minus, incgaps, -1"
               "ALT+SHIFT, equal, incgaps, 1"
               "ALT+SHIFT, R, togglegaps"
+              "SUPER+SHIFT, P, toggleglobal"
 
               # switch layout
               "SUPER+SHIFT, H, setlayout, tile"
@@ -131,6 +135,7 @@
               "SUPER+CTRL, Down, resizewin, +0, +50"
               "SUPER+CTRL, Left, resizewin, -50, +0"
               "SUPER+CTRL, Right, resizewin, +50, +0"
+              "SUPER+CTRL, Equal, setoption, default_mfact, 0.5"
 
               # swap client
               "SUPER+SHIFT, Up, exchange_client, up"
@@ -194,7 +199,7 @@
             animation_type_close = "fade";
             animation_fade_in = 1;
             animation_fade_out = 1;
-          tag_animation_direction = 1;
+            tag_animation_direction = 0;
             zoom_initial_ratio = 0.3;
             zoom_end_ratio = 0.8;
             fadein_begin_opacity = 0.5;
@@ -247,4 +252,5 @@
           dgop
         ];
       };
+    };
 }

modules/hm/desktop/mpv.nix

@@ -0,0 +1,24 @@
+{
+  flake.modules.homeManager.desktop =
+    { pkgs, ... }:
+    {
+      programs.mpv = {
+        enable = true;
+
+        scripts = (
+          with pkgs.mpvScripts;
+          [
+            modernz
+            thumbfast
+            mpris
+            mpv-image-viewer.image-positioning
+          ]
+        );
+
+        config = {
+          osc = "no";
+          border = "no";
+        };
+      };
+    };
+}

modules/hm/desktop/satty.nix

@@ -0,0 +1,19 @@
+{
+  flake.modules.homeManager.desktop = {
+    programs.satty = {
+      enable = true;
+      settings = {
+        general = {
+          corner-roundness = 12;
+          initial-tool = "arrow";
+          early-exit = true;
+          copy-command = "wl-copy";
+        };
+
+        font = {
+          family = "JetBrainsMono NerdFont";
+        };
+      };
+    };
+  };
+}

modules/hm/desktop/theme.nix

@@ -0,0 +1,31 @@
+{
+  flake.modules.homeManager.desktop =
+    { pkgs, ... }:
+    {
+      home.pointerCursor = {
+        package = pkgs.bibata-cursors;
+        name = "Bibata-Modern-Ice";
+        size = 28;
+      };
+
+      qt = {
+        enable = true;
+        style = {
+          name = "Breeze";
+          package = pkgs.kdePackages.breeze;
+        };
+      };
+
+      gtk = {
+        enable = true;
+        theme = {
+          name = "Materia-dark";
+          package = pkgs.materia-theme;
+        };
+        iconTheme = {
+          package = pkgs.tela-icon-theme;
+          name = "Tela-black";
+        };
+      };
+    };
+}

modules/hm/desktop/vicinae.nix

@@ -54,11 +54,6 @@
           imports = [ "/run/secrets/vicinae.json" ];
 
           providers = {
-            "@samlinville/store.raycast.tailscale" = {
-              "preferences" = {
-                "tailscalePath" = "${pkgs.tailscale}/bin/tailscale";
-              };
-            };
             "@sovereign/vicinae-extension-awww-switcher-0" = {
               "preferences" = {
                 "transitionDuration" = "1";

modules/hm/shell/neovim.nix

@@ -13,8 +13,9 @@
         neovim = {
           enable = true;
           defaultEditor = true;
-          vimAlias = true;
         };
+
+        vim.enable = true;
       };
 
       home = {

modules/hm/shell/opencode.nix

@@ -1,10 +1,5 @@
 {
-  flake.modules.homeManager.shell =
-    {
-      osConfig ? { },
-      ...
-    }:
-    {
+  flake.modules.homeManager.shell = {
     programs.opencode = {
       enable = true;
       tui = {
@@ -14,17 +9,17 @@
         provider = {
           google = {
             options = {
-                apiKey = "{file:${osConfig.sops.secrets.gemini-api-key.path}}";
+              apiKey = "{file:/run/secrets/gemini-api-key}";
             };
           };
           openrouter = {
             options = {
-                apiKey = "{file:${osConfig.sops.secrets.openrouter-api-key.path}}";
+              apiKey = "{file:/run/secrets/openrouter-api-key}";
             };
           };
           opencode-go = {
             options = {
-                apiKey = "{file:${osConfig.sops.secrets.opencode-go-api-key.path}}";
+              apiKey = "{file:/run/secrets/opencode-go-api-key}";
             };
           };
         };

modules/hosts/alpha/config.nix

@@ -0,0 +1,82 @@
+{ config, ... }:
+{
+  flake.modules.nixos.alpha =
+    {
+      hostName,
+      userName,
+      ...
+    }:
+    {
+      imports = with config.flake.modules.nixos; [
+        boot
+        networking
+        virtualisation
+        services
+      ];
+
+      tnix = {
+        boot = {
+          legacy.enable = true;
+
+          impermanence = {
+            enable = true;
+
+            home = {
+              directories = [
+                ".local/share/nvim"
+                ".local/share/zsh"
+                ".local/share/zoxide"
+                ".local/state/lazygit"
+                ".local/share/opencode"
+              ];
+            };
+          };
+        };
+
+        networking = {
+          openssh.enable = true;
+          netbird-client.enable = true;
+        };
+
+        virtualisation = {
+          docker.enable = true;
+        };
+      };
+
+      sops.secrets = {
+        tux-password = {
+          sopsFile = ./secrets.yaml;
+          neededForUsers = true;
+        };
+
+        gemini-api-key = {
+          sopsFile = ./secrets.yaml;
+          owner = userName;
+        };
+
+        openrouter-api-key = {
+          sopsFile = ./secrets.yaml;
+          owner = userName;
+        };
+
+        opencode-go-api-key = {
+          sopsFile = ./secrets.yaml;
+          owner = userName;
+        };
+
+        netbird-key = {
+          sopsFile = ./secrets.yaml;
+          owner = userName;
+        };
+      };
+
+      # --- Networking ---
+      networking = {
+        hostName = hostName;
+        networkmanager.enable = true;
+        firewall.enable = false;
+      };
+
+      system.stateVersion = "26.05";
+    };
+}

modules/hosts/alpha/default.nix

@@ -0,0 +1,30 @@
+{
+  inputs,
+  config,
+  ...
+}:
+let
+  hostName = "alpha";
+  userName = "tux";
+  userEmail = "t@tux.rs";
+  system = "x86_64-linux";
+  unstable = true;
+  nixpkgs = if unstable then inputs.nixpkgs else inputs.nixpkgs-stable;
+in
+{
+  flake.nixosConfigurations."${hostName}" = nixpkgs.lib.nixosSystem {
+    inherit system;
+    specialArgs = {
+      inherit
+        hostName
+        userName
+        userEmail
+        system
+        ;
+    };
+    modules = [
+      config.flake.modules.nixos.core
+      config.flake.modules.nixos.${hostName}
+    ];
+  };
+}

modules/hosts/alpha/disko.nix

@@ -0,0 +1,82 @@
+{ inputs, ... }:
+{
+  flake.modules.nixos.alpha =
+    { config, lib, ... }:
+    let
+      hasOptinPersistence = config.tnix.boot.impermanence.enable;
+      isLegacy = config.tnix.boot.legacy.enable;
+    in
+    {
+      imports = [
+        inputs.disko.nixosModules.disko
+      ];
+
+      disko.devices.disk.primary = {
+        device = "/dev/sda";
+        type = "disk";
+        content = {
+          type = "gpt";
+          partitions = {
+            ESP = {
+              size = "1G";
+              type = "EF00";
+              content = {
+                type = "filesystem";
+                format = "vfat";
+                mountpoint = "/boot";
+                mountOptions = [
+                  "defaults"
+                  "umask=0077"
+                ];
+              };
+            };
+            root = {
+              size = "100%";
+              type = "8300";
+              content = {
+                type = "btrfs";
+                # Base subvolumes that always exist
+                subvolumes = {
+                  "/root" = {
+                    mountOptions = [
+                      "compress=zstd"
+                      "noatime"
+                      "space_cache=v2"
+                    ];
+                    mountpoint = "/";
+                  };
+                  "/nix" = {
+                    mountOptions = [
+                      "compress=zstd"
+                      "noatime"
+                      "noacl"
+                      "space_cache=v2"
+                    ];
+                    mountpoint = "/nix";
+                  };
+                }
+                # Conditionally merge /persist only when impermanence is enabled
+                // lib.optionalAttrs hasOptinPersistence {
+                  "/persist" = {
+                    mountOptions = [
+                      "compress=zstd"
+                      "noatime"
+                      "space_cache=v2"
+                    ];
+                    mountpoint = "/persist";
+                  };
+                };
+              };
+            };
+          }
+          // lib.optionalAttrs isLegacy {
+            boot = {
+              name = "boot";
+              size = "1M";
+              type = "EF02";
+            };
+          };
+        };
+      };
+    };
+}

modules/hosts/alpha/hardware.nix

@@ -0,0 +1,17 @@
+{
+  flake.modules.nixos.alpha =
+    {
+      lib,
+      modulesPath,
+      system,
+      ...
+    }:
+    {
+      imports = [
+        (modulesPath + "/profiles/qemu-guest.nix")
+      ];
+
+      networking.useDHCP = lib.mkDefault true;
+      nixpkgs.hostPlatform = lib.mkDefault system;
+    };
+}

modules/hosts/alpha/home.nix

@@ -0,0 +1,6 @@
+{ ... }:
+{
+  flake.modules.homeManager.alpha = {
+    home.stateVersion = "26.05";
+  };
+}

modules/hosts/alpha/secrets.yaml

@@ -0,0 +1,29 @@
+tux-password: ENC[AES256_GCM,data:tvx3nMoIuQSotxHDWLs7UesnyWY3u3EwkqAIzCw3Z2AJseaiqnt/xeSKAeUXPVSs85rVdIJ6Ys5+6r+NONEG7ujuNevpjJRNkQ==,iv:CB0BIrMfdiWiMCvmRdtsafh3dCAD5Qb3mOuE7eq4nA4=,tag:p/3AESwNCEL4EoU9rJjUPw==,type:str]
+gemini-api-key: ENC[AES256_GCM,data:Bo3Z5Jhce0UOBn77I2AcrXYbBgPLDx0eOjPC8J63E/VWNhMPbbxb,iv:iWOsTACOMcK3oqq848WnJ5Ku3tYy1aadmLB4IMgoyqg=,tag:BPzlXoP8/iJaj8c/YFCWyg==,type:str]
+openrouter-api-key: ENC[AES256_GCM,data:D+/ImUTg7UvBTh0fMlWMZ0O/GsQS/R4Hz+CO4l42R6mn+zk+udvw79BctXdWWyrFf2ZNOTJ/99QTtWOUOvHISWaEJogXyb+93g==,iv:c7OtgBu1Zaf7lA4InIsKOAPbAvTl3gaO7QGCFNx21Bo=,tag:KXiASj/qC1YzK6DUox57ug==,type:str]
+opencode-go-api-key: ENC[AES256_GCM,data:ipKkNcRqBERIQ6f6yFzVm999s+UwJys4elHWhzpL441RfOaG9MmRWMcD+wRLJ7DSWFjYu6uUPF7TKez8J6abWeKDgg==,iv:FDSYE3R8zKVxWiP2S/sCVcwEu3fEXg/hCeqCRSF+c6g=,tag:5RDuMFGMoN6xwAYj0HiyjQ==,type:str]
+netbird-key: ENC[AES256_GCM,data:NilfyafnGhFVYD6q4+jJQxlhXNdNC8BQ1CZfu8a5wc693Y1h,iv:Rpl0OpkQdBMPpIJ08t9Z0AjDAW6c97pFZKO1KPu8ipY=,tag:du3d0SQWuqJtJSwhSgJE4g==,type:str]
+sops:
+    age:
+        - recipient: age14vktfes95f33vuefwnmuvryas7az04u76dsgyhfvsx73czkvmp2q7njkl4
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBaR0kzRXBGRjJaVldDRk90
+            KzYwSzJBeXBnNVZ0T2VaU2oyLzdRWmo5ZzNVCk9HTDVtMk8xL1cwL2FSRUR5UGdS
+            bXJnOXhTbWozWm5rd2pnaFNoWk0rWncKLS0tIGFWWmY2WU9YanJ5UElab3lqaXNo
+            QUhYUWs4bitJaGpXL200b0s0SmVIeVUKevQ1IVqmqGIYf014iL47C02+peSYJyeE
+            PNluZUA6VzrL2WpdJzDqxAwSWtcgXG0/JADIg+DssnhftiHMHzn3NQ==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1mzxxxzhy3us3rd960ufqv7vlxj5cnug86md6x69llg9ujzw2pqws057llf
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBnL1VPODRnNEs2bXlUVjB5
+            Z0pBUzBnRDQ0WWcvL2IvUHdmQXUxNjRpTVN3Ck9VLzd2QWpMMlFJck1EQXBVanl0
+            SC91bDFqNFlJZ2E0UXVZa3BKRjh3TlkKLS0tIENuc1dUZ1dDUTg2VXBueU1ETG9S
+            c095blJheHhVT0E4bjdGUWlYN0N4MVUKK42sChX4V37HK1SRKQxldLpft2jVfeiG
+            4TkObqH8ddGpbd7cX5a/wboTjYuEdAviWxjK2oBPgtcFc1f03X3tmA==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2026-05-10T01:11:29Z"
+    mac: ENC[AES256_GCM,data:E+ZcNRFEPtJK02gWooRs7f20BHIYf8Ot4GjB1ab1KZwhI+3pUI6r654iO8+tiimQSeLWLgD43Szq4/7CpS+8NVjSI5uvXSxQQubXQfI0LmulT5XAVueOuSMgvetSFg8yN6+njBmr/MauixSSs2jjpQxtfsSSBgZ9RO7B7qLpMe4=,iv:kdCcTLb3bDmCfcjQQ8fH5ipkTQ5YlVDlhEVw5MzsH6s=,tag:ojub2y6b+jMbW/5i39xH5w==,type:str]
+    unencrypted_suffix: _unencrypted
+    version: 3.12.2

modules/hosts/arcturus/config.nix

@@ -2,7 +2,6 @@
 {
   flake.modules.nixos.arcturus =
     {
-      pkgs,
       hostName,
       userName,
       ...
@@ -10,7 +9,6 @@
     {
       imports = with config.flake.modules.nixos; [
         boot
-        hardware
         networking
         virtualisation
         services
@@ -40,7 +38,10 @@
           };
         };
 
-        networking.openssh.enable = true;
+        networking = {
+          openssh.enable = true;
+          netbird-client.enable = true;
+        };
 
         services = {
           cyber-tux = {
@@ -78,6 +79,11 @@
           sopsFile = ./secrets.yaml;
           owner = userName;
         };
+
+        netbird-key = {
+          sopsFile = ./secrets.yaml;
+          owner = userName;
+        };
       };
 
       # --- Networking ---
@@ -101,10 +107,6 @@
         firewall.enable = false;
       };
 
-      environment.systemPackages = with pkgs; [
-        nvtopPackages.full
-      ];
-
       system.stateVersion = "26.05";
     };
 }

modules/hosts/arcturus/default.nix

@@ -14,7 +14,14 @@ in
 {
   flake.nixosConfigurations."${hostName}" = nixpkgs.lib.nixosSystem {
     inherit system;
-    specialArgs = { inherit hostName userName userEmail; };
+    specialArgs = {
+      inherit
+        hostName
+        userName
+        userEmail
+        system
+        ;
+    };
     modules = [
       config.flake.modules.nixos.core
       config.flake.modules.nixos.${hostName}

modules/hosts/arcturus/hardware.nix

@@ -1,11 +1,17 @@
+{ config, ... }:
 {
   flake.modules.nixos.arcturus =
     {
-      config,
       lib,
+      pkgs,
+      system,
       ...
-    }:
+    }@innerArgs:
     {
+      imports = with config.flake.modules.nixos; [
+        hardware
+      ];
+
       boot.initrd.availableKernelModules = [
         "nvme"
         "xhci_pci"
@@ -18,15 +24,13 @@
       boot.kernelModules = [ "kvm-amd" ];
       boot.extraModulePackages = [ ];
 
-      # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-      # (the default) this is the recommended approach. When using systemd-networkd it's
-      # still possible to use this option, but it's recommended to use it in conjunction
-      # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-      networking.useDHCP = lib.mkDefault true;
-      # networking.interfaces.eno1.useDHCP = lib.mkDefault true;
-      # networking.interfaces.wlp10s0f3u2i2.useDHCP = lib.mkDefault true;
+      hardware.cpu.amd.updateMicrocode = lib.mkDefault innerArgs.config.hardware.enableRedistributableFirmware;
 
-      nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-      hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+      networking.useDHCP = lib.mkDefault true;
+      nixpkgs.hostPlatform = lib.mkDefault system;
+
+      environment.systemPackages = with pkgs; [
+        nvtopPackages.amd
+      ];
     };
 }

modules/hosts/arcturus/secrets.yaml

@@ -3,6 +3,7 @@ discord-token: ENC[AES256_GCM,data:uzxkrNRRplL/1MfvPZ/EL+I8UACuZQBHZ95BSHuxW0nBj
 gemini-api-key: ENC[AES256_GCM,data:gLZSoYTdKY+rwIpYiXvN9n9PGkUD6q8Oe7dHnYkjEjwDf5qpjubg,iv:ySoNgQWTu9DjvbashF4ulyYP8fJUl4yrCTeBQ0jrGmw=,tag:FctubsQv50AP78JvTb9bpQ==,type:str]
 openrouter-api-key: ENC[AES256_GCM,data:6xONCl9lqOoO7b4CEyCz9607tICDUAkpglRjGS5nYq2ppg2UKqYTrWD1BGCA5Xfs/CWskniVhoNG3vscjKiYCCh9gbM6aqdmTQ==,iv:7Iwc9t00HOOBjA7URXcUO41badqYyJCkFHM/uPkLFxY=,tag:Cl39kitr2e0//HVwAdsdUQ==,type:str]
 opencode-go-api-key: ENC[AES256_GCM,data:dmeRKn7TWHnqvpyPQpcEG6yHTb2bRby/rh10ytL0jHj5R+lRmNVdmqUF92GTznY9vEaB6ZYCJecWhpm8g4upNfOWBg==,iv:9UMJpAlD8gpcNiN+liu3nawoAZQKapEg7sCp561N9E8=,tag:OZlASpOa5BQaQwFWjoLCRw==,type:str]
+netbird-key: ENC[AES256_GCM,data:q6eKisca04qn/CvALrvXF79MsToDhvLRLv2JTiUBAZglCC9m,iv:jj0/ZD7IDgopprTVUgSfJmdAJmUP3iqewU3dqssGYbk=,tag:6IPRdCm2FGdlTEIX7jt3qA==,type:str]
 sops:
     age:
         - recipient: age14vktfes95f33vuefwnmuvryas7az04u76dsgyhfvsx73czkvmp2q7njkl4
@@ -23,7 +24,7 @@ sops:
             V3h4dUZLcktrTUZvUm44eVZOWEl4VmMKMTvajoWcktb4jVIP4HyzQiR41Wg8Gdqi
             TLKEYsPQgOJ7s8P9gw2uPUY6HRz86CtiC6EbO27u0+8BbI85x1QScg==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2026-05-08T19:38:01Z"
-    mac: ENC[AES256_GCM,data:G6Klq53VRWgDZDM4aDi0vbs87nvM90eH4e9XZNDMtSdrlf/60Lo2/0qp8kAsuKjf6OC5ThEMSP6h0nWrCZryVGP32b6BCMSUcecFm1rdCP3s64iPUlx/5UeT1dbPG1MPfV+mjO2/43dM9Nkmov7WiFrQ7NNJluvwu/7z6v6hEsQ=,iv:qbesEfb/9hqdwzSvNI0p6/QuGoQQ14ZPwK2S6op9o3g=,tag:5B2cnkWiEeg+GOrtK4H82A==,type:str]
+    lastmodified: "2026-05-10T00:36:06Z"
+    mac: ENC[AES256_GCM,data:nD0exblrbheP1C5lK8V17V/gkHJO6s6yVjXtQWcUOLVGrzkPSxkymYBHUFMTLVyYQNLCVMc8AHkuHVuJ1tBfXNll1f6/SGtfaBQcOLct70U7nFxd/XybTUlscNp2KafJWy/n4ZUfNDbfrWN1R463CN/M50jGqJPDWYuP9ah2JcI=,iv:izQUT/+HQqJZ48X5bXobFSaWcdcXQ/7eh+SCd9i4YYo=,tag:FJlR2wI4rWQ/SDfQGtQ7AQ==,type:str]
     unencrypted_suffix: _unencrypted
     version: 3.12.2

modules/hosts/canopus/config.nix

@@ -0,0 +1,132 @@
+{ config, ... }:
+{
+  flake.modules.nixos.canopus =
+    {
+      pkgs,
+      hostName,
+      userName,
+      ...
+    }:
+    {
+      imports = with config.flake.modules.nixos; [
+        boot
+        networking
+        desktop
+        gaming
+        virtualisation
+      ];
+
+      tnix = {
+        boot = {
+          secure-boot.enable = true;
+
+          impermanence = {
+            enable = true;
+
+            home = {
+              directories = [
+                "Distrobox"
+                ".steam"
+                ".cache/awww"
+                ".config/BraveSoftware"
+                ".config/zed"
+                ".config/Vencord"
+                ".config/vesktop"
+                ".config/sops"
+                ".config/obs-studio"
+                ".config/easyeffects"
+                ".config/DankMaterialShell"
+                ".local/share/Steam"
+                ".local/share/nvim"
+                ".local/share/opencode"
+                ".local/share/zsh"
+                ".local/share/zoxide"
+                ".local/state/lazygit"
+                ".local/share/vicinae"
+                ".local/share/TelegramDesktop"
+              ];
+
+              files = [
+                ".wakatime.cfg"
+              ];
+            };
+          };
+        };
+
+        networking = {
+          openssh.enable = true;
+          netbird-client.enable = true;
+        };
+
+        virtualisation = {
+          docker.enable = true;
+          docker.nvidia.enable = false;
+          qemu.enable = true;
+          waydroid.enable = true;
+          distrobox.enable = true;
+        };
+      };
+
+      sops.secrets = {
+        tux-password = {
+          sopsFile = ./secrets.yaml;
+          neededForUsers = true;
+        };
+
+        gemini-api-key = {
+          sopsFile = ./secrets.yaml;
+          owner = userName;
+        };
+
+        openrouter-api-key = {
+          sopsFile = ./secrets.yaml;
+          owner = userName;
+        };
+
+        opencode-go-api-key = {
+          sopsFile = ./secrets.yaml;
+          owner = userName;
+        };
+
+        netbird-key = {
+          sopsFile = ./secrets.yaml;
+          owner = userName;
+        };
+
+        vicinae-json = {
+          sopsFile = ./secrets.yaml;
+          owner = userName;
+        };
+      };
+
+      # --- Networking ---
+      networking = {
+        hostName = hostName;
+        networkmanager = {
+          enable = true;
+          wifi.backend = "iwd";
+        };
+        wireless.iwd = {
+          enable = true;
+          settings = {
+            Network = {
+              EnableIPv6 = true;
+            };
+            Settings = {
+              AutoConnect = true;
+            };
+          };
+        };
+        firewall.enable = false;
+      };
+
+      environment.systemPackages = with pkgs; [
+        davinci-resolve
+        telegram-desktop
+      ];
+
+      # !!! DO NOT CHANGE THIS !!!
+      # This should match the version used at initial install.
+      system.stateVersion = "26.05";
+    };
+}

modules/hosts/canopus/default.nix

@@ -0,0 +1,30 @@
+{
+  inputs,
+  config,
+  ...
+}:
+let
+  hostName = "canopus";
+  userName = "tux";
+  userEmail = "t@tux.rs";
+  system = "x86_64-linux";
+  unstable = true;
+  nixpkgs = if unstable then inputs.nixpkgs else inputs.nixpkgs-stable;
+in
+{
+  flake.nixosConfigurations."${hostName}" = nixpkgs.lib.nixosSystem {
+    inherit system;
+    specialArgs = {
+      inherit
+        hostName
+        userName
+        userEmail
+        system
+        ;
+    };
+    modules = [
+      config.flake.modules.nixos.core
+      config.flake.modules.nixos.${hostName}
+    ];
+  };
+}

modules/hosts/canopus/disko.nix

@@ -0,0 +1,82 @@
+{ inputs, ... }:
+{
+  flake.modules.nixos.canopus =
+    { config, lib, ... }:
+    let
+      hasOptinPersistence = config.tnix.boot.impermanence.enable;
+    in
+    {
+      imports = [
+        inputs.disko.nixosModules.disko
+      ];
+
+      disko.devices.disk.primary = {
+        device = "/dev/nvme0n1";
+        type = "disk";
+        content = {
+          type = "gpt";
+          partitions = {
+            ESP = {
+              size = "1G";
+              type = "EF00";
+              content = {
+                type = "filesystem";
+                format = "vfat";
+                mountpoint = "/boot";
+                mountOptions = [
+                  "defaults"
+                  "umask=0077"
+                ];
+              };
+            };
+            swap = {
+              size = "32G";
+              content = {
+                type = "swap";
+                discardPolicy = "both";
+                resumeDevice = true;
+              };
+            };
+            root = {
+              size = "100%";
+              type = "8300";
+              content = {
+                type = "btrfs";
+                # Base subvolumes that always exist
+                subvolumes = {
+                  "/root" = {
+                    mountOptions = [
+                      "compress=zstd"
+                      "noatime"
+                      "space_cache=v2"
+                    ];
+                    mountpoint = "/";
+                  };
+                  "/nix" = {
+                    mountOptions = [
+                      "compress=zstd"
+                      "noatime"
+                      "noacl"
+                      "space_cache=v2"
+                    ];
+                    mountpoint = "/nix";
+                  };
+                }
+                # Conditionally merge /persist only when impermanence is enabled
+                // lib.optionalAttrs hasOptinPersistence {
+                  "/persist" = {
+                    mountOptions = [
+                      "compress=zstd"
+                      "noatime"
+                      "space_cache=v2"
+                    ];
+                    mountpoint = "/persist";
+                  };
+                };
+              };
+            };
+          };
+        };
+      };
+    };
+}

modules/hosts/canopus/hardware.nix

@@ -0,0 +1,134 @@
+{ inputs, config, ... }:
+{
+  flake.modules.nixos.canopus =
+    {
+      lib,
+      system,
+      ...
+    }@innerArgs:
+    {
+      imports =
+        with config.flake.modules.nixos;
+        [
+          hardware
+        ]
+        ++ [ inputs.nixos-hardware.nixosModules.asus-zephyrus-ga503 ];
+
+      boot.initrd.availableKernelModules = [
+        "nvme"
+        "xhci_pci"
+        "ahci"
+        "usbhid"
+        "usb_storage"
+        "sd_mod"
+      ];
+      boot.initrd.kernelModules = [ ];
+      boot.kernelModules = [ "kvm-amd" ];
+      boot.extraModulePackages = [ ];
+
+      hardware.cpu.amd.updateMicrocode = lib.mkDefault innerArgs.config.hardware.enableRedistributableFirmware;
+
+      services = {
+        power-profiles-daemon.enable = true;
+        upower.enable = true;
+
+        supergfxd = {
+          enable = true;
+          settings = {
+            mode = "Integrated";
+            vfio_enable = false;
+            vfio_save = false;
+            always_reboot = false;
+            no_logind = false;
+            logout_timeout_s = 180;
+            hotplug_type = "None";
+          };
+        };
+
+        asusd = {
+          enable = true;
+          asusdConfig.text = ''
+            (
+              charge_control_end_threshold: 80,
+              disable_nvidia_powerd_on_battery: true,
+              ac_command: "",
+              bat_command: "",
+
+              platform_profile_linked_epp: true,
+              platform_profile_on_battery: Quiet,
+              platform_profile_on_ac: Performance,
+
+              change_platform_profile_on_battery: true,
+              change_platform_profile_on_ac: true,
+
+              profile_quiet_epp: Power,
+              profile_balanced_epp: BalancePower,
+              profile_custom_epp: Performance,
+              profile_performance_epp: Performance,
+
+              ac_profile_tunings: {},
+              dc_profile_tunings: {},
+              armoury_settings: {},
+            )
+          '';
+          profileConfig.text = ''
+            (
+              active_profile: Quiet,
+            )
+          '';
+          fanCurvesConfig.text = ''
+            (
+              profiles: (
+                balanced: [
+                  (
+                    fan: CPU,
+                    pwm: (2, 22, 45, 68, 91, 153, 153, 153),
+                    temp: (55, 62, 66, 70, 74, 78, 78, 78),
+                    enabled: false,
+                  ),
+                  (
+                    fan: GPU,
+                    pwm: (2, 25, 48, 71, 94, 165, 165, 165),
+                    temp: (55, 62, 66, 70, 74, 78, 78, 78),
+                    enabled: false,
+                  ),
+                ],
+                performance: [
+                  (
+                    fan: CPU,
+                    pwm: (35, 68, 79, 91, 114, 175, 175, 175),
+                    temp: (58, 62, 66, 70, 74, 78, 78, 78),
+                    enabled: false,
+                  ),
+                  (
+                    fan: GPU,
+                    pwm: (35, 71, 84, 94, 119, 188, 188, 188),
+                    temp: (58, 62, 66, 70, 74, 78, 78, 78),
+                    enabled: false,
+                  ),
+                ],
+                quiet: [
+                  (
+                    fan: CPU,
+                    pwm: (2, 12, 22, 35, 45, 58, 79, 79),
+                    temp: (55, 62, 66, 70, 74, 78, 82, 82),
+                    enabled: true,
+                  ),
+                  (
+                    fan: GPU,
+                    pwm: (2, 12, 25, 35, 48, 61, 84, 84),
+                    temp: (55, 62, 66, 70, 74, 78, 82, 82),
+                    enabled: true,
+                  ),
+                ],
+                custom: [],
+              ),
+            )
+          '';
+        };
+      };
+
+      networking.useDHCP = lib.mkDefault true;
+      nixpkgs.hostPlatform = lib.mkDefault system;
+    };
+}

modules/hosts/canopus/home.nix

@@ -0,0 +1,39 @@
+{ config, ... }:
+{
+  flake.modules.homeManager.canopus = {
+    imports = with config.flake.modules.homeManager; [
+      desktop
+    ];
+
+    tnix = {
+      desktop = {
+        mangowm = {
+          enable = true;
+          monitorRule = [
+            "name:eDP-1, width:2560, height:1440, refresh:165, x:0, y:0, vrr:1"
+          ];
+
+          tagRule = [
+            "id:1, layout_name:tile"
+            "id:2, layout_name:tile"
+            "id:3, layout_name:tile"
+            "id:4, layout_name:tile"
+            "id:5, layout_name:scroller"
+          ];
+        };
+      };
+
+      services.lan-mouse = {
+        enable = true;
+        settings = {
+          authorized_fingerprints = {
+            "f4:4b:17:61:f7:01:a4:a2:e1:c7:8c:1c:7a:f3:8b:87:14:3d:05:3d:a0:8b:cc:e7:88:d8:d8:d2:a4:c2:75:8b" =
+              "sirius";
+          };
+        };
+      };
+    };
+
+    home.stateVersion = "26.05";
+  };
+}

modules/hosts/canopus/secrets.yaml

@@ -0,0 +1,30 @@
+tux-password: ENC[AES256_GCM,data:Xb4/JMAZCBnBheDCJdRRGXLnMJ1ej8HbN+AUqA/+2sdYESKeF1PFny4Iq2kqvzdK4D3mp+pdjd7GAGfJp4M7sOcvI3V/coyxPQ==,iv:h+S+MEwHj22uHaTzFoxGZtefNUAQNp3fbU+QRfgtKvQ=,tag:VHrIEIQivPFTfhmm7dWEyQ==,type:str]
+gemini-api-key: ENC[AES256_GCM,data:Q6+actg0oyUWiUJVy/9yZmea1QyGu2o8LfMsuAVFD6k7kp0dYIrl,iv:ukyouqrHxzVpBBE98KL6PW8P3j+seemm/e0Gl1urUcM=,tag:Z7MM3dJ414CmdxE72cdzNA==,type:str]
+openrouter-api-key: ENC[AES256_GCM,data:SalhWKR6artX/kOVKZGpKSmrgsQDU/heshrdkK3wotOZ3BRn/ZqZRBldvl1JPSenMAMvE2LWUdmBQmwG/id7L7JL1O/+lUHIQw==,iv:hLlHayFJgUkWOirVLfqP0pGRBZAqGKe+EE2yG1ELGNk=,tag:0qoo0tb+xWjjQXr4n1qGmw==,type:str]
+opencode-go-api-key: ENC[AES256_GCM,data:zbeTcaXJZFVfYnM/7sgblJFU9WfeosX/44KsXvrzKwiLPfGLLYYo9AFaCvWzzG6jHuSZC5OYrBWfOZv4+3omfCgglQ==,iv:LscUQE+PNhXGim9PSqc9nZIZichWSgAn/zsNxQ/HM/o=,tag:MaBCobnRM42fopiibibe5Q==,type:str]
+netbird-key: ENC[AES256_GCM,data:swmaa+RjxeUmEl8hS2riGrW4lP5jdks9HM3x57/FLpOuqFtR,iv:MrpVjiocrPi+dBGPk7pwgSUNlJ1eryRpMjC8+jkU+T0=,tag:j6sqpQ02apqc6FwkdDvk9g==,type:str]
+vicinae-json: ENC[AES256_GCM,data:FarBf6l8pl3hF7kGKPIWztUhwiKoQXmyTufCuJ120K/bPh1Bfiyi+ETt4DLYOGI6FJXfpVz4BbZOA29bXTLhVPxH0QtyBu/F5uEqA015b/c8VevDJSyy9huR13qO9ksLbMBt8RfWbAd9j26t7A1C8/mMyiJOEXCCTV9CEIW3xWrsYmhwsT8RYM+PwrPSeN1gQXHSMyRUjf/kOdJoda8+iXpLfjo4II4r2ELpbqi8QxhrRdsJsoOfAymFM784NtlTjE+h6S4TMehmoF/9ARif6I5SGQ0WfIKt/8orTGCPllL+NupLziSnpIGRGSybdArD+o5NCw59GOAbVRADxq8rCESwEkq3cF+hm8HabfYbiQ==,iv:Y/hXLFTJT3gNF3B6tgKoAh7njVuneoUzjVTlsCZiySw=,tag:2hfrwph6IccJdRu/yGu3XA==,type:str]
+sops:
+    age:
+        - recipient: age14vktfes95f33vuefwnmuvryas7az04u76dsgyhfvsx73czkvmp2q7njkl4
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBqS2RZdVJaNTlRamZPMkll
+            MDRVSVl1b2x2LzZpdlBrdmZtdyt3UE15RldRCldXUXE2a1BFeHg5NGNPbW5IMDht
+            cHN1QituOU9uWFQwNS9udzNEbVhtUjQKLS0tIEtkTXhlYS9XSUlQRTY1eXBjeXZQ
+            bThQTFdZU29ISm93TWcwVk5ZTkhRWm8KCcprmLGhahgDkXCBpzjctHgao+gc+rKC
+            xLIwheUyFJOGK+ixqcdoZ/PC0kY68hVLt1YzLAyxFi4Ur1wltPrNug==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1x36yr8h993srfj29sfpzt4wyz52nztvncpmhgmfs0j26qvfecq3qvcm0an
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGVW13WFE1Ylh3Uk1HNU1i
+            bU9kRzFqTmhkQlRzMlRkM0VhMlNmMDUyK25NCkZYUStxM2tScGozRXJGekxGa1RX
+            b1VXK0Y2Z1U0YU9XRmxRUWdWem50L1EKLS0tIFovcHRlZ1JJd2lRN0RFbHdCdm9m
+            V1N3eUVjZ0VZRjBZdXRPNng3Y3JoUTAKQau9CG9XfvM+5JZVRwaJr/o/sXMaJiy2
+            wo2YcDb+4vfT4Wr+/8J3ccQgbLRZH916X5ZPL+A+nFyVXVKOCl3ENg==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2026-05-12T06:33:00Z"
+    mac: ENC[AES256_GCM,data:htDJdEx34Q5NG8vwbBimnFENZawbLZ4FC0DkyG6J5RYP0BFnycKcKGsYR87SvIjcJZXvfZ0e6fXdtc78dd6I0sQtrQ7aNn4Iktbu/AkPmntsBwpIjVI99X9zUyQB87go/oX15yuyt8loB6ds2RkL/pfFsgLbFc10JHsBy+WcEzI=,iv:HvY+5LYzyHpRm8XCSKrN8ra/LJT9v23TPSsZg/4QVNU=,tag:k+d45+zgBYq4vlWmmc8ZkQ==,type:str]
+    unencrypted_suffix: _unencrypted
+    version: 3.12.2

modules/hosts/sirius/config.nix

@@ -10,7 +10,6 @@
     {
       imports = with config.flake.modules.nixos; [
         boot
-        hardware
         networking
         desktop
         gaming
@@ -26,6 +25,7 @@
 
             home = {
               directories = [
+                "Distrobox"
                 ".steam"
                 ".cache/awww"
                 ".config/BraveSoftware"
@@ -54,7 +54,10 @@
           };
         };
 
-        networking.openssh.enable = true;
+        networking = {
+          openssh.enable = true;
+          netbird-client.enable = true;
+        };
 
         virtualisation = {
           docker.enable = true;
@@ -86,6 +89,11 @@
           owner = userName;
         };
 
+        netbird-key = {
+          sopsFile = ./secrets.yaml;
+          owner = userName;
+        };
+
         vicinae-json = {
           sopsFile = ./secrets.yaml;
           owner = userName;
@@ -113,20 +121,7 @@
         firewall.enable = false;
       };
 
-      # --- Hardware / GPU ---
-      hardware = {
-        nvidia = {
-          modesetting.enable = true;
-          open = false;
-          nvidiaSettings = true;
-        };
-      };
-      boot.kernelParams = [ "nvidia-drm.modeset=1" ];
-      nixpkgs.config.cudaSupport = true;
-      services.xserver.videoDrivers = [ "nvidia" ];
-
       environment.systemPackages = with pkgs; [
-        nvtopPackages.full
         davinci-resolve
         telegram-desktop
       ];

modules/hosts/sirius/default.nix

@@ -14,7 +14,14 @@ in
 {
   flake.nixosConfigurations."${hostName}" = nixpkgs.lib.nixosSystem {
     inherit system;
-    specialArgs = { inherit hostName userName userEmail; };
+    specialArgs = {
+      inherit
+        hostName
+        userName
+        userEmail
+        system
+        ;
+    };
     modules = [
       config.flake.modules.nixos.core
       config.flake.modules.nixos.${hostName}

modules/hosts/sirius/hardware.nix

@@ -1,11 +1,18 @@
+{ config, ... }:
 {
   flake.modules.nixos.sirius =
     {
-      config,
       lib,
+      pkgs,
+      system,
       ...
-    }:
+    }@innerArgs:
     {
+      imports = with config.flake.modules.nixos; [
+        hardware
+      ];
+
+      boot.kernelParams = [ "nvidia-drm.modeset=1" ];
       boot.initrd.availableKernelModules = [
         "nvme"
         "xhci_pci"
@@ -18,15 +25,27 @@
       boot.kernelModules = [ "kvm-amd" ];
       boot.extraModulePackages = [ ];
 
-      # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-      # (the default) this is the recommended approach. When using systemd-networkd it's
-      # still possible to use this option, but it's recommended to use it in conjunction
-      # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-      networking.useDHCP = lib.mkDefault true;
-      # networking.interfaces.eno1.useDHCP = lib.mkDefault true;
-      # networking.interfaces.wlp10s0f3u2i2.useDHCP = lib.mkDefault true;
+      hardware = {
+        nvidia = {
+          modesetting.enable = true;
+          open = false;
+          nvidiaSettings = true;
+        };
 
-      nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-      hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+        cpu.amd.updateMicrocode = lib.mkDefault innerArgs.config.hardware.enableRedistributableFirmware;
+      };
+
+      services = {
+        xserver.videoDrivers = [ "nvidia" ];
+        power-profiles-daemon.enable = true;
+      };
+
+      networking.useDHCP = lib.mkDefault true;
+      nixpkgs.config.cudaSupport = true;
+      nixpkgs.hostPlatform = lib.mkDefault system;
+
+      environment.systemPackages = with pkgs; [
+        nvtopPackages.full
+      ];
     };
 }

modules/hosts/sirius/home.nix

@@ -5,7 +5,39 @@
       desktop
     ];
 
-    tnix.services.lan-mouse = {
+    tnix = {
+      desktop = {
+        mangowm = {
+          enable = true;
+          monitorRule = [
+            "name:DP-2, width:1440, height:2560, refresh:144, x:0, y:0, vrr:0, rr:1"
+            "name:DP-3, width:2560, height:1440, refresh:144, x:1440, y:0, vrr:0"
+            "name:DP-1, width:1080, height:1920, refresh:144, x:4000, y:0, vrr:0, rr:3"
+          ];
+
+          tagRule = [
+            "id:1, layout_name:vertical_tile, monitor_name:DP-2, no_hide:1"
+            "id:2, layout_name:vertical_tile, monitor_name:DP-2, no_hide:1"
+            "id:3, layout_name:vertical_tile, monitor_name:DP-2, no_hide:1"
+            "id:4, layout_name:vertical_tile, monitor_name:DP-2, no_hide:1"
+            "id:5, layout_name:vertical_tile, monitor_name:DP-2, no_hide:1"
+
+            "id:1, layout_name:tile, monitor_name:DP-3, no_hide:1"
+            "id:2, layout_name:tile, monitor_name:DP-3, no_hide:1"
+            "id:3, layout_name:tile, monitor_name:DP-3, no_hide:1"
+            "id:4, layout_name:tile, monitor_name:DP-3, no_hide:1"
+            "id:5, layout_name:tile, monitor_name:DP-3, no_hide:1"
+
+            "id:1, layout_name:vertical_tile, monitor_name:DP-1, no_hide:1"
+            "id:2, layout_name:vertical_tile, monitor_name:DP-1, no_hide:1"
+            "id:3, layout_name:vertical_tile, monitor_name:DP-1, no_hide:1"
+            "id:4, layout_name:vertical_tile, monitor_name:DP-1, no_hide:1"
+            "id:5, layout_name:vertical_tile, monitor_name:DP-1, no_hide:1"
+          ];
+        };
+      };
+
+      services.lan-mouse = {
         enable = true;
         settings = {
           clients = [
@@ -18,6 +50,7 @@
           ];
         };
       };
+    };
 
     home.stateVersion = "26.05";
   };

modules/hosts/sirius/secrets.yaml

@@ -2,6 +2,7 @@ tux-password: ENC[AES256_GCM,data:JWQVd2MYX2U4UP4II62ixG9hWI5MtgHAFhl8aCmyrYPl1H
 gemini-api-key: ENC[AES256_GCM,data:Y9YgXp/tB3Q1Rb5YMsZLgWCq+bdeIjsXAVeO3Yh7nZ8MwDH7d5De,iv:FIXxJCn6JDYsHIoNn8f8Un3z9ZPVbxdjR48Ux88poRg=,tag:bMJ4i69HTspnhzsrsxkbrw==,type:str]
 openrouter-api-key: ENC[AES256_GCM,data:HfZgZz4NyCLLM9woTZp2I6JGOlVcFblw2OMjx8k0TG5ZU2ycBCF6bKqp3wFibUxXcHy+nIfjI82fkLeSyIaGILRLYCJCc8BHKw==,iv:umUcn8MRaj7JXo6IFrGMXOu+jsFSCEikMxsQxfaFS/Q=,tag:l2s61C4EpJoKv8cc9nYGFA==,type:str]
 opencode-go-api-key: ENC[AES256_GCM,data:BGERcZg5Jpnznc4cXeYFMhPk9kKBkd9GvIuQBV9TW3JE1utgrLLYK6mKNCQqrEStRFiO2jUUnBm3opUNL4SuEHFLpw==,iv:fgFAwx6z9yruK27PvAJX/Q2CS9gU+LJ5zMUK/f/rzpo=,tag:BPu3M+jppPB8sLoLmfuY/Q==,type:str]
+netbird-key: ENC[AES256_GCM,data:qXAnRnLM2TlzpOvWG4exJv0+pUvpe0FpRN5xOWx3+KNt+yhq,iv:X+yl4o1RSYMCMWdVXo1hpzy+6IdKXUpsKPtYNSiHiCY=,tag:I8HbnD5iw6EJ1TdsNrhvfw==,type:str]
 vicinae-json: ENC[AES256_GCM,data:JjxolEgS6uakqR4eHOx3VyrOO5kaL4dj1jcEiLWsrktCU32UB7OmP1kJEVomA1rZjODpFHL89+FRpcNFspTFrc365WlANE81RLg/M2Ja1MiLYaDFNcBGtqMX9Yc1muor53Xl7t+rTSvDIj1oE1L7xPPcjCLfwC5QDzJjCBWj9FhCxnU5BwvoJNv9vgA6xnkzAOYSPZK/ihULMD0DxyqOUEa5ECGX62OPM9Gbr7jEviaItYzOOxaRs/yQVqizodGGl/BcK6fPqvOYSxip9ABYRVSI9ZvysY7ofAkeX91ardPwVG5VvEYfxZwBvGFjV7ZfTzVkK+BiUUNrvciAETHqwkjHftPpfJjxWsgLr8lbOA==,iv:HjDE/sqVDnxeww7r2upxH57rc1+LpuMKnhhyGXoc1Ms=,tag:d2kZeWkg17eVoNACIQ3Q9A==,type:str]
 sops:
     age:
@@ -23,7 +24,7 @@ sops:
             M3JocWZJeXFxenhXOENBVWpvNkd3bm8KqhNLzCyEAI643jGWpZF/uTchHmBj8ozU
             HtpOzKsshif66D0XOHeJQfQamJI4TyKsj3Sk3j9rstsLmN2lxTRGHg==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2026-05-09T08:43:42Z"
-    mac: ENC[AES256_GCM,data:kvavZmpCHF2A4tjPAwbb9lD0y0WtoYi6Ci7vAhcgWRq4fG8nSyJMd9vXItGp5Cc+120R3bWiQmaJpINYLMi2KJF8gIy7aZqXMZgHuQEdxMWR6XhdIGvjSAd31z5leLEXT2/lHwKYhVd0dZmIA2wRbvj9qF6lW9EnuRYUltROdMg=,iv:qRs2VELIa4rszmeJUCbDvpHr7N6iMhr1r2Ddxktot2k=,tag:4Q/utZ06K3E9at+cIVkcwQ==,type:str]
+    lastmodified: "2026-05-10T00:35:50Z"
+    mac: ENC[AES256_GCM,data:u27zQ1PPnWy5Parbh/1DkVP3ICmHnLZJKaLbN3dZEVONgqOWi32LV3t0iNhtLWwVnzFPBusRWahQiqAkUdnQtrXF0OtjPCpLuIw86xB75QPGbet0GZlLNb8/xPshChZe4v520csdJMWiy3vYeKrk8LxMSViAGhmhYK2a5NbGhzI=,iv:/9vePmvCNqoP0kx24fP3HfCjS2FkjBmI5B+SycvKKW4=,tag:gE1/DnLolwhoyfMJYejGIQ==,type:str]
     unencrypted_suffix: _unencrypted
     version: 3.12.2

modules/hosts/vps/config.nix

@@ -0,0 +1,50 @@
+{ config, ... }:
+{
+  flake.modules.nixos.vps =
+    {
+      hostName,
+      ...
+    }:
+    {
+      imports = with config.flake.modules.nixos; [
+        boot
+        networking
+        virtualisation
+        services
+      ];
+
+      tnix = {
+        boot = {
+          legacy.enable = true;
+
+          impermanence = {
+            enable = true;
+
+            home = {
+              directories = [
+                ".local/share/nvim"
+                ".local/share/zsh"
+                ".local/share/zoxide"
+                ".local/state/lazygit"
+              ];
+            };
+          };
+        };
+
+        networking.openssh.enable = true;
+
+        virtualisation = {
+          docker.enable = true;
+        };
+      };
+
+      # --- Networking ---
+      networking = {
+        hostName = hostName;
+        networkmanager.enable = true;
+        firewall.enable = false;
+      };
+
+      system.stateVersion = "26.05";
+    };
+}

modules/hosts/vps/default.nix

@@ -0,0 +1,30 @@
+{
+  inputs,
+  config,
+  ...
+}:
+let
+  hostName = "vps";
+  userName = "tux";
+  userEmail = "t@tux.rs";
+  system = "x86_64-linux";
+  unstable = true;
+  nixpkgs = if unstable then inputs.nixpkgs else inputs.nixpkgs-stable;
+in
+{
+  flake.nixosConfigurations."${hostName}" = nixpkgs.lib.nixosSystem {
+    inherit system;
+    specialArgs = {
+      inherit
+        hostName
+        userName
+        userEmail
+        system
+        ;
+    };
+    modules = [
+      config.flake.modules.nixos.core
+      config.flake.modules.nixos.${hostName}
+    ];
+  };
+}

modules/hosts/vps/disko.nix

@@ -0,0 +1,82 @@
+{ inputs, ... }:
+{
+  flake.modules.nixos.vps =
+    { config, lib, ... }:
+    let
+      hasOptinPersistence = config.tnix.boot.impermanence.enable;
+      isLegacy = config.tnix.boot.legacy.enable;
+    in
+    {
+      imports = [
+        inputs.disko.nixosModules.disko
+      ];
+
+      disko.devices.disk.primary = {
+        device = "/dev/sda";
+        type = "disk";
+        content = {
+          type = "gpt";
+          partitions = {
+            ESP = {
+              size = "1G";
+              type = "EF00";
+              content = {
+                type = "filesystem";
+                format = "vfat";
+                mountpoint = "/boot";
+                mountOptions = [
+                  "defaults"
+                  "umask=0077"
+                ];
+              };
+            };
+            root = {
+              size = "100%";
+              type = "8300";
+              content = {
+                type = "btrfs";
+                # Base subvolumes that always exist
+                subvolumes = {
+                  "/root" = {
+                    mountOptions = [
+                      "compress=zstd"
+                      "noatime"
+                      "space_cache=v2"
+                    ];
+                    mountpoint = "/";
+                  };
+                  "/nix" = {
+                    mountOptions = [
+                      "compress=zstd"
+                      "noatime"
+                      "noacl"
+                      "space_cache=v2"
+                    ];
+                    mountpoint = "/nix";
+                  };
+                }
+                # Conditionally merge /persist only when impermanence is enabled
+                // lib.optionalAttrs hasOptinPersistence {
+                  "/persist" = {
+                    mountOptions = [
+                      "compress=zstd"
+                      "noatime"
+                      "space_cache=v2"
+                    ];
+                    mountpoint = "/persist";
+                  };
+                };
+              };
+            };
+          }
+          // lib.optionalAttrs isLegacy {
+            boot = {
+              name = "boot";
+              size = "1M";
+              type = "EF02";
+            };
+          };
+        };
+      };
+    };
+}

modules/hosts/vps/hardware.nix

@@ -0,0 +1,17 @@
+{
+  flake.modules.nixos.vps =
+    {
+      lib,
+      modulesPath,
+      system,
+      ...
+    }:
+    {
+      imports = [
+        (modulesPath + "/profiles/qemu-guest.nix")
+      ];
+
+      networking.useDHCP = lib.mkDefault true;
+      nixpkgs.hostPlatform = lib.mkDefault system;
+    };
+}

modules/hosts/vps/home.nix

@@ -0,0 +1,6 @@
+{ ... }:
+{
+  flake.modules.homeManager.vps = {
+    home.stateVersion = "26.05";
+  };
+}

modules/nixos/boot/loader.nix

@@ -1,8 +1,29 @@
 {
-  flake.modules.nixos.boot = {
+  flake.modules.nixos.boot =
+    { config, lib, ... }:
+    let
+      cfg = config.tnix.boot;
+    in
+    {
+      options.tnix.boot.legacy = {
+        enable = lib.mkEnableOption "legacy boot (GRUB) instead of systemd-boot";
+      };
+
+      config = lib.mkMerge [
+        {
           boot.loader = {
             timeout = 1;
             efi.canTouchEfiVariables = true;
           };
+        }
+
+        (lib.mkIf (!cfg.legacy.enable && !cfg.secure-boot.enable) {
+          boot.loader.systemd-boot.enable = true;
+        })
+
+        (lib.mkIf cfg.legacy.enable {
+          boot.loader.grub.enable = true;
+        })
+      ];
     };
 }

modules/nixos/boot/secure-boot.nix

@@ -18,11 +18,16 @@
       };
 
       config = lib.mkIf cfg.secure-boot.enable {
-        environment.systemPackages = [
-          pkgs.sbctl
+        assertions = [
+          {
+            assertion = !cfg.legacy.enable;
+            message = "secure-boot and legacy boot (GRUB) cannot be enabled at the same time";
+          }
         ];
 
-        # Lanzaboote currently replaces the systemd-boot module.
+        environment.systemPackages = [ pkgs.sbctl ];
+
+        # Lanzaboote replaces systemd-boot, so force it off
         boot.loader.systemd-boot.enable = lib.mkForce false;
 
         boot.lanzaboote = {

modules/nixos/core/users.nix

@@ -8,6 +8,9 @@
       userEmail,
       ...
     }:
+    let
+      hasPasswordSecret = lib.hasAttrByPath [ "sops" "secrets" "tux-password" ] config;
+    in
     {
       programs.zsh.enable = true;
 
@@ -31,7 +34,8 @@
         mutableUsers = false;
         defaultUserShell = pkgs.zsh;
         users.${userName} = {
-          hashedPasswordFile = config.sops.secrets.tux-password.path;
+          hashedPasswordFile = lib.mkIf hasPasswordSecret config.sops.secrets.tux-password.path;
+          initialPassword = lib.mkIf (!hasPasswordSecret) userName;
           isNormalUser = true;
           extraGroups = [
             "networkmanager"

modules/nixos/desktop/misc.nix

@@ -0,0 +1,7 @@
+{
+  flake.modules.nixos.desktop =
+    { pkgs, ... }:
+    {
+      environment.systemPackages = with pkgs; [ brightnessctl ];
+    };
+}

modules/nixos/desktop/thunar.nix

@@ -0,0 +1,18 @@
+{
+  flake.modules.nixos.desktop =
+    { pkgs, ... }:
+    {
+      services = {
+        gvfs.enable = true;
+        tumbler.enable = true;
+      };
+
+      programs.thunar = {
+        enable = true;
+        plugins = with pkgs; [
+          thunar-archive-plugin
+          thunar-volman
+        ];
+      };
+    };
+}

modules/nixos/desktop/tpanel.nix

@@ -0,0 +1,7 @@
+{
+  flake.modules.nixos.desktop =
+    { pkgs, ... }:
+    {
+      environment.systemPackages = with pkgs; [ tpanel ];
+    };
+}

modules/nixos/gaming/steam.nix

@@ -1,8 +1,11 @@
 {
-  flake.modules.nixos.gaming = {
+  flake.modules.nixos.gaming =
+    { pkgs, ... }:
+    {
       programs.steam = {
         enable = true;
         protontricks.enable = true;
+        extraCompatPackages = with pkgs; [ proton-ge-bin ];
       };
     };
 }

modules/nixos/networking/netbird-client.nix

@@ -0,0 +1,31 @@
+{
+  flake.modules.nixos.networking =
+    {
+      config,
+      lib,
+      hostName,
+      ...
+    }:
+    with lib;
+    let
+      cfg = config.tnix.networking.netbird-client;
+    in
+    {
+      options.tnix.networking.netbird-client = {
+        enable = mkEnableOption "Enable netbird client";
+      };
+
+      config = mkIf cfg.enable {
+        services.netbird.clients = {
+          ${hostName} = {
+            port = 51820;
+            login = {
+              enable = true;
+              setupKeyFile = config.sops.secrets.netbird-key.path;
+            };
+            bin.suffix = "";
+          };
+        };
+      };
+    };
+}