From 855edc83f4c292acd6f10ee7b67ad5167c4a5219 Mon Sep 17 00:00:00 2001 From: Nikolaos Karaolidis Date: Fri, 25 Apr 2025 17:35:29 +0300 Subject: [PATCH] Update Signed-off-by: Nikolaos Karaolidis --- .gitmodules | 4 - flake.lock | 60 +- flake.nix | 12 +- .../common/configs/system/backup/default.nix | 2 +- .../configs/system/nix-install/default.nix | 2 +- .../user/console/kubernetes/default.nix | 2 +- .../user/console/nix-develop/default.nix | 2 +- .../user/console/nix-direnv/default.nix | 180 +++--- .../configs/user/console/zsh/default.nix | 2 +- .../configs/user/console/zsh/options.nix | 2 +- .../configs/user/gui/obsidian/default.nix | 7 - .../configs/user/gui/spicetify/default.nix | 8 + .../user/gui/spicetify/user-colors.patch | 31 + .../common/configs/user/gui/theme/options.nix | 2 +- packages/darktable/lua-scripts/default.nix | 6 +- packages/default.nix | 3 - .../obsidian/plugins/dataview/default.nix | 4 +- .../obsidian/plugins/folder-note/default.nix | 25 - .../plugins/folder-note/package-lock.patch | 549 ------------------ packages/obsidian/plugins/linter/default.nix | 6 +- .../plugins/read-it-later/default.nix | 22 - packages/obsidian/plugins/tasks/default.nix | 4 +- submodules/home-manager | 2 +- submodules/nixpkgs | 2 +- submodules/spicetify-nix | 1 - 25 files changed, 178 insertions(+), 762 deletions(-) create mode 100644 hosts/common/configs/user/gui/spicetify/user-colors.patch delete mode 100644 packages/obsidian/plugins/folder-note/default.nix delete mode 100644 packages/obsidian/plugins/folder-note/package-lock.patch delete mode 100644 packages/obsidian/plugins/read-it-later/default.nix delete mode 160000 submodules/spicetify-nix diff --git a/.gitmodules b/.gitmodules index 9acf7b9..4f2e69e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,7 +6,3 @@ path = submodules/home-manager url = git@github.com:karaolidis/home-manager.git branch = integration -[submodule "submodules/spicetify-nix"] - path = submodules/spicetify-nix - url = git@github.com:karaolidis/spicetify-nix.git - branch = integration diff --git a/flake.lock b/flake.lock index b281488..eed35f9 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ ] }, "locked": { - "lastModified": 1738087375, - "narHash": "sha256-GLyNtU9A2VN22jNRHZ2OXuFfTJLh8uEVVt+ftsKUX0c=", + "lastModified": 1744557573, + "narHash": "sha256-XAyj0iDuI51BytJ1PwN53uLpzTDdznPDQFG4RwihlTQ=", "owner": "aylur", "repo": "ags", - "rev": "a6a7a0adb17740f4c34a59902701870d46fbb6a4", + "rev": "3ed9737bdbc8fc7a7c7ceef2165c9109f336bff6", "type": "github" }, "original": { @@ -31,11 +31,11 @@ ] }, "locked": { - "lastModified": 1742571008, - "narHash": "sha256-5WgfJAeBpxiKbTR/gJvxrGYfqQRge5aUDcGKmU1YZ1Q=", + "lastModified": 1745067202, + "narHash": "sha256-f7LaP9W4nnu8Qh6tjRDN0qzFV7FRLNiQYrEtP50mT38=", "owner": "aylur", "repo": "astal", - "rev": "dc0e5d37abe9424c53dcbd2506a4886ffee6296e", + "rev": "c96126c7e261737270ad7ae35b27674c318648e6", "type": "github" }, "original": { @@ -52,11 +52,11 @@ ] }, "locked": { - "lastModified": 1741786315, - "narHash": "sha256-VT65AE2syHVj6v/DGB496bqBnu1PXrrzwlw07/Zpllc=", + "lastModified": 1745502102, + "narHash": "sha256-LqhRwzvIVPEjH0TaPgwzqpyhW6DtCrvz7FnUJDoUZh8=", "owner": "nix-community", "repo": "disko", - "rev": "0d8c6ad4a43906d14abd5c60e0ffe7b587b213de", + "rev": "ca27b88c88948d96feeee9ed814cbd34f53d0d70", "type": "github" }, "original": { @@ -115,11 +115,11 @@ ] }, "locked": { - "lastModified": 1743493743, - "narHash": "sha256-Lr2yJSJlYIBER5IV4v8FUjQ1etjaGw8IGI5MSVBBOio=", + "lastModified": 1745580871, + "narHash": "sha256-SXA+9Y9gp1c0wRVV8QeZ0rQncrc4f6xGsyuPeD82mvc=", "owner": "karaolidis", "repo": "home-manager", - "rev": "2c32411b8283250cc4b693f256f5b5ad2347a738", + "rev": "e3a65e6b3c5a8dba2c24b411bfe49c98bd24ec0e", "type": "github" }, "original": { @@ -131,11 +131,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1743494574, - "narHash": "sha256-o21JXJ2AnMMXWQ+ZMZc24dmnDiq6AsG+GM79BJNIJik=", + "lastModified": 1745580757, + "narHash": "sha256-ifnIjyCqw9HtY5QukDIfFQVUXYkOngRMgKGRWJ8iJv4=", "owner": "karaolidis", "repo": "nixpkgs", - "rev": "a0bf1c3396f62df55974e0e660d37fecb7002651", + "rev": "12b9c9689ed5cfb8dfff3ad4743e88bbc23a9344", "type": "github" }, "original": { @@ -156,11 +156,11 @@ ] }, "locked": { - "lastModified": 1743483683, - "narHash": "sha256-64TpCxhxG3ymB0ucAxxffmJtArrCvjtrbdzqGgHcBuE=", + "lastModified": 1745578191, + "narHash": "sha256-UEUn1DuOysq4/1Wqd7TSE0lw6iLo5l+TVazKGIBIDp4=", "owner": "nix-community", "repo": "NUR", - "rev": "257a957a47f46614279ab186a760528bd8833613", + "rev": "d1cf5ba24cde01c963554c5c3d01d22f06ef5845", "type": "github" }, "original": { @@ -214,11 +214,11 @@ ] }, "locked": { - "lastModified": 1743494586, - "narHash": "sha256-Rx3/NJnsl8k7N7Ggd7fuHvJkgsee/U19VgtzSGF5k0w=", + "lastModified": 1745310711, + "narHash": "sha256-ePyTpKEJTgX0gvgNQWd7tQYQ3glIkbqcW778RpHlqgA=", "owner": "Mic92", "repo": "sops-nix", - "rev": "49cffb88f6362d14aa893a6b8326692cff48b962", + "rev": "5e3e92b16d6fdf9923425a8d4df7496b2434f39c", "type": "github" }, "original": { @@ -238,16 +238,16 @@ ] }, "locked": { - "lastModified": 1743493803, - "narHash": "sha256-HRFXInTbEzRfF/QgAIghoFTKI33erBDt//Uh6d9BAag=", - "owner": "karaolidis", + "lastModified": 1745151211, + "narHash": "sha256-qFXfTdO1yvW6DmUPfVLIJgDHfkSd5yimZWvBMrlP/ow=", + "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "835177872121df87b334aa88f510e5f40b291a97", + "rev": "1dd4328f82115887901a685ecd9fa6e1d1db2d0c", "type": "github" }, "original": { - "owner": "karaolidis", - "ref": "integration", + "owner": "Gerg-L", + "ref": "master", "repo": "spicetify-nix", "type": "github" } @@ -275,11 +275,11 @@ ] }, "locked": { - "lastModified": 1743081648, - "narHash": "sha256-WRAylyYptt6OX5eCEBWyTwOEqEtD6zt33rlUkr6u3cE=", + "lastModified": 1744961264, + "narHash": "sha256-aRmUh0AMwcbdjJHnytg1e5h5ECcaWtIFQa6d9gI85AI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "29a3d7b768c70addce17af0869f6e2bd8f5be4b7", + "rev": "8d404a69efe76146368885110f29a2ca3700bee6", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 5d894d0..4b2bf66 100644 --- a/flake.nix +++ b/flake.nix @@ -117,18 +117,10 @@ }; spicetify-nix = { - # --- Official - # type = "github"; - # owner = "Gerg-L"; - # repo = "spicetify-nix"; - # ref = "master"; - # --- Fork type = "github"; - owner = "karaolidis"; + owner = "Gerg-L"; repo = "spicetify-nix"; - ref = "integration"; - # --- Local - # url = "git+file:./submodules/spicetify-nix"; + ref = "master"; inputs = { nixpkgs.follows = "nixpkgs"; diff --git a/hosts/common/configs/system/backup/default.nix b/hosts/common/configs/system/backup/default.nix index dc1a49c..7a5a12a 100644 --- a/hosts/common/configs/system/backup/default.nix +++ b/hosts/common/configs/system/backup/default.nix @@ -13,6 +13,6 @@ ]; home-manager.sharedModules = [ - { programs.zsh.initExtra = builtins.readFile ./backup.completion.zsh; } + { programs.zsh.initContent = builtins.readFile ./backup.completion.zsh; } ]; } diff --git a/hosts/common/configs/system/nix-install/default.nix b/hosts/common/configs/system/nix-install/default.nix index cee7f47..3dc0b8b 100644 --- a/hosts/common/configs/system/nix-install/default.nix +++ b/hosts/common/configs/system/nix-install/default.nix @@ -16,6 +16,6 @@ ]; home-manager.sharedModules = [ - { programs.zsh.initExtra = builtins.readFile ./install.completion.zsh; } + { programs.zsh.initContent = builtins.readFile ./install.completion.zsh; } ]; } diff --git a/hosts/common/configs/user/console/kubernetes/default.nix b/hosts/common/configs/user/console/kubernetes/default.nix index 9bddbe9..1326bfe 100644 --- a/hosts/common/configs/user/console/kubernetes/default.nix +++ b/hosts/common/configs/user/console/kubernetes/default.nix @@ -49,7 +49,7 @@ }; zsh = { - initExtra = '' + initContent = '' kubeswitch() { local target="$HOME/.kube/$1" local config="$HOME/.kube/config" diff --git a/hosts/common/configs/user/console/nix-develop/default.nix b/hosts/common/configs/user/console/nix-develop/default.nix index 384d0bc..5a255a5 100644 --- a/hosts/common/configs/user/console/nix-develop/default.nix +++ b/hosts/common/configs/user/console/nix-develop/default.nix @@ -12,7 +12,7 @@ home-manager.users.${user}.programs.zsh = { shellAliases.nd = "nix-develop"; - initExtra = + initContent = let devShells = lib.strings.concatStringsSep " " ( lib.attrsets.mapAttrsToList (key: _: key) inputs.self.devShells.${system} diff --git a/hosts/common/configs/user/console/nix-direnv/default.nix b/hosts/common/configs/user/console/nix-direnv/default.nix index c3c0795..7fc56e5 100644 --- a/hosts/common/configs/user/console/nix-direnv/default.nix +++ b/hosts/common/configs/user/console/nix-direnv/default.nix @@ -10,97 +10,19 @@ ... }: { - home-manager.users.${user} = { - programs = { - direnv = { - enable = true; - silent = true; - nix-direnv.enable = true; - enableZshIntegration = true; + home-manager.users.${user}.programs = { + direnv = { + enable = true; + silent = true; + nix-direnv.enable = true; + enableZshIntegration = true; + + config = { + global.warn_timeout = 0; }; - zsh = { - shellAliases.nde = "nix-direnv"; - - initExtra = - let - devShells = lib.strings.concatStringsSep " " ( - lib.attrsets.mapAttrsToList (key: _: key) inputs.self.devShells.${system} - ); - in - '' - nix-direnv() { - local devshell="" - local hide=false - - while getopts "s:h" opt; do - case $opt in - s) - devshell="$OPTARG" - ;; - h) - hide=true - ;; - *) - echo "Usage: nix-direnv [-s ] [-h]" - return 1 - ;; - esac - done - - if [[ -z "$devshell" ]]; then - if "$hide"; then - echo "use flake path:." > .envrc; - else - echo "use flake" > .envrc; - fi - - if [ ! -f flake.nix ]; then - cp "${../nix-develop/template.nix}" flake.nix - chmod 755 flake.nix - fi - - if [ ! -f treefmt.nix ]; then - cp "${../nix-develop/treefmt.nix}" treefmt.nix - chmod 755 treefmt.nix - fi - else - echo "use flake self#$devshell" > .envrc - fi - - if "$hide" && git rev-parse --is-inside-work-tree &>/dev/null; then - local top - top="$(git rev-parse --show-toplevel)" - if ! grep -q "^\.envrc$" "$top/.gitignore" "$top/.git/info/exclude"; then echo "$(realpath --relative-to="$top" .envrc)" >> "$top/.git/info/exclude"; fi - if [ -z "$devshell" ]; then - if ! grep -q "^flake.nix$" "$top/.gitignore" "$top/.git/info/exclude"; then echo "flake.nix" >> "$top/.git/info/exclude"; fi - if ! grep -q "^flake.lock$" "$top/.gitignore" "$top/.git/info/exclude"; then echo "flake.lock" >> "$top/.git/info/exclude"; fi - if ! grep -q "^treefmt.nix$" "$top/.gitignore" "$top/.git/info/exclude"; then echo "treefmt.nix" >> "$top/.git/info/exclude"; fi - fi - fi - - direnv allow - } - - _nix-direnv_completion() { - local options=( - '-s[Dev shell from root flake]:shell:(${devShells})' - '-h[Hide .envrc and flake.nix in git]' - ) - - _arguments -s $options - } - - compdef _nix-direnv_completion nix-direnv - ''; - - p10k.extraRightPromptElements = [ "direnv" ]; - }; - }; - - # https://github.com/direnv/direnv/wiki/Customizing-cache-location - xdg.configFile = { - "direnv/direnvrc".text = '' + # https://github.com/direnv/direnv/wiki/Customizing-cache-location + stdlib = '' declare -A direnv_layout_dirs direnv_layout_dir() { local hash path @@ -111,10 +33,84 @@ )}" } ''; + }; - "direnv/direnv.toml".source = ( - (pkgs.formats.toml { }).generate "direnv.toml" { global.warn_timeout = 0; } - ); + zsh = { + shellAliases.nde = "nix-direnv"; + + initContent = + let + devShells = lib.strings.concatStringsSep " " ( + lib.attrsets.mapAttrsToList (key: _: key) inputs.self.devShells.${system} + ); + in + '' + nix-direnv() { + local devshell="" + local hide=false + + while getopts "s:h" opt; do + case $opt in + s) + devshell="$OPTARG" + ;; + h) + hide=true + ;; + *) + echo "Usage: nix-direnv [-s ] [-h]" + return 1 + ;; + esac + done + + if [[ -z "$devshell" ]]; then + if "$hide"; then + echo "use flake path:." > .envrc; + else + echo "use flake" > .envrc; + fi + + if [ ! -f flake.nix ]; then + cp "${../nix-develop/template.nix}" flake.nix + chmod 755 flake.nix + fi + + if [ ! -f treefmt.nix ]; then + cp "${../nix-develop/treefmt.nix}" treefmt.nix + chmod 755 treefmt.nix + fi + else + echo "use flake self#$devshell" > .envrc + fi + + if "$hide" && git rev-parse --is-inside-work-tree &>/dev/null; then + local top + top="$(git rev-parse --show-toplevel)" + if ! grep -q "^\.envrc$" "$top/.gitignore" "$top/.git/info/exclude"; then echo "$(realpath --relative-to="$top" .envrc)" >> "$top/.git/info/exclude"; fi + if [ -z "$devshell" ]; then + if ! grep -q "^flake.nix$" "$top/.gitignore" "$top/.git/info/exclude"; then echo "flake.nix" >> "$top/.git/info/exclude"; fi + if ! grep -q "^flake.lock$" "$top/.gitignore" "$top/.git/info/exclude"; then echo "flake.lock" >> "$top/.git/info/exclude"; fi + if ! grep -q "^treefmt.nix$" "$top/.gitignore" "$top/.git/info/exclude"; then echo "treefmt.nix" >> "$top/.git/info/exclude"; fi + fi + fi + + direnv allow + } + + _nix-direnv_completion() { + local options=( + '-s[Dev shell from root flake]:shell:(${devShells})' + '-h[Hide .envrc and flake.nix in git]' + ) + + _arguments -s $options + } + + compdef _nix-direnv_completion nix-direnv + ''; + + p10k.extraRightPromptElements = [ "direnv" ]; }; }; diff --git a/hosts/common/configs/user/console/zsh/default.nix b/hosts/common/configs/user/console/zsh/default.nix index e820075..91a05b1 100644 --- a/hosts/common/configs/user/console/zsh/default.nix +++ b/hosts/common/configs/user/console/zsh/default.nix @@ -33,7 +33,7 @@ file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme"; } ]; - initExtra = '' + initContent = '' source ${./.p10k.zsh} ''; }; diff --git a/hosts/common/configs/user/console/zsh/options.nix b/hosts/common/configs/user/console/zsh/options.nix index 2fda368..4bb8228 100644 --- a/hosts/common/configs/user/console/zsh/options.nix +++ b/hosts/common/configs/user/console/zsh/options.nix @@ -18,7 +18,7 @@ in with lib; with cfg; { - initExtra = '' + initContent = '' export P10K_EXTRA_RIGHT_PROMPT_ELEMENTS=(${strings.concatStringsSep " " p10k.extraRightPromptElements}) ''; }; diff --git a/hosts/common/configs/user/gui/obsidian/default.nix b/hosts/common/configs/user/gui/obsidian/default.nix index 2f2beae..d26872d 100644 --- a/hosts/common/configs/user/gui/obsidian/default.nix +++ b/hosts/common/configs/user/gui/obsidian/default.nix @@ -140,13 +140,6 @@ in showNewVersionNotification = false; }; } - { - pkg = selfPkgs.obsidian-plugin-folder-note; - options = { - folderNoteHide = false; - folderNoteStrInit = ""; - }; - } { pkg = selfPkgs.obsidian-plugin-kanban; options = { diff --git a/hosts/common/configs/user/gui/spicetify/default.nix b/hosts/common/configs/user/gui/spicetify/default.nix index 2f4a53c..53db2ee 100644 --- a/hosts/common/configs/user/gui/spicetify/default.nix +++ b/hosts/common/configs/user/gui/spicetify/default.nix @@ -14,6 +14,14 @@ let hmConfig = config.home-manager.users.${user}; in { + nixpkgs.overlays = [ + (final: prev: { + spicetify-cli = prev.spicetify-cli.overrideAttrs (oldAttrs: { + patches = oldAttrs.patches or [ ] ++ [ ./user-colors.patch ]; + }); + }) + ]; + networking.firewall = { allowedTCPPorts = [ 57621 ]; allowedUDPPorts = [ 5353 ]; diff --git a/hosts/common/configs/user/gui/spicetify/user-colors.patch b/hosts/common/configs/user/gui/spicetify/user-colors.patch new file mode 100644 index 0000000..55bbc8c --- /dev/null +++ b/hosts/common/configs/user/gui/spicetify/user-colors.patch @@ -0,0 +1,31 @@ +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) diff --git a/hosts/common/configs/user/gui/theme/options.nix b/hosts/common/configs/user/gui/theme/options.nix index 16bf7a9..bbb4dca 100644 --- a/hosts/common/configs/user/gui/theme/options.nix +++ b/hosts/common/configs/user/gui/theme/options.nix @@ -535,6 +535,6 @@ in } ); - programs.zsh.initExtra = builtins.readFile ./theme.completion.zsh; + programs.zsh.initContent = builtins.readFile ./theme.completion.zsh; }; } diff --git a/packages/darktable/lua-scripts/default.nix b/packages/darktable/lua-scripts/default.nix index d39c941..d7f03a1 100644 --- a/packages/darktable/lua-scripts/default.nix +++ b/packages/darktable/lua-scripts/default.nix @@ -2,13 +2,13 @@ # AUTO-UPDATE: nix-update --flake --version=branch=master darktable-lua-scripts pkgs.stdenv.mkDerivation rec { pname = "darktable-lua-scripts"; - version = "release-2.0.0-unstable-2025-03-19"; + version = "release-2.0.0-unstable-2025-04-11"; src = pkgs.fetchFromGitHub { owner = "darktable-org"; repo = "lua-scripts"; - rev = "6fdd78114f0b9caff65cf56571e97c61b5173d0b"; - hash = "sha256-dtAa58G4XtGIR6eEUx0+J9UrB1nG+/rPZsRxCGOt6aY="; + rev = "00437699463ce771f4eb474de9a67578b7ced36a"; + hash = "sha256-eBKu5Z4bKHE4hIWIUSFOT2d9zE2mGJy6fM69RC29bSA="; }; installPhase = '' diff --git a/packages/default.nix b/packages/default.nix index 95a0936..727efb3 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -10,17 +10,14 @@ darktable-lua-scripts = import ./darktable/lua-scripts { inherit pkgs; }; obsidian-plugin-better-word-count = import ./obsidian/plugins/better-word-count { inherit pkgs; }; - obsidian-plugin-custom-sort = import ./obsidian/plugins/custom-sort { inherit pkgs; }; obsidian-plugin-dataview = import ./obsidian/plugins/dataview { inherit pkgs; }; obsidian-plugin-excalidraw = import ./obsidian/plugins/excalidraw { inherit pkgs; }; - obsidian-plugin-folder-note = import ./obsidian/plugins/folder-note { inherit pkgs; }; obsidian-plugin-kanban = import ./obsidian/plugins/kanban { inherit pkgs; }; obsidian-plugin-languagetool = import ./obsidian/plugins/languagetool { inherit pkgs; }; obsidian-plugin-linter = import ./obsidian/plugins/linter { inherit pkgs; }; obsidian-plugin-map-view = import ./obsidian/plugins/map-view { inherit pkgs; }; obsidian-plugin-minimal-settings = import ./obsidian/plugins/minimal-settings { inherit pkgs; }; obsidian-plugin-outliner = import ./obsidian/plugins/outliner { inherit pkgs; }; - obsidian-plugin-read-it-later = import ./obsidian/plugins/read-it-later { inherit pkgs; }; obsidian-plugin-style-settings = import ./obsidian/plugins/style-settings { inherit pkgs; }; obsidian-plugin-tasks = import ./obsidian/plugins/tasks { inherit pkgs; }; obsidian-plugin-url-into-selection = import ./obsidian/plugins/url-into-selection { inherit pkgs; }; diff --git a/packages/obsidian/plugins/dataview/default.nix b/packages/obsidian/plugins/dataview/default.nix index 9d1f5ea..5046b15 100644 --- a/packages/obsidian/plugins/dataview/default.nix +++ b/packages/obsidian/plugins/dataview/default.nix @@ -2,13 +2,13 @@ # AUTO-UPDATE: nix-update --flake obsidian-plugin-dataview pkgs.buildNpmPackage rec { pname = "obsidian-plugin-dataview"; - version = "0.5.68"; + version = "0.5.70"; src = pkgs.fetchFromGitHub { owner = "blacksmithgu"; repo = "obsidian-dataview"; rev = version; - hash = "sha256-vmf96wjDrGeGVjZJGKUC8dUTu+lCxy0EIF5DkybAdko="; + hash = "sha256-qz2Un5r4bZyX0mZ7J7Yvd/gSWKn/GxUUrC7OF2jTL3c="; }; patches = [ ./package-lock.patch ]; diff --git a/packages/obsidian/plugins/folder-note/default.nix b/packages/obsidian/plugins/folder-note/default.nix deleted file mode 100644 index e6bcd23..0000000 --- a/packages/obsidian/plugins/folder-note/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ pkgs, ... }: -# AUTO-UPDATE: nix-update --flake obsidian-plugin-folder-note -pkgs.buildNpmPackage rec { - pname = "obsidian-plugin-folder-note"; - version = "0.7.3"; - - src = pkgs.fetchFromGitHub { - owner = "xpgo"; - repo = "obsidian-folder-note-plugin"; - rev = version; - hash = "sha256-MGWIMM2zKB6ydP7wV8yVAOS3Qr02xTBIWIEf/2enynU="; - }; - - patches = [ ./package-lock.patch ]; - - npmDepsHash = "sha256-4v6QwwooxsXy+mbiKriylpKa8NOK8pWZixezY+H6wxo="; - npmPackFlags = [ "--ignore-scripts" ]; - - installPhase = '' - mkdir -p $out - cp ./manifest.json $out/manifest.json - cp ./main.js $out/main.js - cp ./styles.css $out/styles.css - ''; -} diff --git a/packages/obsidian/plugins/folder-note/package-lock.patch b/packages/obsidian/plugins/folder-note/package-lock.patch deleted file mode 100644 index fba7f29..0000000 --- a/packages/obsidian/plugins/folder-note/package-lock.patch +++ /dev/null @@ -1,549 +0,0 @@ -diff --git a/.gitignore b/.gitignore -index c0aac20..9b2ad6e 100644 ---- a/.gitignore -+++ b/.gitignore -@@ -4,7 +4,6 @@ - - # npm - node_modules --package-lock.json - - # build - main.js -diff --git a/package-lock.json b/package-lock.json -new file mode 100644 -index 0000000..ed8a9ed ---- /dev/null -+++ b/package-lock.json -@@ -0,0 +1,518 @@ -+{ -+ "name": "folder-note-plugin", -+ "version": "0.9.7", -+ "lockfileVersion": 3, -+ "requires": true, -+ "packages": { -+ "": { -+ "name": "folder-note-plugin", -+ "version": "0.9.7", -+ "license": "MIT", -+ "devDependencies": { -+ "@rollup/plugin-commonjs": "^15.1.0", -+ "@rollup/plugin-node-resolve": "^9.0.0", -+ "@rollup/plugin-typescript": "^6.0.0", -+ "@types/node": "^14.14.30", -+ "@types/yaml": "^1.9.7", -+ "obsidian": "^1.6.6", -+ "rollup": "^2.39.0", -+ "tslib": "^2.0.3", -+ "typescript": "^4.1.5", -+ "yaml": "^1.10.0" -+ } -+ }, -+ "node_modules/@codemirror/state": { -+ "version": "6.4.1", -+ "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.4.1.tgz", -+ "integrity": "sha512-QkEyUiLhsJoZkbumGZlswmAhA7CBU02Wrz7zvH4SrcifbsqwlXShVXg65f3v/ts57W3dqyamEriMhij1Z3Zz4A==", -+ "dev": true, -+ "peer": true -+ }, -+ "node_modules/@codemirror/view": { -+ "version": "6.28.6", -+ "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.28.6.tgz", -+ "integrity": "sha512-bhwB1AZ6zU4M3dNKm8Aa2BXwj5mWDqE9IWpqxYKJoLCnx+AcwcMuLO01tLWgc1mx4vT1IVYVqx86YoqUsATrqQ==", -+ "dev": true, -+ "peer": true, -+ "dependencies": { -+ "@codemirror/state": "^6.4.0", -+ "style-mod": "^4.1.0", -+ "w3c-keyname": "^2.2.4" -+ } -+ }, -+ "node_modules/@rollup/plugin-commonjs": { -+ "version": "15.1.0", -+ "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-15.1.0.tgz", -+ "integrity": "sha512-xCQqz4z/o0h2syQ7d9LskIMvBSH4PX5PjYdpSSvgS+pQik3WahkQVNWg3D8XJeYjZoVWnIUQYDghuEMRGrmQYQ==", -+ "dev": true, -+ "dependencies": { -+ "@rollup/pluginutils": "^3.1.0", -+ "commondir": "^1.0.1", -+ "estree-walker": "^2.0.1", -+ "glob": "^7.1.6", -+ "is-reference": "^1.2.1", -+ "magic-string": "^0.25.7", -+ "resolve": "^1.17.0" -+ }, -+ "engines": { -+ "node": ">= 8.0.0" -+ }, -+ "peerDependencies": { -+ "rollup": "^2.22.0" -+ } -+ }, -+ "node_modules/@rollup/plugin-node-resolve": { -+ "version": "9.0.0", -+ "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-9.0.0.tgz", -+ "integrity": "sha512-gPz+utFHLRrd41WMP13Jq5mqqzHL3OXrfj3/MkSyB6UBIcuNt9j60GCbarzMzdf1VHFpOxfQh/ez7wyadLMqkg==", -+ "dev": true, -+ "dependencies": { -+ "@rollup/pluginutils": "^3.1.0", -+ "@types/resolve": "1.17.1", -+ "builtin-modules": "^3.1.0", -+ "deepmerge": "^4.2.2", -+ "is-module": "^1.0.0", -+ "resolve": "^1.17.0" -+ }, -+ "engines": { -+ "node": ">= 10.0.0" -+ }, -+ "peerDependencies": { -+ "rollup": "^1.20.0||^2.0.0" -+ } -+ }, -+ "node_modules/@rollup/plugin-typescript": { -+ "version": "6.1.0", -+ "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-6.1.0.tgz", -+ "integrity": "sha512-hJxaiE6WyNOsK+fZpbFh9CUijZYqPQuAOWO5khaGTUkM8DYNNyA2TDlgamecE+qLOG1G1+CwbWMAx3rbqpp6xQ==", -+ "dev": true, -+ "dependencies": { -+ "@rollup/pluginutils": "^3.1.0", -+ "resolve": "^1.17.0" -+ }, -+ "engines": { -+ "node": ">=8.0.0" -+ }, -+ "peerDependencies": { -+ "rollup": "^2.14.0", -+ "tslib": "*", -+ "typescript": ">=3.4.0" -+ } -+ }, -+ "node_modules/@rollup/pluginutils": { -+ "version": "3.1.0", -+ "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz", -+ "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==", -+ "dev": true, -+ "dependencies": { -+ "@types/estree": "0.0.39", -+ "estree-walker": "^1.0.1", -+ "picomatch": "^2.2.2" -+ }, -+ "engines": { -+ "node": ">= 8.0.0" -+ }, -+ "peerDependencies": { -+ "rollup": "^1.20.0||^2.0.0" -+ } -+ }, -+ "node_modules/@rollup/pluginutils/node_modules/estree-walker": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz", -+ "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==", -+ "dev": true -+ }, -+ "node_modules/@types/codemirror": { -+ "version": "5.60.8", -+ "resolved": "https://registry.npmjs.org/@types/codemirror/-/codemirror-5.60.8.tgz", -+ "integrity": "sha512-VjFgDF/eB+Aklcy15TtOTLQeMjTo07k7KAjql8OK5Dirr7a6sJY4T1uVBDuTVG9VEmn1uUsohOpYnVfgC6/jyw==", -+ "dev": true, -+ "dependencies": { -+ "@types/tern": "*" -+ } -+ }, -+ "node_modules/@types/estree": { -+ "version": "0.0.39", -+ "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz", -+ "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==", -+ "dev": true -+ }, -+ "node_modules/@types/node": { -+ "version": "14.18.63", -+ "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.63.tgz", -+ "integrity": "sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ==", -+ "dev": true -+ }, -+ "node_modules/@types/resolve": { -+ "version": "1.17.1", -+ "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz", -+ "integrity": "sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==", -+ "dev": true, -+ "dependencies": { -+ "@types/node": "*" -+ } -+ }, -+ "node_modules/@types/tern": { -+ "version": "0.23.9", -+ "resolved": "https://registry.npmjs.org/@types/tern/-/tern-0.23.9.tgz", -+ "integrity": "sha512-ypzHFE/wBzh+BlH6rrBgS5I/Z7RD21pGhZ2rltb/+ZrVM1awdZwjx7hE5XfuYgHWk9uvV5HLZN3SloevCAp3Bw==", -+ "dev": true, -+ "dependencies": { -+ "@types/estree": "*" -+ } -+ }, -+ "node_modules/@types/yaml": { -+ "version": "1.9.7", -+ "resolved": "https://registry.npmjs.org/@types/yaml/-/yaml-1.9.7.tgz", -+ "integrity": "sha512-8WMXRDD1D+wCohjfslHDgICd2JtMATZU8CkhH8LVJqcJs6dyYj5TGptzP8wApbmEullGBSsCEzzap73DQ1HJaA==", -+ "deprecated": "This is a stub types definition. yaml provides its own type definitions, so you do not need this installed.", -+ "dev": true, -+ "dependencies": { -+ "yaml": "*" -+ } -+ }, -+ "node_modules/balanced-match": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", -+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", -+ "dev": true -+ }, -+ "node_modules/brace-expansion": { -+ "version": "1.1.11", -+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", -+ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", -+ "dev": true, -+ "dependencies": { -+ "balanced-match": "^1.0.0", -+ "concat-map": "0.0.1" -+ } -+ }, -+ "node_modules/builtin-modules": { -+ "version": "3.3.0", -+ "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz", -+ "integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==", -+ "dev": true, -+ "engines": { -+ "node": ">=6" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/commondir": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", -+ "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==", -+ "dev": true -+ }, -+ "node_modules/concat-map": { -+ "version": "0.0.1", -+ "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", -+ "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", -+ "dev": true -+ }, -+ "node_modules/deepmerge": { -+ "version": "4.3.1", -+ "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", -+ "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==", -+ "dev": true, -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/estree-walker": { -+ "version": "2.0.2", -+ "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz", -+ "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==", -+ "dev": true -+ }, -+ "node_modules/fs.realpath": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", -+ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", -+ "dev": true -+ }, -+ "node_modules/fsevents": { -+ "version": "2.3.3", -+ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", -+ "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", -+ "dev": true, -+ "hasInstallScript": true, -+ "optional": true, -+ "os": [ -+ "darwin" -+ ], -+ "engines": { -+ "node": "^8.16.0 || ^10.6.0 || >=11.0.0" -+ } -+ }, -+ "node_modules/function-bind": { -+ "version": "1.1.2", -+ "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", -+ "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", -+ "dev": true, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/glob": { -+ "version": "7.2.3", -+ "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", -+ "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", -+ "deprecated": "Glob versions prior to v9 are no longer supported", -+ "dev": true, -+ "dependencies": { -+ "fs.realpath": "^1.0.0", -+ "inflight": "^1.0.4", -+ "inherits": "2", -+ "minimatch": "^3.1.1", -+ "once": "^1.3.0", -+ "path-is-absolute": "^1.0.0" -+ }, -+ "engines": { -+ "node": "*" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/isaacs" -+ } -+ }, -+ "node_modules/hasown": { -+ "version": "2.0.2", -+ "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", -+ "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", -+ "dev": true, -+ "dependencies": { -+ "function-bind": "^1.1.2" -+ }, -+ "engines": { -+ "node": ">= 0.4" -+ } -+ }, -+ "node_modules/inflight": { -+ "version": "1.0.6", -+ "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", -+ "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", -+ "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", -+ "dev": true, -+ "dependencies": { -+ "once": "^1.3.0", -+ "wrappy": "1" -+ } -+ }, -+ "node_modules/inherits": { -+ "version": "2.0.4", -+ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", -+ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", -+ "dev": true -+ }, -+ "node_modules/is-core-module": { -+ "version": "2.15.0", -+ "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.0.tgz", -+ "integrity": "sha512-Dd+Lb2/zvk9SKy1TGCt1wFJFo/MWBPMX5x7KcvLajWTGuomczdQX61PvY5yK6SVACwpoexWo81IfFyoKY2QnTA==", -+ "dev": true, -+ "dependencies": { -+ "hasown": "^2.0.2" -+ }, -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/is-module": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz", -+ "integrity": "sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==", -+ "dev": true -+ }, -+ "node_modules/is-reference": { -+ "version": "1.2.1", -+ "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz", -+ "integrity": "sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==", -+ "dev": true, -+ "dependencies": { -+ "@types/estree": "*" -+ } -+ }, -+ "node_modules/magic-string": { -+ "version": "0.25.9", -+ "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz", -+ "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==", -+ "dev": true, -+ "dependencies": { -+ "sourcemap-codec": "^1.4.8" -+ } -+ }, -+ "node_modules/minimatch": { -+ "version": "3.1.2", -+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", -+ "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", -+ "dev": true, -+ "dependencies": { -+ "brace-expansion": "^1.1.7" -+ }, -+ "engines": { -+ "node": "*" -+ } -+ }, -+ "node_modules/moment": { -+ "version": "2.29.4", -+ "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz", -+ "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==", -+ "dev": true, -+ "engines": { -+ "node": "*" -+ } -+ }, -+ "node_modules/obsidian": { -+ "version": "1.6.6", -+ "resolved": "https://registry.npmjs.org/obsidian/-/obsidian-1.6.6.tgz", -+ "integrity": "sha512-GZHzeOiwmw/wBjB5JwrsxAZBLqxGQmqtEKSvJJvT0LtTcqeOFnV8jv0ZK5kO7hBb44WxJc+LdS7mZgLXbb+qXQ==", -+ "dev": true, -+ "dependencies": { -+ "@types/codemirror": "5.60.8", -+ "moment": "2.29.4" -+ }, -+ "peerDependencies": { -+ "@codemirror/state": "^6.0.0", -+ "@codemirror/view": "^6.0.0" -+ } -+ }, -+ "node_modules/once": { -+ "version": "1.4.0", -+ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", -+ "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", -+ "dev": true, -+ "dependencies": { -+ "wrappy": "1" -+ } -+ }, -+ "node_modules/path-is-absolute": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", -+ "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", -+ "dev": true, -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/path-parse": { -+ "version": "1.0.7", -+ "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", -+ "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", -+ "dev": true -+ }, -+ "node_modules/picomatch": { -+ "version": "2.3.1", -+ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", -+ "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", -+ "dev": true, -+ "engines": { -+ "node": ">=8.6" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/jonschlinkert" -+ } -+ }, -+ "node_modules/resolve": { -+ "version": "1.22.8", -+ "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", -+ "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", -+ "dev": true, -+ "dependencies": { -+ "is-core-module": "^2.13.0", -+ "path-parse": "^1.0.7", -+ "supports-preserve-symlinks-flag": "^1.0.0" -+ }, -+ "bin": { -+ "resolve": "bin/resolve" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/rollup": { -+ "version": "2.79.1", -+ "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.1.tgz", -+ "integrity": "sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==", -+ "dev": true, -+ "bin": { -+ "rollup": "dist/bin/rollup" -+ }, -+ "engines": { -+ "node": ">=10.0.0" -+ }, -+ "optionalDependencies": { -+ "fsevents": "~2.3.2" -+ } -+ }, -+ "node_modules/sourcemap-codec": { -+ "version": "1.4.8", -+ "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz", -+ "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==", -+ "deprecated": "Please use @jridgewell/sourcemap-codec instead", -+ "dev": true -+ }, -+ "node_modules/style-mod": { -+ "version": "4.1.2", -+ "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.1.2.tgz", -+ "integrity": "sha512-wnD1HyVqpJUI2+eKZ+eo1UwghftP6yuFheBqqe+bWCotBjC2K1YnteJILRMs3SM4V/0dLEW1SC27MWP5y+mwmw==", -+ "dev": true, -+ "peer": true -+ }, -+ "node_modules/supports-preserve-symlinks-flag": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", -+ "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", -+ "dev": true, -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/tslib": { -+ "version": "2.6.3", -+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz", -+ "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==", -+ "dev": true -+ }, -+ "node_modules/typescript": { -+ "version": "4.9.5", -+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", -+ "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", -+ "dev": true, -+ "bin": { -+ "tsc": "bin/tsc", -+ "tsserver": "bin/tsserver" -+ }, -+ "engines": { -+ "node": ">=4.2.0" -+ } -+ }, -+ "node_modules/w3c-keyname": { -+ "version": "2.2.8", -+ "resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.8.tgz", -+ "integrity": "sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==", -+ "dev": true, -+ "peer": true -+ }, -+ "node_modules/wrappy": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", -+ "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", -+ "dev": true -+ }, -+ "node_modules/yaml": { -+ "version": "1.10.2", -+ "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", -+ "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", -+ "dev": true, -+ "engines": { -+ "node": ">= 6" -+ } -+ } -+ } -+} -diff --git a/package.json b/package.json -index 469af6f..7d6e514 100644 ---- a/package.json -+++ b/package.json -@@ -16,7 +16,7 @@ - "@rollup/plugin-typescript": "^6.0.0", - "@types/node": "^14.14.30", - "@types/yaml": "^1.9.7", -- "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master", -+ "obsidian": "^1.6.6", - "rollup": "^2.39.0", - "tslib": "^2.0.3", - "typescript": "^4.1.5", diff --git a/packages/obsidian/plugins/linter/default.nix b/packages/obsidian/plugins/linter/default.nix index bac3d52..186b92f 100644 --- a/packages/obsidian/plugins/linter/default.nix +++ b/packages/obsidian/plugins/linter/default.nix @@ -2,16 +2,16 @@ # AUTO-UPDATE: nix-update --flake obsidian-plugin-linter pkgs.buildNpmPackage rec { pname = "obsidian-plugin-linter"; - version = "1.28.0"; + version = "1.29.0"; src = pkgs.fetchFromGitHub { owner = "platers"; repo = "obsidian-linter"; rev = version; - hash = "sha256-pMcVowcV0k/OcG6cITRxt3HOA5QJDaery6upLPWSxpM="; + hash = "sha256-h2+rksKBMSfOR288G4ZbyituyrFRXGcQiHL6NnYB35A="; }; - npmDepsHash = "sha256-XgOgAJoRXhQIQNnubU0uL7e7SGJvRhWvPktMNZN5F5U="; + npmDepsHash = "sha256-5e7eFX25818dsux9hSdNRsTJPHbaR8n69s6/nnIHFyc="; npmPackFlags = [ "--ignore-scripts" ]; installPhase = '' diff --git a/packages/obsidian/plugins/read-it-later/default.nix b/packages/obsidian/plugins/read-it-later/default.nix deleted file mode 100644 index e0346bd..0000000 --- a/packages/obsidian/plugins/read-it-later/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ pkgs, ... }: -# AUTO-UPDATE: nix-update --flake obsidian-plugin-read-it-later -pkgs.buildNpmPackage rec { - pname = "obsidian-plugin-read-it-later"; - version = "0.11.4"; - - src = pkgs.fetchFromGitHub { - owner = "DominikPieper"; - repo = "obsidian-ReadItLater"; - rev = version; - hash = "sha256-Favp5YhRTYhMGsLuPWiFwmU3zA3vwZkkdXABBVy7NNs="; - }; - - npmDepsHash = "sha256-PUQc3qM/pjJkkO3zpCmga8eO8XaNxyeZAw+0GNPg5Ro="; - npmPackFlags = [ "--ignore-scripts" ]; - - installPhase = '' - mkdir -p $out - cp ./manifest.json $out/manifest.json - cp ./main.js $out/main.js - ''; -} diff --git a/packages/obsidian/plugins/tasks/default.nix b/packages/obsidian/plugins/tasks/default.nix index 431f38e..cf14d8d 100644 --- a/packages/obsidian/plugins/tasks/default.nix +++ b/packages/obsidian/plugins/tasks/default.nix @@ -2,13 +2,13 @@ # AUTO-UPDATE: nix-update --flake obsidian-plugin-tasks pkgs.stdenv.mkDerivation rec { pname = "obsidian-plugin-tasks"; - version = "7.18.4"; + version = "7.19.1"; src = pkgs.fetchFromGitHub { owner = "obsidian-tasks-group"; repo = "obsidian-tasks"; rev = version; - hash = "sha256-NC4Q5hmKGz3Dgz8CEKfochSrsOzjNDcrGnezWP7XesI="; + hash = "sha256-tz22NIfgCicXzieV2dPFvwozzklk6Ovc4Lw6BiF0FIs="; }; offlineCache = pkgs.fetchYarnDeps { diff --git a/submodules/home-manager b/submodules/home-manager index 2c32411..e3a65e6 160000 --- a/submodules/home-manager +++ b/submodules/home-manager @@ -1 +1 @@ -Subproject commit 2c32411b8283250cc4b693f256f5b5ad2347a738 +Subproject commit e3a65e6b3c5a8dba2c24b411bfe49c98bd24ec0e diff --git a/submodules/nixpkgs b/submodules/nixpkgs index a0bf1c3..12b9c96 160000 --- a/submodules/nixpkgs +++ b/submodules/nixpkgs @@ -1 +1 @@ -Subproject commit a0bf1c3396f62df55974e0e660d37fecb7002651 +Subproject commit 12b9c9689ed5cfb8dfff3ad4743e88bbc23a9344 diff --git a/submodules/spicetify-nix b/submodules/spicetify-nix deleted file mode 160000 index 8351778..0000000 --- a/submodules/spicetify-nix +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 835177872121df87b334aa88f510e5f40b291a97