home/modules/accounts.nix

@@ -1,22 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-with lib; let
-  cfg = config.local.services.accounts;
-in {
-  options.local.services.accounts.enable = mkEnableOption "accounts settings";
-  config = mkIf cfg.enable {
-    accounts.email.accounts = {
-      "fabian@posixlycorrect.com" = {
-        address = "fabian@posixlycorrect.com";
-        userName = "fabianmontero@fastmail.com";
-        realName = "fabian";
-        primary = true;
-        flavor = "fastmail.com";
-      };
-    };
-  };
-}

home/modules/baseline.nix

@@ -17,7 +17,6 @@ in {
       packages = with pkgs; [
         calc
         file
-        gcc
         htop
         killall
         man-pages

home/modules/default.nix

@@ -8,12 +8,11 @@
     ./terminal
     ./neovim.nix
     ./baseline.nix
-    ./gaming
+    ./steam
     ./yubikey.nix
     ./browsers.nix
     ./gui
     ./zsh
     ./gpg.nix
-    ./defaultDesktopPack.nix
   ];
 }

home/modules/defaultDesktopPack.nix

@@ -1,34 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-with lib; let
-  cfg = config.local.apps.defaultDesktopPack;
-in {
-  options.local.apps.defaultDesktopPack = {
-    enable = mkEnableOption "common desktop apps";
-  };
-  config = mkIf cfg.enable {
-    home.packages = with pkgs; [
-      calibre
-      discord
-      gwenview
-      libreoffice-fresh
-      mpv
-      obs-studio
-      pavucontrol
-      pdfarranger
-      qpdfview
-      runelite
-      spotify
-      tdesktop
-      usbutils
-      vpsfree-client
-      vscodium-fhs
-      zola
-      zoom-us
-    ];
-  };
-}

home/modules/gaming/default.nix

@@ -1,28 +0,0 @@
-{
-  pkgs,
-  lib,
-  config,
-  ...
-}:
-with lib; let
-  cfg = config.local.apps.gaming;
-in {
-  options.local.apps.gaming = {
-    enable = mkEnableOption "gaming apps";
-  };
-  config = mkIf cfg.enable {
-    home.packages = [
-      # Steam. todo: move to the steam module later
-      (pkgs.callPackage ./package.nix {})
-      pkgs.protonup
-      pkgs.winetricks
-      pkgs.protontricks
-    ];
-
-    home.packages = with pkgs; [
-      lutris
-      openrct2
-      prismlauncher
-    ];
-  };
-}

home/modules/steam/default.nix

@@ -0,0 +1,21 @@
+{
+  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/terminal/default.nix

@@ -7,7 +7,7 @@
 with lib; let
   cfg = config.local.apps.terminal;
 in {
-  options.local.apps.terminal.enable = mkEnableOption "terminal emulator settings";
+  options.local.apps.terminal.enable = mkEnableOption "Terminal emulator settings";
   config = mkIf cfg.enable {
     programs = {
       kitty = {
@@ -33,5 +33,15 @@ in {
         '';
       };
     };
+
+    accounts.email.accounts = {
+      "fabian@posixlycorrect.com" = {
+        address = "fabian@posixlycorrect.com";
+        userName = "fabianmontero@fastmail.com";
+        realName = "fabian";
+        primary = true;
+        flavor = "fastmail.com";
+      };
+    };
   };
 }

home/platforms/fabian@posixlycorrect/apps.nix

@@ -0,0 +1,45 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
+  local = {
+    baseline.enable = true;
+    apps = {
+      terminal.enable = true;
+      neovim.enable = true;
+      steam.enable = true;
+      yubikey.enable = true;
+      browsers.enable = true;
+    };
+  };
+
+  home.packages = with pkgs; [
+    calibre
+    darktable
+    deluge
+    discord
+    gcc
+    gwenview
+    kdenlive
+    libreoffice-fresh
+    lutris
+    mpv
+    obs-studio
+    openrct2
+    pavucontrol
+    pdfarranger
+    prismlauncher
+    qpdfview
+    runelite
+    spotify
+    tdesktop
+    usbutils
+    virt-manager
+    vpsfree-client
+    vscodium-fhs
+    zola
+    zoom-us
+  ];
+}

home/platforms/fabian@posixlycorrect/default.nix

@@ -6,6 +6,7 @@
   ...
 }: {
   imports = [
+    ./apps.nix
     ./systemd
     ./isolation.nix
   ];
@@ -20,29 +21,9 @@
     "unstable".flake = flakes.unstable;
   };
 
-  local = {
-    baseline.enable = true;
-
-    services = {
-      zsh.enable = true;
-      accounts.enable = true;
-      gpg = {
-        enalbe = true;
-        defaultKey = "7AA277E604A4173916BBB4E91FFAC35E1798174F";
-      };
-    };
-
-    apps = {
-      terminal.enable = true;
-      neovim.enable = true;
-      gaming.enable = true;
-      yubikey.enable = true;
-      browsers.enable = true;
-      defaultDesktopPack.enable = true;
-    };
-
-    gui = {
+  local.gui = {
     enable = true;
+    #? wallpaperPath = ""; place wallpaper in config?
     monitors = {
       DP-1 = {
         primary = true;
@@ -61,23 +42,22 @@
       };
     };
   };
+
+  local.services = {
+    zsh.enable = true;
+    gpg = {
+      enalbe = true;
+      defaultKey = "7AA277E604A4173916BBB4E91FFAC35E1798174F";
+    };
   };
 
   home = {
-    packages = with pkgs; [
-      darktable
-      deluge
-      kdenlive
-      virt-manager
-    ];
-
-    stateVersion = "21.11"; # DO NOT CHANGE
+    stateVersion = "21.11"; # No tocar esto
     username = "fabian";
     homeDirectory = "/home/fabian";
     sessionVariables = {
       "TERMINAL" = "kitty";
     };
   };
-
   programs.home-manager.enable = true;
 }