m

23 files changed, 209 insertions, 488 deletions

diff --git a/hosts/cloud/bkk/configuration.nix b/hosts/cloud/bkk/configuration.nix
index 42f6b2c..9769419 100644
--- a/hosts/cloud/bkk/configuration.nix
+++ b/hosts/cloud/bkk/configuration.nix
@@ -1,49 +1,37 @@
-{ modulesPath, lib, pkgs, ... }:
 {
+  modulesPath,
+  lib,
+  pkgs,
+  ...
+}: {
   imports = [
     ./hardware-configuration.nix
     ./nginx.nix
-    ];
-     boot = {
-      loader.grub = {
-        enable = true;
-        device = "/dev/vda";
-      };
-    }; 
-     users.users.root.openssh.authorizedKeys.keys = 
-          [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM+qXhCHNrSZmy4HEXaFn6xAp1w2GzQBMOfVdbR3E81Q cloudboxes" ];
+    ../../users.nix
+    ../../base.nix
+    ../../server.nix
+  ];
+  boot = {
+    loader.grub = {
+      enable = true;
+      device = "/dev/vda";
+    };
+  };
 
-       # enable flakes
-      nix = {
-        package = pkgs.nixFlakes;
-        extraOptions = ''
-          experimental-features = nix-command flakes
-        '';
-        settings = {
-          keep-outputs = true;
-          keep-derivations = true;
-        };
-      };
-     
-      services.openssh = {
-        enable = true;
-        passwordAuthentication = false;
-        # ports = [5522];
-      };
-      networking = {
-        hostName =  "yn-bkk"; # use Digital Ocean metadata server
-      };
-      networking.firewall = {
-        enable = false;
-      #   allowedTCPPorts = [ 993 465 40308 80 443 53 51820 5522 ];
-      #   allowedUDPPorts = [ 993 465 40308 80 443 53 50000 50001 50002 50003 50004 50005 50006 50007 50008 50009 50010 51820 5522 ];
-      };
-      services.ntfy-sh = {
-        enable = true;
-        settings = {
-          base-url = "https://n.urbit.men";
-          listen-http = ":8090";
-        };
-      };
+  networking = {
+    hostName = "yn-bkk"; # use Digital Ocean metadata server
+  };
+  networking.firewall = {
+    enable = false;
+    #   allowedTCPPorts = [ 993 465 40308 80 443 53 51820 5522 ];
+    #   allowedUDPPorts = [ 993 465 40308 80 443 53 50000 50001 50002 50003 50004 50005 50006 50007 50008 50009 50010 51820 5522 ];
+  };
+  services.ntfy-sh = {
+    enable = true;
+    settings = {
+      base-url = "https://n.urbit.men";
+      listen-http = ":8090";
+    };
+  };
   system.stateVersion = "24.05"; # Did you read the comment?
 }
diff --git a/hosts/cloud/bkk/default.nix b/hosts/cloud/bkk/default.nix
new file mode 100644
index 0000000..3669483
--- /dev/null
+++ b/hosts/cloud/bkk/default.nix
@@ -0,0 +1,4 @@
+inputs: [
+  inputs.disko.nixosModules.disko
+  ./configuration.nix
+]
diff --git a/hosts/cloud/jeet/configuration.nix b/hosts/cloud/jeet/configuration.nix
index 1d470e2..30bf8c6 100644
--- a/hosts/cloud/jeet/configuration.nix
+++ b/hosts/cloud/jeet/configuration.nix
@@ -1,75 +1,75 @@
-{ modulesPath, pkgs, ... }:
 {
+  modulesPath,
+  pkgs,
+  ...
+}: {
   imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
     ./disk-config.nix
     ./hardware-configuration.nix
+    ../../users.nix
+    ../../base.nix
+    ../../server.nix
   ];
 
