wtf

9 files changed, 15 insertions, 108 deletions

diff --git a/hosts/cloud/packages.nix b/hosts/cloud/packages.nix
index 89b7979..3a68a73 100644
--- a/hosts/cloud/packages.nix
+++ b/hosts/cloud/packages.nix
@@ -43,8 +43,9 @@
 
     # networking
     curl
-    caddy # simple web server made with go
-    innernet
+    wget
+    # caddy # simple web server made with go
+    # innernet
 
     # s3
     minio
diff --git a/hosts/cloud/span/configuration.nix b/hosts/cloud/span/configuration.nix
index 1157308..d887d37 100644
--- a/hosts/cloud/span/configuration.nix
+++ b/hosts/cloud/span/configuration.nix
@@ -8,10 +8,11 @@
 }: {
   imports = [
     # Include the results of the hardware scan.
+    ../../base.nix
     ./hardware-configuration.nix
     ./users.nix
     ./mail.nix
-    ./packages.nix
+    ../packages.nix
     ./nginx.nix
   ];
 
diff --git a/hosts/cloud/span/default.nix b/hosts/cloud/span/default.nix
index 3669483..6bce414 100644
--- a/hosts/cloud/span/default.nix
+++ b/hosts/cloud/span/default.nix
@@ -1,4 +1,5 @@
 inputs: [
   inputs.disko.nixosModules.disko
+  inputs.nixos-mailserver.nixosModule
   ./configuration.nix
 ]
diff --git a/hosts/cloud/span/flake.lock b/hosts/cloud/span/flake.lock
deleted file mode 100644
index 6bc7bd0..0000000
--- a/hosts/cloud/span/flake.lock
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "nodes": {
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1704008649,
-        "narHash": "sha256-rGPSWjXTXTurQN9beuHdyJhB8O761w1Zc5BqSSmHvoM=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "d44d59d2b5bd694cd9d996fd8c51d03e3e9ba7f7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "nixpkgs": "nixpkgs"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}
diff --git a/hosts/cloud/span/flake.nix b/hosts/cloud/span/flake.nix
deleted file mode 100644
index b801212..0000000
--- a/hosts/cloud/span/flake.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
-
-  outputs = { nixpkgs, ... }:
-    {
-      nixosConfigurations.spanmail = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
-        modules = [
-          ./configuration.nix
-          ./users.nix
-          ./packages.nix
-          ./mail.nix
-        ];
-      };
-    };
-}
diff --git a/hosts/cloud/span/mail.nix b/hosts/cloud/span/mail.nix
index 9cc44a7..beee817 100644
--- a/hosts/cloud/span/mail.nix
+++ b/hosts/cloud/span/mail.nix
@@ -3,18 +3,8 @@
   pkgs,
   ...
 }: {
-  imports = [
-    (builtins.fetchTarball {
-      url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/nixos-23.11/nixos-mailserver-nixos-23.11.tar.gz";
-      # To get the sha256 of the nixos-mailserver tarball, we can use the nix-prefetch-url command:
-      # release="nixos-23.05"; nix-prefetch-url "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/${release}/nixos-mailserver-${release}.tar.gz" --unpack
-
-      sha256 = "122vm4n3gkvlkqmlskiq749bhwfd0r71v6vcmg1bbyg4998brvx8";
-    })
-  ];
-
-  services.dovecot2.sieve.extensions = ["fileinto"];
   mailserver = {
+    stateVersion = 3;
     enable = true;
     fqdn = "mail.spandrell.ch";
     domains = ["spandrell.ch"];
@@ -32,7 +22,7 @@
         hashedPasswordFile = "/home/span/mail.key";
       };
       "lol@spandrell.ch" = {
-        hashedPasswordFile = "/home/span/mail2.key";
+        hashedPasswordFile = "/home/span/mail.key";
       };
       "sub@spandrell.ch" = {
         hashedPasswordFile = "/home/span/mail.key";
@@ -52,8 +42,6 @@
     # down nginx and opens port 80.
     certificateScheme = "acme-nginx";
   };
-  security.acme.acceptTerms = true;
-  security.acme.defaults.email = "security@spandrell.ch";
   services.roundcube = {
     enable = true;
     # this is the url of the vhost, not necessarily the same as the fqdn of
@@ -67,5 +55,4 @@
       $config['smtp_pass'] = "%p";
     '';
   };
-  services.nginx.enable = true;
 }
diff --git a/hosts/cloud/span/nginx.nix b/hosts/cloud/span/nginx.nix
index 4da4b68..9bfa8ea 100644
--- a/hosts/cloud/span/nginx.nix
+++ b/hosts/cloud/span/nginx.nix
@@ -3,6 +3,8 @@
   pkgs,
   ...
 }: {
+  security.acme.acceptTerms = true;
+  security.acme.defaults.email = "admin@spandrell.ch";
   services.nginx = {
     enable = true;
     appendHttpConfig = ''
diff --git a/hosts/cloud/span/packages.nix b/hosts/cloud/span/packages.nix
deleted file mode 100644
index 6574071..0000000
--- a/hosts/cloud/span/packages.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-   nixpkgs.config = {
-     allowUnfree = true;
-   };
-
-  environment.systemPackages = with pkgs; [
-    vim
-    helix
-    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
-    htop # Resource monitoring
-    jq # JSON parsing for the CLI
-    lsof
-    ripgrep # grep replacement written in Rust
-    sd # Fancy sed replacement
-    silver-searcher
-    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
-    wget
-    
-    minio
-    ncdu
-  ];
-}
-
diff --git a/hosts/local/fw11/configuration.nix b/hosts/local/fw11/configuration.nix
index 69b51a2..11c09d1 100644
--- a/hosts/local/fw11/configuration.nix
+++ b/hosts/local/fw11/configuration.nix
@@ -34,6 +34,11 @@
   # environment.systemPackages = [
   #   wrappers
   # ];
+  #
+
+  nixpkgs.config = {
+    allowUnfree = true;
+  };
   environment = {
     etc = {
       "sway/config".source = ./swayconfig;