diff --git a/base/default.nix b/base/default.nix
new file mode 100644
index 0000000..90f2850
--- /dev/null
+++ b/base/default.nix
@@ -0,0 +1,27 @@
+{pkgs, ...}: {
+
+  environment.systemPackages = with pkgs; [
+    home-manager
+    vim
+    bat
+    btop
+    curl
+    dig
+    eza
+    git
+    htop
+    fd
+    fishPlugins.done
+    fishPlugins.fzf-fish
+    fishPlugins.forgit
+    fzf
+    lua
+    ripgrep
+    starship
+    tmux
+    wget
+    whois
+  ];
+
+  programs.mtr.enable = true;
+}
diff --git a/desktop/common.nix b/desktop/common.nix
index bbd8d45..fe6aa40 100644
--- a/desktop/common.nix
+++ b/desktop/common.nix
@@ -1,36 +1,15 @@
 {pkgs, ...}: {
 
   environment.systemPackages = with pkgs; [
-    home-manager
-    vim
     firefox
-    bat
-    btop
     byobu
-    curl
-    dig
-    eza
-    git
-    htop
-    fd
     flameshot
-    fishPlugins.done
-    fishPlugins.fzf-fish
-    fishPlugins.forgit
-    fzf
     google-chrome
-    lua
     microsoft-edge
-    ripgrep
-    starship
     terminator
     thunderbird
-    tmux
     vlc
-    wget
-    whois
     zoom-us
   ];
 
-  programs.mtr.enable = true;
 }
diff --git a/desktop/default.nix b/desktop/default.nix
index fa31858..d5bda8d 100644
--- a/desktop/default.nix
+++ b/desktop/default.nix
@@ -5,6 +5,7 @@
 }  @ args: {
 
   imports = [
+    ../base
     ./common.nix
     ./compat.nix
     ./i18n.nix