diff --git a/home-manager.nix b/home-manager.nix
index 3718e4c..172597f 100755
--- a/home-manager.nix
+++ b/home-manager.nix
@@ -14,7 +14,6 @@
       ./home-manager/gtk.nix
       ./home-manager/vscode.nix
       ./home-manager/firefox.nix
-      ./home-manager/mangohud.nix
     ];
   };
 }
diff --git a/home-manager/mangohud.nix b/home-manager/mangohud.nix
deleted file mode 100644
index eba0238..0000000
--- a/home-manager/mangohud.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  programs.mangohud = {
-    enable = true;
-    enableSessionWide = true;
-    settings = {
-      gpu_stats = true;
-      gpu_text = "GPU";
-      gpu_load_change = true;
-      gpu_load_value = [50 90];
-      gpu_load_color = ["FFFFFF" "FFAA7F" "CC0000"];
-
-      cpu_text = "CPU";
-      cpu_color = "2e97cb";
-      cpu_load_change = true;
-      core_load_change = true;
-      cpu_load_value = [50 90];
-      cpu_load_color = ["FFFFFF" "FFAA7F" "CC0000"];
-
-      vram = true;
-      vram_color = "ad64c1";
-
-      fps = true;
-      frametime = false;
-      frame_timing = false;
-      engine_color = "eb5b5b";
-
-      gpu_name = true;
-      gpu_color = "2e9762";
-
-      font_size = 24;
-      table_columns = 2;
-      round_corners = 10;
-      text_color = "ffffff";
-      background_alpha = 0.4;
-      position = "bottom-right";
-      background_color = "020202";
-    };
-  };
-}
diff --git a/modules/common-desktop/variables.nix b/modules/common-desktop/variables.nix
new file mode 100644
index 0000000..b72f42f
--- /dev/null
+++ b/modules/common-desktop/variables.nix
@@ -0,0 +1,5 @@
+{
+  environment.sessionVariables = {
+    MANGOHUD = 1;
+  };
+}
\ No newline at end of file
diff --git a/wrappers/common-desktop/mangohud/default.nix b/wrappers/common-desktop/mangohud/default.nix
new file mode 100644
index 0000000..e542609
--- /dev/null
+++ b/wrappers/common-desktop/mangohud/default.nix
@@ -0,0 +1,6 @@
+{pkgs, ...}: {
+  wrappers.mangohud = {
+    basePackage = pkgs.mangohud;
+    env.MANGOHUD_CONFIGFILE.value = ./mangohud.conf;
+  };
+}
\ No newline at end of file
diff --git a/wrappers/common-desktop/mangohud/mangohud.conf b/wrappers/common-desktop/mangohud/mangohud.conf
new file mode 100644
index 0000000..a75e97f
--- /dev/null
+++ b/wrappers/common-desktop/mangohud/mangohud.conf
@@ -0,0 +1,31 @@
+gpu_stats = True
+gpu_text = "GPU"
+gpu_load_change = True
+gpu_load_value = [50 90]
+gpu_load_color = ["FFFFFF" "FFAA7F" "CC0000"]
+
+cpu_text = "CPU"
+cpu_color = "2e97cb"
+cpu_load_change = True
+core_load_change = True
+cpu_load_value = [50 90]
+cpu_load_color = ["FFFFFF" "FFAA7F" "CC0000"]
+
+vram = True
+vram_color = "ad64c1"
+
+fps = True
+frametime = False
+frame_timing = False
+engine_color = "eb5b5b"
+
+gpu_name = True
+gpu_color = "2e9762"
+
+font_size = 24
+table_columns = 2
+round_corners = 10
+text_color = "ffffff"
+background_alpha = 0.4
+position = "bottom-right"
+background_color = "020202"
\ No newline at end of file
diff --git a/wrappers/common-desktop/vscode/default.nix b/wrappers/common-desktop/vscode/default.nix
new file mode 100644
index 0000000..45982c5
--- /dev/null
+++ b/wrappers/common-desktop/vscode/default.nix
@@ -0,0 +1,21 @@
+{pkgs, ...}: {
+  wrappers.vscode = {
+    basePackage = pkgs.vscodium;
+
+    pathAdd = with pkgs.vscode-extensions; [
+      mkhl.direnv
+      eamodio.gitlens
+      jnoortheen.nix-ide
+      timonwong.shellcheck
+      usernamehw.errorlens
+      ritwickdey.liveserver
+      dbaeumer.vscode-eslint
+      esbenp.prettier-vscode
+      oderwat.indent-rainbow
+      astro-build.astro-vscode
+      pkief.material-icon-theme
+      streetsidesoftware.code-spell-checker
+      arcticicestudio.nord-visual-studio-code
+    ];
+  };
+}
\ No newline at end of file