Compare commits
5 Commits
master
...
a81fc48127
| Author | SHA1 | Date | |
|---|---|---|---|
|
a81fc48127
|
|||
|
f6d5c83a8e
|
|||
|
695e196024
|
|||
|
8ae48df307
|
|||
|
0e893bc106
|
@ -51,6 +51,7 @@ in {
|
||||
"fetchart" # pickup local cover art or search online
|
||||
"fish" # beet fish generates ~/.config/fish/completions file
|
||||
"lyrics" # fetch song lyrics
|
||||
"musicbrainz" # auto tagger data source
|
||||
"replaygain" # write replaygain tags for automatic loudness adjustments
|
||||
];
|
||||
|
||||
|
||||
@ -143,7 +143,7 @@ with mylib.networking; {
|
||||
|
||||
# Bootloader/Kernel stuff
|
||||
boot = {
|
||||
kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
|
||||
kernelPackages = lib.mkDefault pkgs.linuxPackages;
|
||||
kernelParams = ["mitigations=off"]; # I don't care
|
||||
|
||||
# Make /tmp volatile
|
||||
|
||||
@ -104,7 +104,8 @@
|
||||
};
|
||||
|
||||
boot = {
|
||||
# kernelPackages = pkgs.linuxPackages_zen;
|
||||
kernelPackages = pkgs.linuxPackages_zen;
|
||||
# kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
|
||||
|
||||
# kernelParams = [ "quiet" ];
|
||||
# plymouth.enable = true;
|
||||
|
||||
@ -35,6 +35,10 @@
|
||||
"vfat"
|
||||
];
|
||||
|
||||
supportedFilesystems = [
|
||||
# "zfs" # Probably requires LTS kernel + networking.hostId
|
||||
];
|
||||
|
||||
kernelModules = [
|
||||
"kvm-amd"
|
||||
"sg" # Blu-Ray drive
|
||||
@ -60,6 +64,9 @@
|
||||
];
|
||||
};
|
||||
|
||||
# Required for supportedFilesystems = ["zfs"];, so pools don't get imported on the wrong machine
|
||||
# networking.hostId = "611e6afb";
|
||||
|
||||
fileSystems = {
|
||||
# NOTE: Some filesystems are managed by disko (see ./disks.nix)
|
||||
|
||||
@ -82,23 +89,22 @@
|
||||
# Using NFS over TCP or increasing the value of the retrans option may mitigate
|
||||
# some of the risks of using the soft option.
|
||||
|
||||
"/home/${username}/Movies" = {
|
||||
device = "192.168.86.20:/mnt/SG Exos Mirror 18TB/Movie";
|
||||
fsType = "nfs";
|
||||
options = ["defaults" "rw" "noatime" "_netdev" "bg" "soft"];
|
||||
};
|
||||
|
||||
"/home/${username}/Shows" = {
|
||||
device = "192.168.86.20:/mnt/SG Exos Mirror 18TB/Show";
|
||||
fsType = "nfs";
|
||||
options = ["defaults" "rw" "noatime" "_netdev" "bg" "soft"];
|
||||
};
|
||||
|
||||
"/home/${username}/Music" = {
|
||||
device = "192.168.86.20:/mnt/SG Exos Mirror 18TB/Music";
|
||||
fsType = "nfs";
|
||||
options = ["defaults" "rw" "noatime" "_netdev" "bg" "soft"];
|
||||
};
|
||||
# TODO: New HDDs
|
||||
# "/home/${username}/Movies" = {
|
||||
# device = "192.168.86.20:/mnt/SG Exos Mirror 18TB/Movie";
|
||||
# fsType = "nfs";
|
||||
# options = ["defaults" "rw" "noatime" "_netdev" "bg" "soft"];
|
||||
# };
|
||||
# "/home/${username}/Shows" = {
|
||||
# device = "192.168.86.20:/mnt/SG Exos Mirror 18TB/Show";
|
||||
# fsType = "nfs";
|
||||
# options = ["defaults" "rw" "noatime" "_netdev" "bg" "soft"];
|
||||
# };
|
||||
# "/home/${username}/Music" = {
|
||||
# device = "192.168.86.20:/mnt/SG Exos Mirror 18TB/Music";
|
||||
# fsType = "nfs";
|
||||
# options = ["defaults" "rw" "noatime" "_netdev" "bg" "soft"];
|
||||
# };
|
||||
|
||||
"/home/${username}/Restic" = {
|
||||
device = "192.168.86.15:/volume1/NixinatorPersistence";
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
jellyfinVersion = "10.10.7";
|
||||
jellyfinVersion = "10.11.2";
|
||||
in {
|
||||
virtualisation.oci-containers.containers = {
|
||||
jellyfin = {
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
nginxVersion = "2.12.6";
|
||||
nginxVersion = "2.13.1";
|
||||
in {
|
||||
virtualisation.oci-containers.containers = {
|
||||
nginx-proxy-manager = {
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
...
|
||||
}: let
|
||||
# Match this with the portainer-ce version
|
||||
portainerVersion = "2.31.3";
|
||||
portainerVersion = "2.33.3";
|
||||
in {
|
||||
# Use the agent to connect clients to a main portainer instance
|
||||
virtualisation.oci-containers.containers = {
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
...
|
||||
}: let
|
||||
# Match this with the portainer agent version
|
||||
portainerVersion = "2.31.3";
|
||||
portainerVersion = "2.33.3";
|
||||
in {
|
||||
virtualisation.oci-containers.containers = {
|
||||
portainer = {
|
||||
|
||||
Reference in New Issue
Block a user