Compare commits

..

No commits in common. "473e113c4f1f6d26779a7c9d4cf84d56db5fc0b8" and "fc245b4619538fb6075b5259fc271030946e5126" have entirely different histories.

6 changed files with 40 additions and 42 deletions

View file

@ -4,12 +4,12 @@
./base-server ./base-server
./users ./users
./boot.nix ./boot.nix
./environment.nix
./home-manager.nix ./home-manager.nix
./misc.nix ./misc.nix
./nginx.nix ./nginx.nix
./nix.nix ./nix.nix
./openssh.nix ./openssh.nix
./packages.nix
./sanoid.nix ./sanoid.nix
./security.nix ./security.nix
./steam.nix ./steam.nix

View file

@ -4,12 +4,9 @@
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
btop btop
git git
wget
# hardware troubleshooting
lshw lshw
parted parted
smartmontools wget
# network troubleshooting # network troubleshooting
inetutils inetutils

View file

@ -6,8 +6,6 @@ let
in in
{ {
home.packages = with pkgs; [ home.packages = with pkgs; [
eza # like `ls` but fancier
hexyl # like `xxd` but cooler
tree # like `ls -R` but nicer tree # like `ls -R` but nicer
units units
zip unzip zip unzip

View file

@ -1,8 +1,9 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
{ {
services.sanoid.datasets."rpool_albion/state" = { # FIXME: failing drive
useTemplate = [ "production" ]; # services.sanoid.datasets."rpool_albion/state" = {
recursive = "zfs"; # useTemplate = [ "production" ];
}; # recursive = "zfs";
# };
} }

View file

@ -9,7 +9,8 @@ in
./filesystems.nix ./filesystems.nix
./hardware.nix ./hardware.nix
./networking.nix ./networking.nix
./ftp.nix # FIXME: failing drive
# ./ftp.nix
]; ];
nixpkgs.hostPlatform = "x86_64-linux"; nixpkgs.hostPlatform = "x86_64-linux";
@ -48,20 +49,20 @@ in
]; ];
}; };
programs.steam.enable = true; # programs.steam.enable = true;
qenya.services.audiobookshelf = { # qenya.services.audiobookshelf = {
enable = true; # enable = true;
domain = "audiobookshelf.qenya.tel"; # domain = "audiobookshelf.qenya.tel";
}; # };
qenya.services.jellyfin = { # qenya.services.jellyfin = {
enable = true; # enable = true;
domain = "jellyfin.qenya.tel"; # domain = "jellyfin.qenya.tel";
}; # };
qenya.services.navidrome = { # qenya.services.navidrome = {
enable = true; # enable = true;
domain = "music.qenya.tel"; # domain = "music.qenya.tel";
dataDir = "/srv/music"; # dataDir = "/srv/music";
}; # };
system.stateVersion = "24.05"; system.stateVersion = "24.05";

View file

@ -67,24 +67,25 @@
# HDD in bay # HDD in bay
# FIXME: failing drive
environment.etc.crypttab.text = '' # environment.etc.crypttab.text = ''
albion UUID=8a924f24-9b65-4f05-aeda-5b4080cc7aa1 /root/luks-albion.key # albion UUID=acda0e7a-069f-47c7-8e37-ec00e7cdde0f /root/luks-albion.key
''; # '';
randomcat.services.zfs.datasets = { # randomcat.services.zfs.datasets = {
"rpool_albion/data" = { mountpoint = "none"; }; # "rpool_albion/data" = { mountpoint = "none"; };
"rpool_albion/data/steam" = { mountpoint = "/home/qenya/.local/share/Steam"; }; # "rpool_albion/data/steam" = { mountpoint = "/home/qenya/.local/share/Steam"; };
"rpool_albion/state" = { mountpoint = "none"; }; # "rpool_albion/state" = { mountpoint = "none"; };
"rpool_albion/state/audiobookshelf" = { mountpoint = "/var/lib/audiobookshelf"; }; # "rpool_albion/state/audiobookshelf" = { mountpoint = "/var/lib/audiobookshelf"; };
"rpool_albion/state/jellyfin" = { mountpoint = "/var/lib/jellyfin"; }; # "rpool_albion/state/jellyfin" = { mountpoint = "/var/lib/jellyfin"; };
"rpool_albion/state/navidrome" = { mountpoint = "/var/lib/navidrome"; }; # "rpool_albion/state/navidrome" = { mountpoint = "/var/lib/navidrome"; };
"rpool_albion/srv" = { mountpoint = "none"; }; # "rpool_albion/srv" = { mountpoint = "none"; };
"rpool_albion/srv/audiobookshelf" = { mountpoint = "/srv/audiobookshelf"; }; # "rpool_albion/srv/audiobookshelf" = { mountpoint = "/srv/audiobookshelf"; };
"rpool_albion/srv/ftp" = { mountpoint = "/srv/ftp"; }; # "rpool_albion/srv/ftp" = { mountpoint = "/srv/ftp"; };
"rpool_albion/srv/jellyfin" = { mountpoint = "/srv/jellyfin"; }; # "rpool_albion/srv/jellyfin" = { mountpoint = "/srv/jellyfin"; };
"rpool_albion/srv/music" = { mountpoint = "/srv/music"; }; # "rpool_albion/srv/music" = { mountpoint = "/srv/music"; };
}; # };
# Other # Other