From 7abac181d3c3cbb91d424fe0c973a5bc83df2aa9 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Wed, 11 Dec 2024 08:45:08 +0100 Subject: ... --- accounts/gkleen@sif/default.nix | 13 ++++++++++ accounts/gkleen@sif/zshrc | 6 +++++ overlays/etesync-dav.nix | 57 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 76 insertions(+) create mode 100644 overlays/etesync-dav.nix diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix index c6e479ec..c7588e2f 100644 --- a/accounts/gkleen@sif/default.nix +++ b/accounts/gkleen@sif/default.nix @@ -734,6 +734,7 @@ in { args+=("$@") exec -a emacsclient ${cfg.services.emacs.package}/bin/emacsclient "''${args[@]}" ''; + RCLONE_PASSWORD_COMMAND = "${pkgs.libsecret}/bin/secret-tool lookup service rclone"; }; extraProfileCommands = '' @@ -924,6 +925,18 @@ in { enable = true; settings = import ./hyprland.nix inputs; }; + + xdg.portal = { + enable = true; + xdgOpenUsePortal = true; + config = { + common.default = [ "gtk" ]; + hyprland.default = [ "gtk" "hyprland" ]; + }; + extraPortals = with pkgs; [ + xdg-desktop-portal-gtk xdg-desktop-portal-wlr xdg-desktop-portal-hyprland + ]; + }; }; }; } diff --git a/accounts/gkleen@sif/zshrc b/accounts/gkleen@sif/zshrc index c6052ae3..75a4497c 100644 --- a/accounts/gkleen@sif/zshrc +++ b/accounts/gkleen@sif/zshrc @@ -118,6 +118,12 @@ dir() { nix shell nixos#ghostscript nixos#imagemagick -c convert -verbose -density 400 ${templateArchive} ${modifyPDF:t:r}_%0d.png unpack=false ;; + application/octet-stream) + if [[ $(file --brief --dereferenc ${templateArchive}) =~ Squashfs ]]; then + nix shell nixos#squashfsTools -c unsquashfs -d . ${templateArchive} + unpack=false + fi + ;; *) tar -xvaf ${templateArchive} unpack=false diff --git a/overlays/etesync-dav.nix b/overlays/etesync-dav.nix new file mode 100644 index 00000000..cec216e2 --- /dev/null +++ b/overlays/etesync-dav.nix @@ -0,0 +1,57 @@ +{ final, prev, ... }: { + etesync-dav = prev.python3Packages.buildPythonApplication rec { + pname = "etesync-dav"; + version = "0.33.4"; + + src = prev.fetchFromGitHub { + owner = "etesync"; + repo = "etesync-dav"; + rev = "v${version}"; + hash = "sha256-g+rK762tSWPDaBsaTwpTzfK/lqVs+Z/Qrpq2HCpipQE="; + }; + + dependencies = with prev.python3Packages; [ + appdirs + etebase + etesync + flask + flask-wtf + msgpack + setuptools + (toPythonModule (buildPythonApplication rec { + pname = "radicale"; + version = "3.2.3"; + pyproject = true; + + src = prev.fetchFromGitHub { + owner = "Kozea"; + repo = "Radicale"; + rev = "refs/tags/v${version}"; + hash = "sha256-1IlnXVetQQuKBt6+QVKNeMM6qBQAiUhqc+4x3xOnSdE="; + }; + + build-system = [ + setuptools + ]; + + dependencies = + [ + defusedxml + passlib + vobject + pika + python-dateutil + pytz # https://github.com/Kozea/Radicale/issues/816 + ] + ++ passlib.optional-dependencies.bcrypt; + + doCheck = false; + })) + requests + types-setuptools + requests.optional-dependencies.socks + ]; + + doCheck = false; + }; +} -- cgit v1.2.3