Fix some obsidian settings

Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
This commit is contained in:
2024-07-28 10:55:29 +01:00
parent 4e041d1587
commit dac287f94c
3 changed files with 10 additions and 104 deletions

View File

@@ -7,17 +7,17 @@ pkgs.stdenv.mkDerivation rec {
version = "1.0.8"; version = "1.0.8";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "mgmeyers"; owner = "karaolidis";
rev = "57ef34b6d8903451311db63084eef80b7b7e1a62";
# owner = "mgmeyers";
repo = "obsidian-style-settings"; repo = "obsidian-style-settings";
rev = "${version}"; # rev = "${version}";
hash = "sha256-7IpJQxKnu4ST84bJSDcJ9CsieamboGhO59meNS53f10="; hash = "sha256-ZxYkd0kyDnHwPt5Z1iFpRgQHLKhN4O9S5S7Izz5hd9E=";
}; };
patches = [ ./yarn-lock.patch ];
offlineCache = pkgs.fetchYarnDeps { offlineCache = pkgs.fetchYarnDeps {
yarnLock = src + "/yarn.lock"; yarnLock = src + "/yarn.lock";
hash = "sha256-z14W+dIK0VGggvzh5dichJHdbgKOu3bIA8uhnQJE7xU="; hash = "sha256-Wf5pIbhSdo/rOs/TDqRjiS2JxWWbWsI2IOqCW78gFkU=";
}; };
nativeBuildInputs = with pkgs; [ nativeBuildInputs = with pkgs; [

View File

@@ -1,87 +0,0 @@
diff --git a/package.json b/package.json
index 7fb1d8f..3d1f473 100644
--- a/package.json
+++ b/package.json
@@ -11,8 +11,8 @@
"lint:fix": "eslint ./src --fix",
"clean": "yarn prettier && yarn lint:fix",
"rlnotes": "git log $(git describe --tags --abbrev=0)..HEAD --oneline > release-notes.md && git add release-notes.md",
- "bump": "node version-bump.mjs && git add manifest.json versions.json package.json && yarn rlnotes",
- "release": "git commit -m $npm_package_version && git tag $npm_package_version && git push && git push --tags"
+ "bump": "node version-bump.mjs && git add manifest.json versions.json package.json && yarn rlnotes",
+ "release": "git commit -m $npm_package_version && git tag $npm_package_version && git push && git push --tags"
},
"keywords": [],
"author": "",
@@ -31,7 +31,7 @@
"typescript": "^4.0.3"
},
"dependencies": {
- "@simonwep/pickr": "https://github.com/nothingislost/pickr/archive/a17739f7aa1871b44da778cbb79ae76dae77d839.tar.gz",
+ "@simonwep/pickr": "^1.9.1",
"@types/chroma-js": "^2.1.3",
"@types/js-yaml": "^4.0.3",
"@typescript-eslint/eslint-plugin": "^5.50.0",
diff --git a/yarn.lock b/yarn.lock
index 7eaa833..08d5c1d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -259,13 +259,13 @@
estree-walker "^1.0.1"
picomatch "^2.2.2"
-"@simonwep/pickr@https://github.com/nothingislost/pickr/archive/a17739f7aa1871b44da778cbb79ae76dae77d839.tar.gz":
- version "1.8.4"
- resolved "https://github.com/nothingislost/pickr/archive/a17739f7aa1871b44da778cbb79ae76dae77d839.tar.gz"
- integrity sha512-VOphUjenpUXHMrYo+uNREruBB/xhMsvqqnJMUShctn1pQXWMDp41a9NJ6XyhISwlyRNoubkuXEn/7/3MuvAhyg==
+"@simonwep/pickr@^1.9.1":
+ version "1.9.1"
+ resolved "https://registry.yarnpkg.com/@simonwep/pickr/-/pickr-1.9.1.tgz#10d86dab514b8888b2d6b90299a477f254067c43"
+ integrity sha512-fR3qmfAcPf/HSFS7GEnTmZLM3+xERv1+jyMBbzT63ilRRM8veYjI7ELvkHHKk0/du3lHp7uh/FqatjM3646X1g==
dependencies:
- core-js "^3.15.1"
- nanopop "^2.1.0"
+ core-js "3.37.0"
+ nanopop "2.4.2"
"@trivago/prettier-plugin-sort-imports@^4.2.0":
version "4.2.0"
@@ -524,7 +524,7 @@ chalk@^2.4.2:
chalk@^4.0.0:
version "4.1.2"
- resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz"
+ resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
dependencies:
ansi-styles "^4.1.0"
@@ -576,10 +576,10 @@ concat-map@0.0.1:
resolved "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
integrity "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
-core-js@^3.15.1:
- version "3.18.2"
- resolved "https://registry.npmjs.org/core-js/-/core-js-3.18.2.tgz"
- integrity sha512-zNhPOUoSgoizoSQFdX1MeZO16ORRb9FFQLts8gSYbZU5FcgXhp24iMWMxnOQo5uIaIG7/6FA/IqJPwev1o9ZXQ==
+core-js@3.37.0:
+ version "3.37.0"
+ resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.37.0.tgz#d8dde58e91d156b2547c19d8a4efd5c7f6c426bb"
+ integrity sha512-fu5vHevQ8ZG4og+LXug8ulUtVxjOcEYvifJr7L5Bfq9GOztVqsKd9/59hUk2ZSbCrS3BqUr3EpaYGIYzq7g3Ug==
cross-env@^6.0.3:
version "6.0.3"
@@ -1157,10 +1157,10 @@ ms@2.1.2:
resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"
integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
-nanopop@^2.1.0:
- version "2.1.0"
- resolved "https://registry.npmjs.org/nanopop/-/nanopop-2.1.0.tgz"
- integrity sha512-jGTwpFRexSH+fxappnGQtN9dspgE2ipa1aOjtR24igG0pv6JCxImIAmrLRHX+zUF5+1wtsFVbKyfP51kIGAVNw==
+nanopop@2.4.2:
+ version "2.4.2"
+ resolved "https://registry.yarnpkg.com/nanopop/-/nanopop-2.4.2.tgz#b55482135be7e64f2d0f5aa8ef51a58104ac7b13"
+ integrity sha512-NzOgmMQ+elxxHeIha+OG/Pv3Oc3p4RU2aBhwWwAqDpXrdTbtRylbRLQztLy8dMMwfl6pclznBdfUhccEn9ZIzw==
natural-compare-lite@^1.4.0:
version "1.4.0"

View File

@@ -22,7 +22,7 @@ in
app = { app = {
defaultViewMode = "preview"; defaultViewMode = "preview";
livePreview = false; livePreview = false;
readableLineLength = false; readableLineLength = true;
showLineNumber = true; showLineNumber = true;
tabSize = 2; tabSize = 2;
promptDelete = false; promptDelete = false;
@@ -77,6 +77,7 @@ in
options = { options = {
statusBar = [ statusBar = [
{ {
prefix = "";
suffix = " words"; suffix = " words";
metric = { metric = {
type = 0; type = 0;
@@ -86,6 +87,7 @@ in
]; ];
altBar = [ altBar = [
{ {
prefix = "";
suffix = " files"; suffix = " files";
metric = { metric = {
type = 2; type = 2;
@@ -189,10 +191,6 @@ in
default-array-style = "multi-line"; default-array-style = "multi-line";
}; };
sort-yaml-array-values.enabled = true; sort-yaml-array-values.enabled = true;
yaml-key-sort = {
enabled = true;
yaml-sort-order-for-other-keys = "Ascending Alphabetical";
};
capitalize-headings = { capitalize-headings = {
enabled = true; enabled = true;
ignore-words = ""; ignore-words = "";
@@ -649,12 +647,7 @@ in
}; };
}; };
} }
{ (import ./config/plugins/url-into-selection { inherit pkgs; })
pkg = import ./config/plugins/url-into-selection { inherit pkgs; };
options = {
nothingSelected = 2;
};
}
]; ];
cssSnippets = [ ./config/snippets/file-explorer-separators.css ]; cssSnippets = [ ./config/snippets/file-explorer-separators.css ];