-      boot.loader.grub.enable = true;
-       # enable flakes
-      nix = {
-        package = pkgs.nixFlakes;
-        extraOptions = ''
-          experimental-features = nix-command flakes
-        '';
-        settings = {
-          keep-outputs = true;
-          keep-derivations = true;
-        };
-      };
-     
-      services.openssh = {
-        enable = true;
-        passwordAuthentication = false;
-        # ports = [5522];
-      };
-      services.do-agent.enable =  true;
-      networking = {
-        firewall.enable = false;
-        hostName =  "yn-ind"; # use Digital Ocean metadata server
-        networkmanager.enable = true;
-        useDHCP = false;
-        interfaces.eth0.ipv4.addresses = [
-          {address =  "93.127.194.223"; prefixLength = 32;}
-        ];        
-        interfaces.eth0.ipv6.addresses = [
-          {address =  "2a02:4780:12:413b::1"; prefixLength = 64;}
-        ];        
-        defaultGateway = {
-          address = "169.254.0.1";
-          interface = "eth0";
-        };
-        defaultGateway6 = {
-          address = "fe80:1";
-          interface = "eth0";
-        };
-        interfaces.ens18.ipv4.addresses = [
-          {address =  "93.127.194.223"; prefixLength = 32;}
-        ];        
-        interfaces.ens18.ipv6.addresses = [
-          {address =  "2a02:4780:12:413b::1"; prefixLength = 64;}
-        ];        
-        # defaultGateway = {
-        #   address = "169.254.0.1";
-        #   interface = "ens18";
-        # };
-        # defaultGateway6 = {
-        #   address = "fe80:1";
-        #   interface = "ens18";
-        # };
-        nameservers = [
-          "217.21.86.10"
-          "8.8.4.4"
-          "1.1.1.1"
-        ];
-      };
+  boot.loader.grub.enable = true;
 
-     users.users.root.openssh.authorizedKeys.keys = 
-          [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM+qXhCHNrSZmy4HEXaFn6xAp1w2GzQBMOfVdbR3E81Q cloudboxes" ];
-      # networking.firewall = {
-      #   enable = true;
-      #   allowedTCPPorts = [ 993 465 40308 80 443 53 51820 5522 ];
-      #   allowedUDPPorts = [ 993 465 40308 80 443 53 50000 50001 50002 50003 50004 50005 50006 50007 50008 50009 50010 51820 5522 ];
-      # };
+  services.do-agent.enable = true;
+  networking = {
+    firewall.enable = false;
+    hostName = "yn-ind"; # use Digital Ocean metadata server
+    networkmanager.enable = true;
+    useDHCP = false;
+    interfaces.eth0.ipv4.addresses = [
+      {
+        address = "93.127.194.223";
+        prefixLength = 32;
+      }
+    ];
+    interfaces.eth0.ipv6.addresses = [
+      {
+        address = "2a02:4780:12:413b::1";
+        prefixLength = 64;
+      }
+    ];
+    defaultGateway = {
+      address = "169.254.0.1";
+      interface = "eth0";
+    };
+    defaultGateway6 = {
+      address = "fe80:1";
+      interface = "eth0";
+    };
+    interfaces.ens18.ipv4.addresses = [
+      {
+        address = "93.127.194.223";
+        prefixLength = 32;
+      }
+    ];
+    interfaces.ens18.ipv6.addresses = [
+      {
+        address = "2a02:4780:12:413b::1";
+        prefixLength = 64;
+      }
+    ];
+    # defaultGateway = {
+    #   address = "169.254.0.1";
+    #   interface = "ens18";
+    # };
+    # defaultGateway6 = {
+    #   address = "fe80:1";
+    #   interface = "ens18";
+    # };
+    nameservers = [
+      "217.21.86.10"
+      "8.8.4.4"
+      "1.1.1.1"
+    ];
+  };
+
+  # networking.firewall = {
+  #   enable = true;
+  #   allowedTCPPorts = [ 993 465 40308 80 443 53 51820 5522 ];
+  #   allowedUDPPorts = [ 993 465 40308 80 443 53 50000 50001 50002 50003 50004 50005 50006 50007 50008 50009 50010 51820 5522 ];
+  # };
 }
