Remove all GUI elements from default home configs, using gui/default.nix instead

home/default.nix

@@ -1,4 +1 @@
-{pkgs, ...}: {
-  imports = [./env ./gui ./tui];
-  home.packages = with pkgs; [signal-desktop];
-}
+{...}: {imports = [./env ./tui];}

home/gui/default.nix

@@ -1,4 +1,4 @@
 {pkgs, ...}: {
   imports = [./firefox.nix ./wezterm.nix];
-  home.packages = with pkgs; [bitwarden otpclient];
+  home.packages = with pkgs; [signal-desktop bitwarden otpclient];
 }

home/personal.nix

@@ -1,4 +1 @@
-{pkgs, ...}: {
-  imports = [./default.nix ./git/personal.nix ./ssh/personal.nix];
-  home.packages = with pkgs; [discord element-desktop];
-}
+{...}: {imports = [./default.nix ./git/personal.nix ./ssh/personal.nix];}

home/work.nix

@@ -1,8 +1,15 @@
-{pkgs, ...}: {
+{...}: {
   imports = [./default.nix ./git/work.nix ./ssh/work.nix];
-  home.packages = with pkgs; [openfortivpn nomachine-client teams-for-linux zoom-us];
   programs.fish.functions.arch = ''
     distrobox list | grep -i archlinux > /dev/null || distrobox create -n arch -i docker.io/library/archlinux:latest -y
     distrobox enter arch
   '';
+  programs.fish.functions.nvsync = ''
+    rsync -avz --filter=':- .gitignore' --exclude='.git*'\
+      --delete-during --delete-excluded\
+      $HOME/.config/nvim/ heimdall003.jet.uk:.config/nvim
+    rsync -avz --filter=':- .gitignore' --exclude='.git*'\
+      --delete-during --delete-excluded\
+      $HOME/.config/nvim/ freia:.config/nvim
+  '';
 }

machines/Monarch/tux.nix

@@ -1,21 +1,11 @@
 {pkgs, ...}: {
-  imports = [
-    ../../env
-    ../../tui
-    ../../gui/wezterm.nix
-    ../../git/personal.nix
-    ../../ssh/personal.nix
-  ];
+  imports = [../../home/personal.nix ../../home/gui/wezterm.nix];
   # Home Manager needs a bit of information about you and the
   # paths it should manage.
   home.username = "tux";
   home.homeDirectory = "/Users/tux";
   home.stateVersion = "22.11";
-
-  services.syncthing.enable = true;
-
   home.packages = [pkgs.gcc];
-
   programs.fish.shellAbbrs.update = "home-manager switch";
   programs.zsh = {
     shellAliases.update = "home-manager switch";
@@ -24,4 +14,5 @@
       eval "$(/opt/homebrew/bin/brew shellenv)"
     '';
   };
+  services.syncthing.enable = true;
 }

machines/Northstar/xenia.nix

@@ -1,16 +1,9 @@
 {pkgs, ...}: {
-  imports = [
-    ../../env
-    ../../tui
-    ../../gui/chromium.nix
-    ../../gui/foot.nix
-    ../../ssh/personal.nix
-    ../../git/personal.nix
-  ];
+  imports = [../../home/personal.nix];
   home.username = "xenia";
   home.homeDirectory = "/home/xenia";
   home.stateVersion = "22.11";
-  home.packages = with pkgs; [home-manager sweet];
+  home.packages = with pkgs; [home-manager];
   programs.bash.bashrcExtra = ''
     source $HOME/.nix-profile/etc/profile.d/nix.sh
   '';