karaolidis/nix
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update

Browse Source 
Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
This commit is contained in:
Nick Karaolidis
2025-01-05 02:03:27 +02:00
parent f3faf4d4b6
commit cddf5f019f
22 changed files with 128 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hosts/common/configs/user/gui/astal/config/package.json Normal file
View File

@@ -0,0 +1,6 @@
{
"name": "astal-shell",
"dependencies": {
"astal": "~/.local/share/ags"
}
}

10
hosts/common/configs/user/gui/astal/config/tsconfig.json
View File

@@ -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",
}
}

23
hosts/common/configs/user/gui/astal/config/widget/components/Tray.tsx
View File

@@ -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 <button
const TrayButton = ({ item }: { item: Tray.TrayItem }) => (
<menubutton
className='item'
tooltipMarkup={bind(item, 'tooltipMarkup')}
onClickRelease={self => {
menu?.popup_at_widget(self, Gdk.Gravity.SOUTH, Gdk.Gravity.NORTH, null)
}}
onDestroy={() => menu?.destroy()}
usePopover={false}
menuModel={bind(item, 'menuModel')}
actionGroup={bind(item, 'actionGroup').as(ag => ['dbusmenu', ag])}
>
<icon
className='icon'
gIcon={bind(item, 'gicon')} />
</button>;
}
<icon gicon={bind(item, 'gicon')} />
</menubutton>
)
export default () => <box className='systray'>
{

41
hosts/common/configs/user/gui/darktable/better-copy-and-import.patch
View File

@@ -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
<name>plugins/lighttable/layout</name>
<type>int</type>
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);

4
hosts/common/configs/user/gui/darktable/default.nix
View File

@@ -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
{

8
hosts/common/configs/user/gui/discord/default.nix
View File

@@ -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" = {

17
hosts/common/configs/user/gui/discord/readonly-fix.patch
View File

@@ -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<T extends object = any>(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;

6
hosts/common/configs/user/gui/obsidian/config/plugins/custom-sort/default.nix
View File

@@ -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; [

30
hosts/common/configs/user/gui/obsidian/config/plugins/excalidraw/default.nix
View File

@@ -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 = ''

6
hosts/common/configs/user/gui/obsidian/config/plugins/linter/default.nix
View File

@@ -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 = ''

6
hosts/common/configs/user/gui/obsidian/config/plugins/map-view/default.nix
View File

@@ -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 = ''

8
hosts/common/configs/user/gui/obsidian/config/plugins/minimal-settings/default.nix
View File

@@ -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 = ''

6
hosts/common/configs/user/gui/obsidian/config/plugins/read-it-later/default.nix
View File

@@ -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 = ''

8
hosts/common/configs/user/gui/obsidian/config/plugins/style-settings/default.nix
View File

@@ -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; [

6
hosts/common/configs/user/gui/obsidian/config/plugins/tasks/default.nix
View File

@@ -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; [

4
hosts/common/configs/user/gui/obsidian/config/themes/minimal/default.nix
View File

@@ -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=";

1
hosts/common/configs/user/gui/obsidian/default.nix
View File

@@ -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;

2
hosts/common/configs/user/gui/openlens/package.nix
View File

@@ -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 {

21
hosts/common/configs/user/gui/vscode/langs/nix/default.nix
View File

@@ -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;
};
};
};
};
};