summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2024-12-11 08:45:08 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2024-12-11 08:45:08 +0100
commit7abac181d3c3cbb91d424fe0c973a5bc83df2aa9 (patch)
treedaf019b373d8b7b52c5cde6a68c713febf9b6506
parentcbd0ed9d451c3c4244de00e7edfdba828c48f6bf (diff)
downloadnixos-7abac181d3c3cbb91d424fe0c973a5bc83df2aa9.tar
nixos-7abac181d3c3cbb91d424fe0c973a5bc83df2aa9.tar.gz
nixos-7abac181d3c3cbb91d424fe0c973a5bc83df2aa9.tar.bz2
nixos-7abac181d3c3cbb91d424fe0c973a5bc83df2aa9.tar.xz
nixos-7abac181d3c3cbb91d424fe0c973a5bc83df2aa9.zip
...
-rw-r--r--accounts/gkleen@sif/default.nix13
-rw-r--r--accounts/gkleen@sif/zshrc6
-rw-r--r--overlays/etesync-dav.nix57
3 files changed, 76 insertions, 0 deletions
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 {
734 args+=("$@") 734 args+=("$@")
735 exec -a emacsclient ${cfg.services.emacs.package}/bin/emacsclient "''${args[@]}" 735 exec -a emacsclient ${cfg.services.emacs.package}/bin/emacsclient "''${args[@]}"
736 ''; 736 '';
737 RCLONE_PASSWORD_COMMAND = "${pkgs.libsecret}/bin/secret-tool lookup service rclone";
737 }; 738 };
738 739
739 extraProfileCommands = '' 740 extraProfileCommands = ''
@@ -924,6 +925,18 @@ in {
924 enable = true; 925 enable = true;
925 settings = import ./hyprland.nix inputs; 926 settings = import ./hyprland.nix inputs;
926 }; 927 };
928
929 xdg.portal = {
930 enable = true;
931 xdgOpenUsePortal = true;
932 config = {
933 common.default = [ "gtk" ];
934 hyprland.default = [ "gtk" "hyprland" ];
935 };
936 extraPortals = with pkgs; [
937 xdg-desktop-portal-gtk xdg-desktop-portal-wlr xdg-desktop-portal-hyprland
938 ];
939 };
927 }; 940 };
928 }; 941 };
929} 942}
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() {
118 nix shell nixos#ghostscript nixos#imagemagick -c convert -verbose -density 400 ${templateArchive} ${modifyPDF:t:r}_%0d.png 118 nix shell nixos#ghostscript nixos#imagemagick -c convert -verbose -density 400 ${templateArchive} ${modifyPDF:t:r}_%0d.png
119 unpack=false 119 unpack=false
120 ;; 120 ;;
121 application/octet-stream)
122 if [[ $(file --brief --dereferenc ${templateArchive}) =~ Squashfs ]]; then
123 nix shell nixos#squashfsTools -c unsquashfs -d . ${templateArchive}
124 unpack=false
125 fi
126 ;;
121 *) 127 *)
122 tar -xvaf ${templateArchive} 128 tar -xvaf ${templateArchive}
123 unpack=false 129 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 @@
1{ final, prev, ... }: {
2 etesync-dav = prev.python3Packages.buildPythonApplication rec {
3 pname = "etesync-dav";
4 version = "0.33.4";
5
6 src = prev.fetchFromGitHub {
7 owner = "etesync";
8 repo = "etesync-dav";
9 rev = "v${version}";
10 hash = "sha256-g+rK762tSWPDaBsaTwpTzfK/lqVs+Z/Qrpq2HCpipQE=";
11 };
12
13 dependencies = with prev.python3Packages; [
14 appdirs
15 etebase
16 etesync
17 flask
18 flask-wtf
19 msgpack
20 setuptools
21 (toPythonModule (buildPythonApplication rec {
22 pname = "radicale";
23 version = "3.2.3";
24 pyproject = true;
25
26 src = prev.fetchFromGitHub {
27 owner = "Kozea";
28 repo = "Radicale";
29 rev = "refs/tags/v${version}";
30 hash = "sha256-1IlnXVetQQuKBt6+QVKNeMM6qBQAiUhqc+4x3xOnSdE=";
31 };
32
33 build-system = [
34 setuptools
35 ];
36
37 dependencies =
38 [
39 defusedxml
40 passlib
41 vobject
42 pika
43 python-dateutil
44 pytz # https://github.com/Kozea/Radicale/issues/816
45 ]
46 ++ passlib.optional-dependencies.bcrypt;
47
48 doCheck = false;
49 }))
50 requests
51 types-setuptools
52 requests.optional-dependencies.socks
53 ];
54
55 doCheck = false;
56 };
57}