make everything a module

5 files changed, 50 insertions, 0 deletions

diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index 8d838bf..a7ba7f9 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -5,5 +5,6 @@
     features = ./features;
     server = ./server;
     services = ./services;
+    suites = ./suites;
   };
 }
diff --git a/modules/nixos/server/default.nix b/modules/nixos/server/default.nix
index d412067..baf05f9 100644
--- a/modules/nixos/server/default.nix
+++ b/modules/nixos/server/default.nix
@@ -21,6 +21,7 @@ in {
       tmp.cleanOnBoot = lib.mkDefault true;
       kernelPackages = lib.mkDefault pkgs.linuxPackages_hardened;
     };
+    environment.etc."nix/inputs/nixpkgs".source = inputs.nixpkgs-stable.outPath;
 
     documentation = {
       enable = false;
@@ -35,6 +36,7 @@ in {
         options = "-d --delete-older-than 2d";
       };
 
+      registry.n.flake = inputs.nixpkgs-stable;
       settings.allowed-users = [config.networking.hostName];
     };
   };
diff --git a/modules/nixos/suites/default.nix b/modules/nixos/suites/default.nix
new file mode 100644
index 0000000..0d11285
--- /dev/null
+++ b/modules/nixos/suites/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./personal.nix
+    ./server.nix
+  ];
+}
diff --git a/modules/nixos/suites/personal.nix b/modules/nixos/suites/personal.nix
new file mode 100644
index 0000000..830062b
--- /dev/null
+++ b/modules/nixos/suites/personal.nix
@@ -0,0 +1,18 @@
+{
+  config,
+  lib,
+  secretsDir,
+  ...
+}: let
+  cfg = config.suites.personal;
+in {
+  config = lib.mkIf cfg.enable {
+    age = {
+      identityPaths = ["/etc/age/key"];
+      secrets = {
+        rootPassword.file = secretsDir + "/rootPassword.age";
+        sethPassword.file = secretsDir + "/sethPassword.age";
+      };
+    };
+  };
+}
diff --git a/modules/nixos/suites/server.nix b/modules/nixos/suites/server.nix
new file mode 100644
index 0000000..ac0c001
--- /dev/null
+++ b/modules/nixos/suites/server.nix
@@ -0,0 +1,23 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  cfg = config.suites.server;
+in {
+  options.suites.server = {
+    enable = lib.mkEnableOption "Server configuration set";
+  };
+
+  config = lib.mkIf cfg.enable {
+    features.tailscale = {
+      enable = true;
+      ssh.enable = true;
+    };
+
+    server = {
+      enable = true;
+      secrets.enable = true;
+    };
+  };
+}