diff --git a/config/automatrop/roles/software/templates/package_manager.j2 b/config/automatrop/roles/software/templates/package_manager.j2
index 3a10339..c79ebde 100644
--- a/config/automatrop/roles/software/templates/package_manager.j2
+++ b/config/automatrop/roles/software/templates/package_manager.j2
@@ -1,11 +1,4 @@
 {# Include rules-determined snippets #}
-{% if software_full %}
-{% include 'snippets/pm_android_tools.j2' %}
-{% include 'snippets/pm_multimedia_editors.j2' %}
-{% include 'snippets/pm_download.j2' %}
-{% include 'snippets/pm_wine.j2' %}
-{% include 'snippets/pm_document.j2' %}
-{% endif %}
 {# Inclde dev snippets #}
 {% if dev_stuffs %}
 {% include 'snippets/pm_dev_common.j2' %}
diff --git a/config/automatrop/roles/software/templates/snippets/pm_android_tools.j2 b/config/automatrop/roles/software/templates/snippets/pm_android_tools.j2
deleted file mode 100644
index 3adfc83..0000000
--- a/config/automatrop/roles/software/templates/snippets/pm_android_tools.j2
+++ /dev/null
@@ -1,11 +0,0 @@
-{#
-Stuff for accessing Android phones
-#}
-{% if not termux %}
-{% if arch_based %}
-android-tools
-android-udev
-{% elif debian_based %}
-adb
-{% endif %}
-{% endif %}
diff --git a/config/automatrop/roles/software/templates/snippets/pm_document.j2 b/config/automatrop/roles/software/templates/snippets/pm_document.j2
deleted file mode 100644
index 0ba2105..0000000
--- a/config/automatrop/roles/software/templates/snippets/pm_document.j2
+++ /dev/null
@@ -1,27 +0,0 @@
-{# Document utilities #}
-pandoc
-{% if arch_based %}
-texlive-bibtexextra
-texlive-core
-texlive-fontsextra
-texlive-formatsextra
-texlive-latexextra
-texlive-pictures
-texlive-pstricks
-texlive-science
-{% elif debian_based %}
-texlive-base
-texlive-lang-european
-{% endif %}
-pdftk
-{% if display_server %}
-{# Spell checking #}
-hunspell-en_gb
-hunspell-en_us
-hunspell-fr
-hunspell-nl
-{# libreoffice-extension-grammalecte-fr #}
-{% if arch_based %}
-libreoffice-extension-languagetool
-{% endif %}
-{% endif %}
diff --git a/config/automatrop/roles/software/templates/snippets/pm_download.j2 b/config/automatrop/roles/software/templates/snippets/pm_download.j2
deleted file mode 100644
index 272244c..0000000
--- a/config/automatrop/roles/software/templates/snippets/pm_download.j2
+++ /dev/null
@@ -1,12 +0,0 @@
-{#
-Programs used to download sutff off the internet
-#}
-wget
-curl
-rsync
-yt-dlp
-megatools
-transmission-cli
-{% if display_server %}
-transmission-qt
-{% endif %}
diff --git a/config/automatrop/roles/software/templates/snippets/pm_multimedia_editors.j2 b/config/automatrop/roles/software/templates/snippets/pm_multimedia_editors.j2
deleted file mode 100644
index 9462c63..0000000
--- a/config/automatrop/roles/software/templates/snippets/pm_multimedia_editors.j2
+++ /dev/null
@@ -1,12 +0,0 @@
-{#
-Big behemoth applications
-#}
-{% if display_server %}
-gimp
-inkscape
-darktable
-blender
-puddletag
-musescore
-audacity
-{% endif %}
diff --git a/config/automatrop/roles/software/templates/snippets/pm_shell.j2 b/config/automatrop/roles/software/templates/snippets/pm_shell.j2
deleted file mode 100644
index 5a519a7..0000000
--- a/config/automatrop/roles/software/templates/snippets/pm_shell.j2
+++ /dev/null
@@ -1,21 +0,0 @@
-{#
-Shell related stuff
-#}
-{# ZSH #}
-zsh
-antigen
-{% if arch_based %}
-{# Antigen takex care of the above for others platforms  #}
-zsh-autosuggestions
-zsh-completions
-zsh-history-substring-search
-zsh-syntax-highlighting
-{% endif %}
-tmux
-bash-completion
-fzf
-{% if arch_based and ansible_architecture == 'x86_64' %}
-powerline-go-bin
-{% else %}
-powerline-go
-{% endif %}
diff --git a/config/automatrop/roles/software/templates/snippets/pm_wine.j2 b/config/automatrop/roles/software/templates/snippets/pm_wine.j2
deleted file mode 100644
index 410e64c..0000000
--- a/config/automatrop/roles/software/templates/snippets/pm_wine.j2
+++ /dev/null
@@ -1,11 +0,0 @@
-{% if ansible_architecture == 'x86_64' %}
-wine
-{% if arch_based %}
-wine-gecko
-wine-mono
-mono
-lib32-libpulse
-{% elif debian_based %}
-mono-runtime
-{% endif %}
-{% endif %}
diff --git a/config/nix/configuration.nix b/config/nix/configuration.nix
index e27de2a..2881092 100644
--- a/config/nix/configuration.nix
+++ b/config/nix/configuration.nix
@@ -5,5 +5,6 @@
     ./modules/desktop.nix
     ./modules/battery.nix
     ./modules/wireless.nix
+    # ./modules/extra.nix
   ];
 }
diff --git a/config/nix/modules/battery.nix b/config/nix/modules/battery.nix
index 8c01d3d..98d754e 100644
--- a/config/nix/modules/battery.nix
+++ b/config/nix/modules/battery.nix
@@ -1,7 +1,4 @@
 { pkgs, ... }:
 {
-  users.users.geoffrey.packages = with pkgs; [
-    powertop
-  ];
-  environment.systemPackages = with pkgs; [ tlp ];
+  environment.systemPackages = with pkgs; [ tlp powertop ];
 }
diff --git a/config/nix/modules/common.nix b/config/nix/modules/common.nix
index 279531e..95fb406 100644
--- a/config/nix/modules/common.nix
+++ b/config/nix/modules/common.nix
@@ -4,7 +4,6 @@
   boot.loader.efi.canTouchEfiVariables = true;
 
   networking.hostName = "nixos";
-  networking.wireless.enable = true; # Enable wireless support via wpa_supplicant
 
   time.timeZone = "Europe/Amsterdam";
 
diff --git a/config/nix/modules/extra.nix b/config/nix/modules/extra.nix
new file mode 100644
index 0000000..36699d5
--- /dev/null
+++ b/config/nix/modules/extra.nix
@@ -0,0 +1,48 @@
+{ pkgs, ... }:
+{
+  users.users.geoffrey. packages = with pkgs; [
+    # android tools
+    android-tools
+
+    # multimedia editors
+    gimp
+    inkscape
+    darktable
+    blender
+    puddletag
+    musescore
+    audacity
+
+    # downloading
+    yt-dlp
+    megatools
+    transmission
+    transmission-qt
+
+    # wine
+    wine
+    # TODO wine-gecko wine-mono lib32-libpulse (?)
+
+    # documents
+    pandoc
+    texlive.combined.scheme-full
+    pdftk
+    hunspell
+    hunspellDicts.en_GB-ize
+    hunspellDicts.en_US
+    hunspellDicts.fr-moderne
+    hunspellDicts.nl_NL
+    # TODO libreoffice-extension-languagetool or libreoffice-extension-grammalecte-fr
+
+    # gaming
+    steam
+    yuzu-mainline
+    minecraft
+    # TODO factorio
+  ];
+
+  environment.systemPackages = with pkgs; [
+    # android tools
+    android-udev-rules
+  ];
+}
diff --git a/config/nix/modules/wireless.nix b/config/nix/modules/wireless.nix
index ba7d7e2..ef2a339 100644
--- a/config/nix/modules/wireless.nix
+++ b/config/nix/modules/wireless.nix
@@ -1,4 +1,5 @@
 { pkgs, ... }:
 {
+  networking.wireless.enable = true; # Enable wireless support via wpa_supplicant
   environment.systemPackages = with pkgs; [ wirelesstools ];
 }