refactoring for iServer and isWorkstation: part 2

hosts/desktops/common/default.nix

@@ -1,9 +0,0 @@
-{ ... }:
-
-{
-  imports = [
-    ./home-manager.nix
-    ./impermanence.nix
-    ./stylix.nix
-  ];
-}

hosts/desktops/common/home-manager.nix

@@ -1,10 +0,0 @@
-{ ... }:
-
-{
-  home-manager = {
-    useGlobalPkgs = true;
-    useUserPackages = true;
-    backupFileExtension = "bkp";
-    users.user = import ../../../users/desktops/user.nix;
-  };
-}

hosts/desktops/common/impermanence.nix

@@ -1,24 +0,0 @@
-{ ... }:
-
-{
-  environment.persistence.main = {
-    persistentStoragePath = "/persistent";
-    files = [
-      "/etc/machine-id"
-      "/etc/ssh/ssh_host_ed25519_key"
-      "/etc/ssh/ssh_host_ed25519_key.pub"
-      "/etc/ssh/ssh_host_rsa_key"
-      "/etc/ssh/ssh_host_rsa_key.pub"
-    ];
-    directories = [
-      "/etc/NetworkManager/system-connections"
-      "/var/lib/bluetooth"
-      "/var/lib/flatpak"
-      "/var/lib/nixos"
-      "/var/lib/systemd/coredump"
-      "/var/lib/systemd/timers"
-      "/var/lib/tailscale"
-      "/var/log"
-    ];
-  };
-}

hosts/desktops/common/stylix.nix

@@ -1,47 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  stylix = {
-    enable = true;
-    image = pkgs.fetchurl {
-      url = "https://w.wallhaven.cc/full/dp/wallhaven-dpwvl3.jpg";
-      sha256 = "sha256-h9UeYj8jSRgSv8XL+zgds4KtooLlJ+IqwxZbQEXdCh4=";
-    };
-    base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";
-    cursor = {
-      package = pkgs.kdePackages.breeze-icons;
-      name = "Breeze_Light";
-      size = 24;
-    };
-    opacity = {
-      applications = 1.0;
-      desktop = 0.8;
-      popups = config.stylix.opacity.desktop;
-      terminal = 1.0;
-    };
-    fonts = {
-      serif = {
-        package = pkgs.source-serif;
-        name = "Source Serif 4 Display";
-      };
-      sansSerif = {
-        package = pkgs.inter;
-        name = "Inter";
-      };
-      monospace = {
-        package = pkgs.nerd-fonts.fira-code;
-        name = "FiraCode Nerd Font";
-      };
-      emoji = {
-        package = pkgs.noto-fonts-emoji;
-        name = "Noto Color Emoji";
-      };
-      sizes = {
-        applications = 10;
-        desktop = config.stylix.fonts.sizes.applications;
-        popups = config.stylix.fonts.sizes.applications;
-        terminal = 12;
-      };
-    };
-  };
-}

hosts/desktops/io.nix

@@ -17,10 +17,7 @@ let
 in
 {
   imports = [
-    # Host-common imports
-    ../common
-    # Desktop-common imports
-    ./common
+    ../modules
     # Host-specific imports
     ./io
   ];

hosts/desktops/rotterdam.nix

@@ -30,12 +30,8 @@ let
 in
 {
   imports = [
-    # Host-common imports
-    ../modules
-    # Desktop-common imports
-    ./common
-    # Host-specific imports
     ./rotterdam
+    ../modules
   ];
 
   networking.hostName = "rotterdam";