diff --git a/hosts/cloud/jeet/default.nix b/hosts/cloud/jeet/default.nix
new file mode 100644
index 0000000..3669483
--- /dev/null
+++ b/hosts/cloud/jeet/default.nix
@@ -0,0 +1,4 @@
+inputs: [
+  inputs.disko.nixosModules.disko
+  ./configuration.nix
+]
diff --git a/hosts/cloud/oldsortug/configuration.nix b/hosts/cloud/oldsortug/configuration.nix
deleted file mode 100644
index 1c1866e..0000000
--- a/hosts/cloud/oldsortug/configuration.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{ modulesPath, lib, ... }:
-{
-  imports = lib.optional (builtins.pathExists ./do-userdata.nix) ./do-userdata.nix ++ [
-    ./hardware-configuration.nix
-    ./gitea.nix
-    ./nginx.nix
-    ./coturn.nix
-  ];
-      boot = {
-        growPartition = true;
-        kernelParams = [ "console=ttyS0" "panic=1" "boot.panic_on_fail" ];
-        initrd.kernelModules = [ "virtio_scsi" ];
-        kernelModules = [ "virtio_pci" "virtio_net" ];
-        loader = {
-          grub.device = "/dev/sda";
-          timeout = 0;
-          grub.configurationLimit = 0;
-        };
-      };
-      services.openssh = {
-        enable = true;
-        passwordAuthentication = false;
-	ports = [5522];
-      };
-      services.do-agent.enable =  true;
-      networking = {
-        hostName =  "sortug"; # use Digital Ocean metadata server
-      };
-      networking.firewall = {
-        enable = true;
-	allowedTCPPorts = [ 40308 80 443 53 51820 5522 ];
-	allowedUDPPorts = [ 40308 80 443 53 51820 5522 
-    50000
-    50001
-    50002
-    50003
-    50004
-    50005
-    50006
-    50007
-    50008
-    50009
-    50010
-  ];
-      };
-}
diff --git a/hosts/cloud/oldsortug/coturn.nix b/hosts/cloud/oldsortug/coturn.nix
deleted file mode 100644
index aaf097c..0000000
--- a/hosts/cloud/oldsortug/coturn.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{ ... }: 
-
-{
-  services.coturn = {
-    enable = true;
-    lt-cred-mech = true;
-    # use-auth-secret = true;
-    # static-auth-secret = "GHhc4i7Hwto0KxoDgNioYgWgkc1iLbEE8t45G6voTzD07vKvFsK6R4b8kShVZEhC";
-    realm = "turn.sortug.com";
-    # relay-ips = [
-    #   "<public-server-ip>"
-    # ];
-    # no-tcp-relay = true;
-    extraConfig = "
-      cipher-list=\"HIGH\"
-      no-loopback-peers
-      no-multicast-peers
-    ";
-    # secure-stun = true;
-    cert = "/var/lib/acme/turn.sortug.com/fullchain.pem";
-    pkey = "/var/lib/acme/turn.sortug.com/key.pem";
-    min-port = 49152;
-    max-port = 49999;
-  };
-
-  # Open ports in the firewall.
-  networking.firewall = {
-    enable = true;
-    allowPing = false;
-    allowedTCPPorts = [
-      5349  # STUN tls
-      5350  # STUN tls alt
-      80    # http
-      443   # https
-    ];
-    allowedUDPPortRanges = [
-      { from=49152; to=49999; } # TURN relay
-    ];
-  };
-
-  # setup certs
-  services.nginx = {
-    enable = true;
-    virtualHosts = {
-      "turn.sortug.com" = {
-        forceSSL = true;
-        enableACME = true;
-      };
-    };
-  };
-  users.groups.turnserver.members = ["nginx" "coturn"];
-
-  # share certs with coturn and restart on renewal
-  security.acme.certs = {
-    "turn.sortug.com" = {
-      postRun = "systemctl reload nginx.service; systemctl restart coturn.service";
-    };
-  };
-}  
-
diff --git a/hosts/cloud/oldsortug/gitea.nix b/hosts/cloud/oldsortug/gitea.nix
deleted file mode 100644
index a25773a..0000000
--- a/hosts/cloud/oldsortug/gitea.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ config, ...}:
-{
-  services.gitea = {
-    enable = true;
-    user = "git";
-    appName = "Sortug Git"; 
-    settings.server = {
-      domain = "git.sortug.com";
-      ROOT_URL = "https://git.sortug.com/";
-      SSH_PORT = 5522;
-    };
-    lfs.enable = true;
-  };
-  
-  users.users = {
-    git = {
-      description = "Gitea Service";
-      home = "/var/lib/gitea";
-      useDefaultShell = true;
-      group = "gitea";
-      isSystemUser = true;
-    };
-  };
-
-
-
-}
diff --git a/hosts/cloud/oldsortug/hardware-configuration.nix b/hosts/cloud/oldsortug/hardware-configuration.nix
deleted file mode 100644
index f46db2a..0000000
--- a/hosts/cloud/oldsortug/hardware-configuration.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-
-{
-  imports =
-    [ (modulesPath + "/profiles/qemu-guest.nix")
-    ];
-
-  boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/32e438fa-ead6-47d5-8ebe-75f6b1d0c1a6";
-      fsType = "ext4";
-    };
-
-  swapDevices = [ ];
-
-  # 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.eth0.useDHCP = lib.mkDefault true;
-
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}
diff --git a/hosts/cloud/oldsortug/nginx.nix b/hosts/cloud/oldsortug/nginx.nix
deleted file mode 100644
index ba64539..0000000
--- a/hosts/cloud/oldsortug/nginx.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ ... }: {
-
-  security.acme.acceptTerms = true;
-  security.acme.defaults.email = "security@sortug.com";
-  users.users.y.homeMode = "750";
-  services.nginx = {
-    enable = true;
-    virtualHosts."old.sortug.com" =  {
-      enableACME = true;
-      forceSSL = true;
-      locations."/" = {
-        proxyPass = "http://127.0.0.1:9000";
-        proxyWebsockets = true; # needed if you need to use WebSocket
-        extraConfig = ''
-         proxy_set_header Host $Host;
-        '';
-        # actually important
-      };
-    };
-  };
-}
diff --git a/hosts/cloud/oldsortug/packages.nix b/hosts/cloud/oldsortug/packages.nix
deleted file mode 100644
index 6985acb..0000000
--- a/hosts/cloud/oldsortug/packages.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-   nixpkgs.config = {
-     allowUnfree = true;
-   };
-
-  environment.systemPackages = with pkgs; [
-    neovim
-    fish
-    # unix utilities
-    tmux
-    bat # cat replacement written in Rust
-    colordiff
-    direnv # Per-directory environment variables
-    lsd
-    fd # find replacement written in Rust
-    fzf # Fuzzy finder
-    git
-    glibcLocales
-    gnumake
-    htop # Resource monitoring
-    jq # JSON parsing for the CLI
-    lsof
-    ripgrep # grep replacement written in Rust
-    sd # Fancy sed replacement
-    silver-searcher
-    skim # High-powered fuzzy finder written in Rust
-    strace # debug stack trace
-    tealdeer # tldr for various shell tools
-    testdisk
-    tokei # Handy tool to see lines of code by language
-    watchexec # Fileystem watcher/executor useful for speedy development
-    xsv # CSV file parsing utility
-    just # Intriguing new make replacement
-    mdcat # Markdown converter/reader for the CLI
-    tree
-    unzip
-    zip
-
-    # networking
-    curl
-    caddy # simple web server made with go
-    innernet
-    
-    # s3
-    minio
-    # databases
-   # postgresql
-   # sqlite
-  ];
-}
-
diff --git a/hosts/cloud/oldsortug/users.nix b/hosts/cloud/oldsortug/users.nix
deleted file mode 100644
index b3515c1..0000000
--- a/hosts/cloud/oldsortug/users.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{ config, pkgs, ... }:
-
-
-let shellAliases = {
-  l = "lsd -lAh";
-  la = "lsd -lAh";
-  ports = "sudo lsof -i -P -n | grep LISTEN";
-  gco = "git checkout";
-  gcob = "git checkout -b";
-};
-
-in {
-  programs.fish = {
-  inherit shellAliases;
-  enable = true;
-#   plugins = [{
-#      name="foreign-env";
-#      src = pkgs.fetchFromGitHub {
-#          owner = "oh-my-fish";
-#          repo = "plugin-foreign-env";
-#          rev = "dddd9213272a0ab848d474d0cbde12ad034e65bc";
-#          sha256 = "00xqlyl3lffc5l0viin1nyp819wf81fncqyz87jx8ljjdhilmgbs";
-#      };
-#  }];
-};
-
-  users = {
-    extraUsers = {
-      y = {
-        group = "users";
-        isNormalUser = true;
-        extraGroups = [
-          "systemd-journal"
-          "wheel"
-        ];
-        createHome = true;
-        home = "/home/y";
-        isSystemUser = false;
-        shell = pkgs.fish;
-        openssh.authorizedKeys.keys =
-          [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM+qXhCHNrSZmy4HEXaFn6xAp1w2GzQBMOfVdbR3E81Q cloudboxes" ];
-     };
-#     urbit = {
-#       group = "users";
-#       isNormalUser = true;
-#       createHome = true;
-#       isSystemUser = false;
-#       openssh.authorizedKeys.keys = 
-#       [ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC/VzXbaX1CLqQfPCkRdMHzAKsbS//2B0qlw3ROnR74tgl7jrBP2qeYhydcNECqC5WWO+KLZrbOWdVLATLW6z6oLlMx6E6WCfRVx/F7coMd/FBYqHwJ2Z1PbG0YSjWH07GyVYU2Nc9HfW459aXpGQ2LlTjYP14i7DqvSesCIkfbPfHzwAkyDxj4oIMXS3LMQlh4u69YKoXS/LPU+1Qv+bT5alRc2Uw+/9/q1IfDDxIiKqt3EVNEM6p5QssXtlFhk0+7zXRApWbpYLbjAVHDHbFoPAXeKLQvpgnz1K84fOGNlXj9nISYfDba8NVWQbetKnVxmQNDUKk3jOcBFmjgHvYv pkova@Pyrys-MacBook-Pro.local" ];
-#     };
-    };
-  };
-}
-
-
-
diff --git a/hosts/cloud/sing/default.nix b/hosts/cloud/sing/default.nix
new file mode 100644
index 0000000..3669483
--- /dev/null
+++ b/hosts/cloud/sing/default.nix
@@ -0,0 +1,4 @@
+inputs: [
+  inputs.disko.nixosModules.disko
+  ./configuration.nix
+]
diff --git a/hosts/cloud/sortug/configuration.nix b/hosts/cloud/sortug/configuration.nix
index da267f6..9f75d14 100644
--- a/hosts/cloud/sortug/configuration.nix
+++ b/hosts/cloud/sortug/configuration.nix
@@ -1,84 +1,88 @@
-{ modulesPath, lib, ... }:
 {
-  imports = lib.optional (builtins.pathExists ./do-userdata.nix) ./do-userdata.nix ++ [
-    ./hardware-configuration.nix
-    (modulesPath + "/installer/scan/not-detected.nix")
-    ./gitea.nix
-    ./nginx.nix
-    ./minio.nix
-    # ./coturn.nix
-    ./disk-config.nix
-    # ./mail.nix
-  ];
+  modulesPath,
+  lib,
+  ...
+}: {
+  imports =
+    lib.optional (builtins.pathExists ./do-userdata.nix) ./do-userdata.nix
+    ++ [
+      ./hardware-configuration.nix
+      (modulesPath + "/installer/scan/not-detected.nix")
+      ../../base.nix
+      ../../users.nix
+      ../../server.nix
+      ../packages.nix
+      ./gitea.nix
+      ./nginx.nix
+      ./minio.nix
+      # ./coturn.nix
+      ./disk-config.nix
+      # ./mail.nix
+    ];
 
-    
-   boot = {
+  boot = {
     loader.grub.enable = true;
     # loader.grub.device = "/dev/sda";
-  }; 
+  };
 
-    services.openssh = {
-      enable = true;
-      passwordAuthentication = false;
-    	ports = [5522];
+  services.do-agent.enable = true;
+  networking = {
+    firewall.enable = false;
+    networkmanager.enable = true;
+    hostName = "sortug"; # use Digital Ocean metadata server
+    useDHCP = false;
+    interfaces.enp3s0.ipv4.addresses = [
+      {
+        address = "209.182.234.186";
+        prefixLength = 24;
+      }
+    ];
+    interfaces.enp3s0.ipv6.addresses = [
+      {
+        address = "2602:ff16:14:0:1:f7:0:1";
+        prefixLength = 64;
+      }
+    ];
+    defaultGateway = {
+      address = "209.182.234.1";
+      interface = "enp3s0";
     };
-
-     users.users.root.openssh.authorizedKeys.keys = 
-          [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM+qXhCHNrSZmy4HEXaFn6xAp1w2GzQBMOfVdbR3E81Q cloudboxes" ];
-    
-      services.do-agent.enable =  true;
-      networking = {
-        firewall.enable = false;
-        networkmanager.enable = true;
-        hostName =  "sortug"; # use Digital Ocean metadata server
-        useDHCP = false;
-        interfaces.enp3s0.ipv4.addresses = [
-          {address =  "209.182.234.186"; prefixLength = 24;}
-        ];        
-        interfaces.enp3s0.ipv6.addresses = [
-          {address =  "2602:ff16:14:0:1:f7:0:1"; prefixLength = 64;}
-        ];        
-        defaultGateway = {
-          address = "209.182.234.1";
-          interface = "enp3s0";
-        };
-        defaultGateway6 = {
-          address = "2602:ff16:14::1";
-          interface = "enp3s0";
-        };
-        nameservers = [
-          "8.8.8.8"
-          "8.8.4.4"
-          "2001:4860:4860::8888"
-          "2001:4860:4860::8844"
-        ];
-      };
+    defaultGateway6 = {
+      address = "2602:ff16:14::1";
+      interface = "enp3s0";
+    };
+    nameservers = [
+      "8.8.8.8"
+      "8.8.4.4"
+      "2001:4860:4860::8888"
+      "2001:4860:4860::8844"
+    ];
+  };
 
   # curl https://raw.githubusercontent.com/elitak/nixos-infect/master/nixos-infect | NIX_CHANNEL=nixos-23.11 bash -x
 
-    services.resolved = {
-      enable = true;
-      domains =
-        [ "2001:4860:4860::8888" "2001:4860:4860::8844" ];
-    };      
+  services.resolved = {
+    enable = true;
+    domains = ["2001:4860:4860::8888" "2001:4860:4860::8844"];
+  };
 
-      #      networking.firewall = {
- #        enable = true;
-	# allowedTCPPorts = [ 40308 80 443 53 51820 5522 ];
-	# allowedUDPPorts = [ 40308 80 443 53 51820 5522 
- #    50000
- #    50001
- #    50002
- #    50003
- #    50004
- #    50005
- #    50006
- #    50007
- #    50008
- #    50009
- #    50010
- #  ];
- #      };
+  #      networking.firewall = {
+  #        enable = true;
+  # allowedTCPPorts = [ 40308 80 443 53 51820 5522 ];
+  # allowedUDPPorts = [ 40308 80 443 53 51820 5522
+  #    50000
+  #    50001
+  #    50002
+  #    50003
+  #    50004
+  #    50005
+  #    50006
+  #    50007
+  #    50008
+  #    50009
+  #    50010
+  #  ];
+  #      };
   services.ntfy-sh = {
     enable = true;
     settings = {
diff --git a/hosts/cloud/sortug/default.nix b/hosts/cloud/sortug/default.nix
index 0307c7b..3669483 100644
--- a/hosts/cloud/sortug/default.nix
+++ b/hosts/cloud/sortug/default.nix
@@ -1,3 +1,4 @@
 inputs: [
+  inputs.disko.nixosModules.disko
   ./configuration.nix
 ]
diff --git a/hosts/cloud/spanm/configuration.nix b/hosts/cloud/span/configuration.nix
index 0ec8bf2..1157308 100644
--- a/hosts/cloud/spanm/configuration.nix
+++ b/hosts/cloud/span/configuration.nix
@@ -1,14 +1,19 @@
 # Edit this configuration file to define what should be installed on
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
-
-{ config, pkgs, ... }:
-
 {
-  imports =
-    [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
-    ];
+  config,
+  pkgs,
+  ...
+}: {
+  imports = [
+    # Include the results of the hardware scan.
+    ./hardware-configuration.nix
+    ./users.nix
+    ./mail.nix
+    ./packages.nix
+    ./nginx.nix
+  ];
 
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
@@ -19,13 +24,15 @@
   # Enable networking
   networking.networkmanager.enable = true;
 
-  networking.interfaces.ens160.ipv4.addresses = [ {
-   address = "185.32.214.66";
-   prefixLength = 22;
-   } ];
+  networking.interfaces.ens160.ipv4.addresses = [
+    {
+      address = "185.32.214.66";
+      prefixLength = 22;
+    }
+  ];
   networking.defaultGateway = "185.32.212.1";
-  
-  networking.nameservers = [ "185.32.212.3" ];
+
+  networking.nameservers = ["185.32.212.3"];
 
   # Set your time zone.
   time.timeZone = "Europe/Zurich";
@@ -34,7 +41,7 @@
   i18n.defaultLocale = "en_US.UTF-8";
   users.users.root.openssh.authorizedKeys.keys = [
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKKD2DxTdE7vekp+BTifuB9gPoIPdaFSGkgVblA5MbTh"
-];
+  ];
 
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
@@ -62,5 +69,4 @@
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
   system.stateVersion = "23.11"; # Did you read the comment?
-
 }
diff --git a/hosts/cloud/span/default.nix b/hosts/cloud/span/default.nix
new file mode 100644
index 0000000..3669483
--- /dev/null
+++ b/hosts/cloud/span/default.nix
@@ -0,0 +1,4 @@
+inputs: [
+  inputs.disko.nixosModules.disko
+  ./configuration.nix
+]
diff --git a/hosts/cloud/spanm/flake.lock b/hosts/cloud/span/flake.lock
index 6bc7bd0..6bc7bd0 100644
--- a/hosts/cloud/spanm/flake.lock
+++ b/hosts/cloud/span/flake.lock
diff --git a/hosts/cloud/spanm/flake.nix b/hosts/cloud/span/flake.nix
index b801212..b801212 100644
--- a/hosts/cloud/spanm/flake.nix
+++ b/hosts/cloud/span/flake.nix
diff --git a/hosts/cloud/spanm/hardware-configuration.nix b/hosts/cloud/span/hardware-configuration.nix
index fad27b2..fad27b2 100644
--- a/hosts/cloud/spanm/hardware-configuration.nix
+++ b/hosts/cloud/span/hardware-configuration.nix
diff --git a/hosts/cloud/spanm/mail.nix b/hosts/cloud/span/mail.nix
index d020fec..d020fec 100644
--- a/hosts/cloud/spanm/mail.nix
+++ b/hosts/cloud/span/mail.nix
diff --git a/hosts/cloud/spanm/nginx.nix b/hosts/cloud/span/nginx.nix
index cda5ab4..cda5ab4 100644
--- a/hosts/cloud/spanm/nginx.nix
+++ b/hosts/cloud/span/nginx.nix
diff --git a/hosts/cloud/spanm/packages.nix b/hosts/cloud/span/packages.nix
index 6574071..6574071 100644
--- a/hosts/cloud/spanm/packages.nix
+++ b/hosts/cloud/span/packages.nix
diff --git a/hosts/cloud/spanm/users.nix b/hosts/cloud/span/users.nix
index 60e3a5a..60e3a5a 100644
--- a/hosts/cloud/spanm/users.nix
+++ b/hosts/cloud/span/users.nix