diff --git a/archachatina.nix b/archachatina.nix
index 4acabb4..78e5ea4 100644
--- a/archachatina.nix
+++ b/archachatina.nix
@@ -4,6 +4,7 @@
   imports =
     [
       ./common.nix
+      ./large-sw.nix
       ./uefi.nix
       ./fstrim.nix
     ];
diff --git a/common-sw.nix b/common-sw.nix
new file mode 100644
index 0000000..fe6618f
--- /dev/null
+++ b/common-sw.nix
@@ -0,0 +1,101 @@
+{ config, pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs.haskellPackages; with pkgs; [
+    gitg
+    gmpc
+    m4
+    subversion
+    openjdk8
+    sbt scala
+    # firefoxWrapper
+    # qutebrowser
+    chromium
+    # thunderbird
+    qalculate-gtk
+    speedcrunch
+    viewnior
+    gnupg
+    pass xclip pwgen
+    remmina
+    ledger
+    hledger
+    hledger-diff
+    cmake
+    mpv
+    wireshark-gtk
+    mutt
+    stable.goldendict
+    patchelf
+    bazaar
+
+    pdfpc
+
+    # haskell dev
+    cabal2nix
+    cabal-install
+    ghc-mod
+
+    # emacs
+    emacs
+    ghostscript # for auctex
+    aspell
+
+    mediainfo
+
+    isync
+    mu
+    msmtp
+    vdirsyncer khard khal
+
+    veriT
+    minisat
+    picosat
+    prover9
+    eprover
+    metis-prover
+    spass
+    z3
+    cvc4
+    why3
+    graphviz
+    # toysolver
+    stable.haskellPackages.tip-lib
+
+    emacsPackages.proofgeneral_4_3_pre
+
+    stablePkgs # protect nixpkgs checkout from GC
+  ] ++ (with aspellDicts; [ en de fr nl ]);
+
+  nixpkgs.config.packageOverrides = pkgs: with pkgs; let
+    fetchNixPkgs = { rev, sha256 }:
+    fetchFromGitHub {
+      inherit sha256 rev;
+      owner = "NixOS";
+      repo = "nixpkgs-channels";
+    };
+    stablePkgs = fetchNixPkgs {
+      rev = "f231b2b3f79020025eaabe4e8fae53e81651914c";
+      sha256 = "0bnac2qsx2j5gl2vfqjswv096fnqvf7d5ids1442mk050yph0gix";
+    };
+  in {
+    idea.idea-community = pkgs.idea.idea-community.overrideDerivation (oldAttrs: rec {
+        name = "idea-community-${version}";
+        version = "2016.2.eap";
+        src = pkgs.fetchurl {
+          url = "https://download.jetbrains.com/idea/ideaIC-162.1447.7-no-jdk.tar.gz";
+          sha256 = "a8eaef5d00bb6b41ab8e6ac3f2047a4d3db412fe28ca0fd8ea87d5f531186a1d";
+        };
+      });
+
+    neovim = pkgs.neovim.override {
+      extraPythonPackages = [ pkgs.pythonPackages.websocket_client ];
+    };
+
+    stablePkgs = stablePkgs;
+    stable = import stablePkgs {};
+  };
+
+  nixpkgs.config.allowTexliveBuilds = true;
+
+}
diff --git a/common.nix b/common.nix
index 9affa2b..092e50a 100644
--- a/common.nix
+++ b/common.nix
@@ -6,6 +6,7 @@
       /etc/nixos/hardware-configuration.nix
       ./i3.nix
       ./basic-tools.nix
+      ./common-sw.nix
     ];
 
   boot.kernelPackages = pkgs.linuxPackages_latest;
@@ -23,119 +24,6 @@
 
   time.timeZone = "Europe/Vienna";
 
