diff --git a/hosts/common/user/configs/gui/ags/config/default.nix b/hosts/common/user/configs/gui/ags/config/default.nix
index 33ceb4b..84e32c9 100644
--- a/hosts/common/user/configs/gui/ags/config/default.nix
+++ b/hosts/common/user/configs/gui/ags/config/default.nix
@@ -1,7 +1,4 @@
-{
-  pkgs ? import <nixpkgs> { },
-  ...
-}:
+{ pkgs, ... }:
 pkgs.stdenv.mkDerivation {
   pname = "ags.config";
   version = "0.0.1";
diff --git a/hosts/common/user/configs/gui/ags/default.nix b/hosts/common/user/configs/gui/ags/default.nix
index 86c1004..0749ec4 100644
--- a/hosts/common/user/configs/gui/ags/default.nix
+++ b/hosts/common/user/configs/gui/ags/default.nix
@@ -10,7 +10,7 @@
   ...
 }:
 let
-  agsConfig = import ./config { inherit pkgs; };
+  agsConfig = pkgs.callPackage ./config { };
 in
 {
   home-manager.users.${user} = {
diff --git a/hosts/common/user/configs/gui/obsidian/config/plugins/better-word-count/default.nix b/hosts/common/user/configs/gui/obsidian/config/plugins/better-word-count/default.nix
index b2ba20d..dcd76b7 100644
--- a/hosts/common/user/configs/gui/obsidian/config/plugins/better-word-count/default.nix
+++ b/hosts/common/user/configs/gui/obsidian/config/plugins/better-word-count/default.nix
@@ -1,7 +1,4 @@
-{
-  pkgs ? import <nixpkgs> { },
-  ...
-}:
+{ pkgs, ... }:
 pkgs.buildNpmPackage rec {
   pname = "obsidian.plugins.better-word-count";
   version = "0.10.1";
diff --git a/hosts/common/user/configs/gui/obsidian/config/plugins/custom-sort/default.nix b/hosts/common/user/configs/gui/obsidian/config/plugins/custom-sort/default.nix
index 44bfb80..6fdadad 100644
--- a/hosts/common/user/configs/gui/obsidian/config/plugins/custom-sort/default.nix
+++ b/hosts/common/user/configs/gui/obsidian/config/plugins/custom-sort/default.nix
@@ -1,7 +1,4 @@
-{
-  pkgs ? import <nixpkgs> { },
-  ...
-}:
+{ pkgs, ... }:
 pkgs.stdenv.mkDerivation rec {
   pname = "obsidian.plugins.custom-sort";
   version = "2.1.12";
diff --git a/hosts/common/user/configs/gui/obsidian/config/plugins/dataview/default.nix b/hosts/common/user/configs/gui/obsidian/config/plugins/dataview/default.nix
index 9ea2f1e..6443711 100644
--- a/hosts/common/user/configs/gui/obsidian/config/plugins/dataview/default.nix
+++ b/hosts/common/user/configs/gui/obsidian/config/plugins/dataview/default.nix
@@ -1,7 +1,4 @@
-{
-  pkgs ? import <nixpkgs> { },
-  ...
-}:
+{ pkgs, ... }:
 pkgs.buildNpmPackage rec {
   pname = "obsidian.plugins.dataview";
   version = "0.5.67";
diff --git a/hosts/common/user/configs/gui/obsidian/config/plugins/excalidraw/default.nix b/hosts/common/user/configs/gui/obsidian/config/plugins/excalidraw/default.nix
index d924f3d..d9d919c 100644
--- a/hosts/common/user/configs/gui/obsidian/config/plugins/excalidraw/default.nix
+++ b/hosts/common/user/configs/gui/obsidian/config/plugins/excalidraw/default.nix
@@ -1,7 +1,4 @@
-{
-  pkgs ? import <nixpkgs> { },
-  ...
-}:
+{ pkgs, ... }:
 pkgs.buildNpmPackage rec {
   pname = "obsidian.plugins.excalidraw";
   version = "2.2.8";
diff --git a/hosts/common/user/configs/gui/obsidian/config/plugins/folder-note/default.nix b/hosts/common/user/configs/gui/obsidian/config/plugins/folder-note/default.nix
index b5d0332..4fd3863 100644
--- a/hosts/common/user/configs/gui/obsidian/config/plugins/folder-note/default.nix
+++ b/hosts/common/user/configs/gui/obsidian/config/plugins/folder-note/default.nix
@@ -1,7 +1,4 @@
-{
-  pkgs ? import <nixpkgs> { },
-  ...
-}:
+{ pkgs, ... }:
 pkgs.buildNpmPackage rec {
   pname = "obsidian.plugins.folder-note";
   version = "0.7.3";
diff --git a/hosts/common/user/configs/gui/obsidian/config/plugins/kanban/default.nix b/hosts/common/user/configs/gui/obsidian/config/plugins/kanban/default.nix
index 0e0f67c..e30101d 100644
--- a/hosts/common/user/configs/gui/obsidian/config/plugins/kanban/default.nix
+++ b/hosts/common/user/configs/gui/obsidian/config/plugins/kanban/default.nix
@@ -1,7 +1,4 @@
-{
-  pkgs ? import <nixpkgs> { },
-  ...
-}:
+{ pkgs, ... }:
 pkgs.stdenv.mkDerivation rec {
   pname = "obsidian.plugins.kanban";
   version = "2.0.51";
diff --git a/hosts/common/user/configs/gui/obsidian/config/plugins/languagetool/default.nix b/hosts/common/user/configs/gui/obsidian/config/plugins/languagetool/default.nix
index 280dc15..446a9c0 100644
--- a/hosts/common/user/configs/gui/obsidian/config/plugins/languagetool/default.nix
+++ b/hosts/common/user/configs/gui/obsidian/config/plugins/languagetool/default.nix
@@ -1,7 +1,4 @@
-{
-  pkgs ? import <nixpkgs> { },
-  ...
-}:
+{ pkgs, ... }:
 pkgs.stdenv.mkDerivation rec {
   pname = "obsidian.plugins.languagetool";
   version = "0.3.7";
diff --git a/hosts/common/user/configs/gui/obsidian/config/plugins/linter/default.nix b/hosts/common/user/configs/gui/obsidian/config/plugins/linter/default.nix
index 6f83dda..9d56369 100644
--- a/hosts/common/user/configs/gui/obsidian/config/plugins/linter/default.nix
+++ b/hosts/common/user/configs/gui/obsidian/config/plugins/linter/default.nix
@@ -1,7 +1,4 @@
-{
-  pkgs ? import <nixpkgs> { },
-  ...
-}:
+{ pkgs, ... }:
 pkgs.buildNpmPackage rec {
   pname = "obsidian.plugins.linter";
   version = "1.25.0";
diff --git a/hosts/common/user/configs/gui/obsidian/config/plugins/map-view/default.nix b/hosts/common/user/configs/gui/obsidian/config/plugins/map-view/default.nix
index 329c14a..234d53d 100644
--- a/hosts/common/user/configs/gui/obsidian/config/plugins/map-view/default.nix
+++ b/hosts/common/user/configs/gui/obsidian/config/plugins/map-view/default.nix
@@ -1,7 +1,4 @@
-{
-  pkgs ? import <nixpkgs> { },
-  ...
-}:
+{ pkgs, ... }:
 pkgs.buildNpmPackage rec {
   pname = "obsidian.plugins.map-view";
   version = "5.0.2";
diff --git a/hosts/common/user/configs/gui/obsidian/config/plugins/minimal-settings/default.nix b/hosts/common/user/configs/gui/obsidian/config/plugins/minimal-settings/default.nix
index 11d581a..194b149 100644
--- a/hosts/common/user/configs/gui/obsidian/config/plugins/minimal-settings/default.nix
+++ b/hosts/common/user/configs/gui/obsidian/config/plugins/minimal-settings/default.nix
@@ -1,7 +1,4 @@
-{
-  pkgs ? import <nixpkgs> { },
-  ...
-}:
+{ pkgs, ... }:
 pkgs.buildNpmPackage rec {
   pname = "obsidian.plugins.minimal-settings";
   version = "8.0.2";
diff --git a/hosts/common/user/configs/gui/obsidian/config/plugins/outliner/default.nix b/hosts/common/user/configs/gui/obsidian/config/plugins/outliner/default.nix
index 97b7252..80db3ae 100644
--- a/hosts/common/user/configs/gui/obsidian/config/plugins/outliner/default.nix
+++ b/hosts/common/user/configs/gui/obsidian/config/plugins/outliner/default.nix
@@ -1,7 +1,4 @@
-{
-  pkgs ? import <nixpkgs> { },
-  ...
-}:
+{ pkgs, ... }:
 pkgs.buildNpmPackage rec {
   pname = "obsidian.plugins.outliner";
   version = "4.8.1";
diff --git a/hosts/common/user/configs/gui/obsidian/config/plugins/read-it-later/default.nix b/hosts/common/user/configs/gui/obsidian/config/plugins/read-it-later/default.nix
index d67bf5a..07c5ce2 100644
--- a/hosts/common/user/configs/gui/obsidian/config/plugins/read-it-later/default.nix
+++ b/hosts/common/user/configs/gui/obsidian/config/plugins/read-it-later/default.nix
@@ -1,7 +1,4 @@
-{
-  pkgs ? import <nixpkgs> { },
-  ...
-}:
+{ pkgs, ... }:
 pkgs.buildNpmPackage rec {
   pname = "obsidian.plugins.read-it-later";
   version = "0.4.0";
diff --git a/hosts/common/user/configs/gui/obsidian/config/plugins/style-settings/default.nix b/hosts/common/user/configs/gui/obsidian/config/plugins/style-settings/default.nix
index c46d36e..be43fca 100644
--- a/hosts/common/user/configs/gui/obsidian/config/plugins/style-settings/default.nix
+++ b/hosts/common/user/configs/gui/obsidian/config/plugins/style-settings/default.nix
@@ -1,7 +1,4 @@
-{
-  pkgs ? import <nixpkgs> { },
-  ...
-}:
+{ pkgs, ... }:
 pkgs.stdenv.mkDerivation rec {
   pname = "obsidian.plugins.style-settings";
   version = "1.0.8";
diff --git a/hosts/common/user/configs/gui/obsidian/config/plugins/tasks/default.nix b/hosts/common/user/configs/gui/obsidian/config/plugins/tasks/default.nix
index f6018f2..a8785f8 100644
--- a/hosts/common/user/configs/gui/obsidian/config/plugins/tasks/default.nix
+++ b/hosts/common/user/configs/gui/obsidian/config/plugins/tasks/default.nix
@@ -1,7 +1,4 @@
-{
-  pkgs ? import <nixpkgs> { },
-  ...
-}:
+{ pkgs, ... }:
 pkgs.stdenv.mkDerivation rec {
   pname = "obsidian.plugins.tasks";
   version = "7.6.1";
diff --git a/hosts/common/user/configs/gui/obsidian/config/plugins/url-into-selection/default.nix b/hosts/common/user/configs/gui/obsidian/config/plugins/url-into-selection/default.nix
index cf16e7b..4d48810 100644
--- a/hosts/common/user/configs/gui/obsidian/config/plugins/url-into-selection/default.nix
+++ b/hosts/common/user/configs/gui/obsidian/config/plugins/url-into-selection/default.nix
@@ -1,7 +1,4 @@
-{
-  pkgs ? import <nixpkgs> { },
-  ...
-}:
+{ pkgs, ... }:
 pkgs.buildNpmPackage rec {
   pname = "obsidian.plugins.url-into-selection";
   version = "1.7.0";
diff --git a/hosts/common/user/configs/gui/obsidian/config/themes/minimal/default.nix b/hosts/common/user/configs/gui/obsidian/config/themes/minimal/default.nix
index de85f66..fd7174b 100644
--- a/hosts/common/user/configs/gui/obsidian/config/themes/minimal/default.nix
+++ b/hosts/common/user/configs/gui/obsidian/config/themes/minimal/default.nix
@@ -1,7 +1,4 @@
-{
-  pkgs ? import <nixpkgs> { },
-  ...
-}:
+{ pkgs, ... }:
 pkgs.buildNpmPackage rec {
   pname = "obsidian.themes.minimal";
   version = "7.7.7";
diff --git a/hosts/common/user/configs/gui/obsidian/default.nix b/hosts/common/user/configs/gui/obsidian/default.nix
index 028f0f5..534d703 100644
--- a/hosts/common/user/configs/gui/obsidian/default.nix
+++ b/hosts/common/user/configs/gui/obsidian/default.nix
@@ -75,7 +75,7 @@ in
 
         communityPlugins = [
           {
-            pkg = import ./config/plugins/better-word-count { inherit pkgs; };
+            pkg = pkgs.callPackage ./config/plugins/better-word-count { };
             options = {
               statusBar = [
                 {
@@ -101,7 +101,7 @@ in
             };
           }
           {
-            pkg = import ./config/plugins/custom-sort { inherit pkgs; };
+            pkg = pkgs.callPackage ./config/plugins/custom-sort { };
             options = {
               suspended = false;
               statusBarEntryEnabled = false;
@@ -112,7 +112,7 @@ in
             };
           }
           {
-            pkg = import ./config/plugins/dataview { inherit pkgs; };
+            pkg = pkgs.callPackage ./config/plugins/dataview { };
             options = {
               enableDataviewJs = true;
               enableInlineDataviewJs = true;
@@ -122,7 +122,7 @@ in
             };
           }
           {
-            pkg = import ./config/plugins/excalidraw { inherit pkgs; };
+            pkg = pkgs.callPackage ./config/plugins/excalidraw { };
             options = {
               folder = "Inbox";
               templateFilePath = "Templates";
@@ -145,14 +145,14 @@ in
             };
           }
           {
-            pkg = import ./config/plugins/folder-note { inherit pkgs; };
+            pkg = pkgs.callPackage ./config/plugins/folder-note { };
             options = {
               folderNoteHide = false;
               folderNoteStrInit = "";
             };
           }
           {
-            pkg = import ./config/plugins/kanban { inherit pkgs; };
+            pkg = pkgs.callPackage ./config/plugins/kanban { };
             options = {
               move-tags = true;
               move-dates = true;
@@ -166,7 +166,7 @@ in
             };
           }
           {
-            pkg = import ./config/plugins/languagetool { inherit pkgs; };
+            pkg = pkgs.callPackage ./config/plugins/languagetool { };
             options = {
               shouldAutoCheck = true;
               pickyMode = true;
@@ -175,7 +175,7 @@ in
             };
           }
           {
-            pkg = import ./config/plugins/linter { inherit pkgs; };
+            pkg = pkgs.callPackage ./config/plugins/linter { };
             options = {
               lintOnSave = true;
               displayChanged = false;
@@ -316,7 +316,7 @@ in
             };
           }
           {
-            pkg = import ./config/plugins/map-view { inherit pkgs; };
+            pkg = pkgs.callPackage ./config/plugins/map-view { };
             options = {
               "markerIconRules" = [
                 {
@@ -402,20 +402,20 @@ in
             };
           }
           {
-            pkg = import ./config/plugins/minimal-settings { inherit pkgs; };
+            pkg = pkgs.callPackage ./config/plugins/minimal-settings { };
             options = {
               editorFont = "var(--font-monospace)";
             };
           }
           {
-            pkg = import ./config/plugins/outliner { inherit pkgs; };
+            pkg = pkgs.callPackage ./config/plugins/outliner { };
             options = {
               styleLists = false;
               stickCursor = "never";
             };
           }
           {
-            pkg = import ./config/plugins/read-it-later { inherit pkgs; };
+            pkg = pkgs.callPackage ./config/plugins/read-it-later { };
             options = {
               inboxDir = "Inbox";
               assetsDir = "Inbox/assets";
@@ -501,9 +501,9 @@ in
               textSnippetNote = "%content%";
             };
           }
-          (import ./config/plugins/style-settings { inherit pkgs; })
+          (pkgs.callPackage ./config/plugins/style-settings { })
           {
-            pkg = import ./config/plugins/tasks { inherit pkgs; };
+            pkg = pkgs.callPackage ./config/plugins/tasks { };
             options = {
               globalQuery = "short mode";
               globalFilter = "#todo";
@@ -649,12 +649,12 @@ in
               };
             };
           }
-          (import ./config/plugins/url-into-selection { inherit pkgs; })
+          (pkgs.callPackage ./config/plugins/url-into-selection { })
         ];
 
         cssSnippets = [ ./config/snippets/file-explorer-separators.css ];
 
-        themes = [ (import ./config/themes/minimal { inherit pkgs; }) ];
+        themes = [ (pkgs.callPackage ./config/themes/minimal { }) ];
 
         hotkeys = {
           "command-palette:open" = [ { key = "F1"; } ];