3 files changed, 75 insertions, 36 deletions

diff --git a/hosts/aptos/home.nix b/hosts/aptos/home.nix
index 7788cd2..133c6ed 100644
--- a/hosts/aptos/home.nix
+++ b/hosts/aptos/home.nix
@@ -1,36 +1,51 @@
 { pkgs, ... }: {
   my.home = {
+    # default packages I want on all hosts
     packages.enable = true;
+
+    # desktop
+    evince.enable = true;
+    pcmanfm.enable = true;
+
+    # multimedia
     bluetooth.enable = true;
+    eog.enable = true;
+    mpv.enable = true;
+    scanner.enable = true;
+    sublime-music.enable = true;
+    vlc.enable = true;
+
+    # communication
     element.enable = true;
+    mail.enable = true;
+
+    # terminal
+    direnv.enable = true;
+    gcloud.enable = true;
+    ssh.enable = true;
+    terminal.program = "alacritty";
+    tmux.enable = true;
+    xdg.enable = true;
     zsh.enable = true;
+
+    # software development
+    emacs.enable = true;
     git.enable = true;
     go.enable = true;
     python.enable = true;
-    scanner.enable = true;
-    tmux.enable = true;
+
+    # web
+    firefox.enable = true;
+    transmission-remote.enable = true;
     yt-dlp.enable = true;
-    vlc.enable = true;
-    mpv.enable = true;
-    sublime-music.enable = true;
-    ssh.enable = true;
+
+    # security
     gpg = {
       enable = true;
       pinentry = "gnome3";
       defaultKey = "23348B57F01D4234B5CFBA0923208AC01EB6EEA1";
     };
-    gcloud.enable = true;
-    mail.enable = true;
     pass.enable = true;
     seahorse.enable = true;
-    emacs.enable = true;
-    direnv.enable = true;
-    firefox.enable = true;
-    pcmanfm.enable = true;
-    terminal.program = "alacritty";
-    xdg.enable = true;
-    eog.enable = true;
-    evince.enable = true;
-    transmission-remote.enable = true;
   };
 }
diff --git a/hosts/carmel/home.nix b/hosts/carmel/home.nix
index 7788cd2..133c6ed 100644
--- a/hosts/carmel/home.nix
+++ b/hosts/carmel/home.nix
@@ -1,36 +1,51 @@
 { pkgs, ... }: {
   my.home = {
+    # default packages I want on all hosts
     packages.enable = true;
+
+    # desktop
+    evince.enable = true;
+    pcmanfm.enable = true;
+
+    # multimedia
     bluetooth.enable = true;
+    eog.enable = true;
+    mpv.enable = true;
+    scanner.enable = true;
+    sublime-music.enable = true;
+    vlc.enable = true;
+
+    # communication
     element.enable = true;
+    mail.enable = true;
+
+    # terminal
+    direnv.enable = true;
+    gcloud.enable = true;
+    ssh.enable = true;
+    terminal.program = "alacritty";
+    tmux.enable = true;
+    xdg.enable = true;
     zsh.enable = true;
+
+    # software development
+    emacs.enable = true;
     git.enable = true;
     go.enable = true;
     python.enable = true;
-    scanner.enable = true;
-    tmux.enable = true;
+
+    # web
+    firefox.enable = true;
+    transmission-remote.enable = true;
     yt-dlp.enable = true;
-    vlc.enable = true;
-    mpv.enable = true;
-    sublime-music.enable = true;
-    ssh.enable = true;
+
+    # security
     gpg = {
       enable = true;
       pinentry = "gnome3";
       defaultKey = "23348B57F01D4234B5CFBA0923208AC01EB6EEA1";
     };
-    gcloud.enable = true;
-    mail.enable = true;
     pass.enable = true;
     seahorse.enable = true;
-    emacs.enable = true;
-    direnv.enable = true;
-    firefox.enable = true;
-    pcmanfm.enable = true;
-    terminal.program = "alacritty";
-    xdg.enable = true;
-    eog.enable = true;
-    evince.enable = true;
-    transmission-remote.enable = true;
   };
 }
diff --git a/hosts/tahoe/home.nix b/hosts/tahoe/home.nix
index 2e56275..dc9c0aa 100644
--- a/hosts/tahoe/home.nix
+++ b/hosts/tahoe/home.nix
@@ -2,16 +2,25 @@
 
 {
   my.home = {
-    packages = { enable = true; };
+    # default packages I want on all hosts
+    packages.enable = true;
+
+    # terminal
     tmux.enable = true;
-    git.enable = true;
     ssh.enable = true;
     zsh.enable = true;
+
+    # software development
+    git.enable = true;
+
+    # multimedia
     beets = {
       enable = true;
       musicDirectory = "/data/fast/music";
     };
     flac.enable = true;
+
+    # web
     yt-dlp.enable = true;
   };
 }