diff --git a/base/configuration.nix b/base/configuration.nix
index 567d0f6..0900071 100644
--- a/base/configuration.nix
+++ b/base/configuration.nix
@@ -31,10 +31,5 @@
 
   security.rtkit.enable = true;
 
-  fileSystems."/data" = {
-     device = "10.253.18.103:/data";
-     fsType = "nfs";
-   };
-
   imports = [ ./users.nix ./packages.nix ];
 }
diff --git a/base/workstation.nix b/base/desktop.nix
similarity index 100%
rename from base/workstation.nix
rename to base/desktop.nix
diff --git a/base/packages.nix b/base/packages.nix
index 055d080..07d1113 100644
--- a/base/packages.nix
+++ b/base/packages.nix
@@ -6,59 +6,36 @@ in
     nixpkgs.config.allowUnfree = true;
 
     environment.systemPackages =
-      with pkgs;
-      let
-        sys = [
-          stdenv
-          findutils
-          coreutils
-          psmisc
-          iputils
-          nettools
-          netcat
-          rsync
-          htop
-          iotop
-          zsh
-          wget
-          vimNox
-          python
-          file
-          bc
-          sshuttle
-          nix-prefetch-git
-          docker
-          nix-home
-        ];
-        devel = [
-          git
-          patchelf
-          binutils
-          gcc
-        ];
-        dotnet = with dotnetPackages; [
-          fsharp
-          mono-addins
-          mono
-          Fake
-          Paket
-        ];
-        node = with nodePackages; [
-          nodejs
-          npm
-          npm2nix
-          yo
-          gulp
-        ];
-        k8s = [
-          ebtables
-          ethtool
-          socat
-        ];
-      in
-      devel ++
-      dotnet ++
-      node ++
-      k8s ++
-      sys;
-}
+    with pkgs;
+    let
+      sys = [
+        stdenv
+        findutils
+        coreutils
+        patchelf
+        binutils
+        psmisc
+        iputils
+        nettools
+        netcat
+        rsync
+        htop
+        iotop
+        zsh
+        wget
+        vimNox
+        file
+        bc
+        git
+        nix-prefetch-git
+        nix-home
+      ];
+      k8s = [
+        ebtables
+        ethtool
+        socat
+      ];
+    in
+    k8s ++
+    sys;
+  }