diff --git a/modules/i3.nix b/modules/i3.nix
index a5769ba..f78c0e3 100644
--- a/modules/i3.nix
+++ b/modules/i3.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, machine, pkgs, ... }:
 
 let
   inherit (pkgs.stdenv.hostPlatform) isLinux;
@@ -168,7 +168,7 @@ in
   xdg = lib.mkIf isLinux {
     configFile = {
       "i3" = {
-        source = config.lib.file.mkOutOfStoreSymlink ./i3;
+        source = config.lib.file.mkOutOfStoreSymlink "${machine.flakePath}/modules/i3";
         recursive = true;
       };
     };
diff --git a/modules/vscode.nix b/modules/vscode.nix
index 617c67f..09098c3 100644
--- a/modules/vscode.nix
+++ b/modules/vscode.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, machine, pkgs, ... }:
 
 let
   inherit (pkgs.stdenv.hostPlatform) isLinux;
@@ -20,11 +20,11 @@ in
   home.file = {
     "${config.xdg.configHome}/Code/User/settings.json" = {
       enable = isLinux;
-      source = config.lib.file.mkOutOfStoreSymlink ./vscode/settings.json;
+      source = config.lib.file.mkOutOfStoreSymlink "${machine.flakePath}/modules/vscode/settings.json";
     };
     "Library/Application Support/Code/User/settings.json" = {
       enable = isDarwin;
-      source = config.lib.file.mkOutOfStoreSymlink ./vscode/settings.json;
+      source = config.lib.file.mkOutOfStoreSymlink "${machine.flakePath}/modules/vscode/settings.json";
     };
   };
 }
diff --git a/modules/vscode/settings.json b/modules/vscode/settings.json
index 62e0e77..8bc79e5 100644
--- a/modules/vscode/settings.json
+++ b/modules/vscode/settings.json
@@ -24,88 +24,40 @@
   "vim.insertModeKeyBindings": [],
   "vim.normalModeKeyBindingsNonRecursive": [
     {
-      "before": [
-        "K"
-      ],
-      "commands": [
-        "editor.action.showHover"
-      ]
+      "before": ["K"],
+      "commands": ["editor.action.showHover"]
     },
     {
-      "before": [
-        "<leader>",
-        "f",
-        "d"
-      ],
-      "commands": [
-        "workbench.action.quickOpen"
-      ]
+      "before": ["<leader>", "f", "d"],
+      "commands": ["workbench.action.quickOpen"]
     },
     {
-      "before": [
-        "<leader>",
-        "f",
-        "t"
-      ],
-      "commands": [
-        "workbench.action.selectTheme"
-      ]
+      "before": ["<leader>", "f", "t"],
+      "commands": ["workbench.action.selectTheme"]
     },
     {
-      "before": [
-        "<leader>",
-        "n",
-        "f"
-      ],
-      "commands": [
-        "editor.action.formatDocument"
-      ]
+      "before": ["<leader>", "n", "f"],
+      "commands": ["editor.action.formatDocument"]
     },
     {
-      "before": [
-        "<C-l>"
-      ],
-      "after": [
-        "<C-W>",
-        "l"
-      ]
+      "before": ["<C-l>"],
+      "after": ["<C-W>", "l"]
     },
     {
-      "before": [
-        "<C-h>"
-      ],
-      "after": [
-        "<C-W>",
-        "h"
-      ]
+      "before": ["<C-h>"],
+      "after": ["<C-W>", "h"]
     },
     {
-      "before": [
-        "K"
-      ],
-      "commands": [
-        "editor.action.showHover"
-      ]
+      "before": ["K"],
+      "commands": ["editor.action.showHover"]
     },
     {
-      "before": [
-        "<C-W>",
-        "\\"
-      ],
-      "after": [
-        "<C-W>",
-        "v"
-      ]
+      "before": ["<C-W>", "\\"],
+      "after": ["<C-W>", "v"]
     },
     {
-      "before": [
-        "<C-W>",
-        "-"
-      ],
-      "after": [
-        "<C-W>",
-        "s"
-      ]
+      "before": ["<C-W>", "-"],
+      "after": ["<C-W>", "s"]
     }
   ],
   "vim.leader": "<space>",
@@ -128,17 +80,7 @@
   "catppuccin.customUIColors": {
     "all": {
       "statusBar.foreground": "accent",
-      "statusBar.noFolderForeground": "accent",
-    }
-  },
-  "workbench.colorCustomizations": {
-    "[Catppuccin Mocha]": {
-      "editorInlayHint.foreground": "#74416b",
-      "editorInlayHint.background": "#41363f2f",
-      "editorInlayHint.typeForeground": "#74416b",
-      "editorInlayHint.typeBackground": "#41363f2f",
-      "editorInlayHint.parameterForeground": "#74416b",
-      "editorInlayHint.parameterBackground": "#41363f2f",
+      "statusBar.noFolderForeground": "accent"
     }
   },
   "redhat.telemetry.enabled": false,
@@ -149,5 +91,5 @@
   "editor.inlayHints.fontSize": 12,
   "vs-kubernetes": {
     "vs-kubernetes.crd-code-completion": "enabled"
-  },
-}
\ No newline at end of file
+  }
+}
diff --git a/modules/zsh.nix b/modules/zsh.nix
index b6d02a8..d60295b 100644
--- a/modules/zsh.nix
+++ b/modules/zsh.nix
@@ -87,11 +87,11 @@
 
   xdg.configFile = {
     "lsd" = {
-      source = config.lib.file.mkOutOfStoreSymlink ./lsd/themes;
+      source = config.lib.file.mkOutOfStoreSymlink "${machine.flakePath}/modules/lsd/themes";
       recursive = true;
     };
     "zsh/functions" = {
-      source = config.lib.file.mkOutOfStoreSymlink ./zsh/functions;
+      source = config.lib.file.mkOutOfStoreSymlink "${machine.flakePath}/modules/zsh/functions";
       recursive = true;
     };
   };