keep organizing into modules and profiles

3 files changed, 4 insertions, 29 deletions

diff --git a/machines/darwin/aarch64-darwin/hq-kwny2vh41p.nix b/machines/darwin/aarch64-darwin/hq-kwny2vh41p.nix
index 0364728..e0ebf11 100644
--- a/machines/darwin/aarch64-darwin/hq-kwny2vh41p.nix
+++ b/machines/darwin/aarch64-darwin/hq-kwny2vh41p.nix
@@ -9,7 +9,6 @@
   imports = [
     "${self}/profiles/home-manager.nix"
     "${self}/profiles/darwin.nix"
-    "${self}/profiles/nix.nix"
   ];
 
   system.primaryUser = adminUser.name;
diff --git a/machines/darwin/aarch64-darwin/mba-m2.nix b/machines/darwin/aarch64-darwin/mba-m2.nix
index 6f41583..a2c5607 100644
--- a/machines/darwin/aarch64-darwin/mba-m2.nix
+++ b/machines/darwin/aarch64-darwin/mba-m2.nix
@@ -8,7 +8,6 @@
   imports = [
     "${self}/profiles/home-manager.nix"
     "${self}/profiles/darwin.nix"
-    "${self}/profiles/nix.nix"
   ];
 
   system.primaryUser = adminUser.name;
@@ -53,7 +52,6 @@
     home.homeDirectory = "/Users/${adminUser.name}";
     home.packages = with pkgs; [
       element-desktop
-      vlc-bin
       zoom-us
     ];
     imports = [
diff --git a/machines/nixos/x86_64-linux/vm-synology.nix b/machines/nixos/x86_64-linux/vm-synology.nix
index a86e18b..39c483f 100644
--- a/machines/nixos/x86_64-linux/vm-synology.nix
+++ b/machines/nixos/x86_64-linux/vm-synology.nix
@@ -22,46 +22,24 @@
   };
 
   imports = [
-    "${self}/profiles/git-server.nix"
+    "${self}/profiles/home-manager.nix"
+    "${self}/profiles/admin-user/user.nix"
+    "${self}/profiles/admin-user/home-manager.nix"
     "${self}/profiles/hardware/synology.nix"
     "${self}/profiles/disk/vm.nix"
     "${self}/profiles/server.nix"
-    # ./backups.nix
-    # ./ingress.nix
-    # ./nginx.nix
+    "${self}/profiles/git-server.nix"
   ];
 
   # Use the systemd-boot EFI boot loader.
   boot.loader.efi.canTouchEfiVariables = true;
   networking.hostName = "vm-synology";
 
-  # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.mutableUsers = false;
-
-  # Enable the OpenSSH daemon.
-  services.openssh.enable = true;
-  services.openssh.settings.PasswordAuthentication = true;
-  services.openssh.settings.PermitRootLogin = "no";
-
-  users.users.root.openssh.authorizedKeys.keys = [
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINBkozy+X96u5ciX766bJ/AyQ3xm1tXZTIr5+4PVFZFi"
-  ];
-
   home-manager.users.${adminUser.name} = {
-    home.stateVersion = "25.05";
-    home.username = "${adminUser.name}";
-    home.homeDirectory = "/Users/${adminUser.name}";
     imports = [
       ../../../users/profiles/minimal.nix
     ];
-    inherit (adminUser) userinfo;
   };
 
-  # 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
-  # this value at the release version of the first install of this system.
-  # 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?
 }