-  # Select internationalisation properties.
-  # i18n = {
-  #   consoleFont = "lat9w-16";
-  #   consoleKeyMap = "us";
-  #   defaultLocale = "en_US.UTF-8";
-  # };
-
-  environment.systemPackages = with pkgs.haskellPackages; with pkgs; [
-    gitg
-    gmpc
-    m4
-    subversion
-    openjdk8
-    sbt scala
-    idea.idea-community
-    # firefoxWrapper
-    # qutebrowser
-    chromium
-    # thunderbird
-    qalculate-gtk
-    speedcrunch
-    viewnior
-    gnupg
-    pass xclip pwgen
-    remmina
-    ledger
-    hledger
-    hledger-diff
-    cmake
-    mpv
-    wireshark-gtk
-    mutt
-    stable.goldendict
-    patchelf
-    bazaar
-
-    texlive.combined.scheme-full biber
-    androidsdk
-    gimp
-    inkscape
-    jabref
-    pdfpc
-
-    # haskell dev
-    cabal2nix
-    cabal-install
-    ghc-mod
-
-    # emacs
-    emacs
-    ghostscript # for auctex
-    aspell
-
-    libreoffice
-    stable.calibre
-    mediainfo
-
-    isync
-    mu
-    msmtp
-    vdirsyncer khard khal
-
-    veriT
-    minisat
-    picosat
-    prover9
-    eprover
-    metis-prover
-    spass
-    z3
-    cvc4
-    why3
-    graphviz
-    # toysolver
-    stable.haskellPackages.tip-lib
-
-    coq_8_5
-    emacsPackages.proofgeneral_4_3_pre
-
-    stablePkgs # protect nixpkgs checkout from GC
-  ] ++ (with aspellDicts; [ en de fr nl ]);
-
-  nixpkgs.config.packageOverrides = pkgs: with pkgs; let
-    fetchNixPkgs = { rev, sha256 }:
-    fetchFromGitHub {
-      inherit sha256 rev;
-      owner = "NixOS";
-      repo = "nixpkgs-channels";
-    };
-    stablePkgs = fetchNixPkgs {
-      rev = "f231b2b3f79020025eaabe4e8fae53e81651914c";
-      sha256 = "0bnac2qsx2j5gl2vfqjswv096fnqvf7d5ids1442mk050yph0gix";
-    };
-  in {
-    idea.idea-community = pkgs.idea.idea-community.overrideDerivation (oldAttrs: rec {
-        name = "idea-community-${version}";
-        version = "2016.2.eap";
-        src = pkgs.fetchurl {
-          url = "https://download.jetbrains.com/idea/ideaIC-162.1447.7-no-jdk.tar.gz";
-          sha256 = "a8eaef5d00bb6b41ab8e6ac3f2047a4d3db412fe28ca0fd8ea87d5f531186a1d";
-        };
-      });
-
-    neovim = pkgs.neovim.override {
-      extraPythonPackages = [ pkgs.pythonPackages.websocket_client ];
-    };
-
-    stablePkgs = stablePkgs;
-    stable = import stablePkgs {};
-  };
-
-  nixpkgs.config.allowTexliveBuilds = true;
-
   # Enable the OpenSSH daemon.
   services.openssh = {
     enable = true;
diff --git a/large-sw.nix b/large-sw.nix
new file mode 100644
index 0000000..a97ca19
--- /dev/null
+++ b/large-sw.nix
@@ -0,0 +1,17 @@
+{ config, pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs.haskellPackages; with pkgs; [
+    idea.idea-community
+    texlive.combined.scheme-full biber
+    androidsdk
+    gimp
+    inkscape
+    jabref
+    libreoffice
+    stable.calibre
+
+    coq_8_5
+  ] ++ (with aspellDicts; [ en de fr nl ]);
+
+}
diff --git a/theba.nix b/theba.nix
index b21d369..07428ac 100644
--- a/theba.nix
+++ b/theba.nix
@@ -4,6 +4,7 @@
   imports =
     [
       ./common.nix
+      ./large-sw.nix
       ./uefi.nix
       ./fstrim.nix
     ];