Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
This commit is contained in:
2025-02-11 15:49:10 +00:00
parent 76552af3af
commit 54ec0d98cb
13 changed files with 8046 additions and 96 deletions

View File

@@ -1,13 +1,13 @@
{ pkgs, ... }:
pkgs.stdenv.mkDerivation rec {
pname = "obsidian.plugins.custom-sort";
version = "3.0.1";
version = "3.1.2";
src = pkgs.fetchFromGitHub {
owner = "SebastianMC";
repo = "obsidian-custom-sort";
rev = version;
hash = "sha256-mIHAqSAIa7nYy1V96WRKhq2ALAT1mGW6ae3hQmzYyXE=";
hash = "sha256-a6t0+mzzXQsgUwZ3m3UvF3N83ajGmxalsnD8beAVAr0=";
};
offlineCache = pkgs.fetchYarnDeps {

View File

@@ -1,21 +1,20 @@
{ pkgs, ... }:
pkgs.buildNpmPackage rec {
pname = "obsidian.plugins.excalidraw";
version = "2.2.8";
version = "2.8.3";
pkg = pkgs.fetchFromGitHub {
rev = "fa46f8c39df2e9646de63bc610a842659c896005";
owner = "zsviczian";
repo = "obsidian-excalidraw-plugin";
# rev = version;
hash = "sha256-kbFJjHPHPIuecZYK5zQ3thgTC45g4g9W9xSNiZd+wPM=";
rev = version;
hash = "sha256-vfswTT+FzzcddUQSoy6xseE+PzsWtRx8RkYzqGn6wFQ=";
};
mathjaxToSVG = pkgs.buildNpmPackage {
pname = "obsidian.plugins.excalidraw.mathjaxToSVG";
version = "1.0.0";
src = "${pkg}/MathjaxToSVG";
npmDepsHash = "sha256-Q1kLsw1Lu6DVddXNaVAY2CRZ0z2MSSW+tc9VpXljDO4=";
npmDepsHash = "sha256-AosKWlX08dpXNQ2YlrfR6jEInmU02Ztf26nmV19Jxok=";
configurePhase = ''
mkdir dist
@@ -28,7 +27,9 @@ pkgs.buildNpmPackage rec {
};
src = pkg;
npmDepsHash = "sha256-/82kYaDe0ixe6FO0EDHe2h0vGZiE1IrSNos+yKYca/8=";
patches = [ ./package-lock.patch ];
npmDepsHash = "sha256-6Y22TD6BMljRGrL/qT54F7bFXcQbY1bQ5GuKEqAXIwY=";
npmPackFlags = [ "--ignore-scripts" ];
configurePhase = ''

View File

@@ -1,16 +1,16 @@
{ pkgs, ... }:
pkgs.buildNpmPackage rec {
pname = "obsidian.plugins.read-it-later";
version = "0.10.1";
version = "0.11.4";
src = pkgs.fetchFromGitHub {
owner = "DominikPieper";
repo = "obsidian-ReadItLater";
rev = version;
hash = "sha256-E+GeTvXD72PNDdge8qoaQvaJ2mcUV+tJpLyIpUBA4sU=";
hash = "sha256-Favp5YhRTYhMGsLuPWiFwmU3zA3vwZkkdXABBVy7NNs=";
};
npmDepsHash = "sha256-MQAFJjRhKqVlhGbQ79gob8/PwUtIkxRbjukrK6zfa84=";
npmDepsHash = "sha256-PUQc3qM/pjJkkO3zpCmga8eO8XaNxyeZAw+0GNPg5Ro=";
npmPackFlags = [ "--ignore-scripts" ];
installPhase = ''

View File

@@ -1,18 +1,18 @@
{ pkgs, ... }:
pkgs.stdenv.mkDerivation rec {
pname = "obsidian.plugins.tasks";
version = "7.14.0";
version = "7.15.0";
src = pkgs.fetchFromGitHub {
owner = "obsidian-tasks-group";
repo = "obsidian-tasks";
rev = version;
hash = "sha256-vAYeCNgDF0aheN9ff3fFPyW21g4N4gyYo/Y6axTi7Yc=";
hash = "sha256-BF9ye4ocE6vZh+ChkmuLkQpNWtH425EX0EHQs+wbTZc=";
};
offlineCache = pkgs.fetchYarnDeps {
yarnLock = src + "/yarn.lock";
hash = "sha256-hXZ/BVmqtOsBa1G+7YulYOSk8GLJZ2hJ4kWrhf80MSY=";
hash = "sha256-Tf1K048Ox+hImIfrdBWQHsiDe+3FGUQLFBcf/Bbbo1U=";
};
nativeBuildInputs = with pkgs; [

View File

@@ -33,10 +33,6 @@ in
{
enable = true;
spicetifyPackage = pkgs.spicetify-cli.overrideAttrs (oldAttrs: {
patches = oldAttrs.patches or [ ] ++ [ ./user-colors.patch ];
});
theme = spicePkgs.themes.sleek // {
extraCommands = ''
export COLORS_CSS_PATH="${home}/.config/spotify/colors.css"

View File

@@ -1,31 +0,0 @@
diff --git a/src/apply/apply.go b/src/apply/apply.go
index 47f1346..47badab 100644
--- a/src/apply/apply.go
+++ b/src/apply/apply.go
@@ -2,6 +2,7 @@ package apply
import (
"fmt"
+ "errors"
"os"
"path/filepath"
"strings"
@@ -65,10 +66,17 @@ func AdditionalOptions(appsFolderPath string, flags Flag) {
// To not use custom css, set `themeFolder` to blank string
// To use default color scheme, set `scheme` to `nil`
func UserCSS(appsFolderPath, themeFolder string, scheme map[string]string) {
+ colorsSrc := os.Getenv("COLORS_CSS_PATH")
colorsDest := filepath.Join(appsFolderPath, "xpui", "colors.css")
- if err := os.WriteFile(colorsDest, []byte(getColorCSS(scheme)), 0700); err != nil {
+
+ if len(colorsSrc) == 0 {
+ utils.Fatal(errors.New("COLORS_CSS_PATH environment variable is not set"))
+ }
+
+ if err := os.Symlink(colorsSrc, colorsDest); err != nil {
utils.Fatal(err)
}
+
cssDest := filepath.Join(appsFolderPath, "xpui", "user.css")
if err := os.WriteFile(cssDest, []byte(getUserCSS(themeFolder)), 0700); err != nil {
utils.Fatal(err)