diff --git a/systems/nasty/configuration.nix b/systems/nasty/configuration.nix index 2492612..610e870 100644 --- a/systems/nasty/configuration.nix +++ b/systems/nasty/configuration.nix @@ -16,9 +16,11 @@ ./modules/navidrome.nix ./modules/feishin.nix ./modules/tvproxy.nix - ./modules/calibre-web.nix + #./modules/calibre-web.nix ./modules/borg.nix ./modules/nctest.nix + ./modules/encode + ./modules/lancache.nix ]; system.autoUpgrade = { @@ -28,13 +30,15 @@ sops.secrets."authentik/proxy/nasty" = {}; services.authentik-proxy.token = builtins.readFile config.sops.secrets."authentik/proxy/nasty".path; + services.nginx.defaultListen = [ { addr = "192.168.178.2"; } ]; # to not occupy the port for the lancache ip + environment.systemPackages = with pkgs; [ mediainfo mergerfs mergerfs-tools filezilla firefox - ffmpeg_6-full + ffmpeg_7-full _7zz ]; @@ -42,7 +46,7 @@ users.users.mc-fucker.extraGroups = [ "render" ]; - zramSwap.memoryPercent = 50; + zramSwap.memoryPercent = 100; programs.atop.netatop.enable = false; programs.java.enable = true; diff --git a/systems/nasty/hardware-configuration.nix b/systems/nasty/hardware-configuration.nix index 7a3d22b..d3f6313 100644 --- a/systems/nasty/hardware-configuration.nix +++ b/systems/nasty/hardware-configuration.nix @@ -19,6 +19,9 @@ boot.loader.efi.efiSysMountPoint = "/boot/efi"; boot.loader.systemd-boot.enable = true; boot.kernelPackages = pkgs.linuxPackages_latest; + boot.kernel.sysctl = { + "kernel.hung_task_timeout_secs" = 600; + }; boot.extraModprobeConfig = '' options usb-storage quirks=174c:1356:u @@ -55,9 +58,17 @@ # (the default) this is the recommended approach. When using systemd-networkd it's # still possible to use this option, but it's recommended to use it in conjunction # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; + #networking.useDHCP = lib.mkDefault true; # networking.interfaces.enp86s0.useDHCP = lib.mkDefault true; # networking.interfaces.wlo1.useDHCP = lib.mkDefault true; + networking.interfaces.enp86s0 = { + useDHCP = true; + ipv4.addresses = [ + { address = "192.168.178.53"; + prefixLength = 24; + } + ]; + }; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; diff --git a/systems/nasty/samba.nix b/systems/nasty/samba.nix index afca911..9d3129e 100644 --- a/systems/nasty/samba.nix +++ b/systems/nasty/samba.nix @@ -2,14 +2,12 @@ { users.groups = { dummesos = { gid = 1100; }; + juju = { gid = 1101; }; }; users.users = { - dummesos = { - uid = 1100; - isSystemUser = true; - group = "dummesos"; - }; + dummesos = { uid = 1100; isSystemUser = true; group = "dummesos";}; + juju = { uid = 1101; isSystemUser = true; group = "juju";}; }; services.samba-wsdd = { @@ -46,10 +44,6 @@ path = "/mnt/mergerfs/media/Serien"; "guest ok" = "yes"; }; - #"software" = { - # path = "/mnt/mergerfs/media/software"; - # "guest ok" = "yes"; - #}; }; }; diff --git a/systems/nasty/snapraid.nix b/systems/nasty/snapraid.nix index b530abf..b0b341c 100644 --- a/systems/nasty/snapraid.nix +++ b/systems/nasty/snapraid.nix @@ -6,82 +6,78 @@ let in { #systemd.timers."snapraid-sync".enable = false; #temporarily - #services.snapraid = { - # enable = true; - # scrub.plan = 5; - # parityFiles = [ - # "/mnt/drives/X2N0A0AZFJDH/snapraid.parity" - # ]; - # dataDisks = { - # d1 = "/mnt/drives/43P0A00AFJDH"; - # d2 = "/mnt/drives/43P0A00FFJDH"; - # d3 = "/mnt/drives/53F0A0SBFJDH"; - # d4 = "/mnt/drives/53G0A2AXFJDH"; - # d5 = "/mnt/drives/53J0A016FJDH"; - # d6 = "/mnt/drives/92F0A079FJDH"; - # d7 = "/mnt/drives/X2N0A0AXFJDH"; - # #d3 = "/mnt/drives/1EKVK21Z"; - # }; - # contentFiles = [ - # "/mnt/snapraid-18tb1.content" - # "/mnt/snapraid-18tb2.content" - # #"/mnt/drives/43P0A00AFJDH/snapraid.content" - # #"/mnt/drives/43P0A00FFJDH/snapraid.content" - # #"/mnt/drives/53F0A0SBFJDH/snapraid.content" - # #"/mnt/drives/53G0A2AXFJDH/snapraid.content" - # #"/mnt/drives/53J0A016FJDH/snapraid.content" - # #"/mnt/drives/92F0A079FJDH/snapraid.content" - # #"/mnt/drives/X2N0A0AXFJDH/snapraid.content" - # #"/mnt/drives/1EKVK21Z/snapraid.content" - # ]; - # exclude = [ - # "/media/usenet/incomplete/" - # ]; - #}; - - imports = [ ./modules/snapraid.nix ]; - - services.snapraidnew = { - "8tb" = { - arrayName = "8tb"; - enable = true; - scrub.plan = 5; - parityFiles = [ - "/mnt/drives/ZA1D9307/snapraid-8tb.parity" - ]; - dataDisks = { - d1 = "/mnt/drives/1EJZN6MZ"; - d2 = "/mnt/drives/1EKR513Z"; - d3 = "/mnt/drives/1EKVK21Z"; - }; - contentFiles = [ - "/mnt/snapraid-8tb1.content" - "/mnt/drives/X2N0A0AZFJDH/snapraid-8tb2.content" - ]; - exclude = excludes; - }; - "18tb" = { - enable = true; - scrub.plan = 5; - parityFiles = [ - "/mnt/drives/X2N0A0AZFJDH/snapraid.parity" - ]; - dataDisks = { - d1 = "/mnt/drives/43P0A00AFJDH"; - d2 = "/mnt/drives/43P0A00FFJDH"; - d3 = "/mnt/drives/53F0A0SBFJDH"; - d4 = "/mnt/drives/53G0A2AXFJDH"; - d5 = "/mnt/drives/53J0A016FJDH"; - d6 = "/mnt/drives/92F0A079FJDH"; - d7 = "/mnt/drives/X2N0A0AXFJDH"; - }; - contentFiles = [ - "/mnt/snapraid-18tb1.content" - "/mnt/drives/ZA1D9307/snapraid-18tb2.content" - ]; - exclude = excludes; + services.snapraid = { + enable = true; + scrub.plan = 5; + parityFiles = [ + "/mnt/drives/43P0A00AFJDH/snapraid1.parity" + "/mnt/drives/53J0A016FJDH/snapraid2.parity" + ]; + dataDisks = { + d1 = "/mnt/drives/ZVV0688G"; + d2 = "/mnt/drives/ZVV072JR"; + d3 = "/mnt/drives/53F0A0SBFJDH"; + d4 = "/mnt/drives/X2N0A0AZFJDH"; + d5 = "/mnt/drives/53G0A2AXFJDH"; + d6 = "/mnt/drives/92F0A079FJDH"; + d7 = "/mnt/drives/X2N0A0AXFJDH"; + d8 = "/mnt/drives/43P0A00FFJDH"; + d9 = "/mnt/drives/ZA1D9307"; + d10 = "/mnt/drives/1EJZN6MZ"; + d11 = "/mnt/drives/1EKR513Z"; + d12 = "/mnt/drives/1EKVK21Z"; }; + contentFiles = [ + "/mnt/snapraid1.content" + "/mnt/drives/43P0A00AFJDH/snapraid2.content" + "/mnt/drives/53J0A016FJDH/snapraid3.content" + ]; + exclude = excludes; }; + #imports = [ ./modules/snapraid.nix ]; + + #services.snapraidnew = { + # "8tb" = { + # arrayName = "8tb"; + # enable = true; + # scrub.plan = 5; + # parityFiles = [ + # "/mnt/drives/ZA1D9307/snapraid-8tb.parity" + # ]; + # dataDisks = { + # d1 = "/mnt/drives/1EJZN6MZ"; + # d2 = "/mnt/drives/1EKR513Z"; + # d3 = "/mnt/drives/1EKVK21Z"; + # }; + # contentFiles = [ + # "/mnt/snapraid-8tb1.content" + # "/mnt/drives/X2N0A0AZFJDH/snapraid-8tb2.content" + # ]; + # exclude = excludes; + # }; + # "18tb" = { + # enable = true; + # scrub.plan = 5; + # parityFiles = [ + # "/mnt/drives/X2N0A0AZFJDH/snapraid.parity" + # ]; + # dataDisks = { + # d1 = "/mnt/drives/43P0A00AFJDH"; + # d2 = "/mnt/drives/43P0A00FFJDH"; + # d3 = "/mnt/drives/92F0A079FJDH"; + # d4 = "/mnt/drives/X2N0A0AXFJDH"; + # d5 = "/mnt/drives/53J0A016FJDH"; + # d6 = "/mnt/drives/ZVV072JR"; + # d7 = "/mnt/drives/ZVV0688G"; + # }; + # contentFiles = [ + # "/mnt/snapraid-18tb1.content" + # "/mnt/drives/ZA1D9307/snapraid-18tb2.content" + # ]; + # exclude = excludes; + # }; + #}; + } # vim: set et ts=2 sw=2 ai: