From 00d3d26ee778013b1aa95a9f7fc645975fbb3169 Mon Sep 17 00:00:00 2001
From: Fuwn <contact@fuwn.me>
Date: Wed, 6 Nov 2024 08:03:32 -0800
Subject: hosts: add hoka host and joint configuration

---
 modules/pi/default.nix  | 15 +++++++++++++++
 modules/pi/users.nix    | 22 ++++++++++++++++++++++
 modules/pi/zram.nix     |  9 +++++++++
 modules/usb/default.nix | 11 -----------
 modules/usb/users.nix   | 22 ----------------------
 modules/usb/zram.nix    |  9 ---------
 6 files changed, 46 insertions(+), 42 deletions(-)
 create mode 100644 modules/pi/default.nix
 create mode 100644 modules/pi/users.nix
 create mode 100644 modules/pi/zram.nix
 delete mode 100644 modules/usb/users.nix
 delete mode 100644 modules/usb/zram.nix

(limited to 'modules')

diff --git a/modules/pi/default.nix b/modules/pi/default.nix
new file mode 100644
index 0000000..410dbd9
--- /dev/null
+++ b/modules/pi/default.nix
@@ -0,0 +1,15 @@
+{
+  lib,
+  secrets,
+  ...
+}:
+{
+  imports = [
+    ./users.nix
+    ./zram.nix
+  ];
+
+  time.timeZone = secrets.i18n.timezone;
+  services.openssh.settings.PermitRootLogin = "prohibit-password";
+  networking.firewall.enable = lib.mkForce false;
+}
diff --git a/modules/pi/users.nix b/modules/pi/users.nix
new file mode 100644
index 0000000..eb96893
--- /dev/null
+++ b/modules/pi/users.nix
@@ -0,0 +1,22 @@
+{ config, secrets, ... }:
+{
+  users = {
+    groups.${config.modules.primaryUser} = { };
+
+    users =
+      let
+        defaultOptions = {
+          initialHashedPassword = secrets.initial_hashed_password;
+          openssh.authorizedKeys.keys = [ secrets.kioku_openssh_public_key ];
+        };
+      in
+      {
+        root = defaultOptions;
+
+        ${config.modules.primaryUser} = defaultOptions // {
+          group = config.modules.primaryUser;
+          isNormalUser = true;
+        };
+      };
+  };
+}
diff --git a/modules/pi/zram.nix b/modules/pi/zram.nix
new file mode 100644
index 0000000..d9df0a9
--- /dev/null
+++ b/modules/pi/zram.nix
@@ -0,0 +1,9 @@
+{
+  zramSwap = {
+    enable = true;
+    priority = 100;
+    memoryMax = 268435456;
+    algorithm = "lz4";
+    memoryPercent = 50;
+  };
+}
diff --git a/modules/usb/default.nix b/modules/usb/default.nix
index b255eba..fdcfae1 100644
--- a/modules/usb/default.nix
+++ b/modules/usb/default.nix
@@ -1,17 +1,6 @@
-{
-  lib,
-  secrets,
-  ...
-}:
 {
   imports = [
     ./samba.nix
-    ./users.nix
     ./watchdog.nix
-    ./zram.nix
   ];
-
-  time.timeZone = secrets.i18n.timezone;
-  services.openssh.settings.PermitRootLogin = "prohibit-password";
-  networking.firewall.enable = lib.mkForce false;
 }
diff --git a/modules/usb/users.nix b/modules/usb/users.nix
deleted file mode 100644
index eb96893..0000000
--- a/modules/usb/users.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ config, secrets, ... }:
-{
-  users = {
-    groups.${config.modules.primaryUser} = { };
-
-    users =
-      let
-        defaultOptions = {
-          initialHashedPassword = secrets.initial_hashed_password;
-          openssh.authorizedKeys.keys = [ secrets.kioku_openssh_public_key ];
-        };
-      in
-      {
-        root = defaultOptions;
-
-        ${config.modules.primaryUser} = defaultOptions // {
-          group = config.modules.primaryUser;
-          isNormalUser = true;
-        };
-      };
-  };
-}
diff --git a/modules/usb/zram.nix b/modules/usb/zram.nix
deleted file mode 100644
index d9df0a9..0000000
--- a/modules/usb/zram.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  zramSwap = {
-    enable = true;
-    priority = 100;
-    memoryMax = 268435456;
-    algorithm = "lz4";
-    memoryPercent = 50;
-  };
-}
-- 
cgit v1.2.3