diff --git a/home-manager/vscode.nix b/modules/common-desktop/vscodium.nix
old mode 100755
new mode 100644
similarity index 82%
rename from home-manager/vscode.nix
rename to modules/common-desktop/vscodium.nix
index f862eac..7988e04
--- a/home-manager/vscode.nix
+++ b/modules/common-desktop/vscodium.nix
@@ -1,40 +1,10 @@
 {
-  pkgs,
   lib,
+  pkgs,
   ...
 }: {
-  programs.vscode = {
-    enable = true;
-    package = pkgs.vscodium;
-    extensions = with pkgs.vscode-extensions; [
-      mkhl.direnv
-      eamodio.gitlens
-      dart-code.flutter
-      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
-    ];
-
-    keybindings = [
-      {
-        key = "ctrl+s";
-        command = "workbench.action.files.saveAll";
-      }
-      {
-        key = "ctrl+s";
-        command = "-workbench.action.files.save";
-      }
-    ];
-
-    userSettings = lib.mkForce {
+  systemd.tmpfiles.settings.vscodium = {
+    "/home/quadradical/.config/VSCodium/User/settings.json"."f+".argument = builtins.toJSON {
       "dart.debugExternalPackageLibraries" = true;
       "dart.debugSdkLibraries" = true;
       "redhat.telemetry.enabled" = false;
@@ -101,5 +71,16 @@
       "indentRainbow.ignoreErrorLanguages" = ["*"];
       "dart.runPubGetOnPubspecChanges" = "never";
     };
+
+    "/home/quadradical/.config/VSCodium/User/keybindings.json"."f+".argument = builtins.toJSON [
+      {
+        key = "ctrl+s";
+        command = "workbench.action.files.saveAll";
+      }
+      {
+        key = "ctrl+s";
+        command = "-workbench.action.files.save";
+      }
+    ];
   };
 }
diff --git a/wrappers/common-desktop/vscode.nix b/wrappers/common-desktop/vscode.nix
new file mode 100644
index 0000000..64a4873
--- /dev/null
+++ b/wrappers/common-desktop/vscode.nix
@@ -0,0 +1,22 @@
+{pkgs, ...}: {
+ wrappers.vscode = {
+   basePackage = pkgs.vscodium;
+
+   pathAdd = with pkgs.vscode-extensions; [
+     mkhl.direnv
+     eamodio.gitlens
+     dart-code.flutter
+     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
+   ];
+ };
+}
diff --git a/wrappers/common-desktop/vscodium/default.nix b/wrappers/common-desktop/vscodium/default.nix
deleted file mode 100644
index 381ce0c..0000000
--- a/wrappers/common-desktop/vscodium/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{pkgs, ...}: {
-#  wrappers.vscode = {
-#    basePackage = pkgs.vscodium;
-#    flags = ["--user-data-dir" ./.];
-#
-#    pathAdd = with pkgs.vscode-extensions; [
-#      mkhl.direnv
-#      eamodio.gitlens
-#      dart-code.flutter
-#      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
-#    ];
-#  };
-}
diff --git a/wrappers/common-desktop/vscodium/keybindings.json b/wrappers/common-desktop/vscodium/keybindings.json
deleted file mode 100644
index a1fccc9..0000000
--- a/wrappers/common-desktop/vscodium/keybindings.json
+++ /dev/null
@@ -1,10 +0,0 @@
-[
-    {
-        "command": "workbench.action.files.saveAll",
-        "key": "ctrl+s"
-    },
-    {
-        "command": "-workbench.action.files.save",
-        "key": "ctrl+s"
-    }
-]
diff --git a/wrappers/common-desktop/vscodium/settings.json b/wrappers/common-desktop/vscodium/settings.json
deleted file mode 100644
index 8fb1481..0000000
--- a/wrappers/common-desktop/vscodium/settings.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "[astro]": {
-    "editor.defaultFormatter": "astro-build.astro-vscode"
-  },
-  "[nix]": {
-    "editor.defaultFormatter": "jnoortheen.nix-ide",
-    "editor.formatOnSave": true
-  },
-  "[yaml]": {
-    "editor.defaultFormatter": "redhat.vscode-yaml"
-  },
-  "dart.checkForSdkUpdates": false,
-  "dart.debugExternalPackageLibraries": true,
-  "dart.debugSdkLibraries": true,
-  "dart.runPubGetOnPubspecChanges": "never",
-  "diffEditor.ignoreTrimWhitespace": false,
-  "editor.bracketPairColorization.enabled": true,
-  "editor.codeActionsOnSave": {
-    "source.fixAll": "explicit"
-  },
-  "editor.defaultFormatter": "esbenp.prettier-vscode",
-  "editor.detectIndentation": false,
-  "editor.fontLigatures": true,
-  "editor.formatOnSave": true,
-  "editor.guides.bracketPairs": "active",
-  "editor.inlineSuggest.enabled": true,
-  "editor.insertSpaces": false,
-  "editor.minimap.enabled": false,
-  "editor.unicodeHighlight.nonBasicASCII": false,
-  "editor.wordWrap": "on",
-  "errorLens.enabledDiagnosticLevels": [
-    "error"
-  ],
-  "explorer.confirmDelete": false,
-  "explorer.confirmDragAndDrop": false,
-  "explorer.fileNesting.enabled": true,
-  "explorer.fileNesting.expand": false,
-  "git.confirmSync": false,
-  "git.enableSmartCommit": true,
-  "git.mergeEditor": true,
-  "git.openRepositoryInParentFolders": "never",
-  "gitlens.codeLens.enabled": false,
-  "gitlens.currentLine.enabled": false,
-  "gitlens.hovers.currentLine.over": "line",
-  "gitlens.statusBar.enabled": false,
-  "indentRainbow.ignoreErrorLanguages": [
-    "*"
-  ],
-  "javascript.format.semicolons": "remove",
-  "javascript.updateImportsOnFileMove.enabled": "always",
-  "nix.enableLanguageServer": true,
-  "nix.serverPath": "/nix/store/3b0kiw6h7qzqgnx3kdl57m3qkzvh37j0-nil-2024-08-06/bin/nil",
-  "nix.serverSettings": {
-    "nil": {
-      "formatting": {
-        "command": [
-          "alejandra"
-        ]
-      }
-    }
-  },
-  "prettier.semi": false,
-  "prettier.tabWidth": 4,
-  "redhat.telemetry.enabled": false,
-  "terminal.integrated.shellIntegration.enabled": false,
-  "typescript.updateImportsOnFileMove.enabled": "always",
-  "window.dialogStyle": "custom",
-  "window.menuBarVisibility": "compact",
-  "window.titleBarStyle": "custom",
-  "window.zoomLevel": 1,
-  "workbench.colorTheme": "Nord",
-  "workbench.iconTheme": "material-icon-theme",
-  "workbench.sideBar.location": "right",
-  "workbench.startupEditor": "none"
-}