Compare commits

..

No commits in common. "3242d90c24fc238aa76bda15ebeaf079c2a20c77" and "cb2e73007f3c4fe17a72985ef53038ceb988419d" have entirely different histories.

6 changed files with 9 additions and 42 deletions

View file

@ -6,7 +6,6 @@
./hardware-configuration.nix ./hardware-configuration.nix
./services/factorio.nix ./services/factorio.nix
./services/http/index.nix ./services/http/index.nix
./services/immich.nix
./services/minecraft.nix ./services/minecraft.nix
./services/monitoring.nix ./services/monitoring.nix
./services/forgejo.nix ./services/forgejo.nix
@ -42,11 +41,7 @@
fileSystems."/mnt/bigbird_public" = { fileSystems."/mnt/bigbird_public" = {
device = "//bigbird/public"; device = "//bigbird/public";
fsType = "cifs"; fsType = "cifs";
options = [ options = [ "guest" ];
"x-systemd.automount"
"x-systemd.requires=network-online.target"
"guest"
];
}; };
time.timeZone = "America/Chicago"; time.timeZone = "America/Chicago";

View file

@ -1,7 +1,6 @@
{ {
services.forgejo = { services.forgejo = {
enable = true; enable = true;
stateDir = "/srv/forgejo";
settings = { settings = {
DEFAULT = { DEFAULT = {
APP_NAME = "Forgejo: Beyond coding. We Forge."; # TODO APP_NAME = "Forgejo: Beyond coding. We Forge."; # TODO

View file

@ -7,24 +7,6 @@
reverse_proxy /grafana/* localhost:3000 reverse_proxy /grafana/* localhost:3000
# hide .git # ??? # hide .git # ???
respond /robots.txt 200 {
body <<EOF
User-agent: *
Disallow: /sheets/
Disallow: /newspapers/
EOF
}
file_server /newspapers/* {
browse ${./caddy-browse-template.html}
# TOOD: is there a better way to strip the prefix here? This shouldn't be
# vulnerable to a directory traversal attack (and it doesn't really
# matter anyway; everything in there is public somewhere or another!) but
# it sorta feels wrong to do this without a `/sheets` suffix.
root /mnt/bigbird_public
}
file_server /sheets/* { file_server /sheets/* {
browse ${./caddy-browse-template.html} browse ${./caddy-browse-template.html}
@ -32,7 +14,7 @@
# vulnerable to a directory traversal attack (and it doesn't really # vulnerable to a directory traversal attack (and it doesn't really
# matter anyway; everything in there is public somewhere or another!) but # matter anyway; everything in there is public somewhere or another!) but
# it sorta feels wrong to do this without a `/sheets` suffix. # it sorta feels wrong to do this without a `/sheets` suffix.
root /mnt/bigbird_public root /mnt/bigbird-public
} }
handle_errors { handle_errors {

View file

@ -13,7 +13,6 @@
./maps.chandlerswift.com.nix ./maps.chandlerswift.com.nix
./music.chandlerswift.com.nix ./music.chandlerswift.com.nix
./nau-sidewalks.chandlerswift.com.nix ./nau-sidewalks.chandlerswift.com.nix
./photos.chandlerswift.com.nix
./preview.chandlerswift.com.nix ./preview.chandlerswift.com.nix
./sharontrahan.com.nix ./sharontrahan.com.nix
./social.chandlerswift.com.nix ./social.chandlerswift.com.nix

View file

@ -1,8 +0,0 @@
{config, ...}: {
services.immich.enable = true;
services.immich.mediaLocation = "/srv/immich";
services.caddy.virtualHosts."photos.chandlerswift.com".extraConfig = ''
reverse_proxy localhost:${toString config.services.immich.port}
'';
}

View file

@ -34,7 +34,11 @@
boot.plymouth.theme = "breeze"; boot.plymouth.theme = "breeze";
boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
boot.binfmt.preferStaticEmulators = true; boot.binfmt.registrations.aarch64-linux = {
interpreter = "${pkgs.pkgsStatic.qemu-user.override { hostCpuTargets = ["aarch64-linux-user"]; }}/bin/qemu-aarch64";
wrapInterpreterInShell = false;
fixBinary = true;
};
boot.initrd.luks.devices."luks-ca2fdf0b-d385-498c-9f7d-f58368a65fd4".device = "/dev/disk/by-uuid/ca2fdf0b-d385-498c-9f7d-f58368a65fd4"; boot.initrd.luks.devices."luks-ca2fdf0b-d385-498c-9f7d-f58368a65fd4".device = "/dev/disk/by-uuid/ca2fdf0b-d385-498c-9f7d-f58368a65fd4";
networking.hostName = "oscar"; # Define your hostname. networking.hostName = "oscar"; # Define your hostname.
@ -97,15 +101,12 @@
jack.enable = true; jack.enable = true;
}; };
environment.sessionVariables = { environment.sessionVariables.NIXOS_OZONE_WL = "1";
NIXOS_OZONE_WL = "1";
BUILDKIT_PROGRESS = "plain";
};
# Define a user account. Don't forget to set a password with passwd. # Define a user account. Don't forget to set a password with passwd.
users.users.chandler.isNormalUser = true; users.users.chandler.isNormalUser = true;
users.users.chandler.description = "Chandler Swift"; users.users.chandler.description = "Chandler Swift";
users.users.chandler.extraGroups = [ "networkmanager" "wheel" "dialout" "cdrom" "plugdev" "adbusers" "libvirtd" "docker" ]; users.users.chandler.extraGroups = [ "networkmanager" "wheel" "dialout" "cdrom" "plugdev" "adbusers" "docker" ];
home-manager.backupFileExtension = "backup"; home-manager.backupFileExtension = "backup";
home-manager.users.chandler = { pkgs, ... }: { home-manager.users.chandler = { pkgs, ... }: {
@ -151,7 +152,6 @@
ffmpeg ffmpeg
git-absorb git-absorb
imagemagick imagemagick
jujutsu
killall killall
pv pv
scrcpy scrcpy