wip: fix(copypary): zotero webdav

flake.lock

@@ -76,11 +76,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1762095388,
-        "narHash": "sha256-7Q8LtcvKWHbP8znARRTOY2tpU5WoV6FHwp5TZJOI8Us=",
+        "lastModified": 1774411715,
+        "narHash": "sha256-mceIHtVMXpLAfr1W0VK9ceTBX5yKu4gGWpVbThWTsAA=",
         "owner": "9001",
         "repo": "copyparty",
-        "rev": "ac085b8149ff50e03d260128596dd130ed1c7cae",
+        "rev": "26e663d111e39ca96c63702ad27a05b6736607cf",
         "type": "github"
       },
       "original": {

hosts/deertopia/configuration.nix

@@ -58,7 +58,7 @@
       lldap.pam.enable = true;
       nginx.enable = true;
       slskd.enable = true;
-      webdav.enable = true;
+      # webdav.enable = true;
       copyparty.enable = true;
       syncthing.enable = true;
       cache.enable = true;

hosts/sydpc/configuration.nix

@@ -19,9 +19,8 @@
     slippi.enable = true;
     niri.enable = true;
     stylix.enable = true;
-    # qemu.enable = true;
+    qemu.enable = true;
     flatpak.enable = true;
-    gtav-battleye-hack.enable = true;
     # gdm.enable = true;
     openssh.enable = true;
     sydpkgs.overlay.enable = true;

modules/home/emacs.nix

@@ -56,12 +56,7 @@ in {
         Extra arguments to pass to the final wrapProgram call.
       '';
       default = [];
-      type = with lib.types;
-        listOf
-          (coercedTo
-            (oneOf [str package])
-            builtins.toString
-            str);
+      type = lib.types.listOf lib.types.str;
       apply = lib.escapeShellArgs;
     };
   };

modules/home/users/crumb/niri.nix

@@ -9,6 +9,14 @@ in {
       type = lib.types.nullOr lib.types.path;
       default = config.stylix.image;
     };
+    # xwayland-satellite implements rootless Xwayland in a separate application,
+    # without the host compositor's involvement. It makes X11 windows appear as
+    # normal windows, just like a native Xwayland integration. While it is still
+    # somewhat experimental, it handles a lot of applications correctly, like
+    # Steam, games and Discord.
+    xwayland-satellite.enable =
+      lib.mkEnableOption "xwayland-satellite starting with Niri"
+        // { default = true; };
     polkit.enable =
       lib.mkEnableOption "Niri/Gnome Polkit" // { default = true; };
     swaylock.enable =
