Compare commits

...

10 Commits

18 changed files with 321 additions and 58 deletions

View File

@@ -10,6 +10,7 @@
filesystemType = "btrfs";
stylix.enable = true;
gc.enable = true;
openssh.enable = true;
sydpkgs.overlay.enable = true;
@@ -48,6 +49,7 @@
deertopia = {
authelia.enable = true;
gitea.enable = true;
quiver.enable = true;
www.enable = true;
bepasty.enable = true;

View File

@@ -25,14 +25,18 @@
openssh.enable = true;
sydpkgs.overlay.enable = true;
dank-material-shell.enable = true;
kdeconnect.enable = true;
steam = {
enable = true;
impermanenceUsers = ["crumb" "msyds"];
impermanenceUsers = [
# "crumb"
"msyds"
];
};
users.users = [
"crumb"
# "crumb"
"msyds"
];

View File

@@ -0,0 +1,20 @@
{ config, lib, pkgs, osConfig, ... }:
let cfg = config.sydnix.kdeconnect;
in {
options.sydnix.kdeconnect = {
enable = lib.mkEnableOption "KDE Connect";
};
config = lib.mkIf cfg.enable {
services.kdeconnect = {
enable = true;
indicator = true;
};
warnings = lib.optional (!osConfig.sydnix.kdeconnect.openFirewall) ''
The KDE Connect ports were not opened in the NixOS config. Make
sure someone's allowing these ports!!!
'';
};
}

14
modules/home/terraria.nix Normal file
View File

@@ -0,0 +1,14 @@
{ config, lib, pkgs, ... }:
let cfg = config.sydnix.terraria;
in {
options.sydnix.terraria = {
enable = lib.mkEnableOption "Terraria";
};
config = lib.mkIf cfg.enable {
sydnix.impermanence.directories = [
".local/share/Terraria"
];
};
}

View File

@@ -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/20260207174607-discontinuity_linguistics.org")
(front-context-string . "\nIn [[id:f140be8")
(rear-context-string . "y (linguistics)\n")
(position . 105)
(last-modified 27015 56580 955383 229000))
)

View File

