diff --git a/hosts/common/common.nix b/hosts/common/common.nix
new file mode 100644
index 0000000..11d559c
--- /dev/null
+++ b/hosts/common/common.nix
@@ -0,0 +1,58 @@
+{ inputs, config, pkgs, lib, ... }:
+{
+
+  imports =
+    [
+      inputs.home-manager.nixosModules.home-manager
+      ../../modules/nix/pipewire.nix
+      ../../modules/nix/locales.nix
+      ../../modules/nix/grub.nix
+      ../../modules/nix/nvf.nix
+      ../../modules/nix/nh.nix
+    ];
+
+  users.users.smayzy = {
+    isNormalUser = true;
+    description = "smayzy";
+    extraGroups = [ "networkmanager" "wheel" ];
+    packages = with pkgs; [];
+  };
+
+  environment.systemPackages = with pkgs; [
+    home-manager
+    wget
+    kitty
+    tldr
+    fastfetch
+    tree
+    font-awesome
+    dig
+    btop
+    thunderbird
+    lf
+    fzf
+    file
+    qalculate-qt
+    baobab
+    arduino-ide
+    piper
+    element-desktop
+    calibre
+    vlc
+    loupe
+    gimp3
+    mullvad-vpn
+    libreoffice-qt6-still
+    hunspellDicts.fr-any
+    base16-schemes
+    tor
+    wireshark
+    tshark
+    freecad-wayland
+    aegisub
+    audacity
+    mpv
+    vim
+  ];
+
+}
diff --git a/hosts/desktop1/configuration.nix b/hosts/desktop1/configuration.nix
index 96e9a05..ea0dc0e 100644
--- a/hosts/desktop1/configuration.nix
+++ b/hosts/desktop1/configuration.nix
@@ -3,15 +3,9 @@
 {
   imports =
     [
+      ../common/common.nix
       ./hardware-configuration.nix
-      inputs.home-manager.nixosModules.home-manager
-
-      ../../modules/nix/pipewire.nix
-      ../../modules/nix/locales.nix
       ../../modules/nix/nvidia.nix
-      ../../modules/nix/grub.nix
-      ../../modules/nix/nvf.nix
-      ../../modules/nix/nh.nix
     ];
 
   home-manager = {
@@ -38,13 +32,6 @@
   networking.hostName = "desktop1";
   networking.networkmanager.enable = true;
 
-  users.users.smayzy = {
-    isNormalUser = true;
-    description = "smayzy";
-    extraGroups = [ "networkmanager" "wheel" ];
-    packages = with pkgs; [];
-  };
-
   users.defaultUserShell = pkgs.zsh;
 
   services.xserver.xkb = {
@@ -78,12 +65,6 @@
   programs.steam.enable = true;
 
   environment.systemPackages = with pkgs; [
-  home-manager
-  wget
-  kitty
-  tldr
-  fastfetch
-  tree
   mako
   wofi
   wlogout
@@ -91,47 +72,19 @@
   wl-clipboard
   libnotify
   hyprpaper
-  font-awesome
-  dig
-  btop
   webcord
   pavucontrol
-  thunderbird
-  lf
-  fzf
   qemu
   cliphist
-  file
   obsidian
-  qalculate-qt 
-  baobab
-  arduino-ide
-  piper
   samrewritten
-  element-desktop
-  calibre
-  vlc
-  loupe
-  gimp3
-  mullvad-vpn
   libsForQt5.kdenlive
   prismlauncher
   floorp
-  libreoffice-qt6-still
-  hunspellDicts.fr-any
-  base16-schemes
-  tor
-  wireshark
-  tshark
   komikku
   librewolf
-  freecad-wayland
-  aegisub
   blender
   inkscape
-  audacity
-  mpv
-  vim
   ];
 
   stylix.enable = true;