diff --git a/legacy/modules/desktop-default.nix b/legacy/modules/desktop-default.nix
deleted file mode 100644
index 3220d78..0000000
--- a/legacy/modules/desktop-default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ config, lib, pkgs, ... }:
-{
-  environment.systemPackages = with pkgs; [
-    evince
-    firefox
-    ghostwriter
-    (gimp-with-plugins.override {
-      plugins = with gimpPlugins; [
-        resynthesizer
-      ];
-    })
-    keepassxc
-    libreoffice
-    (mpv.override {
-      scripts = with mpvScripts; [
-        convert
-        mpris
-        simple-mpv-webui
-        sponsorblock
-      ];
-    })
-    newsflash
-    rhythmbox
-    tdesktop
-    thunderbird
-    vlc
-    wayvnc
-    zathura
-    zeal
-    # terminal
-    socat
-    sshuttle
-    libnotify
-    keychain
-  ];
-
-  programs.wireshark = {
-    enable = true;
-    package = pkgs.wireshark; # enable the gui
-  };
-}
diff --git a/legacy/modules/desktop-development.nix b/legacy/modules/desktop-development.nix
deleted file mode 100644
index 5a133fd..0000000
--- a/legacy/modules/desktop-development.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ config, pkgs, ... }:
-{
-  environment.systemPackages = with pkgs; [
-    arduino
-    bless # hex editor
-    chromium
-    dbeaver
-    filezilla
-    fritzing
-    gnome.gnome-font-viewer
-    meld
-    insomnia
-    qgis
-    sqlitebrowser
-    (vscode-with-extensions.override {
-      vscode = vscodium;
-      vscodeExtensions =
-        with vscode-extensions; [
-          bbenoist.nix
-          editorconfig.editorconfig
-          mkhl.direnv
-          ms-azuretools.vscode-docker
-          ms-python.python
-          ms-vscode-remote.remote-ssh
-        ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
-          {
-            name = "vsc-material-theme";
-            publisher = "Equinusocio";
-            version = "33.8.0";
-            sha256 = "sha256-+I4AUwsrElT62XNvmuAC2iBfHfjNYY0bmAqzQvfwUYM=";
-          }
-        ];
-    })
-  ];
-}
diff --git a/machines/thinkman/configuration.nix b/machines/thinkman/configuration.nix
index 709b034..5bc31b2 100644
--- a/machines/thinkman/configuration.nix
+++ b/machines/thinkman/configuration.nix
@@ -8,8 +8,6 @@
     ./profiles.nix
     ./services.nix
     ./system.nix
-    ../../legacy/modules/desktop-default.nix
-    ../../legacy/modules/desktop-development.nix
   ];
 
   networking.hostName = "thinkman";
diff --git a/machines/thinkman/profiles.nix b/machines/thinkman/profiles.nix
index b92c79b..0d40845 100644
--- a/machines/thinkman/profiles.nix
+++ b/machines/thinkman/profiles.nix
@@ -8,6 +8,8 @@ in
     "3d-design".enable = true;
     android.enable = true;
     clean.enable = true;
+    desktop-apps.enable = true;
+    desktop-dev.enable = true;
     development.enable = true;
     filesystem.enable = true;
     gaming.enable = true;
diff --git a/profiles/default.nix b/profiles/default.nix
index fff8890..13e25c1 100644
--- a/profiles/default.nix
+++ b/profiles/default.nix
@@ -5,6 +5,8 @@
     ./3d-design
     ./android
     ./clean
+    ./desktop-apps
+    ./desktop-dev
     ./development
     ./filesystem
     ./gaming
diff --git a/profiles/desktop-apps/default.nix b/profiles/desktop-apps/default.nix
new file mode 100644
index 0000000..f60f12c
--- /dev/null
+++ b/profiles/desktop-apps/default.nix
@@ -0,0 +1,50 @@
+{ config, lib, pkgs, ... }:
+let
+  cfg = config.my.profiles.desktop-apps;
+in
+{
+  options.my.profiles.desktop-apps = with lib; {
+    enable = mkEnableOption "desktop-apps profile";
+  };
+
+  config = lib.mkIf cfg.enable {
+    environment.systemPackages = with pkgs; [
+      evince
+      firefox
+      ghostwriter
+      (gimp-with-plugins.override {
+        plugins = with gimpPlugins; [
+          resynthesizer
+        ];
+      })
+      keepassxc
+      libreoffice
+      (mpv.override {
+        scripts = with mpvScripts; [
+          convert
+          mpris
+          simple-mpv-webui
+          sponsorblock
+        ];
+      })
+      newsflash
+      rhythmbox
+      tdesktop
+      thunderbird
+      vlc
+      wayvnc
+      zathura
+      zeal
+      # terminal
+      socat
+      sshuttle
+      libnotify
+      keychain
+    ];
+
+    programs.wireshark = {
+      enable = true;
+      package = pkgs.wireshark; # enable the gui
+    };
+  };
+}
diff --git a/profiles/desktop-dev/default.nix b/profiles/desktop-dev/default.nix
new file mode 100644
index 0000000..1ed49be
--- /dev/null
+++ b/profiles/desktop-dev/default.nix
@@ -0,0 +1,44 @@
+{ config, lib, pkgs, ... }:
+let
+  cfg = config.my.profiles.desktop-dev;
+in
+{
+  options.my.profiles.desktop-dev = with lib; {
+    enable = mkEnableOption "desktop-dev profile";
+  };
+
+  config = lib.mkIf cfg.enable {
+    environment.systemPackages = with pkgs; [
+      arduino
+      bless # hex editor
+      chromium
+      dbeaver
+      filezilla
+      fritzing
+      gnome.gnome-font-viewer
+      meld
+      insomnia
+      qgis
+      sqlitebrowser
+      (vscode-with-extensions.override {
+        vscode = vscodium;
+        vscodeExtensions =
+          with vscode-extensions; [
+            bbenoist.nix
+            editorconfig.editorconfig
+            mkhl.direnv
+            ms-azuretools.vscode-docker
+            ms-python.python
+            ms-vscode-remote.remote-ssh
+          ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
+            {
+              name = "vsc-material-theme";
+              publisher = "Equinusocio";
+              version = "33.8.0";
+              sha256 = "sha256-+I4AUwsrElT62XNvmuAC2iBfHfjNYY0bmAqzQvfwUYM=";
+            }
+          ];
+      })
+    ];
+  };
+}