@@ -63,3 +63,46 @@
syd/eshell
syd/treesit
syd/grammatical-framework))
(custom-set-variables
;; custom-set-variables was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right.
'(org-latex-preview-mode-display-live t nil nil "Customized with use-package org-latex-preview")
'(org-latex-preview-mode-update-delay 0.25 nil nil "Customized with use-package org-latex-preview")
'(safe-local-variable-directories
'("/home/msyds/src/deertopia.net/"
"/home/msyds/src/net-deertopia/publisher/"
"/home/msyds/src/net-deertopia/"))
'(safe-local-variable-values '((jinx-languages . "en_GB en_US"))))
(custom-set-faces
;; custom-set-faces was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right.
'(comint-highlight-prompt ((t :foreground "#C8C093" :background unspecified :weight bold)))
'(form-feed-st-line ((t :strike-through "#727169")))
'(org-block ((t (:inherit fixed-pitch :background "#1a1a22"))))
'(org-block-begin-line ((t (:foreground unspecified :inherit font-lock-comment-face :extend t :background "#16161D" :height 0.75))))
'(org-block-end-line ((t (:foreground unspecified :inherit font-lock-comment-face :extend t :background "#16161D" :height 0.75))))
'(org-checkbox ((t (:inherit fixed-pitch))))
'(org-code ((t (:inherit (shadow fixed-pitch)))))
'(org-document-info ((t (:weight bold :height 1.0))))
'(org-document-info-keyword ((t (:background unspecified :foreground unspecified :inherit (fixed-pitch font-lock-comment-face) :height 0.9))))
'(org-document-title ((t (:weight bold :height 1.6))))
'(org-drawer ((t (:foreground unspecified :inherit font-lock-comment-face :extend t :background "#16161D" :height 0.75))))
'(org-ellipsis ((t (:height 1.0))))
'(org-indent ((t (:inherit (org-hide syd-alt-fixed-pitch)))))
'(org-level-1 ((t (:weight bold :height 1.4 :foreground "#957FB8"))))
'(org-level-2 ((t (:weight bold :height 1.35 :foreground "#7E9CD8"))))
'(org-level-3 ((t (:weight bold :height 1.3 :foreground "#9CABCA"))))
'(org-level-4 ((t (:weight bold :height 1.25 :foreground "#A3D4D5"))))
'(org-level-5 ((t (:weight bold :height 1.2 :foreground "#7AA89F"))))
'(org-level-6 ((t (:weight bold :height 1.15 :foreground "#98BB6C"))))
'(org-level-7 ((t (:weight bold :height 1.1 :foreground "#938056"))))
'(org-level-8 ((t (:weight bold :height 1.05 :foreground "#C0A36E"))))
'(org-meta-line ((t (:background unspecified :foreground unspecified :inherit (fixed-pitch font-lock-comment-face) :height 0.9))))
'(org-property-value ((t (:inherit fixed-pitch))))
'(org-quote ((t (:inherit (variable-pitch org-block)))))
'(org-special-keyword ((t (:inherit (font-lock-comment-face fixed-pitch)))))
'(org-table ((t (:inherit fixed-pitch)))))

View File

@@ -44,13 +44,11 @@
;; functionality.
(cider-download-java-sources t))
:general
;; DEPRECATED: Remove once a `map!' equivalent is implemented.
(:keymaps 'cider-repl-mode-map
:states '(normal insert)
"C-k" #'cider-repl-backward-input
"C-j" #'cider-repl-forward-input
"C-s" #'consult-history)
;; DEPRECATED: Remove once a `map!' equivalent is implemented.
(:keymaps '(cider-repl-mode-map clojure-mode-map)
:states '(normal visual motion emacs insert)
:major-modes t
@@ -74,10 +72,15 @@
"T n" #'cider-test-run-ns-tests
"T r" #'cider-test-rerun-failed-tests
"T R" #'cider-test-rerun-test
"x" #'cider-scratch)
"x" #'cider-scratch
"i" #'cider-inspect-last-result)
(:keymaps 'cider-repl-mode-map
:states 'insert
"S-<return>" #'cider-repl-newline-and-indent)
(:keymaps 'cider-inspector-mode-map
:states '(motion insert)
"C-o" #'cider-inspector-pop
"C-i" #'cider-inspector-push)
:config
(add-hook 'cider-mode-hook #'eldoc-mode)
(with-eval-after-load 'consult

View File

@@ -127,7 +127,6 @@ if FILE-NAME has no TRAMP prefix."
(cons nil file-name)))
(use-package eshell
:ensure nil
:defer t
:init
(defvar syd-eshell-data-dir

View File

@@ -0,0 +1 @@
nil

View File

@@ -65,9 +65,22 @@ in {
server = {
address = "tcp://:${builtins.toString cfg.httpPort}";
# asset_path = "${authelia-state-dir}/assets";
endpoints.authz = {
# Necessary for Nginx integration. No, I do not understand what it
# does.
endpoints.authz.auth-request.implementation = "AuthRequest";
auth-request = {
implementation = "AuthRequest";
authn_strategies = [
{
name = "HeaderAuthorization";
schemes = [ "Basic" ];
}
{
name = "CookieSession";
}
];
};
};
};
authentication_backend =
let base-dn = config.services.lldap.settings.ldap_base_dn;

View File

@@ -13,8 +13,13 @@ in {
};
};
imports = [ ./copyparty/vault.nix ];
config = lib.mkIf cfg.enable {
sydnix.deertopia.copyparty.vault.enable = true;
sydnix.impermanence.directories = [
"/var/lib/copyparty"
];
nixpkgs.overlays = [ inputs.copyparty.overlays.default ];

View File

@@ -0,0 +1,46 @@
{ config, lib, pkgs, ... }:
let cfg = config.sydnix.deertopia.copyparty.vault;
in {
options.sydnix.deertopia.copyparty.vault = {
enable = lib.mkEnableOption "personal storage under Copyparty";
};
config = lib.mkIf cfg.enable {
sydnix.impermanence.directories = [ "/vault" ];
# HACK: Ad-hoc permissions, as typical.
users.groups.vault = {};
users.users.copyparty.extraGroups = [ "vault" ];
systemd.tmpfiles.settings."50-vault" =
let e = {
z.group = "vault";
z.mode = "2775";
v.group = "vault";
v.mode = "2775";
};
in {
"/vault" = e;
"/vault/~msyds" = e;
};
services.copyparty.volumes = {
"/~msyds" = {
path = "/vault/~msyds";
access.A = [ "msyds" ];
};
"/~msyds/zotero" = {
path = "/vault/~msyds/zotero";
flags.daw = true;
access.A = [ "msyds" ];
access.rwmd = [ "zotero" ];
};
"/~msyds/public" = {
path = "/vault/~msyds/public";
access.A = [ "msyds" ];
access.r = [ "*" ];
};
};
};
}

View File

@@ -0,0 +1,59 @@
{ config, lib, pkgs, ... }:
let cfg = config.sydnix.deertopia.gitea;
in {
options.sydnix.deertopia.gitea = {
enable = lib.mkEnableOption "Gitea";
};
config = lib.mkIf cfg.enable {
sydnix.impermanence.directories = [
{
directory = config.services.gitea.stateDir;
inherit (config.services.gitea) user group;
}
];
sydnix.deertopia.nginx.vhosts."git" = {
directory = null;
vhost = {
forceSSL = true;
enableACME = true;
locations."/".extraConfig =
let port = builtins.toString config.services.gitea
.settings.server.HTTP_PORT;
in ''
proxy_pass http://127.0.0.1:${port}/;
'';
};
};
users.users.git = {
description = "Gitea Service";
home = config.services.gitea.stateDir;
useDefaultShell = true;
group = config.services.gitea.group;
isSystemUser = true;
};
users.groups.git = { };
# sudo -u git gitea admin auth add-ldap --name gitea --port 3890 --bind-dn 'uid=gitea,ou=people,dc=deertopia,dc=net' --bind-password «password» --user-search-base 'ou=people,dc=deertopia,dc=net' --user-filter '(&(memberof=cn=git,ou=groups,dc=deertopia,dc=net)(|(uid=%[1]s)(mail=%[1]s)))' --username-attribute uid --firstname-attribute givenName --surname-attribute sn --email-attribute mail --avatar-attribute jpegPhoto --security-protocol unencrypted --host 127.0.0.1 --config /var/lib/gitea/custom/conf/app.ini --synchronize-users
services.gitea = {
enable = true;
user = "git";
group = "git";
settings = {
server = {
ROOT_URL = "https://git.deertopia.net/";
HTTP_PORT = 3000;
DOMAIN = "deertopia.net";
};
service = {
DISABLE_REGISTRATION = true;
};
};
};
};
}

View File

@@ -29,6 +29,8 @@ in {
};
};
imports = [ ./copyparty/vault.nix ];
config = mkIf cfg.enable {
users.users.${cfg.user} = {
isSystemUser = true;

View File

@@ -34,6 +34,7 @@ in {
extraConfig = ''
location /~msyds/ {
index index.html;
alias /vault/~msyds/public/;
}
location /~liv/ {
index index.html;

16
modules/nixos/gc.nix Normal file
View File

@@ -0,0 +1,16 @@
{ config, lib, pkgs, ... }:
let cfg = config.sydnix.gc;
in {
options.sydnix.gc = {
enable = lib.mkEnableOption "the automatic Nix garbage collector";
};
config = lib.mkIf cfg.enable {
nix.gc = {
automatic = true;
randomizedDelaySec = "14m";
options = "--delete-older-than 30d";
};
};
}

View File

@@ -0,0 +1,21 @@
{ config, lib, pkgs, ... }:
let cfg = config.sydnix.kdeconnect;
in {
options.sydnix.kdeconnect = {
enable = lib.mkEnableOption "KDE Connect";
openFirewall = lib.mkOption {
description = ''Open required ports for KDE Connect'';
type = lib.types.bool;
default = true;
};
};
config = lib.mkIf cfg.enable
(let
port-range = lib.optional cfg.openFirewall { from = 1714; to = 1764; };
in {
networking.firewall.allowedTCPPortRanges = port-range;
networking.firewall.allowedUDPPortRanges = port-range;
});
}

View File

@@ -37,6 +37,9 @@
desktop-environment.enable = true;
clojure.enable = true;
capitaine-cursors.enable = true;
terraria.enable = true;
kdeconnect.enable = true;
qalculate.enable = true;
sops = {
enable = true;
keyFile = "/persist/private-keys/age/crumb";