Use pkgs.callPackage for all derivations

Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
This commit is contained in:
2024-08-15 15:47:54 +02:00
parent 63cd833778
commit b5b38e88da
19 changed files with 34 additions and 85 deletions

View File

@@ -1,7 +1,4 @@
{ { pkgs, ... }:
pkgs ? import <nixpkgs> { },
...
}:
pkgs.stdenv.mkDerivation { pkgs.stdenv.mkDerivation {
pname = "ags.config"; pname = "ags.config";
version = "0.0.1"; version = "0.0.1";

View File

@@ -10,7 +10,7 @@
... ...
}: }:
let let
agsConfig = import ./config { inherit pkgs; }; agsConfig = pkgs.callPackage ./config { };
in in
{ {
home-manager.users.${user} = { home-manager.users.${user} = {

View File

@@ -1,7 +1,4 @@
{ { pkgs, ... }:
pkgs ? import <nixpkgs> { },
...
}:
pkgs.buildNpmPackage rec { pkgs.buildNpmPackage rec {
pname = "obsidian.plugins.better-word-count"; pname = "obsidian.plugins.better-word-count";
version = "0.10.1"; version = "0.10.1";

View File

@@ -1,7 +1,4 @@
{ { pkgs, ... }:
pkgs ? import <nixpkgs> { },
...
}:
pkgs.stdenv.mkDerivation rec { pkgs.stdenv.mkDerivation rec {
pname = "obsidian.plugins.custom-sort"; pname = "obsidian.plugins.custom-sort";
version = "2.1.12"; version = "2.1.12";

View File

@@ -1,7 +1,4 @@
{ { pkgs, ... }:
pkgs ? import <nixpkgs> { },
...
}:
pkgs.buildNpmPackage rec { pkgs.buildNpmPackage rec {
pname = "obsidian.plugins.dataview"; pname = "obsidian.plugins.dataview";
version = "0.5.67"; version = "0.5.67";

View File

@@ -1,7 +1,4 @@
{ { pkgs, ... }:
pkgs ? import <nixpkgs> { },
...
}:
pkgs.buildNpmPackage rec { pkgs.buildNpmPackage rec {
pname = "obsidian.plugins.excalidraw"; pname = "obsidian.plugins.excalidraw";
version = "2.2.8"; version = "2.2.8";

View File

@@ -1,7 +1,4 @@
{ { pkgs, ... }:
pkgs ? import <nixpkgs> { },
...
}:
pkgs.buildNpmPackage rec { pkgs.buildNpmPackage rec {
pname = "obsidian.plugins.folder-note"; pname = "obsidian.plugins.folder-note";
version = "0.7.3"; version = "0.7.3";

View File

@@ -1,7 +1,4 @@
{ { pkgs, ... }:
pkgs ? import <nixpkgs> { },
...
}:
pkgs.stdenv.mkDerivation rec { pkgs.stdenv.mkDerivation rec {
pname = "obsidian.plugins.kanban"; pname = "obsidian.plugins.kanban";
version = "2.0.51"; version = "2.0.51";

View File

@@ -1,7 +1,4 @@
{ { pkgs, ... }:
pkgs ? import <nixpkgs> { },
...
}:
pkgs.stdenv.mkDerivation rec { pkgs.stdenv.mkDerivation rec {
pname = "obsidian.plugins.languagetool"; pname = "obsidian.plugins.languagetool";
version = "0.3.7"; version = "0.3.7";

View File

@@ -1,7 +1,4 @@
{ { pkgs, ... }:
pkgs ? import <nixpkgs> { },
...
}:
pkgs.buildNpmPackage rec { pkgs.buildNpmPackage rec {
pname = "obsidian.plugins.linter"; pname = "obsidian.plugins.linter";
version = "1.25.0"; version = "1.25.0";

View File

@@ -1,7 +1,4 @@
{ { pkgs, ... }:
pkgs ? import <nixpkgs> { },
...
}:
pkgs.buildNpmPackage rec { pkgs.buildNpmPackage rec {
pname = "obsidian.plugins.map-view"; pname = "obsidian.plugins.map-view";
version = "5.0.2"; version = "5.0.2";

View File

@@ -1,7 +1,4 @@
{ { pkgs, ... }:
pkgs ? import <nixpkgs> { },
...
}:
pkgs.buildNpmPackage rec { pkgs.buildNpmPackage rec {
pname = "obsidian.plugins.minimal-settings"; pname = "obsidian.plugins.minimal-settings";
version = "8.0.2"; version = "8.0.2";

View File

@@ -1,7 +1,4 @@
{ { pkgs, ... }:
pkgs ? import <nixpkgs> { },
...
}:
pkgs.buildNpmPackage rec { pkgs.buildNpmPackage rec {
pname = "obsidian.plugins.outliner"; pname = "obsidian.plugins.outliner";
version = "4.8.1"; version = "4.8.1";

View File

@@ -1,7 +1,4 @@
{ { pkgs, ... }:
pkgs ? import <nixpkgs> { },
...
}:
pkgs.buildNpmPackage rec { pkgs.buildNpmPackage rec {
pname = "obsidian.plugins.read-it-later"; pname = "obsidian.plugins.read-it-later";
version = "0.4.0"; version = "0.4.0";

View File

@@ -1,7 +1,4 @@
{ { pkgs, ... }:
pkgs ? import <nixpkgs> { },
...
}:
pkgs.stdenv.mkDerivation rec { pkgs.stdenv.mkDerivation rec {
pname = "obsidian.plugins.style-settings"; pname = "obsidian.plugins.style-settings";
version = "1.0.8"; version = "1.0.8";

View File

@@ -1,7 +1,4 @@
{ { pkgs, ... }:
pkgs ? import <nixpkgs> { },
...
}:
pkgs.stdenv.mkDerivation rec { pkgs.stdenv.mkDerivation rec {
pname = "obsidian.plugins.tasks"; pname = "obsidian.plugins.tasks";
version = "7.6.1"; version = "7.6.1";

View File

@@ -1,7 +1,4 @@
{ { pkgs, ... }:
pkgs ? import <nixpkgs> { },
...
}:
pkgs.buildNpmPackage rec { pkgs.buildNpmPackage rec {
pname = "obsidian.plugins.url-into-selection"; pname = "obsidian.plugins.url-into-selection";
version = "1.7.0"; version = "1.7.0";

View File

@@ -1,7 +1,4 @@
{ { pkgs, ... }:
pkgs ? import <nixpkgs> { },
...
}:
pkgs.buildNpmPackage rec { pkgs.buildNpmPackage rec {
pname = "obsidian.themes.minimal"; pname = "obsidian.themes.minimal";
version = "7.7.7"; version = "7.7.7";

View File

@@ -75,7 +75,7 @@ in
communityPlugins = [ communityPlugins = [
{ {
pkg = import ./config/plugins/better-word-count { inherit pkgs; }; pkg = pkgs.callPackage ./config/plugins/better-word-count { };
options = { options = {
statusBar = [ statusBar = [
{ {
@@ -101,7 +101,7 @@ in
}; };
} }
{ {
pkg = import ./config/plugins/custom-sort { inherit pkgs; }; pkg = pkgs.callPackage ./config/plugins/custom-sort { };
options = { options = {
suspended = false; suspended = false;
statusBarEntryEnabled = false; statusBarEntryEnabled = false;
@@ -112,7 +112,7 @@ in
}; };
} }
{ {
pkg = import ./config/plugins/dataview { inherit pkgs; }; pkg = pkgs.callPackage ./config/plugins/dataview { };
options = { options = {
enableDataviewJs = true; enableDataviewJs = true;
enableInlineDataviewJs = true; enableInlineDataviewJs = true;
@@ -122,7 +122,7 @@ in
}; };
} }
{ {
pkg = import ./config/plugins/excalidraw { inherit pkgs; }; pkg = pkgs.callPackage ./config/plugins/excalidraw { };
options = { options = {
folder = "Inbox"; folder = "Inbox";
templateFilePath = "Templates"; templateFilePath = "Templates";
@@ -145,14 +145,14 @@ in
}; };
} }
{ {
pkg = import ./config/plugins/folder-note { inherit pkgs; }; pkg = pkgs.callPackage ./config/plugins/folder-note { };
options = { options = {
folderNoteHide = false; folderNoteHide = false;
folderNoteStrInit = ""; folderNoteStrInit = "";
}; };
} }
{ {
pkg = import ./config/plugins/kanban { inherit pkgs; }; pkg = pkgs.callPackage ./config/plugins/kanban { };
options = { options = {
move-tags = true; move-tags = true;
move-dates = true; move-dates = true;
@@ -166,7 +166,7 @@ in
}; };
} }
{ {
pkg = import ./config/plugins/languagetool { inherit pkgs; }; pkg = pkgs.callPackage ./config/plugins/languagetool { };
options = { options = {
shouldAutoCheck = true; shouldAutoCheck = true;
pickyMode = true; pickyMode = true;
@@ -175,7 +175,7 @@ in
}; };
} }
{ {
pkg = import ./config/plugins/linter { inherit pkgs; }; pkg = pkgs.callPackage ./config/plugins/linter { };
options = { options = {
lintOnSave = true; lintOnSave = true;
displayChanged = false; displayChanged = false;
@@ -316,7 +316,7 @@ in
}; };
} }
{ {
pkg = import ./config/plugins/map-view { inherit pkgs; }; pkg = pkgs.callPackage ./config/plugins/map-view { };
options = { options = {
"markerIconRules" = [ "markerIconRules" = [
{ {
@@ -402,20 +402,20 @@ in
}; };
} }
{ {
pkg = import ./config/plugins/minimal-settings { inherit pkgs; }; pkg = pkgs.callPackage ./config/plugins/minimal-settings { };
options = { options = {
editorFont = "var(--font-monospace)"; editorFont = "var(--font-monospace)";
}; };
} }
{ {
pkg = import ./config/plugins/outliner { inherit pkgs; }; pkg = pkgs.callPackage ./config/plugins/outliner { };
options = { options = {
styleLists = false; styleLists = false;
stickCursor = "never"; stickCursor = "never";
}; };
} }
{ {
pkg = import ./config/plugins/read-it-later { inherit pkgs; }; pkg = pkgs.callPackage ./config/plugins/read-it-later { };
options = { options = {
inboxDir = "Inbox"; inboxDir = "Inbox";
assetsDir = "Inbox/assets"; assetsDir = "Inbox/assets";
@@ -501,9 +501,9 @@ in
textSnippetNote = "%content%"; 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 = { options = {
globalQuery = "short mode"; globalQuery = "short mode";
globalFilter = "#todo"; 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 ]; cssSnippets = [ ./config/snippets/file-explorer-separators.css ];
themes = [ (import ./config/themes/minimal { inherit pkgs; }) ]; themes = [ (pkgs.callPackage ./config/themes/minimal { }) ];
hotkeys = { hotkeys = {
"command-palette:open" = [ { key = "F1"; } ]; "command-palette:open" = [ { key = "F1"; } ];