From cddf5f019fd9efd12fe589c544412907fb116285 Mon Sep 17 00:00:00 2001 From: Nikolaos Karaolidis Date: Sun, 5 Jan 2025 02:03:27 +0200 Subject: [PATCH] Update Signed-off-by: Nikolaos Karaolidis --- flake.lock | 60 +++++++++---------- .../user/gui/astal/config/package.json | 6 ++ .../user/gui/astal/config/tsconfig.json | 10 +--- .../astal/config/widget/components/Tray.tsx | 23 +++---- .../darktable/better-copy-and-import.patch | 41 ++++--------- .../configs/user/gui/darktable/default.nix | 4 +- .../configs/user/gui/discord/default.nix | 8 --- .../user/gui/discord/readonly-fix.patch | 17 ------ .../config/plugins/custom-sort/default.nix | 6 +- .../config/plugins/excalidraw/default.nix | 30 ++++++++-- .../config/plugins/linter/default.nix | 6 +- .../config/plugins/map-view/default.nix | 6 +- .../plugins/minimal-settings/default.nix | 8 +-- .../config/plugins/read-it-later/default.nix | 6 +- .../config/plugins/style-settings/default.nix | 8 +-- .../obsidian/config/plugins/tasks/default.nix | 6 +- .../config/themes/minimal/default.nix | 4 +- .../configs/user/gui/obsidian/default.nix | 1 - .../configs/user/gui/openlens/package.nix | 2 +- .../user/gui/vscode/langs/nix/default.nix | 21 +++++-- submodules/home-manager | 2 +- submodules/nixpkgs | 2 +- 22 files changed, 128 insertions(+), 149 deletions(-) create mode 100644 hosts/common/configs/user/gui/astal/config/package.json delete mode 100644 hosts/common/configs/user/gui/discord/readonly-fix.patch diff --git a/flake.lock b/flake.lock index a899e32..bd66f01 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1734091628, - "narHash": "sha256-8O3i8zESjHVsGzyXb8gEpLztvANq3Ot5bwo60YKJc7k=", + "lastModified": 1735485506, + "narHash": "sha256-7CWr3Q83KnGiLUn0oaboafLMOXQ0X9/fjFRVY1xopbM=", "owner": "aylur", "repo": "ags", - "rev": "27cd93147aba09142fa585fd16f13c56268b696c", + "rev": "251d39413543264361898b02035775aa3e46fe52", "type": "github" }, "original": { @@ -29,11 +29,11 @@ ] }, "locked": { - "lastModified": 1733520119, - "narHash": "sha256-6K07ZJTnFu1xASBCMtVc9cFTbBEauwSc7gGBmjLkLSk=", + "lastModified": 1735172721, + "narHash": "sha256-rtEAwGsHSppnkR3Qg3eRJ6Xh/F84IY9CrBBLzYabalY=", "owner": "aylur", "repo": "astal", - "rev": "4c19d8d06fa25cc6389f37abe8839b4d8be5c0d6", + "rev": "6c84b64efc736e039a8a10774a4a1bf772c37aa2", "type": "github" }, "original": { @@ -49,11 +49,11 @@ ] }, "locked": { - "lastModified": 1734092894, - "narHash": "sha256-M7nXS9YXO8gtrRU/mwYSyM40GjhuJM2lJm/P5t7vsOM=", + "lastModified": 1735921862, + "narHash": "sha256-4GPjTUJsfMdDfdRAZPMR5Xx9rJ1LedRYY+YtS2nh6NQ=", "owner": "aylur", "repo": "astal", - "rev": "4f47b69946dd7127ba66e6333af4945afaba15de", + "rev": "a3bb83a22b7d237c2c2fc6bd531f30d6265135cf", "type": "github" }, "original": { @@ -69,11 +69,11 @@ ] }, "locked": { - "lastModified": 1734343412, - "narHash": "sha256-b7G8oFp0Nj01BYUJ6ENC9Qf/HsYAIZvN9k/p0Kg/PFU=", + "lastModified": 1735468753, + "narHash": "sha256-2dt1nOe9zf9pDkf5Kn7FUFyPRo581s0n90jxYXJ94l0=", "owner": "nix-community", "repo": "disko", - "rev": "a08bfe06b39e94eec98dd089a2c1b18af01fef19", + "rev": "84a5b93637cc16cbfcc61b6e1684d626df61eb21", "type": "github" }, "original": { @@ -144,11 +144,11 @@ ] }, "locked": { - "lastModified": 1734529492, - "narHash": "sha256-U+8snNnPq87a0SkqRqvX3X4hHL//nbHnvtN1Th6Xja4=", + "lastModified": 1736014267, + "narHash": "sha256-Tvi/kZJdIGEU9u1ivm4Zv1a0YEb77V1FCfvsMIiqF8M=", "owner": "karaolidis", "repo": "home-manager", - "rev": "24d660ebd62d3fee4578777efb4f38b042ac6f84", + "rev": "8079b1ba676b23136629bd133da6e9d8f664f179", "type": "github" }, "original": { @@ -160,11 +160,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1734529489, - "narHash": "sha256-HmUlOWpBp62kr/hFPObhbIXjDPuo915OiUBbL/4CkD8=", + "lastModified": 1736034412, + "narHash": "sha256-P0CKCon/dxpKc45VMBvykZzbgg0GkYhJ0gs0uSQlSAc=", "owner": "karaolidis", "repo": "nixpkgs", - "rev": "9d03f3a891c104cdf1de7c76900642614a929ce5", + "rev": "d17ad39f9394611a3921c69e6730a51eb6fec80b", "type": "github" }, "original": { @@ -176,11 +176,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1734424634, - "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", + "lastModified": 1735834308, + "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", + "rev": "6df24922a1400241dae323af55f30e4318a6ca65", "type": "github" }, "original": { @@ -197,11 +197,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1734526336, - "narHash": "sha256-qI+dxxvmYNLhus/4CCE6QjjjPOjTz2olmnc5nZv0SE8=", + "lastModified": 1736027142, + "narHash": "sha256-AZ5YNuV9w8SSxCM2KYnvcqntxPKED53oMjDotEj5jyU=", "owner": "nix-community", "repo": "NUR", - "rev": "409fe7866b2171633d7be0b7de262d861c61a726", + "rev": "782119f4b55be55f6578f8387c1b9a8017719997", "type": "github" }, "original": { @@ -230,11 +230,11 @@ ] }, "locked": { - "lastModified": 1733965552, - "narHash": "sha256-GZ4YtqkfyTjJFVCub5yAFWsHknG1nS/zfk7MuHht4Fs=", + "lastModified": 1735844895, + "narHash": "sha256-CIRlqX9tBK2awJkmVu2cKuap/0QziDXStQZ/u/+e8Z4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "2d73fc6ac4eba4b9a83d3cb8275096fbb7ab4004", + "rev": "24d89184adf76d7ccc99e659dc5f3838efb5ee32", "type": "github" }, "original": { @@ -251,11 +251,11 @@ ] }, "locked": { - "lastModified": 1734495402, - "narHash": "sha256-NicfWsazv+LpZk2Xny9pzCd26IJttnzuou3yGZ5/1AA=", + "lastModified": 1735964101, + "narHash": "sha256-FUKeipaDxAFf+0jun6CKk37g7UALIeisSz6L19KL+WM=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "5b15daf10de2ce488771e6aabf72a7400b8500fc", + "rev": "5b2bbc7a627ea983cef34f4a8ec81cd597529943", "type": "github" }, "original": { diff --git a/hosts/common/configs/user/gui/astal/config/package.json b/hosts/common/configs/user/gui/astal/config/package.json new file mode 100644 index 0000000..a4b7093 --- /dev/null +++ b/hosts/common/configs/user/gui/astal/config/package.json @@ -0,0 +1,6 @@ +{ + "name": "astal-shell", + "dependencies": { + "astal": "~/.local/share/ags" + } +} diff --git a/hosts/common/configs/user/gui/astal/config/tsconfig.json b/hosts/common/configs/user/gui/astal/config/tsconfig.json index a2224fd..041fc07 100644 --- a/hosts/common/configs/user/gui/astal/config/tsconfig.json +++ b/hosts/common/configs/user/gui/astal/config/tsconfig.json @@ -7,14 +7,6 @@ "module": "ES2022", "moduleResolution": "Bundler", "jsx": "react-jsx", - "jsxImportSource": "/nix/store/ii2w7wv88fjvmldn8kzz8ni20kzpkld4-astal-gjs/share/astal/gjs/gtk3", - "paths": { - "astal": [ - "/nix/store/ii2w7wv88fjvmldn8kzz8ni20kzpkld4-astal-gjs/share/astal/gjs" - ], - "astal/*": [ - "/nix/store/ii2w7wv88fjvmldn8kzz8ni20kzpkld4-astal-gjs/share/astal/gjs/*" - ] - }, + "jsxImportSource": "astal/gtk3", } } diff --git a/hosts/common/configs/user/gui/astal/config/widget/components/Tray.tsx b/hosts/common/configs/user/gui/astal/config/widget/components/Tray.tsx index 4dce588..242ca29 100644 --- a/hosts/common/configs/user/gui/astal/config/widget/components/Tray.tsx +++ b/hosts/common/configs/user/gui/astal/config/widget/components/Tray.tsx @@ -1,25 +1,20 @@ -import { App, Gdk } from 'astal/gtk3' +import { App } from 'astal/gtk3' import { bind } from 'astal' import Tray from 'gi://AstalTray' const tray = Tray.get_default() -const TrayButton = ({ item }: { item: Tray.TrayItem }) => { - const menu = item.create_menu(); - - return ; -} + + +) export default () => { diff --git a/hosts/common/configs/user/gui/darktable/better-copy-and-import.patch b/hosts/common/configs/user/gui/darktable/better-copy-and-import.patch index b5179b9..a7a75c5 100644 --- a/hosts/common/configs/user/gui/darktable/better-copy-and-import.patch +++ b/hosts/common/configs/user/gui/darktable/better-copy-and-import.patch @@ -1,5 +1,5 @@ diff --git a/data/darktableconfig.xml.in b/data/darktableconfig.xml.in -index 83eadf8a35..39ed8d43d7 100644 +index 4cd5497ab8..227493e754 100644 --- a/data/darktableconfig.xml.in +++ b/data/darktableconfig.xml.in @@ -1524,6 +1524,22 @@ @@ -26,15 +26,10 @@ index 83eadf8a35..39ed8d43d7 100644 plugins/lighttable/layout int diff --git a/src/common/import_session.c b/src/common/import_session.c -index e83ef4de62..4d0c4efa0c 100644 +index 03d4212c5b..ed07369b7e 100644 --- a/src/common/import_session.c +++ b/src/common/import_session.c -@@ -266,48 +266,42 @@ const char *dt_import_session_filename(struct dt_import_session_t *self, gboolea - char *pattern = _import_session_filename_pattern(); - if(pattern == NULL) - { -- dt_print(DT_DEBUG_ALWAYS, "[import_session] Failed to get session filaname pattern.\n"); -+ dt_print(DT_DEBUG_ALWAYS, "[import_session] Failed to get session filename pattern.\n"); +@@ -266,44 +266,38 @@ const char *dt_import_session_filename(dt_import_session_t *self, const gboolean return NULL; } @@ -52,7 +47,7 @@ index e83ef4de62..4d0c4efa0c 100644 - char *previous_fname = fname; - if(g_file_test(fname, G_FILE_TEST_EXISTS) == TRUE) { -- dt_print(DT_DEBUG_ALWAYS, "[import_session] File %s exists.\n", fname); +- dt_print(DT_DEBUG_ALWAYS, "[import_session] File %s exists", fname); do { - /* file exists, yield a new filename */ @@ -61,7 +56,7 @@ index e83ef4de62..4d0c4efa0c 100644 result_fname = _import_session_filename_from_pattern(self, pattern); - fname = g_build_path(G_DIR_SEPARATOR_S, path, result_fname, (char *)NULL); -- dt_print(DT_DEBUG_ALWAYS, "[import_session] Testing %s.\n", fname); +- dt_print(DT_DEBUG_ALWAYS, "[import_session] Testing %s", fname); - /* check if same filename was yielded as before */ - if(strcmp(previous_fname, fname) == 0) + char *test_path = g_build_path(G_DIR_SEPARATOR_S, path, result_fname, (char *)NULL); @@ -71,7 +66,7 @@ index e83ef4de62..4d0c4efa0c 100644 - g_free(previous_fname); - g_free(fname); - dt_control_log(_( -- "couldn't expand to a unique filename for session, please check your import session settings.")); +- "couldn't expand to a unique filename for session, please check your import session settings")); - return NULL; + dt_print(DT_DEBUG_ALWAYS, "[import_session] File %s exists, retrying.\n", test_path); + self->vp->retry_count++; @@ -95,10 +90,10 @@ index e83ef4de62..4d0c4efa0c 100644 self->current_filename = result_fname; diff --git a/src/common/variables.c b/src/common/variables.c -index 1474cc32e8..820f88414b 100644 +index beb74b7f1c..23bce605c4 100644 --- a/src/common/variables.c +++ b/src/common/variables.c -@@ -914,6 +914,14 @@ static char *_get_base_value(dt_variables_params_t *params, char **variable) +@@ -1000,6 +1000,14 @@ static char *_get_base_value(dt_variables_params_t *params, char **variable) else if(_has_prefix(variable, "DARKTABLE.NAME") || _has_prefix(variable, "DARKTABLE_NAME")) result = g_strdup(PACKAGE_NAME); @@ -128,19 +123,10 @@ index 86052a9a3d..a5d616a94c 100644 const gchar *jobcode; diff --git a/src/control/jobs/control_jobs.c b/src/control/jobs/control_jobs.c -index a9fab6f0ea..27bceab782 100644 +index 62908d100c..28302da7b7 100644 --- a/src/control/jobs/control_jobs.c +++ b/src/control/jobs/control_jobs.c -@@ -1566,7 +1566,7 @@ static int32_t dt_control_export_job_run(dt_job_t *job) - { - // IPTC character encoding not set by user, so we set the default utf8 here - settings->metadata_export = dt_util_dstrcat(settings->metadata_export, -- "\1%s\1%s", -+ "\1%s\1%s", - iptc_envelope_characterset, - "\x1b%G"); // ESC % G - } -@@ -2265,6 +2265,59 @@ void dt_control_write_sidecar_files() +@@ -2664,6 +2664,59 @@ void dt_control_write_sidecar_files() FALSE)); } @@ -200,15 +186,14 @@ index a9fab6f0ea..27bceab782 100644 static int _control_import_image_copy(const char *filename, char **prev_filename, char **prev_output, -@@ -2308,37 +2361,37 @@ static int _control_import_image_copy(const char *filename, +@@ -2707,37 +2760,37 @@ static int _control_import_image_copy(const char *filename, g_free(basename); } - if(!g_file_set_contents(output, data, size, NULL)) + if(!_copy_file(filename, output)) { -- dt_print(DT_DEBUG_CONTROL, "[import_from] failed to write file %s\n", output); -+ dt_print(DT_DEBUG_CONTROL, "[import_from] failed to copy file %s", filename); + dt_print(DT_DEBUG_CONTROL, "[import_from] failed to write file %s", output); res = FALSE; } else @@ -262,4 +247,4 @@ index a9fab6f0ea..27bceab782 100644 + { const dt_imgid_t imgid = dt_image_import(dt_import_session_film_id(session), output, FALSE, FALSE); - if(!imgid) dt_control_log(_("error loading file `%s'"), output); + if(!dt_is_valid_imgid(imgid)) dt_control_log(_("error loading file `%s'"), output); diff --git a/hosts/common/configs/user/gui/darktable/default.nix b/hosts/common/configs/user/gui/darktable/default.nix index af7d92b..710d49a 100644 --- a/hosts/common/configs/user/gui/darktable/default.nix +++ b/hosts/common/configs/user/gui/darktable/default.nix @@ -29,14 +29,14 @@ in owner = "darktable-org"; repo = "lua-scripts"; rev = "daa0877b4c25b91e4b71afc1ef8ffcba6018f7b2"; - sha256 = "sha256-NNGAq1zgKqWLhKBPgm7kFZq4xwvescxnCAwovSF9r4k="; + hash = "sha256-NNGAq1zgKqWLhKBPgm7kFZq4xwvescxnCAwovSF9r4k="; }; hald-clut = pkgs.fetchFromGitHub { owner = "cedeber"; repo = "hald-clut"; rev = "3b3180f82d4dcea1e6e8c5648473539a910d7f49"; - sha256 = "sha256-R8vyYmcsfk49QsSV3v0QblXcO6U0oIfDyxbHPLwSMdo="; + hash = "sha256-R8vyYmcsfk49QsSV3v0QblXcO6U0oIfDyxbHPLwSMdo="; }; in { diff --git a/hosts/common/configs/user/gui/discord/default.nix b/hosts/common/configs/user/gui/discord/default.nix index a432cd8..a2c41c7 100644 --- a/hosts/common/configs/user/gui/discord/default.nix +++ b/hosts/common/configs/user/gui/discord/default.nix @@ -4,14 +4,6 @@ }: { lib, pkgs, ... }: { - nixpkgs.overlays = [ - (final: prev: { - vesktop = prev.vesktop.overrideAttrs (oldAttrs: { - patches = oldAttrs.patches or [ ] ++ [ ./readonly-fix.patch ]; - }); - }) - ]; - environment.persistence = { "/persist"."${home}/.config/vesktop" = { }; "/cache" = { diff --git a/hosts/common/configs/user/gui/discord/readonly-fix.patch b/hosts/common/configs/user/gui/discord/readonly-fix.patch deleted file mode 100644 index 710a865..0000000 --- a/hosts/common/configs/user/gui/discord/readonly-fix.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/main/settings.ts b/src/main/settings.ts -index 6fad97f..dfc64e3 100644 ---- a/src/main/settings.ts -+++ b/src/main/settings.ts -@@ -26,8 +26,10 @@ function loadSettings(file: string, name: string) { - - const store = new SettingsStore(settings); - store.addGlobalChangeListener(o => { -- mkdirSync(dirname(file), { recursive: true }); -- writeFileSync(file, JSON.stringify(o, null, 4)); -+ try { -+ mkdirSync(dirname(file), { recursive: true }); -+ writeFileSync(file, JSON.stringify(o, null, 4)); -+ } catch {} - }); - - return store; diff --git a/hosts/common/configs/user/gui/obsidian/config/plugins/custom-sort/default.nix b/hosts/common/configs/user/gui/obsidian/config/plugins/custom-sort/default.nix index 46a2832..a3fd6ce 100644 --- a/hosts/common/configs/user/gui/obsidian/config/plugins/custom-sort/default.nix +++ b/hosts/common/configs/user/gui/obsidian/config/plugins/custom-sort/default.nix @@ -1,18 +1,18 @@ { pkgs, ... }: pkgs.stdenv.mkDerivation rec { pname = "obsidian.plugins.custom-sort"; - version = "2.1.14"; + version = "3.0.1"; src = pkgs.fetchFromGitHub { owner = "SebastianMC"; repo = "obsidian-custom-sort"; rev = version; - hash = "sha256-DM2aKCsFC2Z4a/ZX95ZMBzshBx2C2Z8a7j94ABS2UGI="; + hash = "sha256-mIHAqSAIa7nYy1V96WRKhq2ALAT1mGW6ae3hQmzYyXE="; }; offlineCache = pkgs.fetchYarnDeps { yarnLock = src + "/yarn.lock"; - hash = "sha256-RdR+S6WQj2AAoxJnAowNa1etr/Xfp6HnhM7rMYJh8o8="; + hash = "sha256-J/+LJWaco2QRwZx8Ry3G5DiJB6J21iOn5GBeY5EY4+g="; }; nativeBuildInputs = with pkgs; [ diff --git a/hosts/common/configs/user/gui/obsidian/config/plugins/excalidraw/default.nix b/hosts/common/configs/user/gui/obsidian/config/plugins/excalidraw/default.nix index dd0e058..b51b553 100644 --- a/hosts/common/configs/user/gui/obsidian/config/plugins/excalidraw/default.nix +++ b/hosts/common/configs/user/gui/obsidian/config/plugins/excalidraw/default.nix @@ -3,20 +3,38 @@ pkgs.buildNpmPackage rec { pname = "obsidian.plugins.excalidraw"; version = "2.2.8"; - src = pkgs.fetchFromGitHub { - owner = "karaolidis"; - rev = "9f5811b0f849b0f1a6a842945a81b605f65a9bdb"; - # owner = "zsviczian"; + pkg = pkgs.fetchFromGitHub { + rev = "fa46f8c39df2e9646de63bc610a842659c896005"; + owner = "zsviczian"; repo = "obsidian-excalidraw-plugin"; # rev = version; - hash = "sha256-/YbbGFYWkzBxdIFpFNn85D8oXJsFrgndq3KZmMSxcvw="; + hash = "sha256-kbFJjHPHPIuecZYK5zQ3thgTC45g4g9W9xSNiZd+wPM="; }; - npmDepsHash = "sha256-KgsmcGj8WbWLCxaXMNA8anGcmOq0BzuDtdeNqS8ra8E="; + mathjaxToSVG = pkgs.buildNpmPackage { + pname = "obsidian.plugins.excalidraw.mathjaxToSVG"; + version = "1.0.0"; + src = "${pkg}/MathjaxToSVG"; + npmDepsHash = "sha256-Q1kLsw1Lu6DVddXNaVAY2CRZ0z2MSSW+tc9VpXljDO4="; + + configurePhase = '' + mkdir dist + ''; + + installPhase = '' + mkdir -p $out + cp ./dist/index.js $out/index.js + ''; + }; + + src = pkg; + npmDepsHash = "sha256-/82kYaDe0ixe6FO0EDHe2h0vGZiE1IrSNos+yKYca/8="; npmPackFlags = [ "--ignore-scripts" ]; configurePhase = '' mkdir dist + mkdir -p ./MathjaxToSVG/dist + cp ${mathjaxToSVG}/index.js ./MathjaxToSVG/dist/index.js ''; installPhase = '' diff --git a/hosts/common/configs/user/gui/obsidian/config/plugins/linter/default.nix b/hosts/common/configs/user/gui/obsidian/config/plugins/linter/default.nix index ac7ef0b..b512c7f 100644 --- a/hosts/common/configs/user/gui/obsidian/config/plugins/linter/default.nix +++ b/hosts/common/configs/user/gui/obsidian/config/plugins/linter/default.nix @@ -1,16 +1,16 @@ { pkgs, ... }: pkgs.buildNpmPackage rec { pname = "obsidian.plugins.linter"; - version = "1.25.0"; + version = "1.28.0"; src = pkgs.fetchFromGitHub { owner = "platers"; repo = "obsidian-linter"; rev = version; - hash = "sha256-jf3tIE6zDD5VCrkWWgxpANqrYUqJunESD08bVJB2H54="; + hash = "sha256-pMcVowcV0k/OcG6cITRxt3HOA5QJDaery6upLPWSxpM="; }; - npmDepsHash = "sha256-Bln8cD04ACdj73xXrcG6RVlET1D1bfMsRZqaejbAedo="; + npmDepsHash = "sha256-XgOgAJoRXhQIQNnubU0uL7e7SGJvRhWvPktMNZN5F5U="; npmPackFlags = [ "--ignore-scripts" ]; installPhase = '' diff --git a/hosts/common/configs/user/gui/obsidian/config/plugins/map-view/default.nix b/hosts/common/configs/user/gui/obsidian/config/plugins/map-view/default.nix index e9ccc09..35e1d70 100644 --- a/hosts/common/configs/user/gui/obsidian/config/plugins/map-view/default.nix +++ b/hosts/common/configs/user/gui/obsidian/config/plugins/map-view/default.nix @@ -5,14 +5,14 @@ pkgs.buildNpmPackage rec { src = pkgs.fetchFromGitHub { owner = "karaolidis"; - rev = "22e13b87e43dc5a5e40240e7de216ed8f638e741"; + rev = "e1d2737f20e8667417b040b4dcad020aa6de84d3"; # owner = "esm7"; repo = "obsidian-map-view"; # rev = version; - hash = "sha256-n++PIWsaxAFnbfzlD0sWMs5+ljOXjA+ft6d/m/p2oq8="; + hash = "sha256-Tmp8/li82BHVY3pLwi5l86NTXzfzrcRMZFMVNWiItXE="; }; - npmDepsHash = "sha256-AzJfluB+KjGudESedQxX4BxStnELeFDHO+h+f73ihuA="; + npmDepsHash = "sha256-BsiFThkaZHQcayTuI5uvD5uD710eDVPgkANSj7Qd5S0="; npmPackFlags = [ "--ignore-scripts" ]; installPhase = '' diff --git a/hosts/common/configs/user/gui/obsidian/config/plugins/minimal-settings/default.nix b/hosts/common/configs/user/gui/obsidian/config/plugins/minimal-settings/default.nix index a46d702..7944ff0 100644 --- a/hosts/common/configs/user/gui/obsidian/config/plugins/minimal-settings/default.nix +++ b/hosts/common/configs/user/gui/obsidian/config/plugins/minimal-settings/default.nix @@ -1,18 +1,18 @@ { pkgs, ... }: pkgs.buildNpmPackage rec { pname = "obsidian.plugins.minimal-settings"; - version = "8.0.2"; + version = "8.1.1"; src = pkgs.fetchFromGitHub { owner = "karaolidis"; - rev = "2bdab8f00be4b98600e40d6a2ecac8be359c99dd"; + rev = "5a69fb195726cc61ae3ca9b14fb1a78862397529"; # owner = "kepano"; repo = "obsidian-minimal-settings"; # rev = version; - hash = "sha256-JI7I1n6ZiWdzemoLFGt7C3RF+HQgh9BmmI3owZNm944="; + hash = "sha256-FPZMdOcwkCnCN0v3IgiFnhBLrnuqU7DR7XE+qheYdZE="; }; - npmDepsHash = "sha256-N9wfFsbpcO53Lno6sM4OvXywUqn9L2DpS4HfmjL1Ld4="; + npmDepsHash = "sha256-E8CPsBmuV51GC3N5qxz8haa249vMfm3TZyZVsyPwfkg="; npmPackFlags = [ "--ignore-scripts" ]; installPhase = '' diff --git a/hosts/common/configs/user/gui/obsidian/config/plugins/read-it-later/default.nix b/hosts/common/configs/user/gui/obsidian/config/plugins/read-it-later/default.nix index 8466c79..9a33484 100644 --- a/hosts/common/configs/user/gui/obsidian/config/plugins/read-it-later/default.nix +++ b/hosts/common/configs/user/gui/obsidian/config/plugins/read-it-later/default.nix @@ -1,16 +1,16 @@ { pkgs, ... }: pkgs.buildNpmPackage rec { pname = "obsidian.plugins.read-it-later"; - version = "0.4.0"; + version = "0.10.1"; src = pkgs.fetchFromGitHub { owner = "DominikPieper"; repo = "obsidian-ReadItLater"; rev = version; - hash = "sha256-yaEgYH9jfjumZJ/kD/jj2NDTsuvP6EmyfYXEj5E8Q0Q="; + hash = "sha256-E+GeTvXD72PNDdge8qoaQvaJ2mcUV+tJpLyIpUBA4sU="; }; - npmDepsHash = "sha256-OOhdusXBbxSl8S2uCGTqkTDYEbO5FxOlH8cehwU3LjY="; + npmDepsHash = "sha256-MQAFJjRhKqVlhGbQ79gob8/PwUtIkxRbjukrK6zfa84="; npmPackFlags = [ "--ignore-scripts" ]; installPhase = '' diff --git a/hosts/common/configs/user/gui/obsidian/config/plugins/style-settings/default.nix b/hosts/common/configs/user/gui/obsidian/config/plugins/style-settings/default.nix index a960ff1..a24996e 100644 --- a/hosts/common/configs/user/gui/obsidian/config/plugins/style-settings/default.nix +++ b/hosts/common/configs/user/gui/obsidian/config/plugins/style-settings/default.nix @@ -1,20 +1,20 @@ { pkgs, ... }: pkgs.stdenv.mkDerivation rec { pname = "obsidian.plugins.style-settings"; - version = "1.0.8"; + version = "1.0.9"; src = pkgs.fetchFromGitHub { owner = "karaolidis"; - rev = "57ef34b6d8903451311db63084eef80b7b7e1a62"; + rev = "21f29b7aea728d9040ed209cddb7d9f05c68be1f"; # owner = "mgmeyers"; repo = "obsidian-style-settings"; # rev = version; - hash = "sha256-ZxYkd0kyDnHwPt5Z1iFpRgQHLKhN4O9S5S7Izz5hd9E="; + hash = "sha256-6xyp5PE4mhKYP3Lc4vKUG/N3aqBhHGwsCuzfVkq1jwM="; }; offlineCache = pkgs.fetchYarnDeps { yarnLock = src + "/yarn.lock"; - hash = "sha256-Wf5pIbhSdo/rOs/TDqRjiS2JxWWbWsI2IOqCW78gFkU="; + hash = "sha256-tqX09XWI3ZL9bXVdjgsAEuvfCAjnyWj5uSWGFbNApds="; }; nativeBuildInputs = with pkgs; [ diff --git a/hosts/common/configs/user/gui/obsidian/config/plugins/tasks/default.nix b/hosts/common/configs/user/gui/obsidian/config/plugins/tasks/default.nix index 3003b20..77d129f 100644 --- a/hosts/common/configs/user/gui/obsidian/config/plugins/tasks/default.nix +++ b/hosts/common/configs/user/gui/obsidian/config/plugins/tasks/default.nix @@ -1,18 +1,18 @@ { pkgs, ... }: pkgs.stdenv.mkDerivation rec { pname = "obsidian.plugins.tasks"; - version = "7.6.1"; + version = "7.14.0"; src = pkgs.fetchFromGitHub { owner = "obsidian-tasks-group"; repo = "obsidian-tasks"; rev = version; - hash = "sha256-7VvoaX2WkKrg2WpR+JQcpT73rAhZXJ3FXr2BBUIwrmA="; + hash = "sha256-vAYeCNgDF0aheN9ff3fFPyW21g4N4gyYo/Y6axTi7Yc="; }; offlineCache = pkgs.fetchYarnDeps { yarnLock = src + "/yarn.lock"; - hash = "sha256-3ReJNZKgecKTbXTWZGSY2hBLHysdbr/iKFS9tgCJvW0="; + hash = "sha256-hXZ/BVmqtOsBa1G+7YulYOSk8GLJZ2hJ4kWrhf80MSY="; }; nativeBuildInputs = with pkgs; [ diff --git a/hosts/common/configs/user/gui/obsidian/config/themes/minimal/default.nix b/hosts/common/configs/user/gui/obsidian/config/themes/minimal/default.nix index ad00ecc..08a2ab1 100644 --- a/hosts/common/configs/user/gui/obsidian/config/themes/minimal/default.nix +++ b/hosts/common/configs/user/gui/obsidian/config/themes/minimal/default.nix @@ -1,13 +1,13 @@ { pkgs, ... }: pkgs.buildNpmPackage rec { pname = "obsidian.themes.minimal"; - version = "7.7.7"; + version = "7.7.18"; src = pkgs.fetchFromGitHub { owner = "kepano"; repo = "obsidian-minimal"; rev = version; - hash = "sha256-Atb9ZVou4EkfppV7VvTEMG/UruKlADctbXL1M8vvhxQ="; + hash = "sha256-zOUOE8EQlnnOmEhkWQmT28eH2Yk7fgkNvbxjJzLXio8="; }; npmDepsHash = "sha256-PzsZv/On8ci6EkF3WE4aez3/jQu5AqyJxFUzJk+Pn0c="; diff --git a/hosts/common/configs/user/gui/obsidian/default.nix b/hosts/common/configs/user/gui/obsidian/default.nix index 77f1136..1c8f290 100644 --- a/hosts/common/configs/user/gui/obsidian/default.nix +++ b/hosts/common/configs/user/gui/obsidian/default.nix @@ -241,7 +241,6 @@ in heading-blank-lines.enabled = true; line-break-at-document-end.enabled = true; move-math-block-indicators-to-their-own-line.enabled = true; - paragraph-blank-lines.enabled = true; remove-empty-lines-between-list-markers-and-checklists.enabled = true; remove-link-spacing.enabled = true; space-after-list-markers.enabled = true; diff --git a/hosts/common/configs/user/gui/openlens/package.nix b/hosts/common/configs/user/gui/openlens/package.nix index 5e58ff6..1eba9fe 100644 --- a/hosts/common/configs/user/gui/openlens/package.nix +++ b/hosts/common/configs/user/gui/openlens/package.nix @@ -6,7 +6,7 @@ pkgs.appimageTools.wrapType2 rec { src = pkgs.fetchurl { url = "https://github.com/MuhammedKalkan/OpenLens/releases/download/v${version}/OpenLens-${version}.x86_64.AppImage"; - sha256 = "sha256-ZAltAS/U/xh4kCT7vQ+NHAzWV7z0uE5GMQICHKSdj8k="; + hash = "sha256-ZAltAS/U/xh4kCT7vQ+NHAzWV7z0uE5GMQICHKSdj8k="; }; appimageContents = pkgs.appimageTools.extractType2 { diff --git a/hosts/common/configs/user/gui/vscode/langs/nix/default.nix b/hosts/common/configs/user/gui/vscode/langs/nix/default.nix index fa9ea73..11b43f3 100644 --- a/hosts/common/configs/user/gui/vscode/langs/nix/default.nix +++ b/hosts/common/configs/user/gui/vscode/langs/nix/default.nix @@ -5,12 +5,21 @@ "nix.enableLanguageServer" = true; "nix.serverPath" = lib.meta.getExe pkgs.nil; "nix.serverSettings" = { - nil.formatting.command = [ - (lib.meta.getExe pkgs.nix) - "fmt" - "--" - "--" - ]; + nil = { + formatting.command = [ + (lib.meta.getExe pkgs.nix) + "fmt" + "--" + "--" + ]; + nix = { + maxMemoryMB = 4096; + flake = { + autoArchive = true; + autoEvalInputs = true; + }; + }; + }; }; }; diff --git a/submodules/home-manager b/submodules/home-manager index 24d660e..8079b1b 160000 --- a/submodules/home-manager +++ b/submodules/home-manager @@ -1 +1 @@ -Subproject commit 24d660ebd62d3fee4578777efb4f38b042ac6f84 +Subproject commit 8079b1ba676b23136629bd133da6e9d8f664f179 diff --git a/submodules/nixpkgs b/submodules/nixpkgs index 9d03f3a..d17ad39 160000 --- a/submodules/nixpkgs +++ b/submodules/nixpkgs @@ -1 +1 @@ -Subproject commit 9d03f3a891c104cdf1de7c76900642614a929ce5 +Subproject commit d17ad39f9394611a3921c69e6730a51eb6fec80b