diff --git a/hosts/daedalus/default.nix b/hosts/daedalus/default.nix index 49e904c4..e9e7c786 100644 --- a/hosts/daedalus/default.nix +++ b/hosts/daedalus/default.nix @@ -3,6 +3,7 @@ with lib; with lib.my; { system.stateVersion = 5; + ids.gids.nixbld = 30000; users.users.xyno = { name = "xyno"; @@ -58,6 +59,8 @@ with lib.my; "whisky" "dbeaver-community" + "rider" # I'm sorry + # "qutebrowser" # rly want to switch to it # "dmenu-mac" diff --git a/hosts/picard/default.nix b/hosts/picard/default.nix index a8b2d161..64788fcb 100644 --- a/hosts/picard/default.nix +++ b/hosts/picard/default.nix @@ -11,6 +11,7 @@ ./hardware-configuration.nix ./xynospace-matrix.nix ./plausible.nix + ./obsidianshare.nix # ./ts-ovpn.nix ../../nixos-modules/system/persist.nix @@ -164,6 +165,11 @@ handle @git { reverse_proxy http://127.0.0.1:${toString config.services.forgejo.settings.server.HTTP_PORT} } + @notes host notes.xyno.systems + handle @notes { + reverse_proxy http://127.0.0.1:8086 + } + handle { abort } @@ -171,9 +177,6 @@ virtualHosts."xyno.systems".extraConfig = '' redir https://xyno.space{uri} ''; - virtualHosts."graph.czi.dating".extraConfig = '' - redir https://graph-czi-dating-s8tan-01d008685713bd0312de3223b3b980279b0ca590.fspages.org{uri} - ''; virtualHosts."czi.dating".extraConfig = '' redir https://foss-ag.de{uri} ''; diff --git a/hosts/picard/obsidianshare.nix b/hosts/picard/obsidianshare.nix new file mode 100644 index 00000000..6aa35259 --- /dev/null +++ b/hosts/picard/obsidianshare.nix @@ -0,0 +1,17 @@ +{ pkgs, config, ... }: { + ragon.agenix.secrets.picardSharenoteEnv = { }; + virtualisation.oci-containers.containers."sharenote" = { + image = "ghcr.io/thexyno/sharenote-py:latest"; + environmentFiles = [ + config.age.secrets.picardSharenoteEnv.path + ]; + ports = [ + "127.0.0.1:8086:8086" + ]; + volumes = [ + "/var/lib/sharenote:/sharenote-py/static" + ]; + }; + ragon.persist.extraDirectories = ["/var/lib/sharenote"]; + +} diff --git a/secrets/picardSharenoteEnv.age b/secrets/picardSharenoteEnv.age new file mode 100644 index 00000000..5209d68f --- /dev/null +++ b/secrets/picardSharenoteEnv.age @@ -0,0 +1,15 @@ +age-encryption.org/v1 +-> ssh-ed25519 WceKOQ uyWPHHlE4ibT64x6HwjVor0Stf4lISTstd1xM1+X01Y +1wIk5yrnIvdd7loEILTV6jlg7TAayKImUHgFd1t1bOU +-> ssh-ed25519 ugHWWw 0pIleJcv0MNlMy3VYyQs+bkFfQQG2NCM63iktYewKGw +82Sv5RlaTMsQRhr4QL5hXjlu6Gi61w17m4cyngVKMSA +-> ssh-ed25519 UU9RSA bCvra9eUCNjTf57puVqjdsMkQCbsLUURkbldbHMurzw +3XvlfVBBlJhuu2P8brPe8/Kt6/PNGlHhOGY0AVNh+ps +-> ssh-ed25519 RJI3BA jfYooAK63Fuf3r0/ugknVtiTDLSM3rymb3iNiOjD2gI +vNyPfP1SBnjOG7KvvnFKwRL9gWvvwBMOrl+HZ01rWNU +-> ssh-ed25519 XnvJKw SK696j2kqJJAbnRDW5VBWKtpGd9ZnJl2ljpI95C3Yws +P1FQqZV8R3NgdfW2xjZCfNVbyevPrNHzuLseByMR4yc +-> ssh-ed25519 7NL5Ng ixMT/WmxqASrFDKL477D6P0VPTH7Ob4U7nUBLEG87n4 +K1K9XW8rHmVHPUqRheDhEb+/nT5W4KIy/vw/0KWTKBg +--- Q7JKXJytt20M5feLIlRzxA4EK4r9Gs4sJvqb4pCwHCg +(7[X_AmBmP[Pű.\R؇l-0]Ճ3F `FQFޢ_=8~Og@ 4z!Ts*owk3op%zT"Ěc,~)zHoi!k \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 6ff00258..733bfe12 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -36,6 +36,7 @@ in "vpnConfig.age".publicKeys = pubkeys.ragon.host "beliskner"; "gitlabJWSFile.age".publicKeys = pubkeys.ragon.host "picard"; "nextcloudAdminPass.age".publicKeys = pubkeys.ragon.host "picard"; + "picardSharenoteEnv.age".publicKeys = pubkeys.ragon.host "picard"; "picardResticSSHKey.age".publicKeys = pubkeys.ragon.host "picard"; "picardSlidingSyncSecret.age".publicKeys = pubkeys.ragon.host "picard"; "picardCalCom.age".publicKeys = pubkeys.ragon.host "picard";