4 Commits

7 changed files with 20 additions and 7 deletions
+12 -2
View File
@@ -49,13 +49,23 @@
security.polkit.enable = true; # Required for nextcloud security.polkit.enable = true; # Required for nextcloud
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
"nvidia-x11" "nvidia-kernel-modules"
"nvidia-settings" "nvidia-settings"
"nvidia-x11"
]; ];
hardware.nvidia = { hardware.nvidia = {
modesetting.enable = true; modesetting.enable = true;
open = false; open = false;
# https://github.com/sircam-html/nixos-conf/blob/main/guides/nvidia-nixos-guide.md
package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
version = "580.142";
sha256_64bit = "sha256-IJFfzz/+icNVDPk7YKBKKFRTFQ2S4kaOGRGkNiBEdWM=";
sha256_aarch64 = "sha256-0000000000000000000000000000000000000000000=";
openSha256 = "sha256-0000000000000000000000000000000000000000000=";
settingsSha256 = "sha256-BnrIlj5AvXTfqg/qcBt2OS9bTDDZd3uhf5jqOtTMTQM=";
persistencedSha256 = "sha256-0000000000000000000000000000000000000000000=";
};
}; };
hardware.graphics.enable = true; hardware.graphics.enable = true;
+1
View File
@@ -4,6 +4,7 @@
"/export/riker-backup" = { "/export/riker-backup" = {
device = "/tank/backup/riker"; device = "/tank/backup/riker";
options = [ "bind" ]; options = [ "bind" ];
fsType = "none";
}; };
}; };
+1
View File
@@ -9,6 +9,7 @@
zfs = { zfs = {
extraPools = [ "tank" ]; extraPools = [ "tank" ];
requestEncryptionCredentials = false; requestEncryptionCredentials = false;
forceImportRoot = false;
}; };
supportedFilesystems = [ "zfs" ]; supportedFilesystems = [ "zfs" ];
}; };
+1
View File
@@ -5,6 +5,7 @@
device = "/tank/nvr/frigate"; device = "/tank/nvr/frigate";
depends = [ "/tank/nvr/frigate" ]; depends = [ "/tank/nvr/frigate" ];
options = [ "bind" ]; options = [ "bind" ];
fsType = "none";
}; };
}; };
+2 -2
View File
@@ -5,7 +5,7 @@ let
in { in {
services.nextcloud = { services.nextcloud = {
enable = true; enable = true;
package = pkgs.nextcloud32; package = pkgs.nextcloud33;
inherit hostName; inherit hostName;
home = "/tank/nextcloud"; home = "/tank/nextcloud";
https = true; https = true;
@@ -75,7 +75,7 @@ in {
environment.systemPackages = [ environment.systemPackages = [
cfg.occ # "occ CMD" in the docs -> "sudo -u nextcloud nextcloud-occ CMD" cfg.occ # "occ CMD" in the docs -> "sudo -u nextcloud nextcloud-occ CMD"
pkgs.nodejs_20 # For Recognize; Put /run/current-system/sw/bin/node in the "node_binary" field in the web UI -> Memories pkgs.nodejs # For Recognize; Put /run/current-system/sw/bin/node in the "node_binary" field in the web UI -> Memories
]; ];
sops.secrets."nextcloud/adminpass" = { sops.secrets."nextcloud/adminpass" = {
+1 -1
View File
@@ -11,7 +11,7 @@
fileSystems."/var/lib/libvirt/images" = { fileSystems."/var/lib/libvirt/images" = {
device = "/tank/iso"; device = "/tank/iso";
options = [ "bind" ]; options = [ "bind" ];
fsType = "auto"; fsType = "none";
}; };
# On a gui-enabled machine, connect with: # On a gui-enabled machine, connect with:
+2 -2
View File
@@ -16,10 +16,10 @@ in {
privateKeyFile = "/etc/wireguard/defiant.private"; privateKeyFile = "/etc/wireguard/defiant.private";
postSetup = '' postSetup = ''
${pkgs.iptables}/bin/iptables -t nat -A POSTROUTING -s 10.100.0.0/24 -d 192.168.10.0/24 -o eth0 -j MASQUERADE ${pkgs.iptables}/bin/iptables -t nat -A POSTROUTING -s 10.100.0.0/24 -d 192.168.10.0/24 -o enp3s0 -j MASQUERADE
''; '';
postShutdown = '' postShutdown = ''
${pkgs.iptables}/bin/iptables -t nat -D POSTROUTING -s 10.100.0.0/24 -d 192.168.10.0/24 -o eth0 -j MASQUERADE ${pkgs.iptables}/bin/iptables -t nat -D POSTROUTING -s 10.100.0.0/24 -d 192.168.10.0/24 -o enp3s0 -j MASQUERADE
''; '';
peers = (import ../../../common/wireguard-peers.nix); peers = (import ../../../common/wireguard-peers.nix);