chore: slowly moving away from puffer

This commit is contained in:
alina 🌸 2024-11-13 22:56:04 +03:00
parent ca6c67a65e
commit cb2a3971a0
Signed by: teidesu
SSH key fingerprint: SHA256:uNeCpw6aTSU4aIObXLvHfLkDa82HWH9EiOj9AXOIRpI
7 changed files with 14 additions and 17 deletions

View file

@ -28,7 +28,7 @@
./containers/verdaccio ./containers/verdaccio
./containers/sharkey ./containers/sharkey
./containers/pds ./containers/pds
./containers/navidrome # ./containers/navidrome
./containers/conduwuit ./containers/conduwuit
./containers/zond ./containers/zond
./containers/kanidm ./containers/kanidm

View file

@ -14,10 +14,11 @@ in {
services.postgresql.ensureDatabases = [ "memos" ]; services.postgresql.ensureDatabases = [ "memos" ];
desu.postgresql.ensurePasswords.memos = "memos"; desu.postgresql.ensurePasswords.memos = "memos";
systemd.services.docker-memos.after = [ "postgresql.service" ];
virtualisation.oci-containers.containers.memos = { virtualisation.oci-containers.containers.memos = {
image = "neosmemo/memos:0.22.5"; image = "neosmemo/memos:0.22.5";
volumes = [ volumes = [
"/srv/memos/data:/var/opt/memoss" "/srv/memos/data:/var/opt/memos"
]; ];
environment = { environment = {

View file

@ -23,7 +23,7 @@ in {
image = "ghcr.io/bluesky-social/pds:sha-b595125a28368fa52d12d3b6ca265c1bea06977f"; image = "ghcr.io/bluesky-social/pds:sha-b595125a28368fa52d12d3b6ca265c1bea06977f";
volumes = [ volumes = [
"/srv/bluesky-pds/data:/pds" "/srv/bluesky-pds/data:/pds"
"/mnt/puffer/bluesky-pds:/blobstore" "/srv/bluesky-pds/blobstore:/blobstore"
]; ];
environment = { environment = {
PDS_HOSTNAME = "pds.stupid.fish"; PDS_HOSTNAME = "pds.stupid.fish";
@ -46,8 +46,7 @@ in {
}; };
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [
"d /mnt/puffer/bluesky-pds 0700 ${builtins.toString UID} ${builtins.toString UID} -" "d /srv/bluesky-pds 0700 ${builtins.toString UID} ${builtins.toString UID} -"
"d /srv/bluesky-pds/data 0700 ${builtins.toString UID} ${builtins.toString UID} -"
]; ];
services.nginx.virtualHosts."pds.stupid.fish" = { services.nginx.virtualHosts."pds.stupid.fish" = {

View file

@ -12,7 +12,6 @@ in {
}; };
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [
"d /mnt/puffer/Sharkey 0777 root root -"
"d /srv/Sharkey 0777 root root -" "d /srv/Sharkey 0777 root root -"
]; ];
@ -55,7 +54,7 @@ in {
dependsOn = [ "sharkey-redis" "sharkey-meili" ]; dependsOn = [ "sharkey-redis" "sharkey-meili" ];
image = "local/sharkey"; image = "local/sharkey";
volumes = [ volumes = [
"/mnt/puffer/Sharkey/files:/sharkey/files" "/srv/Sharkey/files:/sharkey/files"
"${context}/.config:/sharkey/.config:ro" "${context}/.config:/sharkey/.config:ro"
]; ];
environment = { environment = {

View file

@ -1,16 +1,9 @@
{ config, abs, lib, pkgs, modulesPath, ... }@inputs: { config, abs, lib, pkgs, modulesPath, ... }@inputs:
let
systemd = import (abs "lib/systemd.nix") inputs;
in
{ {
imports = imports =
[ [
(modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
(systemd.mkOneshot {
name = "puffer-spindown";
script = "${pkgs.hdparm}/bin/hdparm -S 120 /dev/disk/by-uuid/42d1c1e4-57c8-4249-b6e7-1233803b3798";
})
]; ];
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usbhid" "uas" "usb_storage" "sd_mod" "tpm_crb" ]; boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usbhid" "uas" "usb_storage" "sd_mod" "tpm_crb" ];
@ -24,7 +17,7 @@ in
}; };
fileSystems."/boot" = { fileSystems."/boot" = {
device = "/dev/disk/by-uuid/5DAC-EE9F"; device = "/dev/disk/by-path/pci-0000:01:00.0-nvme-1-part1";
fsType = "vfat"; fsType = "vfat";
}; };
@ -37,12 +30,12 @@ in
swapDevices = swapDevices =
[{ device = "/dev/disk/by-uuid/c418bb69-15cf-4d47-b9a0-0cf7191551da"; }]; [{ device = "/dev/disk/by-uuid/c418bb69-15cf-4d47-b9a0-0cf7191551da"; }];
boot.initrd.luks.devices.root = { boot.initrd.luks.devices.root = {
device = "/dev/disk/by-uuid/57d168a4-2bc6-4f6c-9cd6-d2d5c775de7d"; device = "/dev/disk/by-path/pci-0000:01:00.0-nvme-1-part2";
preLVM = true; preLVM = true;
allowDiscards = true; allowDiscards = true;
}; };
boot.initrd.luks.devices.puffer = { boot.initrd.luks.devices.puffer = {
device = "/dev/disk/by-uuid/42d1c1e4-57c8-4249-b6e7-1233803b3798"; device = "/dev/disk/by-path/pci-0000:04:00.3-usb-0:4:1.0-scsi-0:0:0:0-part1";
preLVM = true; preLVM = true;
allowDiscards = true; allowDiscards = true;
}; };

Binary file not shown.

5
secrets/wakapi-env.age Normal file
View file

@ -0,0 +1,5 @@
age-encryption.org/v1
-> ssh-ed25519 sj88Xw 0dsWtTkNn9CqLCL8nBWocyI6IW2vmYqqAkMDA60p3Ug
EW7SroMig6Eeu7fRFFKxW88DBQq5U0pauTdyVYqrKco
--- aWUxVGpwYt8F8TFCTaRbHfItYrV4Izvps/9mssb6q2Q
ÕŸÌc}âF…Až…øÇ4žÝƒcVrʧRgbº~,ðw0ɤ 1ýßð%þ| »Øvø(³ ¬«‰ë¶ìbw<11>L×ìQb0@â#ÄLwE}R†§Þ**nc7|ua<ÛÊÀÏ>t¦<74>Ø5¨2´][¯ïþ¶Š¼‡¹ 'j}ÖÙ%