hosts: add services to tahoe

3 files changed, 10 insertions, 11 deletions

diff --git a/hosts/carmel/default.nix b/hosts/carmel/default.nix
index 61599d6..71980f7 100644
--- a/hosts/carmel/default.nix
+++ b/hosts/carmel/default.nix
@@ -6,9 +6,6 @@
     ./boot.nix
     ./sound.nix
     ./networking.nix
-    ../common/desktop
-    # In order to unlock the root disk remotely
-    ../common/system/boot-ssh.nix
   ];
 
   hardware.opengl.driSupport = true;
diff --git a/hosts/tahoe/default.nix b/hosts/tahoe/default.nix
index dfac37c..ad48bcc 100644
--- a/hosts/tahoe/default.nix
+++ b/hosts/tahoe/default.nix
@@ -5,7 +5,7 @@
     ./hardware-configuration.nix
     ./networking.nix
     ./home.nix
-    ../profiles/nas.nix
+    ./services.nix
   ];
 
   my.system.boot = {
@@ -13,6 +13,13 @@
     initrd = { network.enable = true; };
   };
 
+  users.groups.nas.gid = 5000;
+  users.users.nas = {
+    uid = 5000;
+    group = "nas";
+    isSystemUser = true;
+  };
+
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave
diff --git a/hosts/profiles/nas.nix b/hosts/tahoe/services.nix
index 5ec18d0..a8badea 100644
--- a/hosts/profiles/nas.nix
+++ b/hosts/tahoe/services.nix
@@ -1,11 +1,6 @@
-{ config, pkgs, lib, ... }: {
-  users.groups.nas.gid = 5000;
-  users.users.nas = {
-    uid = 5000;
-    group = "nas";
-    isSystemUser = true;
-  };
+{ ... }:
 
+{
   my.services = {
     samba = {
       enable = true;