3 files changed, 16 insertions, 82 deletions
diff --git a/hosts/aptos/home.nix b/hosts/aptos/home.nix
index 8341d8e..568e7ae 100644
--- a/hosts/aptos/home.nix
+++ b/hosts/aptos/home.nix
@@ -1,57 +1,17 @@
-{ ... }: {
-  my.home = {
-    wm.windowManager = "sway";
-
-    # default packages I want on all hosts
-    packages.enable = true;
-
-    # desktop
-    evince.enable = true;
-    gtk.enable = true;
-    pcmanfm.enable = true;
+{ self, ... }: {
+  imports = [
+    "${self}/home/profiles/home.nix"
+    "${self}/home/profiles/workstation.nix"
+    "${self}/home/profiles/sway.nix"
+  ];
 
-    # multimedia
-    bluetooth.enable = true;
-    eog.enable = true;
-    mpv.enable = true;
-    scanner.enable = true;
-    sublime-music.enable = true;
-    vlc.enable = true;
-
-    # communication
+  my.home = {
     mail.enable = true;
     matrix-client.enable = true;
-
-    # terminal
-    direnv.enable = true;
-    gcloud.enable = true;
-    shell.name = "zsh";
-    ssh.enable = true;
-    terminal.program = "alacritty";
-    terraform.enable = true;
-    tmux.enable = true;
-    xdg.enable = true;
-
-    # software development
-    emacs.enable = true;
-    git.enable = true;
-    go.enable = true;
-    python.enable = true;
-    rust.enable = true;
-
-    # web
-    firefox.enable = true;
-    transmission-remote.enable = true;
-    yt-dlp.enable = true;
-
-    # security
-    age.enable = true;
     gpg = {
       enable = true;
       pinentry = "gnome3";
       defaultKey = "23348B57F01D4234B5CFBA0923208AC01EB6EEA1";
     };
-    pass.enable = true;
-    yubikey.enable = true;
   };
 }
diff --git a/hosts/carmel/home.nix b/hosts/carmel/home.nix
index eb6c9ab..6fb5fc2 100644
--- a/hosts/carmel/home.nix
+++ b/hosts/carmel/home.nix
@@ -1,14 +1,6 @@
-{ ... }: {
-  my.home = {
-    # default packages I want on all hosts
-    packages.enable = true;
+{ self, ... }: {
 
-    # terminal
-    shell.name = "zsh";
-    ssh.enable = true;
-    tmux.enable = true;
-
-    # software development
-    git.enable = true;
-  };
+  imports = [
+    "${self}/home/modules/home.nixhome"
+  ];
 }
diff --git a/hosts/tahoe/home.nix b/hosts/tahoe/home.nix
index c58d0d4..9177e59 100644
--- a/hosts/tahoe/home.nix
+++ b/hosts/tahoe/home.nix
@@ -1,26 +1,8 @@
-{ pkgs, ... }:
+{ pkgs, self, ... }:
 
 {
-  my.home = {
-    # default packages I want on all hosts
-    packages.enable = true;
-
-    # terminal
-    shell.name = "zsh";
-    ssh.enable = true;
-    tmux.enable = true;
-
-    # software development
-    git.enable = true;
-
-    # multimedia
-    beets = {
-      enable = true;
-      musicDirectory = "/data/fast/music";
-    };
-    flac.enable = true;
-
-    # web
-    yt-dlp.enable = true;
-  };
+  imports = [
+    "${self}/home/profiles/home.nix"
+    "${self}/home/profiles/nas.nix"
+  ];
 }