home/modules/baseline.nix

@@ -12,19 +12,5 @@ in {
   };
   config = mkIf cfg.enable {
     xdg.enable = true;
-
-    home.packages = with pkgs; [
-      calc
-      file
-      git
-      htop
-      killall
-      man-pages
-      man-pages-posix
-      tree
-      units
-      unzip
-      zip
-    ];
   };
 }

home/modules/browsers.nix

@@ -1,19 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-with lib; let
-  cfg = config.local.apps.browsers;
-in {
-  options.local.apps.browsers = {
-    enable = mkEnableOption "Browser home settings";
-  };
-  config = mkIf cfg.enable {
-    home.packages = with pkgs; [
-      chromium
-      firefox
-    ];
-  };
-}

home/modules/default.nix

@@ -8,8 +8,5 @@
     ./terminal
     ./neovim.nix
     ./baseline.nix
-    ./steam
-    ./yubikey.nix
-    ./browsers.nix
   ];
 }

home/modules/steam/default.nix

@@ -1,21 +0,0 @@
-{
-  pkgs,
-  lib,
-  config,
-  ...
-}:
-with lib; let
-  cfg = config.local.apps.steam;
-in {
-  options.local.apps.steam = {
-    enable = mkEnableOption "Steam settings";
-  };
-  config = mkIf cfg.enable {
-    home.packages = [
-      (pkgs.callPackage ./package.nix {})
-      pkgs.protonup
-      pkgs.winetricks
-      pkgs.protontricks
-    ];
-  };
-}

home/modules/yubikey.nix

@@ -1,20 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-with lib; let
-  cfg = config.local.apps.yubikey;
-in {
-  options.local.apps.yubikey = {
-    enable = mkEnableOption "Yubikey home settings";
-  };
-  config = mkIf cfg.enable {
-    home.packages = with pkgs; [
-      yubikey-manager
-      yubico-pam
-      yubikey-personalization
-    ];
-  };
-}

home/platforms/fabian@posixlycorrect/apps/default.nix

@@ -4,27 +4,28 @@
   pkgs,
   ...
 }: {
-  local = {
+  imports = [
-    baseline.enable = true;
+    ./steam
-    apps = {
+  ];
-      terminal.enable = true;
-      neovim.enable = true;
-      steam.enable = true;
-      yubikey.enable = true;
-      browsers.enable = true;
-    };
-  };
 
   home.packages = with pkgs; [
+    calc
     calibre
+    chromium
     darktable
     deluge
     discord
+    file
+    firefox
     gcc
     gwenview
+    htop
+    killall
     kdenlive
     libreoffice-fresh
     lutris
+    man-pages
+    man-pages-posix
     mpv
     obs-studio
     openrct2
@@ -35,10 +36,18 @@
     runelite
     spotify
     tdesktop
+    tree
+    units
+    unzip
     usbutils
     virt-manager
+    vlc
     vpsfree-client
     vscodium-fhs
+    yubikey-manager
+    yubico-pam
+    yubikey-personalization
+    zip
     zola
     zoom-us
   ];

home/platforms/fabian@posixlycorrect/apps/steam/default.nix

@@ -0,0 +1,14 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
+with lib; {
+  home.packages = [
+    (pkgs.callPackage ./package.nix {})
+    pkgs.protonup
+    pkgs.winetricks
+    pkgs.protontricks
+  ];
+}

home/platforms/fabian@posixlycorrect/default.nix

@@ -6,12 +6,16 @@
   ...
 }: {
   imports = [
-    ./apps.nix
+    ./apps
     ./systemd
     ./gui
     ./isolation.nix
   ];
 
+  local.baseline = true;
+  local.apps.terminal.enable = true;
+  local.apps.neovim.enable = true;
+
   nix.registry = {
     "system".to = {
       type = "path";