@@ -59,17 +67,26 @@ in {
     stylix.targets.swaylock.enable = cfg.swaylock.enable;
 
     services.polkit-gnome.enable = cfg.polkit.enable;
-    sydnix.xwayland-satellite.enable = lib.mkDefault true;
 
     # File-picker.
     home.packages = [ pkgs.nautilus ];
 
+    systemd.user.services.xwayland-satellite =
+      lib.mkIf cfg.xwayland-satellite.enable {
+        Service.ExecStart =
+          ["${pkgs.xwayland-satellite}/bin/xwayland-satellite"];
+        Unit.After = ["niri.service"];
+        Unit.PartOf = ["niri.service"];
+        Install.WantedBy = ["niri.service"];
+      };
+
     programs.niri = {
       settings = {
         # Activates some Nixpkgs patches to help run Electron applications under
         # Wayland.
 	environment = {
 	  NIXOS_OZONE_WL = "1";
+	  DISPLAY = ":0";
 	  XDG_CURRENT_DESKTOP = "niri";
 	  QT_QPA_PLATFORM = "wayland";
 	  ELECTRON_OZONE_PLATFORM_HINT = "auto";

modules/home/users/msyds/emacs.nix

@@ -51,10 +51,6 @@ in {
         pkgs.nerd-fonts.victor-mono
         pkgs.ibm-plex
       ];
-      extraWrapProgramArgs = [
-        "--set" "ESHELL_ALIASES_FILE"
-        config.home.sessionVariables.ESHELL_ALIASES_FILE
-      ];
     };
   };
 }

modules/home/users/msyds/emacs/bookmarks

@@ -0,0 +1,11 @@
+;;;; Emacs Bookmark Format Version 1;;;; -*- coding: utf-8-emacs; mode: lisp-data -*-
+;;; This format is meant to be slightly human-readable;
+;;; nevertheless, you probably don't want to edit it.
+;;; -*- End Of Bookmark File Format Version Stamp -*-
+(("org-capture-last-stored"
+ (filename . "~/org/daily/2026-03-26.org")
+ (front-context-string . "* The significan")
+ (rear-context-string . "le: 2026-03-26\n\n")
+ (position . 89)
+ (last-modified 27077 32462 617656 528000))
+)

modules/home/users/msyds/emacs/lisp/syd/auctex.el

@@ -2,10 +2,7 @@
 
 (require 'syd/base)
 
-(use-package auctex)
-
-(use-package tex
-  :straight nil ; Part of auctex.
+(use-package auctex
   :config
   (add-to-list 'TeX-view-program-selection '(output-pdf "Sioyek")))
 

modules/home/users/msyds/emacs/lisp/syd/clojure.el

@@ -27,7 +27,8 @@
     cider-doc-buffer)
   (defun syd-clojure-eval-region (beg end)
     (cider-eval-region beg end))
-  (syd-handle '(clojure-mode clojurescript-mode cider-repl-mode)
+  (syd-handle '(clojure-mode clojurescript-mode cider-repl-mode
+                cider-clojure-interaction-mode)
     :docs #'cider-doc
     :eval-region #'syd-clojure-eval-region
     :load-buffer #'cider-load-buffer)

modules/home/users/msyds/emacs/lisp/syd/fcitx.el

@@ -3,8 +3,8 @@
 (require 'syd/base)
 
 (use-package fcitx
+  :custom ((fcitx-remote-command "fcitx5-remote"))
   :config
-  (setq fcitx-remote-command "fcitx5-remote")
   (fcitx-aggressive-setup))
 
 (provide 'syd/fcitx)

modules/home/users/msyds/emacs/lisp/syd/keymaps.el

@@ -69,8 +69,7 @@
 (general-def
   :prefix-map 'syd-leader-insert-map
   "u" #'insert-char
-  "e" #'emoji-insert
-  "p" #'syd-insert-file-name)
+  "e" #'emoji-insert)
 
 ;; This is necessary to properly rebind `universal-argument'.
 ;; `universal-argument-more' is a command that provides additional prefixes

modules/home/users/msyds/emacs/lisp/syd/ligature.el

@@ -22,16 +22,11 @@
 			    "/*" "/=" "/>" "//" "__" "~~" "(*" "*)"
 			    "\\\\" "://"))
   ;; Sitelen pona glyphs.
-  (rx-let ((ideograph (any (#xF1900 . #xF198C)))
-           (tok-punct (any "󱦜" "󱦝"))
-           (arrow (any "←-↙"))
-           (zwj "‍"))
+  (rx-let ((ideograph (any (#xF1900 . #xF198C))))
     (ligature-set-ligatures
      'fundamental-mode
-     `(("󱦐" ,(rx (* (or ideograph tok-punct))))
-       ("󱥍" ,(rx "󱦗" (* (or ideograph tok-punct)) "󱦘"))
-       ("󱥁" ,(rx zwj arrow))
-       ("󱤑" ,(rx zwj ideograph)))))
+     `(("󱦐" ,(rx (* ideograph)))
+       ("󱥍" ,(rx "󱦗" (* ideograph))))))
   (global-ligature-mode 1))
 
 (provide 'syd/ligature)

modules/home/users/msyds/emacs/lisp/syd/prelude.el

@@ -193,38 +193,4 @@ form."
 	 (cons mode (intern (concat (match-string 1 s) "-ts-mode"))))
       (error "Symbol `%c' is not a mode." mode))))
 
-(defun syd--insert-file-name-annotation (x)
-  (concat
-   " "
-   (propertize " " 'display `(space :align-to (- right ,(+ 1 (length x)))))
-   x))
-
-(defun syd-insert-file-name ()
-  (interactive)
-  (let* ((path (read-file-name "Path: " nil nil 'confirm))
-         (proj-root (project-root (project-current)))
-         (alts
-          `((,(file-relative-name path proj-root) . "Project-relative")
-            (,(file-relative-name path default-directory) . "File-relative")
-            (,path . "Absolute")
-            ("... (choose a dir)")))
-         (choice
-          (completing-read
-           "Variant: "
-           (lambda (s p flag)
-             (pcase flag
-               ('metadata
-                `(metadata
-                  (annotation-function
-                   . ,(lambda (s)
-                        (when-let* ((desc (cdr (assoc s alts))))
-                          (syd--insert-file-name-annotation
-                           desc))))))
-               (_ (all-completions s (mapcar #'car alts) p)))))))
-    (if (equal choice "... (choose a root)")
-        (insert (file-relative-name
-                 path (read-file-name "Relative to: " nil nil
-                                      'confirm)))
-      (insert choice))))
-
 (provide 'syd/prelude)

modules/home/users/msyds/emacs/lisp/syd/project.el

@@ -1,7 +1,6 @@
 ;;; -*- lexical-binding: t; -*-
 
 (require 'syd/base)
-(require 'syd/keymaps)
 (require 'syd/completion) ; For `consult'.
 (require 'consult)
 

modules/home/users/msyds/emacs/transient/history.el

@@ -0,0 +1 @@
+nil

modules/home/xwayland-satellite.nix

@@ -1,38 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let cfg = config.sydnix.xwayland-satellite;
-in {
-  options.sydnix.xwayland-satellite = {
-    # xwayland-satellite implements rootless Xwayland in a separate
-    # application, without the host compositor's involvement. It makes
-    # X11 windows appear as normal windows, just like a native
-    # Xwayland integration. While it is still somewhat experimental,
-    # it handles a lot of applications correctly, like Steam, games
-    # and Discord.
-    enable = lib.mkEnableOption "XWayland outside your Wayland";
-  };
-
-  config = lib.mkIf cfg.enable {
-    systemd.user.services.xwayland-satellite =
-      let xwayland-satellite =
-        pkgs.xwayland-satellite.override { withSystemd = true; };
-      in {
-        Unit = {
-          Description = "Xwayland outside your Wayland";
-          BindsTo = [ "graphical-session.target" ];
-          PartOf = [ "graphical-session.target" ];
-          After = [ "graphical-session.target" ];
-          Requisite = [ "graphical-session.target" ];
-        };
-        Service = {
-          Type = "notify";
-          NotifyAccess = "all";
-          ExecStart = lib.getExe xwayland-satellite;
-          StandardOutput = "journal";
-          ExecStartPost = "systemctl --user set-environment DISPLAY=:0";
-          ExecStop = "systemctl --user unset-environment DISPLAY";
-        };
-        Install.WantedBy = [ "graphical-session.target" ];
-      };
-  };
-}

modules/nixos/dank-material-shell.nix

@@ -12,13 +12,6 @@ in {
       enableDynamicTheming = false;
     };
 
-    # Start after xwayland-satellite, if possible.  So DMS can start
-    # with the DISPLAY env var set.
-    systemd.user.services.dms = {
-      wants = ["xwayland-satellite.service"];
-      after = ["xwayland-satellite.service"];
-    };
-
     services.displayManager.dms-greeter = {
       enable = true;
       compositor.name = assert config.sydnix.niri.enable; "niri";

modules/nixos/deertopia/copyparty.nix

@@ -13,10 +13,14 @@ in {
     };
   };
 
-  imports = [ ./copyparty/vault.nix ];
+  imports = [
+    ./copyparty/vault.nix
+    ./copyparty/webdav.nix
+  ];
 
   config = lib.mkIf cfg.enable {
     sydnix.deertopia.copyparty.vault.enable = true;
+    sydnix.deertopia.copyparty.webdav.enable = true;
 
     sydnix.impermanence.directories = [
       "/var/lib/copyparty"
@@ -29,8 +33,8 @@ in {
       "media"
     ];
 
-    # HACK: Make files created by copyparty.service initialise with the mode
-    # 775.
+    # HACK: Make files created by copyparty.service initialise with
+    # the mode 775.
     systemd.services.copyparty.serviceConfig.UMask = lib.mkForce "002";
 
     services.copyparty = {
@@ -56,7 +60,7 @@ in {
         "/Media library" = {
           path = "/media/library";
           # View and upload, but no deleting.
-          access.rw = "*";
+          access.r = "*";
           access.rwmd = "@jellyfin-admin";
         };
         "/Torrents" = {

modules/nixos/deertopia/copyparty/vault.nix

@@ -36,6 +36,12 @@ in {
 	access.A = [ "msyds" ];
 	access.rwmd = [ "zotero" ];
       };
+      "/msyds/zotero-root" = {
+	path = "/vault/msyds/zotero-root";
+	flags.daw = true;
+	access.A = [ "msyds" ];
+	access.rwmd = [ "zotero" ];
+      };
       "/~msyds/public" = {
 	path = "/vault/~msyds/public";
 	access.A = [ "msyds" ];

modules/nixos/deertopia/copyparty/webdav.nix

@@ -0,0 +1,57 @@
+{ config, lib, pkgs, ... }:
+
+let cfg = config.sydnix.deertopia.copyparty.webdav;
+in {
+  options.sydnix.deertopia.copyparty.webdav = {
+    enable = lib.mkEnableOption "WebDAV via copyparty";
+    port = lib.mkOption {
+      type = lib.types.port;
+      description = ''
+        Port on which Copyparty shall listen for WebDAV traffic.
+      '';
+      default = 3924;
+    };
+  };
+
+  # https://github.com/9001/copyparty/issues/1142
+  config = lib.mkIf cfg.enable {
+    services.copyparty.settings = {
+      rproxy = -1;
+      xff-src = "lan";
+      daw = true;
+      dav-auth = true;
+      ihead = "*";
+      ohead = "*";
+      dav-port = cfg.port;
+    };
+
+    services.authelia.instances.deertopia.settings =
+      lib.mkIf config.sydnix.deertopia.authelia.enable {
+        access_control.rules = lib.mkBefore [
+          {
+            domain = "dav.deertopia.net";
+            policy = "bypass";
+            methods = [ "OPTIONS" "PROPFIND" ];
+          }
+        ];
+      };
+
+    sydnix.deertopia.nginx.vhosts."dav" = {
+      directory = null;
+      vhost = {
+        forceSSL = true;
+        enableACME = true;
+        extraConfig = ''
+          include ${../authelia/authelia-location.conf};
+          # Increase limit of upload sizes.
+          client_max_body_size 20G;
+        '';
+        locations."/".extraConfig = ''
+          include ${../authelia/authelia-authrequest.conf};
+          include ${../authelia/proxy.conf};
+          proxy_pass http://localhost:${builtins.toString cfg.port};
+        '';
+      };
+    };
+  };
+}

modules/nixos/gtav-battleye-hack.nix

@@ -1,17 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let cfg = config.sydnix.gtav-battleye-hack;
-in {
-  options.sydnix.gtav-battleye-hack = {
-    enable = lib.mkEnableOption
-      "Grand Theft Auto V Online BattlEye workaround";
-  };
-
-  config = lib.mkIf cfg.enable {
-    networking.hosts."0.0.0.0" = [
-      "paradise-s1.battleye.com"
-      "test-s1.battleye.com"
-      "paradiseenhanced-s1.battleye.com"
-    ];
-  };
-}

users/msyds/default.nix

@@ -46,8 +46,7 @@
         kdeconnect.enable = true;
         qalculate.enable = true;
         toki-pona.enable = true;
-        prism-launcher.enable = on "sydpc";
-        flatpak.enable = on "sydpc";
+        prism-launcher.enable = true;
         sops = {
           enable = true;
           keyFile = "/persist/private-keys/age/crumb";