Compare commits
3 Commits
fix-zotero
...
1f0c248b24
| Author | SHA1 | Date | |
|---|---|---|---|
| 1f0c248b24 | |||
| 31b61ddd73 | |||
| c0b60ff0e4 |
6
flake.lock
generated
6
flake.lock
generated
@@ -76,11 +76,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1774411715,
|
"lastModified": 1762095388,
|
||||||
"narHash": "sha256-mceIHtVMXpLAfr1W0VK9ceTBX5yKu4gGWpVbThWTsAA=",
|
"narHash": "sha256-7Q8LtcvKWHbP8znARRTOY2tpU5WoV6FHwp5TZJOI8Us=",
|
||||||
"owner": "9001",
|
"owner": "9001",
|
||||||
"repo": "copyparty",
|
"repo": "copyparty",
|
||||||
"rev": "26e663d111e39ca96c63702ad27a05b6736607cf",
|
"rev": "ac085b8149ff50e03d260128596dd130ed1c7cae",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -58,7 +58,7 @@
|
|||||||
lldap.pam.enable = true;
|
lldap.pam.enable = true;
|
||||||
nginx.enable = true;
|
nginx.enable = true;
|
||||||
slskd.enable = true;
|
slskd.enable = true;
|
||||||
# webdav.enable = true;
|
webdav.enable = true;
|
||||||
copyparty.enable = true;
|
copyparty.enable = true;
|
||||||
syncthing.enable = true;
|
syncthing.enable = true;
|
||||||
cache.enable = true;
|
cache.enable = true;
|
||||||
|
|||||||
@@ -51,6 +51,10 @@ in {
|
|||||||
pkgs.nerd-fonts.victor-mono
|
pkgs.nerd-fonts.victor-mono
|
||||||
pkgs.ibm-plex
|
pkgs.ibm-plex
|
||||||
];
|
];
|
||||||
|
extraWrapProgramArgs = [
|
||||||
|
"--set" "ESHELL_ALIASES_FILE"
|
||||||
|
config.home.sessionVariables.ESHELL_ALIASES_FILE
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,11 +0,0 @@
|
|||||||
;;;; 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))
|
|
||||||
)
|
|
||||||
@@ -27,8 +27,7 @@
|
|||||||
cider-doc-buffer)
|
cider-doc-buffer)
|
||||||
(defun syd-clojure-eval-region (beg end)
|
(defun syd-clojure-eval-region (beg end)
|
||||||
(cider-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
|
:docs #'cider-doc
|
||||||
:eval-region #'syd-clojure-eval-region
|
:eval-region #'syd-clojure-eval-region
|
||||||
:load-buffer #'cider-load-buffer)
|
:load-buffer #'cider-load-buffer)
|
||||||
|
|||||||
@@ -22,11 +22,16 @@
|
|||||||
"/*" "/=" "/>" "//" "__" "~~" "(*" "*)"
|
"/*" "/=" "/>" "//" "__" "~~" "(*" "*)"
|
||||||
"\\\\" "://"))
|
"\\\\" "://"))
|
||||||
;; Sitelen pona glyphs.
|
;; Sitelen pona glyphs.
|
||||||
(rx-let ((ideograph (any (#xF1900 . #xF198C))))
|
(rx-let ((ideograph (any (#xF1900 . #xF198C)))
|
||||||
|
(tok-punct (any "" ""))
|
||||||
|
(arrow (any "←-↙"))
|
||||||
|
(zwj ""))
|
||||||
(ligature-set-ligatures
|
(ligature-set-ligatures
|
||||||
'fundamental-mode
|
'fundamental-mode
|
||||||
`(("" ,(rx (* ideograph)))
|
`(("" ,(rx (* (or ideograph tok-punct))))
|
||||||
("" ,(rx "" (* ideograph))))))
|
("" ,(rx "" (* (or ideograph tok-punct)) ""))
|
||||||
|
("" ,(rx zwj arrow))
|
||||||
|
("" ,(rx zwj ideograph)))))
|
||||||
(global-ligature-mode 1))
|
(global-ligature-mode 1))
|
||||||
|
|
||||||
(provide 'syd/ligature)
|
(provide 'syd/ligature)
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
nil
|
|
||||||
@@ -13,14 +13,10 @@ in {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
imports = [
|
imports = [ ./copyparty/vault.nix ];
|
||||||
./copyparty/vault.nix
|
|
||||||
./copyparty/webdav.nix
|
|
||||||
];
|
|
||||||
|
|
||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
sydnix.deertopia.copyparty.vault.enable = true;
|
sydnix.deertopia.copyparty.vault.enable = true;
|
||||||
sydnix.deertopia.copyparty.webdav.enable = true;
|
|
||||||
|
|
||||||
sydnix.impermanence.directories = [
|
sydnix.impermanence.directories = [
|
||||||
"/var/lib/copyparty"
|
"/var/lib/copyparty"
|
||||||
@@ -33,8 +29,8 @@ in {
|
|||||||
"media"
|
"media"
|
||||||
];
|
];
|
||||||
|
|
||||||
# HACK: Make files created by copyparty.service initialise with
|
# HACK: Make files created by copyparty.service initialise with the mode
|
||||||
# the mode 775.
|
# 775.
|
||||||
systemd.services.copyparty.serviceConfig.UMask = lib.mkForce "002";
|
systemd.services.copyparty.serviceConfig.UMask = lib.mkForce "002";
|
||||||
|
|
||||||
services.copyparty = {
|
services.copyparty = {
|
||||||
@@ -60,7 +56,7 @@ in {
|
|||||||
"/Media library" = {
|
"/Media library" = {
|
||||||
path = "/media/library";
|
path = "/media/library";
|
||||||
# View and upload, but no deleting.
|
# View and upload, but no deleting.
|
||||||
access.r = "*";
|
access.rw = "*";
|
||||||
access.rwmd = "@jellyfin-admin";
|
access.rwmd = "@jellyfin-admin";
|
||||||
};
|
};
|
||||||
"/Torrents" = {
|
"/Torrents" = {
|
||||||
|
|||||||
@@ -36,12 +36,6 @@ in {
|
|||||||
access.A = [ "msyds" ];
|
access.A = [ "msyds" ];
|
||||||
access.rwmd = [ "zotero" ];
|
access.rwmd = [ "zotero" ];
|
||||||
};
|
};
|
||||||
"/msyds/zotero-root" = {
|
|
||||||
path = "/vault/msyds/zotero-root";
|
|
||||||
flags.daw = true;
|
|
||||||
access.A = [ "msyds" ];
|
|
||||||
access.rwmd = [ "zotero" ];
|
|
||||||
};
|
|
||||||
"/~msyds/public" = {
|
"/~msyds/public" = {
|
||||||
path = "/vault/~msyds/public";
|
path = "/vault/~msyds/public";
|
||||||
access.A = [ "msyds" ];
|
access.A = [ "msyds" ];
|
||||||
|
|||||||
@@ -1,57 +0,0 @@
|
|||||||
{ 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};
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user