Changed option namespace for better compatibility

hosts/arr/default.nix

@@ -1,63 +1,31 @@
-{ config, pkgs, ... }:
-
-let
-
-  # parameters = import ./parameters.nix { };
-
-  # GID = 888;
-  # user = "rtorrent";
-  # passwordHash = "$y$j9T$dA94KVg1/jYLqclQQbTDk.$cnfxBWUN8P4shr8Kkipv5bU/RCtQNoAwYFDZ0X/BYs5";
-
-  timeZone = "Europe/Rome";
-  defaultLocale = "en_US.UTF-8";
-in
 {
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+  my = {
+    utils.commons.enable = true;
 
-  commons.enable = true;
-
-  proxmox.enable = true;
-
-  download-pod = {
-    enable = false;
-    proxy.enable = false;
-  };
-
-  services.podmanPods = {
-    mywebapp = {
-      name = "mywebapp";
-      ports = [
-        "9090:80"
-        "9443:443"
-      ];
-      containers = {
-        webserver = {
-          enable = true;
-          image = "nginx";
-          volumes = [
-            "aaa:/config"
-            "bbb:/data"
-          ];
-        };
-        appserver = {
-          image = "my-custom-app:latest";
-        };
-      };
+    networking.tailscale = {
+      enable = false;
+      exitNode = "vps";
+      # authKeyFile = builtins.toFile "authKey" ''${parameters.tailscaleAuthKey}'';
     };
 
-    database = {
-      name = "database";
-      ports = [
-        "3333:4444"
-        "5432:5432"
-      ];
-      containers = {
-        postgres = {
-          image = "postgres:13";
-        };
-      };
+    services.download-pod = {
+      enable = true;
+      proxy.enable = false;
+    };
+
+    virtualisation = {
+      proxmox.enable = true;
     };
   };
 
+  time.timeZone = "Europe/Rome";
+
   # Extra packages
   environment.systemPackages = with pkgs; [ ];
 
@@ -65,13 +33,5 @@ in
     openssh.enable = true;
   };
 
-  tailscale = {
-    enable = false;
-    exitNode = "vps";
-    # authKeyFile = builtins.toFile "authKey" ''${parameters.tailscaleAuthKey}'';
-  };
-
-  time.timeZone = timeZone;
-
   system.stateVersion = "24.05";
 }

hosts/deadbeef/default.nix

@@ -1,6 +1,7 @@
 {
   config,
   pkgs,
+  lib,
   home-manager,
   ...
 }:
@@ -8,8 +9,6 @@
   imports = [
     ./hardware-configuration.nix
     # home-manager.nixosModules.home-manager
-    # ../../modules
-    # "${config.inputs.self}/modules"
   ];
 
   # Don't use the systemd-boot EFI boot loader.
@@ -38,16 +37,20 @@
     };
   };
 
-  desktopUser = {
-    enable = true;
-    userName = "pazpi";
-    hashedPassword = "$y$j9T$dA94KVg1/jYLqclQQbTDk.$cnfxBWUN8P4shr8Kkipv5bU/RCtQNoAwYFDZ0X/BYs5";
+  my = {
+    desktop = {
+
+      desktopUser = {
+        enable = true;
+        userName = "pazpi";
+        hashedPassword = "$y$j9T$dA94KVg1/jYLqclQQbTDk.$cnfxBWUN8P4shr8Kkipv5bU/RCtQNoAwYFDZ0X/BYs5";
+      };
+
+      audio.enable = false;
+    };
+
   };
 
-  audio.enable = false;
-
-  # podman.enable = true;
-
   # Vedi https://github.com/TLATER/dotfiles/blob/f989a86890f27f6b089e9d74b7e8356ec8e5683d/home-config/hosts/yui.nix
   # home-manager.users.pazpi = import "${flake-inputs.self}/home-config/hosts/deadbeef.nix";