applied nixfmt (new version)

base.nix

@@ -1,4 +1,11 @@
-{ lib, pkgs, inputs, outputs, ... }: {
+{
+  lib,
+  pkgs,
+  inputs,
+  outputs,
+  ...
+}:
+{
   imports = [
     inputs.home-manager.nixosModules.home-manager
     ./modules/apps.nix
@@ -22,7 +29,9 @@
   home-manager = {
     useUserPackages = true;
     useGlobalPkgs = true;
-    extraSpecialArgs = { inherit inputs outputs; };
+    extraSpecialArgs = {
+      inherit inputs outputs;
+    };
     users.jawz = import ./home-manager.nix;
   };
   time = {
@@ -31,7 +40,9 @@
   };
   i18n = {
     defaultLocale = "en_CA.UTF-8";
-    extraLocaleSettings = { LC_MONETARY = "es_MX.UTF-8"; };
+    extraLocaleSettings = {
+      LC_MONETARY = "es_MX.UTF-8";
+    };
   };
   console = {
     font = "Lat2-Terminus16";
@@ -44,19 +55,22 @@
       enable = true;
       wheelNeedsPassword = false;
     };
-    pam.loginLimits = [{
+    pam.loginLimits = [
+      {
         domain = "*";
         type = "soft";
         item = "nofile";
         value = "8192";
-    }];
+      }
+    ];
   };
   users = {
     mutableUsers = false;
     groups.piracy.gid = 985;
   };
   nixpkgs.config.allowUnfree = true;
-  nix = let
+  nix =
+    let
       featuresList = [
         "nixos-test"
         "benchmark"
@@ -66,14 +80,18 @@
         "gccarch-skylake"
         "gccarch-alderlake"
       ];
-  in {
+    in
+    {
       distributedBuilds = true;
       optimise.automatic = true;
       settings = {
         auto-optimise-store = true;
         trusted-users = [ "nixremote" ];
         system-features = featuresList;
-      experimental-features = [ "nix-command" "flakes" ];
+        experimental-features = [
+          "nix-command"
+          "flakes"
+        ];
         substituters = [
           "https://nix-gaming.cachix.org"
           "https://nixpkgs-python.cachix.org"
@@ -96,7 +114,10 @@
     };
   documentation.enable = false;
   environment = {
-    systemPackages = with pkgs; [ wget sops ];
+    systemPackages = with pkgs; [
+      wget
+      sops
+    ];
     variables = rec {
       # PATH
       XDG_CACHE_HOME = "\${HOME}/.cache";

cinnamon.nix

@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
   services = {
     libinput.enable = true;
     xserver = {

cosmic.nix

@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
   services = {
     gvfs.enable = true;
     libinput.enable = true;
@@ -9,11 +10,14 @@
     enable = true;
     style = "adwaita";
   };
-  users.users.jawz.packages = (with pkgs; [
+  users.users.jawz.packages = (
+    with pkgs;
+    [
       # ffmpegthumbnailer # generate thumbnails
       adw-gtk3 # theme legacy applications
       papirus-icon-theme # icon theme
       # libgda # for pano shell extension
       # gradience # theme customizer, allows you to modify adw-gtk3 themes
-  ]);
+    ]
+  );
 }

flake.nix

@@ -19,13 +19,23 @@
     };
   };
 
-  outputs = { self, nixpkgs, unstable, master, home-manager, sops-nix
+  outputs =
-    , nixos-cosmic, ... }@inputs:
+    {
+      self,
+      nixpkgs,
+      unstable,
+      master,
+      home-manager,
+      sops-nix,
+      nixos-cosmic,
+      ...
+    }@inputs:
     let
       inherit (self) outputs;
       lib = nixpkgs.lib // home-manager.lib;
       system = "x86_64-linux";
-      makePkgs = repo:
+      makePkgs =
+        repo:
         import repo {
           inherit system;
           config.allowUnfree = true;
@@ -36,15 +46,23 @@
       overlays = [ (import ./overlay.nix { inherit pkgs pkgsU pkgsM; }) ];
       createConfig = name: {
         inherit system;
-        specialArgs = { inherit inputs outputs; };
+        specialArgs = {
+          inherit inputs outputs;
+        };
         modules = [
           ./hosts/${name}/configuration.nix
           sops-nix.nixosModules.sops
-          ({ ... }: { nixpkgs.overlays = overlays; })
+          (
+            { ... }:
+            {
+              nixpkgs.overlays = overlays;
+            }
+          )
           nixos-cosmic.nixosModules.default
         ];
       };
-    in {
+    in
+    {
       inherit lib pkgs;
       formatter = pkgs.alejandra;
       nixosConfigurations = {

gnome.nix

@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
   services = {
     gvfs.enable = true;
     libinput.enable = true;
@@ -15,14 +16,16 @@
       };
     };
   };
-  environment.gnome.excludePackages = (with pkgs; [
+  environment.gnome.excludePackages =
+    (with pkgs; [
       gnome-photos
       gnome-tour
       gnome-text-editor
       gnome-connections
       # gnome-shell-extensions
       baobab
-  ]) ++ (with pkgs.gnome; [
+    ])
+    ++ (with pkgs.gnome; [
       # totem
       gnome-music
       epiphany
@@ -35,14 +38,16 @@
     enable = true;
     style = "adwaita";
   };
-  users.users.jawz.packages = (with pkgs; [
+  users.users.jawz.packages =
+    (with pkgs; [
       # ffmpegthumbnailer # generate thumbnails
       adw-gtk3 # theme legacy applications
       gnome.gnome-tweaks # tweaks for the gnome desktop environment
       papirus-icon-theme # icon theme
       libgda # for pano shell extension
       # gradience # theme customizer, allows you to modify adw-gtk3 themes
-  ]) ++ (with pkgs.gnomeExtensions; [
+    ])
+    ++ (with pkgs.gnomeExtensions; [
       appindicator # applets for open applications
       reading-strip # like putting a finger on every line I read
       tactile # window manager

home-manager.nix

@@ -1,9 +1,14 @@
-{ config, ... }: {
+{ config, ... }:
+{
   home.stateVersion = "24.05";
   programs.bash = {
     enable = true;
     historyFile = "\${XDG_STATE_HOME}/bash/history";
-    historyControl = [ "erasedups" "ignorespace" "ignoredups" ];
+    historyControl = [
+      "erasedups"
+      "ignorespace"
+      "ignoredups"
+    ];
     shellAliases = {
       cp = "cp -i";
       mv = "mv -i";

hosts/miniserver/hardware-configuration.nix

@@ -1,4 +1,5 @@
-{ lib, modulesPath, ... }: {
+{ lib, modulesPath, ... }:
+{
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
   powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
   hardware = {
@@ -129,7 +130,8 @@
       '';
     };
   };
-  swapDevices = [{
+  swapDevices = [
+    {
       device = "/dev/nvme0n1p3";
       randomEncryption = {
         enable = true;
@@ -137,5 +139,6 @@
         keySize = 512;
         sectorSize = 4096;
       };
-  }];
+    }
+  ];
 }

hosts/miniserver/temp-nginx.nix

@@ -1,4 +1,9 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 let
   proxy = locations: {
     inherit locations;
@@ -6,7 +11,8 @@ let
     enableACME = true;
     http2 = true;
   };
-  proxyReverse = port:
+  proxyReverse =
+    port:
     proxy {
       "/" = {
         proxyPass = "http://192.168.1.69:${toString port}";
@@ -16,14 +22,14 @@ let
           proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
           proxy_set_header X-Forwarded-Proto $scheme;
 
-          proxy_redirect http://192.168.1.69:${
+          proxy_redirect http://192.168.1.69:${toString port}/ https://your_domain.com/;
-            toString port
-          }/ https://your_domain.com/;
         '';
       };
     };
-  proxyReverseArr = port:
+  proxyReverseArr =
-    proxyReverse port // {
+    port:
+    proxyReverse port
+    // {
       extraConfig = ''
         proxy_set_header   X-Forwarded-Host $host;
         proxy_set_header   Upgrade $http_upgrade;
@@ -32,7 +38,8 @@ let
         proxy_http_version 1.1;
       '';
     };
-in {
+in
+{
   services = {
     nginx = {
       appendHttpConfig = ''
@@ -47,10 +54,8 @@ in {
         "movies.${config.my.domain}" = proxyReverseArr 7878 // { };
         "indexer.${config.my.domain}" = proxyReverseArr 9696 // { };
         "music.${config.my.domain}" = proxyReverseArr 8686 // { };
-        "subs.${config.my.domain}" =
+        "subs.${config.my.domain}" = proxyReverse config.services.bazarr.listenPort // { };
-          proxyReverse config.services.bazarr.listenPort // { };
+        "library.${config.my.domain}" = proxyReverse config.services.kavita.port // { };
-        "library.${config.my.domain}" = proxyReverse config.services.kavita.port
-          // { };
         "vnfx2cojmt7dwzcfmi73.${config.my.domain}" = proxyReverse 9091 // { };
         "HSoeJdGRd2Orj0n31UGI.${config.my.domain}" = proxyReverse 3399 // { };
         "flix.${config.my.domain}" = {

hosts/server/hardware-configuration.nix

@@ -1,4 +1,5 @@
-{ lib, modulesPath, ... }: {
+{ lib, modulesPath, ... }:
+{
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
   hardware = {
     nvidia = {
@@ -68,8 +69,14 @@
     };
     extraModulePackages = [ ];
     initrd = {
-      availableKernelModules =
+      availableKernelModules = [
-        [ "xhci_pci" "ahci" "usbhid" "nvme" "usb_storage" "sd_mod" ];
+        "xhci_pci"
+        "ahci"
+        "usbhid"
+        "nvme"
+        "usb_storage"
+        "sd_mod"
+      ];
       kernelModules = [ ];
     };
   };
@@ -129,7 +136,10 @@
     };
     "/mnt/jellyfin/media" = {
       device = "/mnt/pool/multimedia/media";
-      options = [ "bind" "ro" ];
+      options = [
+        "bind"
+        "ro"
+      ];
       depends = [ "/mnt/pool" ];
     };
     # NFS
@@ -154,7 +164,8 @@
       '';
     };
   };
-  swapDevices = [{
+  swapDevices = [
+    {
       device = "/dev/disk/by-partuuid/cb0ad486-ebf8-4bfc-ad7c-96bdc68576ca";
       randomEncryption = {
         enable = true;
@@ -162,5 +173,6 @@
         keySize = 512;
         sectorSize = 4096;
       };
-  }];
+    }
+  ];
 }

hosts/workstation/configuration.nix

@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
   imports = [
     ./hardware-configuration.nix
     ../../base.nix
@@ -53,15 +54,19 @@
   };
   networking = {
     hostName = "workstation";
-    firewall = let
+    firewall =
+      let
         openPorts = [
           6674 # ns-usbloader
         ];
-      openPortRanges = [{
+        openPortRanges = [
+          {
             from = 1714; # kdeconnect
             to = 1764; # kdeconnect
-      }];
+          }
-    in {
+        ];
+      in
+      {
         allowedTCPPorts = openPorts;
         allowedUDPPorts = openPorts;
         allowedTCPPortRanges = openPortRanges;
@@ -132,8 +137,7 @@
       enable = true;
       useUpnp = true;
       enableWebUI = true;
-      httpPass =
+      httpPass = "Uplifting-Proofs-Eggshell-Molecule-Wriggly-Janitor3-Padded-Oxidizing";
-        "Uplifting-Proofs-Eggshell-Molecule-Wriggly-Janitor3-Padded-Oxidizing";
       deviceName = "Oversweet3834";
       httpLogin = "Oversweet3834";
       httpListenPort = 9876;

hosts/workstation/hardware-configuration.nix

@@ -1,8 +1,13 @@
-{ config, modulesPath, lib, ... }: {
+{
+  config,
+  modulesPath,
+  lib,
+  ...
+}:
+{
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
   hardware = {
-    cpu.amd.updateMicrocode =
+    cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-      lib.mkDefault config.hardware.enableRedistributableFirmware;
     bluetooth = {
       enable = true;
       settings.General = {
@@ -45,8 +50,14 @@
     };
     initrd = {
       secrets."/keyfile" = /etc/keyfile;
-      availableKernelModules =
+      availableKernelModules = [
-        [ "xhci_pci" "ahci" "usbhid" "nvme" "usb_storage" "sd_mod" ];
+        "xhci_pci"
+        "ahci"
+        "usbhid"
+        "nvme"
+        "usb_storage"
+        "sd_mod"
+      ];
       luks.devices.nvme = {
         device = "/dev/disk/by-uuid/e9618e85-a631-4374-b2a4-22c376d6e41b";
         keyFile = "/keyfile";
@@ -54,11 +65,16 @@
       };
     };
   };
-  fileSystems = let
+  fileSystems =
+    let
       nfsMount = server: nfsDisk: {
         device = "${server}:/${nfsDisk}";
         fsType = "nfs";
-      options = [ "x-systemd.automount" "noauto" "x-systemd.idle-timeout=600" ];
+        options = [
+          "x-systemd.automount"
+          "noauto"
+          "x-systemd.idle-timeout=600"
+        ];
       };
       btrfsMount = subvol: {
         device = "/dev/mapper/nvme";
@@ -73,7 +89,8 @@
           "datacow"
         ] ++ (if subvol == "nixos" then [ "noatime" ] else [ ]);
       };
-  in {
+    in
+    {
       "/" = btrfsMount "nixos" // { };
       "/home" = btrfsMount "home" // { };
       "/mnt/games" = btrfsMount "games" // { };
@@ -91,7 +108,8 @@
       };
 
     };
-  swapDevices = [{
+  swapDevices = [
+    {
       device = "/dev/disk/by-partuuid/c1bd22d7-e62c-440a-88d1-6464be1aa1b0";
       randomEncryption = {
         enable = true;
@@ -99,5 +117,6 @@
         keySize = 512;
         sectorSize = 4096;
       };
-  }];
+    }
+  ];
 }

jawz.nix

@@ -1,17 +1,19 @@
-{ config, ... }: {
+{ config, ... }:
-  sops.secrets = let
+{
+  sops.secrets =
+    let
       keyConfig = file: {
         sopsFile = ./secrets/keys.yaml;
         owner = config.users.users.jawz.name;
         inherit (config.users.users.jawz) group;
         path = "/home/jawz/.ssh/${file}";
       };
-  in {
+    in
+    {
       jawz-password.neededForUsers = true;
       "private_keys/age" = keyConfig "ed25519_age";
       "public_keys/age" = keyConfig "ed25519_age.pub";
-    "private_keys/${config.networking.hostName}" =
+      "private_keys/${config.networking.hostName}" = keyConfig "ed25519_${config.networking.hostName}";
-      keyConfig "ed25519_${config.networking.hostName}";
       "git_private_keys/${config.networking.hostName}" = keyConfig "ed25519_git";
     };
   users.users.jawz = {

modules/apps.nix

@@ -1,4 +1,5 @@
-{ lib, ... }: {
+{ lib, ... }:
+{
   imports = [
     ./apps/art.nix
     ./apps/dictionaries.nix

modules/apps/art.nix

@@ -1,10 +1,17 @@
-{ config, lib, pkgs, ... }: {
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+{
   options.my = {
     apps.art.enable = lib.mkEnableOption "enable";
     dev.gameDev.enable = lib.mkEnableOption "enable";
   };
   config = lib.mkIf config.my.apps.art.enable {
-    users.users.jawz.packages = (with pkgs; [
+    users.users.jawz.packages =
+      (with pkgs; [
         gimp # the coolest bestest art program to never exist
         krita # art to your heart desire!
         mypaint # not the best art program
@@ -13,13 +20,16 @@
         # pureref # create inspiration/reference boards
         blender # cgi animation and sculpting
         # drawpile # arty party with friends!!
-    ]) ++ (if config.my.dev.gameDev.enable then
+      ])
+      ++ (
+        if config.my.dev.gameDev.enable then
           with pkgs;
           [
             godot_4 # game development
             # gdtoolkit # gdscript language server
           ]
         else
-      [ ]);
+          [ ]
+      );
   };
 }

modules/apps/dictionaries.nix

@@ -1,4 +1,10 @@
-{ config, lib, pkgs, ... }: {
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+{
   options.my.apps.dictionaries.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.apps.dictionaries.enable {
     users.users.jawz.packages = with pkgs; [

modules/apps/fonts.nix

@@ -1,4 +1,10 @@
-{ config, lib, pkgs, ... }: {
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+{
   options.my.apps.fonts.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.apps.fonts.enable {
     users.users.jawz.packages = with pkgs; [

modules/apps/gaming.nix

@@ -1,4 +1,11 @@
-{ config, lib, pkgs, inputs, ... }: {
+{
+  config,
+  lib,
+  pkgs,
+  inputs,
+  ...
+}:
+{
   imports = [ inputs.nix-gaming.nixosModules.platformOptimizations ];
   options.my.apps.gaming.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.apps.gaming.enable {
@@ -12,11 +19,12 @@
         platformOptimizations.enable = true;
       };
     };
-    users.users.jawz.packages = let
+    users.users.jawz.packages =
+      let
         polymc = pkgs.callPackage ../../pkgs/polymc/default.nix { };
-      citra-nightly =
+        citra-nightly = pkgs.callPackage ../../pkgs/citra/default.nix { branch = "nightly"; };
-        pkgs.callPackage ../../pkgs/citra/default.nix { branch = "nightly"; };
+      in
-    in (with pkgs; [
+      (with pkgs; [
         shipwright # zelda OoT port
         mangohud # fps & stats overlay
         lutris # games launcher & emulator hub
@@ -35,7 +43,8 @@
         dolphin-emu # wii emulator
         snes9x-gtk # snes emulator
         ryujinx # switch emulator
-    ]) ++ [
+      ])
+      ++ [
         citra-nightly # 3Ds emulator
         polymc # minecraft launcher with mod support
       ];

modules/apps/internet.nix

@@ -1,4 +1,10 @@
-{ config, lib, pkgs, ... }: {
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+{
   options.my.apps.internet.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.apps.internet.enable {
     programs = {
@@ -6,13 +12,19 @@
       firefox = {
         enable = true;
         package = pkgs.librewolf; # fuck u firefox
-        languagePacks = [ "en-CA" "es-MX" "it" ];
+        languagePacks = [
+          "en-CA"
+          "es-MX"
+          "it"
+        ];
       };
     };
     services.psd.enable = true;
     users.users.jawz.packages =
-      let vdhcoapp = pkgs.callPackage ../../pkgs/vdhcoapp/default.nix { };
+      let
-      in (with pkgs; [
+        vdhcoapp = pkgs.callPackage ../../pkgs/vdhcoapp/default.nix { };
+      in
+      (with pkgs; [
         warp # transfer files with based ppl
         brave # crypto-browser that at least somewhat integrates with gtk
         nextcloud-client # self-hosted google-drive alternative
@@ -26,7 +38,8 @@
         discord # :3
         teamspeak5_client # ppl say they will use this...?
         # hugo # website engine
-      ]) ++ [
+      ])
+      ++ [
         vdhcoapp # video download helper assistant
       ];
   };

modules/apps/misc.nix

@@ -1,4 +1,10 @@
-{ config, lib, pkgs, ... }: {
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+{
   options.my.apps.misc.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.apps.misc.enable {
     users.users.jawz.packages = with pkgs; [

modules/apps/multimedia.nix

@@ -1,4 +1,10 @@
-{ config, lib, pkgs, ... }: {
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+{
   options.my.apps.multimedia.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.apps.multimedia.enable {
     users.users.jawz.packages = with pkgs; [

modules/apps/office.nix

@@ -1,4 +1,10 @@
-{ config, lib, pkgs, ... }: {
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+{
   options.my.apps.office.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.apps.office.enable {
     environment.variables.CALIBRE_USE_SYSTEM_THEME = "1";

modules/dev.nix

@@ -1,4 +1,5 @@
-{ lib, ... }: {
+{ lib, ... }:
+{
   imports = [
     ./dev/sh.nix
     ./dev/nix.nix

modules/dev/docker.nix

@@ -1,4 +1,10 @@
-{ config, lib, pkgs, ... }: {
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+{
   options.my.dev.docker.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.dev.docker.enable {
     environment.variables.DOCKER_CONFIG = "\${XDG_CONFIG_HOME}/docker";

modules/dev/haskell.nix

@@ -1,4 +1,10 @@
-{ config, lib, pkgs, ... }: {
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+{
   options.my.dev.haskell.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.dev.haskell.enable {
     users.users.jawz.packages = with pkgs; [

modules/dev/javascript.nix

@@ -1,16 +1,27 @@
-{ config, lib, pkgs, ... }: {
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+{
   options.my.dev.javascript.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.dev.javascript.enable {
     home-manager.users.jawz.xdg.configFile = {
       "npm/npmrc".source = ../../dotfiles/npm/npmrc;
-      "configstore/update-notifier-npm-check.json".source =
+      "configstore/update-notifier-npm-check.json".source = ../../dotfiles/npm/update-notifier-npm-check.json;
-        ../../dotfiles/npm/update-notifier-npm-check.json;
     };
-    users.users.jawz.packages = with pkgs; [ nodejs nodePackages.pnpm ];
+    users.users.jawz.packages = with pkgs; [
+      nodejs
+      nodePackages.pnpm
+    ];
     environment.variables = {
       NPM_CONFIG_USERCONFIG = "\${XDG_CONFIG_HOME}/npm/npmrc";
       PNPM_HOME = "\${XDG_DATA_HOME}/pnpm";
-      PATH = [ "\${XDG_DATA_HOME}/npm/bin" "\${XDG_DATA_HOME}/pnpm" ];
+      PATH = [
+        "\${XDG_DATA_HOME}/npm/bin"
+        "\${XDG_DATA_HOME}/pnpm"
+      ];
     };
   };
 }

modules/dev/nix.nix

@@ -1,4 +1,10 @@
-{ config, lib, pkgs, ... }: {
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+{
   options.my.dev.nix.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.dev.nix.enable {
     users.users.jawz.packages = with pkgs; [

modules/dev/python.nix

@@ -1,14 +1,19 @@
-{ config, lib, pkgs, ... }: {
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+{
   options.my.dev.python.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.dev.python.enable {
-    home-manager.users.jawz.xdg.configFile."python/pythonrc".source =
+    home-manager.users.jawz.xdg.configFile."python/pythonrc".source = ../../dotfiles/pythonrc;
-      ../../dotfiles/pythonrc;
     environment.variables.PYTHONSTARTUP = "\${XDG_CONFIG_HOME}/python/pythonrc";
     users.users.jawz.packages = with pkgs; [
       pipenv # python development workflow for humans
       nodePackages.pyright # LSP
-      (python3.withPackages (ps:
+      (python3.withPackages (
-        with ps; [
+        ps: with ps; [
           black # Python code formatter
           editorconfig # follow rules of contributin
           flake8 # wraper for pyflakes, pycodestyle and mccabe
@@ -19,7 +24,8 @@
           # nose # testing and running python scripts
           # poetry # dependency management made easy
           # pytest # framework for writing tests
-        ]))
+        ]
+      ))
     ];
   };
 }

modules/dev/sh.nix

@@ -1,4 +1,10 @@
-{ config, lib, pkgs, ... }: {
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+{
   options.my.dev.sh.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.dev.sh.enable {
     users.users.jawz.packages = with pkgs; [

modules/emacs.nix

@@ -1,4 +1,10 @@
-{ config, lib, pkgs, ... }: {
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+{
   options.my.emacs.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.emacs.enable {
     home-manager.users.jawz = {
@@ -18,7 +24,8 @@
         };
       };
     };
-    users.users.jawz.packages = (with pkgs; [
+    users.users.jawz.packages =
+      (with pkgs; [
         fd # modern find, faster searches
         fzf # fuzzy finder! super cool and useful
         ripgrep # modern grep
@@ -35,16 +42,17 @@
         # lsps
         yaml-language-server
         markdownlint-cli
-    ]) ++ (with pkgs.nodePackages; [
+      ])
+      ++ (with pkgs.nodePackages; [
         vscode-json-languageserver
         # linters
         prettier
       ]);
     services.emacs = {
       enable = true;
-      package = with pkgs;
+      package =
-        ((emacsPackagesFor emacs-gtk).emacsWithPackages
+        with pkgs;
-          (epkgs: with epkgs; [ vterm ]));
+        ((emacsPackagesFor emacs-gtk).emacsWithPackages (epkgs: with epkgs; [ vterm ]));
       defaultEditor = true;
     };
     environment.variables.PATH = [ "\${XDG_CONFIG_HOME}/emacs/bin" ];

modules/scripts.nix

@@ -1,4 +1,5 @@
-{ lib, ... }: {
+{ lib, ... }:
+{
   imports = [
     ./scripts/download.nix
     ./scripts/ffmpeg4discord.nix

modules/scripts/base.nix

@@ -1,6 +1,13 @@
-{ config, lib, pkgs, ... }: {
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+{
   options.my.scripts = lib.mkOption {
-    type = lib.types.attrsOf (lib.types.submodule {
+    type = lib.types.attrsOf (
+      lib.types.submodule {
         options = {
           enable = lib.mkEnableOption "Whether to enable this script";
           install = lib.mkEnableOption "Whether to install the script package";
@@ -23,37 +30,51 @@
             description = "Package containing the executable script.";
           };
         };
-    });
+      }
+    );
     default = { };
     description = "Configuration for multiple scripts.";
   };
 
   config = lib.mkIf (lib.any (s: s.enable) (lib.attrValues config.my.scripts)) {
-    users.users.jawz.packages = lib.flatten (lib.mapAttrsToList (_name: script:
+    users.users.jawz.packages = lib.flatten (
-      lib.optional (script.enable && script.install) script.package)
+      lib.mapAttrsToList (
-      config.my.scripts);
+        _name: script: lib.optional (script.enable && script.install) script.package
+      ) config.my.scripts
+    );
 
-    systemd.user.services = lib.mapAttrs' (name: script:
+    systemd.user.services = lib.mapAttrs' (
-      lib.nameValuePair "${script.name}"
+      name: script:
-      (lib.mkIf (script.enable && script.service) {
+      lib.nameValuePair "${script.name}" (
+        lib.mkIf (script.enable && script.service) {
           restartIfChanged = true;
           inherit (script) description;
           wantedBy = [ "default.target" ];
-        path = [ pkgs.nix script.package ];
+          path = [
+            pkgs.nix
+            script.package
+          ];
           serviceConfig = {
             Restart = "on-failure";
             RestartSec = 30;
             ExecStart = "${script.package}/bin/${script.name}";
           };
-      })) config.my.scripts;
+        }
+      )
+    ) config.my.scripts;
 
-    systemd.user.timers = lib.mapAttrs' (name: script:
+    systemd.user.timers = lib.mapAttrs' (
-      lib.nameValuePair "${script.name}"
+      name: script:
-      (lib.mkIf (script.enable && script.service) {
+      lib.nameValuePair "${script.name}" (
+        lib.mkIf (script.enable && script.service) {
           enable = true;
           inherit (script) description;
           wantedBy = [ "timers.target" ];
-        timerConfig = { OnCalendar = script.timer; };
+          timerConfig = {
-      })) config.my.scripts;
+            OnCalendar = script.timer;
+          };
+        }
+      )
+    ) config.my.scripts;
   };
 }

modules/scripts/download.nix

@@ -1,20 +1,35 @@
-{ pkgs, lib, config, ... }: {
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
+{
   imports = [ ./base.nix ];
   options.my.units.download.enable = lib.mkEnableOption "enable";
-  config = let
+  config =
-    download = with pkgs;
+    let
+      download =
+        with pkgs;
         python3Packages.buildPythonApplication {
           pname = "download";
           version = "2.5";
           src = ../../scripts/download/.;
           build-system = with python3Packages; [ setuptools ];
-        dependencies = with python3Packages; [ pyyaml types-pyyaml yt-dlp ];
+          dependencies = with python3Packages; [
-        propagatedBuildInputs = [ gallery-dl ffmpeg ];
+            pyyaml
+            types-pyyaml
+            yt-dlp
+          ];
+          propagatedBuildInputs = [
+            gallery-dl
+            ffmpeg
+          ];
         };
-  in {
+    in
+    {
       home-manager.users.jawz = {
-      xdg.configFile."gallery-dl/config.json".source =
+        xdg.configFile."gallery-dl/config.json".source = ../../dotfiles/gallery-dl/config.json;
-        ../../dotfiles/gallery-dl/config.json;
         services.lorri.enable = true;
         programs.bash = {
           shellAliases = {
@@ -31,12 +46,16 @@
         };
       };
       systemd.user = lib.mkIf config.my.units.download.enable {
-      services = let
+        services =
+          let
             mkDownloadService = desc: execStartCmd: {
               restartIfChanged = true;
               description = "Downloads ${desc}";
               wantedBy = [ "default.target" ];
-          path = [ pkgs.bash download ];
+              path = [
+                pkgs.bash
+                download
+              ];
               serviceConfig = {
                 TimeoutStartSec = 2000;
                 TimeoutStopSec = 2000;
@@ -45,15 +64,16 @@
                 ExecStart = "${download}/bin/download ${execStartCmd}";
               };
             };
-      in {
+          in
+          {
             tuhmayto = mkDownloadService "tuhmayto stuff" ''
               -u jawz -i https://x.com/tuhmayto/media \
               https://www.furaffinity.net/user/tuhmayto/'';
             "download@" = mkDownloadService "post from multiple sources" "%I";
-        "instagram@" = mkDownloadService "post types from instagram"
+            "instagram@" = mkDownloadService "post types from instagram" "instagram -u jawz -t %I";
-          "instagram -u jawz -t %I";
           };
-      timers = let
+        timers =
+          let
             downloadTimer = time: delay: {
               enable = true;
               description = "Downloads post types from different sites";
@@ -64,7 +84,8 @@
                 Persistent = true;
               };
             };
-      in {
+          in
+          {
             "instagram@stories" = downloadTimer "*-*-* 08:12:00" 120 // { };
             "download@main" = downloadTimer "*-*-* 06,18:02:00" 30 // { };
             "download@push" = downloadTimer "*:0/5" 30 // { };
@@ -75,7 +96,9 @@
               enable = true;
               description = "Downloads tuhmayto stuff";
               wantedBy = [ "timers.target" ];
-          timerConfig = { OnCalendar = "*:0/10"; };
+              timerConfig = {
+                OnCalendar = "*:0/10";
+              };
             };
           };
       };

modules/scripts/ffmpeg4discord.nix

@@ -1,11 +1,11 @@
-{ pkgs, lib, ... }: {
+{ pkgs, lib, ... }:
+{
   imports = [ ./base.nix ];
   config.my.scripts.ffmpeg4discord = {
     enable = lib.mkDefault false;
     install = true;
     service = false;
     name = "ffmpeg4discord";
-    package = pkgs.writeScriptBin "ffmpeg4discord"
+    package = pkgs.writeScriptBin "ffmpeg4discord" (builtins.readFile ../../scripts/ffmpeg4discord.py);
-      (builtins.readFile ../../scripts/ffmpeg4discord.py);
   };
 }

modules/scripts/ffmpreg.nix

@@ -1,11 +1,11 @@
-{ pkgs, lib, ... }: {
+{ pkgs, lib, ... }:
+{
   imports = [ ./base.nix ];
   config.my.scripts.ffmpreg = {
     enable = lib.mkDefault false;
     install = true;
     service = false;
     name = "ffmpreg";
-    package = pkgs.writeScriptBin "ffmpreg"
+    package = pkgs.writeScriptBin "ffmpreg" (builtins.readFile ../../scripts/ffmpreg.sh);
-      (builtins.readFile ../../scripts/ffmpreg.sh);
   };
 }

modules/scripts/find-dup-episode.nix

@@ -1,11 +1,13 @@
-{ pkgs, lib, ... }: {
+{ pkgs, lib, ... }:
+{
   imports = [ ./base.nix ];
   config.my.scripts.find-dup-episodes = {
     enable = lib.mkDefault false;
     install = true;
     service = false;
     name = "find-dup-episodes";
-    package = pkgs.writeScriptBin "find-dup-episodes"
+    package = pkgs.writeScriptBin "find-dup-episodes" (
-      (builtins.readFile ../../scripts/find-dup-episodes.sh);
+      builtins.readFile ../../scripts/find-dup-episodes.sh
+    );
   };
 }

modules/scripts/manage-library.nix

@@ -1,4 +1,5 @@
-{ pkgs, lib, ... }: {
+{ pkgs, lib, ... }:
+{
   imports = [ ./base.nix ];
   config.my.scripts.manage-library = {
     enable = lib.mkDefault false;
@@ -7,7 +8,6 @@
     name = "manage-library";
     timer = "00:30";
     description = "scans the library directory and sorts files";
-    package = pkgs.writeScriptBin "manage-library"
+    package = pkgs.writeScriptBin "manage-library" (builtins.readFile ../../scripts/manage-library.sh);
-      (builtins.readFile ../../scripts/manage-library.sh);
   };
 }

modules/scripts/pika-list.nix

@@ -1,11 +1,11 @@
-{ pkgs, lib, ... }: {
+{ pkgs, lib, ... }:
+{
   imports = [ ./base.nix ];
   config.my.scripts.pika-list = {
     enable = lib.mkDefault false;
     install = true;
     service = false;
     name = "pika-list";
-    package = pkgs.writeScriptBin "pika-list"
+    package = pkgs.writeScriptBin "pika-list" (builtins.readFile ../../scripts/pika-list.sh);
-      (builtins.readFile ../../scripts/pika-list.sh);
   };
 }

modules/scripts/run.nix

@@ -1,11 +1,11 @@
-{ pkgs, lib, ... }: {
+{ pkgs, lib, ... }:
+{
   imports = [ ./base.nix ];
   config.my.scripts.run = {
     enable = lib.mkDefault false;
     install = true;
     service = false;
     name = "run";
-    package =
+    package = pkgs.writeScriptBin "run" (builtins.readFile ../../scripts/run.sh);
-      pkgs.writeScriptBin "run" (builtins.readFile ../../scripts/run.sh);
   };
 }

modules/scripts/split-dir.nix

@@ -1,11 +1,11 @@
-{ pkgs, lib, ... }: {
+{ pkgs, lib, ... }:
+{
   imports = [ ./base.nix ];
   config.my.scripts.split-dir = {
     enable = lib.mkDefault false;
     install = true;
     service = false;
     name = "split-dir";
-    package = pkgs.writeScriptBin "split-dir"
+    package = pkgs.writeScriptBin "split-dir" (builtins.readFile ../../scripts/split-dir.sh);
-      (builtins.readFile ../../scripts/split-dir.sh);
   };
 }

modules/scripts/stream-dl.nix

@@ -1,23 +1,34 @@
-{ pkgs, lib, config, ... }: {
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
+{
   imports = [ ./base.nix ];
   options.my.units.stream-dl.enable = lib.mkEnableOption "enable";
-  config = let
+  config =
-    stream-dl = pkgs.writeScriptBin "stream-dl"
+    let
-      (builtins.readFile ../../scripts/stream-dl.sh);
+      stream-dl = pkgs.writeScriptBin "stream-dl" (builtins.readFile ../../scripts/stream-dl.sh);
-  in {
+    in
+    {
       systemd.user = lib.mkIf config.my.units.stream-dl.enable {
         services."stream@" = {
           description = "monitors a stream channel for online streams.";
           restartIfChanged = true;
           wantedBy = [ "default.target" ];
-        path = [ pkgs.nix stream-dl ];
+          path = [
+            pkgs.nix
+            stream-dl
+          ];
           serviceConfig = {
             Restart = "on-failure";
             RestartSec = 30;
             ExecStart = "${stream-dl}/bin/stream-dl %I";
           };
         };
-      timers = let
+        timers =
+          let
             streamTimer = {
               enable = true;
               description = "monitors a stream channel for online streams.";
@@ -28,7 +39,8 @@
                 RandomizedDelaySec = 30;
               };
             };
-      in {
+          in
+          {
             "stream@johnneal911" = streamTimer // { };
             "stream@uk2011boy" = streamTimer // { };
             "stream@tommy9x6" = streamTimer // { };

modules/scripts/tasks.nix

@@ -1,4 +1,5 @@
-{ pkgs, lib, ... }: {
+{ pkgs, lib, ... }:
+{
   imports = [ ./base.nix ];
   config.my.scripts.tasks = {
     enable = lib.mkDefault false;
@@ -7,7 +8,6 @@
     name = "tasks";
     timer = "*:0/10";
     description = "Runs a bunch of organizing tasks on selected directories";
-    package =
+    package = pkgs.writeScriptBin "tasks" (builtins.readFile ../../scripts/tasks.sh);
-      pkgs.writeScriptBin "tasks" (builtins.readFile ../../scripts/tasks.sh);
   };
 }

modules/scripts/update-dns.nix

@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
   imports = [ ./base.nix ];
   config = {
     sops.secrets = {
@@ -25,10 +31,11 @@
       name = "update-dns";
       timer = "*:0/30";
       description = "Updates the IP of all my domains";
-      package = let
+      package =
-        update-dns = pkgs.writeScriptBin "update-dns"
+        let
-          (builtins.readFile ../../scripts/update-dns.sh);
+          update-dns = pkgs.writeScriptBin "update-dns" (builtins.readFile ../../scripts/update-dns.sh);
-      in pkgs.writeScriptBin "update-dns" ''
+        in
+        pkgs.writeScriptBin "update-dns" ''
           #!/usr/bin/env nix-shell
           #! nix-shell -i bash -p bash curl 
           set -a

modules/servers.nix

@@ -1,4 +1,9 @@
-{ lib, config, pkgs, ... }:
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
 let
   setup = import ./servers/base.nix { inherit lib config; };
   proxy = locations: {
@@ -7,12 +12,11 @@ let
     enableACME = true;
     http2 = true;
   };
-  proxyReverse = port:
+  proxyReverse = port: proxy { "/".proxyPass = "http://${config.my.localhost}:${toString port}/"; };
-    proxy {
+  proxyReverseArr =
-      "/".proxyPass = "http://${config.my.localhost}:${toString port}/";
+    port:
-    };
+    proxyReverse port
-  proxyReverseArr = port:
+    // {
-    proxyReverse port // {
       extraConfig = ''
         proxy_set_header   Host $host;
         proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -35,17 +39,46 @@ let
     config.my.servers.metube.enable
     config.my.servers.go-vod.enable
   ];
-in {
+in
+{
   imports = [
     ./servers/adguardhome.nix
     ./servers/paperless.nix
     ./servers/postgres.nix
-    (import ./servers/audiobookshelf.nix { inherit lib config proxy setup; })
+    (import ./servers/audiobookshelf.nix {
+      inherit
+        lib
+        config
+        proxy
+        setup
+        ;
+    })
     (import ./servers/bazarr.nix { inherit lib config proxyReverse; })
     (import ./servers/flame.nix { inherit lib config proxyReverse; })
-    (import ./servers/homepage.nix { inherit lib config pkgs proxyReverse; })
+    (import ./servers/homepage.nix {
-    (import ./servers/jellyfin.nix { inherit lib config pkgs setup; })
+      inherit
-    (import ./servers/kavita.nix { inherit lib config pkgs proxyReverse; })
+        lib
+        config
+        pkgs
+        proxyReverse
+        ;
+    })
+    (import ./servers/jellyfin.nix {
+      inherit
+        lib
+        config
+        pkgs
+        setup
+        ;
+    })
+    (import ./servers/kavita.nix {
+      inherit
+        lib
+        config
+        pkgs
+        proxyReverse
+        ;
+    })
     (import ./servers/lidarr.nix { inherit lib config proxyReverseArr; })
     (import ./servers/maloja.nix { inherit lib config proxyReverse; })
     (import ./servers/mealie.nix { inherit lib config proxyReverse; })
@@ -54,14 +87,49 @@ in {
     (import ./servers/multi-scrobbler.nix { inherit lib config proxyReverse; })
     (import ./servers/nextcloud.nix { inherit lib config pkgs; })
     (import ./servers/prowlarr.nix { inherit lib config proxyReverseArr; })
-    (import ./servers/qbittorrent.nix { inherit lib config pkgs proxyReverse; })
+    (import ./servers/qbittorrent.nix {
-    (import ./servers/sabnzbd.nix { inherit lib config pkgs proxyReverse; })
+      inherit
+        lib
+        config
+        pkgs
+        proxyReverse
+        ;
+    })
+    (import ./servers/sabnzbd.nix {
+      inherit
+        lib
+        config
+        pkgs
+        proxyReverse
+        ;
+    })
     (import ./servers/radarr.nix { inherit lib config proxyReverseArr; })
     (import ./servers/ryot.nix { inherit lib config proxyReverse; })
-    (import ./servers/shiori.nix { inherit lib config pkgs proxyReverse; })
+    (import ./servers/shiori.nix {
+      inherit
+        lib
+        config
+        pkgs
+        proxyReverse
+        ;
+    })
     (import ./servers/sonarr.nix { inherit lib config proxyReverse; })
-    (import ./servers/vaultwarden.nix { inherit lib config pkgs proxyReverse; })
+    (import ./servers/vaultwarden.nix {
-    (import ./servers/firefly-iii.nix { inherit lib config pkgs proxyReverse; })
+      inherit
+        lib
+        config
+        pkgs
+        proxyReverse
+        ;
+    })
+    (import ./servers/firefly-iii.nix {
+      inherit
+        lib
+        config
+        pkgs
+        proxyReverse
+        ;
+    })
   ];
   options.my = {
     localhost = lib.mkOption {
@@ -173,8 +241,14 @@ in {
       clientMaxBodySize = "4096m";
       sslCiphers = "AES256+EECDH:AES256+EDH:!aNULL";
     };
-    networking.firewall = let ports = [ 80 443 ];
+    networking.firewall =
-    in {
+      let
+        ports = [
+          80
+          443
+        ];
+      in
+      {
         enable = true;
         allowedTCPPorts = ports;
         allowedUDPPorts = ports;

modules/servers/adguardhome.nix

@@ -1,4 +1,5 @@
-{ lib, config, ... }: {
+{ lib, config, ... }:
+{
   options.my.servers.adguardhome.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.servers.adguardhome.enable {
     services.adguardhome = {

modules/servers/audiobookshelf.nix

@@ -1,8 +1,15 @@
-{ lib, config, proxy, setup, ... }:
+{
-let cfg = config.my.servers.audiobookshelf;
+  lib,
-in {
+  config,
-  options.my.servers.audiobookshelf =
+  proxy,
-    setup.mkOptions "audiobookshelf" "audiobooks" 5687;
+  setup,
+  ...
+}:
+let
+  cfg = config.my.servers.audiobookshelf;
+in
+{
+  options.my.servers.audiobookshelf = setup.mkOptions "audiobookshelf" "audiobooks" 5687;
   config = lib.mkIf config.my.servers.audiobookshelf.enable {
     services = {
       audiobookshelf = {

modules/servers/base.nix

@@ -24,4 +24,7 @@ let
       default = "http://${config.my.localhost}:${toString port}";
     };
   };
-in { inherit mkOptions; }
+in
+{
+  inherit mkOptions;
+}

modules/servers/bazarr.nix

@@ -1,4 +1,10 @@
-{ lib, config, proxyReverse, ... }: {
+{
+  lib,
+  config,
+  proxyReverse,
+  ...
+}:
+{
   options.my.servers.bazarr.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.servers.bazarr.enable {
     services = {

modules/servers/firefly-iii.nix

@@ -1,7 +1,7 @@
-{ lib, config, ... }: {
+{ lib, config, ... }:
+{
   options.my.servers.firefly-iii.enable = lib.mkEnableOption "enable";
-  config = lib.mkIf (config.my.servers.firefly-iii.enable
+  config = lib.mkIf (config.my.servers.firefly-iii.enable && config.my.servers.postgres.enable) {
-    && config.my.servers.postgres.enable) {
     sops.secrets.firefly-iii-keyfile = {
       owner = config.users.users.firefly-iii.name;
       inherit (config.users.users.firefly-iii) group;

modules/servers/flame.nix

@@ -1,8 +1,14 @@
-{ lib, config, proxyReverse, ... }:
+{
+  lib,
+  config,
+  proxyReverse,
+  ...
+}:
 let
   port = 5005;
   portSecret = 5007;
-in {
+in
+{
   options.my.servers = {
     flame.enable = lib.mkEnableOption "enable";
     flameSecret.enable = lib.mkEnableOption "enable";
@@ -40,8 +46,7 @@ in {
     };
     services.nginx = {
       virtualHosts."start.${config.my.domain}" = proxyReverse port // { };
-      virtualHosts."qampqwn4wprhqny8h8zj.${config.my.domain}" =
+      virtualHosts."qampqwn4wprhqny8h8zj.${config.my.domain}" = proxyReverse portSecret // { };
-        proxyReverse portSecret // { };
     };
   };
 }

modules/servers/homepage.nix

@@ -1,8 +1,14 @@
-{ lib, config, proxyReverse, ... }:
+{
+  lib,
+  config,
+  proxyReverse,
+  ...
+}:
 let
   port = 8082;
   services = import ./homepage/services.nix { inherit config lib; };
-in {
+in
+{
   options.my.servers.homepage.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.servers.homepage.enable {
     sops.secrets.homepage.sopsFile = ../../secrets/env.yaml;
@@ -22,8 +28,7 @@ in {
               columns = 4;
             };
           };
-          background =
+          background = "https://images.unsplash.com/photo-1502790671504-542ad42d5189?auto=format&fit=crop&w=2560&q=80";
-            "https://images.unsplash.com/photo-1502790671504-542ad42d5189?auto=format&fit=crop&w=2560&q=80";
         };
         widgets = [
           {
@@ -37,7 +42,11 @@ in {
           }
           {
             search = {
-              provider = [ "brave" "bing" "google" ];
+              provider = [
+                "brave"
+                "bing"
+                "google"
+              ];
               target = "_blank";
               showSearchSuggestions = true;
             };

modules/servers/homepage/services.nix

@@ -1,4 +1,5 @@
-{ config, lib, ... }: {
+{ config, lib, ... }:
+{
   audiobookshelf = lib.mkIf config.my.servers.audiobookshelf.enable {
     icon = "${config.my.servers.audiobookshelf.name}.png";
     href = config.my.servers.audiobookshelf.url;
@@ -8,10 +9,12 @@
       key = "{{HOMEPAGE_VAR_AUDIOBOOKSHELF}}";
     };
   };
-  jellyfin = let
+  jellyfin =
+    let
       name = "jellyfin";
       url = "https://flix.servidos.lat";
-  in {
+    in
+    {
       icon = "${name}.png";
       href = url;
       widget = {
@@ -23,10 +26,12 @@
         enableNowPlaying = false;
       };
     };
-  "now playing" = let
+  "now playing" =
+    let
       name = "jellyfin";
       url = "https://flix.servidos.lat";
-  in {
+    in
+    {
       icon = "${name}.png";
       href = url;
       widget = {
@@ -40,10 +45,12 @@
         expandOneStreamToTwoRows = true;
       };
     };
-  sonarr = let
+  sonarr =
+    let
       name = "sonarr";
       url = "https://series.servidos.lat";
-  in {
+    in
+    {
       icon = "${name}.png";
       href = url;
       widget = {
@@ -53,10 +60,12 @@
         enableQueue = true;
       };
     };
-  radarr = let
+  radarr =
+    let
       name = "radarr";
       url = "https://movies.servidos.lat";
-  in {
+    in
+    {
       icon = "${name}.png";
       href = url;
       widget = {
@@ -66,10 +75,12 @@
         enableQueue = true;
       };
     };
-  lidarr = let
+  lidarr =
+    let
       name = "lidarr";
       url = "https://music.servidos.lat";
-  in {
+    in
+    {
       icon = "${name}.png";
       href = url;
       widget = {
@@ -78,10 +89,12 @@
         key = "{{HOMEPAGE_VAR_LIDARR}}";
       };
     };
-  prowlarr = let
+  prowlarr =
+    let
       name = "prowlarr";
       url = "https://indexer.servidos.lat";
-  in {
+    in
+    {
       icon = "${name}.png";
       href = url;
       widget = {
@@ -90,10 +103,12 @@
         key = "{{HOMEPAGE_VAR_PROWLARR}}";
       };
     };
-  bazarr = let
+  bazarr =
+    let
       name = "bazarr";
       url = "https://subs.servidos.lat";
-  in {
+    in
+    {
       icon = "${name}.png";
       href = url;
       widget = {
@@ -102,10 +117,12 @@
         key = "{{HOMEPAGE_VAR_BAZARR}}";
       };
     };
-  kavita = let
+  kavita =
+    let
       name = "kavita";
       url = "https://library.servidos.lat";
-  in {
+    in
+    {
       icon = "${name}.png";
       href = url;
       widget = {
@@ -115,10 +132,12 @@
         password = "{{HOMEPAGE_VAR_KAVITA_PASSWORD}}";
       };
     };
-  "qbittorrent server" = let
+  "qbittorrent server" =
+    let
       name = "qbittorrent";
       url = "https://vnfx2cojmt7dwzcfmi73.servidos.lat";
-  in {
+    in
+    {
       icon = "${name}.png";
       href = url;
       widget = {
@@ -128,10 +147,12 @@
         password = "{{HOMEPAGE_VAR_QBIT_PASSWORD}}";
       };
     };
-  "qbittorrent miniserver" = let
+  "qbittorrent miniserver" =
+    let
       name = "qbittorrent";
       url = "https://xfwmrle6h6skqujbeizw.servidos.lat";
-  in {
+    in
+    {
       icon = "${name}.png";
       href = url;
       widget = {
@@ -141,10 +162,12 @@
         password = "{{HOMEPAGE_VAR_QBIT_PASSWORD}}";
       };
     };
-  sabnzbd = let
+  sabnzbd =
+    let
       name = "sabnzbd";
       url = "https://HSoeJdGRd2Orj0n31UGI.servidos.lat";
-  in {
+    in
+    {
       icon = "${name}.png";
       href = url;
       widget = {

modules/servers/jellyfin.nix

@@ -1,8 +1,13 @@
-{ lib, config, pkgs, setup, ... }:
+{
+  lib,
+  config,
+  pkgs,
+  setup,
+  ...
+}:
 let
   cfg = config.my.servers.jellyfin;
-  sub-sync = pkgs.writeScriptBin "sub-sync"
+  sub-sync = pkgs.writeScriptBin "sub-sync" (builtins.readFile ../../scripts/sub-sync.sh);
-    (builtins.readFile ../../scripts/sub-sync.sh);
   sub-sync-path = [
     pkgs.nix
     pkgs.bash
@@ -14,11 +19,13 @@ let
     pkgs.gum
     sub-sync
   ];
-in {
+in
+{
   options.my.servers.jellyfin = setup.mkOptions "jellyfin" "flix" 8096;
   config = lib.mkIf cfg.enable {
-    environment.systemPackages = [ pkgs.jellyfin-ffmpeg ]
+    environment.systemPackages = [
-      ++ (if cfg.enableCron then sub-sync-path else [ ]);
+      pkgs.jellyfin-ffmpeg
+    ] ++ (if cfg.enableCron then sub-sync-path else [ ]);
     services = {
       jellyfin = {
         enable = true;
@@ -131,7 +138,9 @@ in {
         enable = true;
         description = "syncronizes subtitles downloaded & modified today";
         wantedBy = [ "timers.target" ];
-        timerConfig = { OnCalendar = "20:00"; };
+        timerConfig = {
+          OnCalendar = "20:00";
+        };
       };
     };
   };

modules/servers/kavita.nix

@@ -1,4 +1,10 @@
-{ lib, config, proxyReverse, ... }: {
+{
+  lib,
+  config,
+  proxyReverse,
+  ...
+}:
+{
   options.my.servers.kavita.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.servers.kavita.enable {
     sops.secrets.kavita-token = {
@@ -15,8 +21,7 @@
         enable = true;
         tokenKeyFile = config.sops.secrets.kavita-token.path;
       };
-      nginx.virtualHosts."library.${config.my.domain}" =
+      nginx.virtualHosts."library.${config.my.domain}" = proxyReverse config.services.kavita.port // { };
-        proxyReverse config.services.kavita.port // { };
     };
   };
 }

modules/servers/lidarr.nix

@@ -1,8 +1,14 @@
-{ lib, config, proxyReverseArr, ... }:
+{
+  lib,
+  config,
+  proxyReverseArr,
+  ...
+}:
 let
   port = 8686;
   url = "music.${config.my.domain}";
-in {
+in
+{
   options.my.servers.lidarr.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.servers.lidarr.enable {
     virtualisation.oci-containers.containers.lidarr = {

modules/servers/maloja.nix

@@ -1,8 +1,14 @@
-{ lib, config, proxyReverse, ... }:
+{
+  lib,
+  config,
+  proxyReverse,
+  ...
+}:
 let
   port = 42010;
   url = "maloja.${config.my.domain}";
-in {
+in
+{
   options.my.servers.maloja.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.servers.maloja.enable {
     sops.secrets.maloja.sopsFile = ../../secrets/env.yaml;

modules/servers/mealie.nix

@@ -1,9 +1,15 @@
-{ lib, config, proxyReverse, ... }:
+{
+  lib,
+  config,
+  proxyReverse,
+  ...
+}:
 let
   port = 9925;
   domain = "mealie.${config.my.domain}";
   url = "https://${domain}";
-in {
+in
+{
   options.my.servers.mealie.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.servers.mealie.enable {
     sops.secrets.mealie.sopsFile = ../../secrets/env.yaml;

modules/servers/metube.nix

@@ -1,6 +1,13 @@
-{ lib, config, proxyReverse, ... }:
+{
-let port = 8881;
+  lib,
-in {
+  config,
+  proxyReverse,
+  ...
+}:
+let
+  port = 8881;
+in
+{
   options.my.servers.metube.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.servers.metube.enable {
     virtualisation.oci-containers.containers.metube = {
@@ -15,7 +22,6 @@ in {
         YTDL_OPTIONS = ''{"cookiefile":"/cookies.txt"}'';
       };
     };
-    services.nginx.virtualHosts."bajameesta.${config.my.domain}" =
+    services.nginx.virtualHosts."bajameesta.${config.my.domain}" = proxyReverse port // { };
-      proxyReverse port // { };
   };
 }

modules/servers/microbin.nix

@@ -1,4 +1,10 @@
-{ lib, config, proxyReverse, ... }: {
+{
+  lib,
+  config,
+  proxyReverse,
+  ...
+}:
+{
   options.my.servers.microbin = {
     enable = lib.mkEnableOption "enable";
     enableCron = lib.mkEnableOption "enable";

modules/servers/multi-scrobbler.nix

@@ -1,9 +1,15 @@
-{ lib, config, proxyReverse, ... }:
+{
+  lib,
+  config,
+  proxyReverse,
+  ...
+}:
 let
   port = 9078;
   domain = "scrobble.${config.my.domain}";
   url = "https://${domain}";
-in {
+in
+{
   options.my.servers.multi-scrobbler.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.servers.multi-scrobbler.enable {
     sops.secrets.multi-scrobbler.sopsFile = ../../secrets/env.yaml;
@@ -16,8 +22,7 @@ in {
         PUID = "1000";
         PGID = "100";
         BASE_URL = url;
-        DEEZER_REDIRECT_URI =
+        DEEZER_REDIRECT_URI = "http://${config.my.miniserver-ip}:${toString port}/deezer/callback";
-          "http://${config.my.miniserver-ip}:${toString port}/deezer/callback";
         MALOJA_URL = "http://maloja:42010";
         WS_ENABLE = "true";
       };

modules/servers/nextcloud.nix

@@ -1,4 +1,9 @@
-{ lib, config, pkgs, ... }:
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
 let
   inherit (config.my) localhost;
   collaboraPort = 9980;
@@ -13,7 +18,8 @@ let
     proxy_set_header Host $host;
     proxy_read_timeout 36000s;
   '';
-in {
+in
+{
   options.my.servers = {
     nextcloud = {
       enable = lib.mkEnableOption "enable";
@@ -22,8 +28,7 @@ in {
     collabora.enable = lib.mkEnableOption "enable";
     go-vod.enable = lib.mkEnableOption "enable";
   };
-  config = lib.mkIf
+  config = lib.mkIf (config.my.servers.nextcloud.enable && config.my.servers.postgres.enable) {
-    (config.my.servers.nextcloud.enable && config.my.servers.postgres.enable) {
     sops.secrets = {
       smtp-password = { };
       nextcloud-adminpass = {
@@ -31,8 +36,10 @@ in {
         inherit (config.users.users.nextcloud) group;
       };
     };
-      nixpkgs.config.permittedInsecurePackages =
+    nixpkgs.config.permittedInsecurePackages = [
-        [ "nodejs-14.21.3" "openssl-1.1.1v" ];
+      "nodejs-14.21.3"
+      "openssl-1.1.1v"
+    ];
     users.users.nextcloud = {
       isSystemUser = true;
       extraGroups = [ "render" ];
@@ -110,15 +117,17 @@ in {
           log_type = "file";
           log_level = 3;
           trusted_proxies = [ "192.168.1.100" ];
-            trusted_domains = [ "cloud.rotehaare.art" "danilo-reyes.com" ];
+          trusted_domains = [
+            "cloud.rotehaare.art"
+            "danilo-reyes.com"
+          ];
           forwarded_for_headers = [ "HTTP_X_FORWARDED_FOR" ];
           overwrite_protocol = "https";
           default_phone_region = "MX";
           allow_local_remote_servers = true;
           mail_smtpmode = "sendmail";
           mail_sendmailmode = "pipe";
-            "memories.exiftool" =
+          "memories.exiftool" = "/etc/profiles/per-user/nextcloud/bin/exiftool";
-              "/etc/profiles/per-user/nextcloud/bin/exiftool";
           enabledPreviewProviders = [
             "OC\\Preview\\Image"
             "OC\\Preview\\HEIC"
@@ -144,8 +153,7 @@ in {
               { };
           };
         };
-          "collabora.${config.my.domain}" =
+        "collabora.${config.my.domain}" = lib.mkIf config.my.servers.collabora.enable {
-            lib.mkIf config.my.servers.collabora.enable {
           forceSSL = true;
           enableACME = true;
           http2 = true;
@@ -198,8 +206,7 @@ in {
         image = "collabora/code";
         imageFile = pkgs.dockerTools.pullImage {
           imageName = "collabora/code";
-            imageDigest =
+          imageDigest = "sha256:aab41379baf5652832e9237fcc06a768096a5a7fccc66cf8bd4fdb06d2cbba7f";
-              "sha256:aab41379baf5652832e9237fcc06a768096a5a7fccc66cf8bd4fdb06d2cbba7f";
           sha256 = "sha256-M66lynhzaOEFnE15Sy1N6lBbGDxwNw6ap+IUJAvoCLs=";
         };
         ports = [ "9980:9980" ];
@@ -214,19 +221,28 @@ in {
             --o:ssl.termination=true
           '';
         };
-          extraOptions = [ "--cap-add" "MKNOD" ];
+        extraOptions = [
+          "--cap-add"
+          "MKNOD"
+        ];
       };
     };
     systemd = lib.mkIf config.my.servers.nextcloud.enableCron {
       services = {
         nextcloud-cron.path = [ pkgs.perl ];
-          nextcloud-cronjob = let
+        nextcloud-cronjob =
-            nextcloud-cronjob = pkgs.writeScriptBin "nextcloud-cronjob"
+          let
-              (builtins.readFile ../../scripts/nextcloud-cronjob.sh);
+            nextcloud-cronjob = pkgs.writeScriptBin "nextcloud-cronjob" (
-          in {
+              builtins.readFile ../../scripts/nextcloud-cronjob.sh
+            );
+          in
+          {
             description = "Runs various nextcloud-related cronjobs";
             wantedBy = [ "multi-user.target" ];
-            path = [ pkgs.bash nextcloud-cronjob ];
+            path = [
+              pkgs.bash
+              nextcloud-cronjob
+            ];
             serviceConfig = {
               Restart = "on-failure";
               RestartSec = 30;
@@ -238,7 +254,9 @@ in {
         enable = true;
         description = "Runs various nextcloud-related cronjobs";
         wantedBy = [ "timers.target" ];
-          timerConfig = { OnCalendar = "*:0/10"; };
+        timerConfig = {
+          OnCalendar = "*:0/10";
+        };
       };
     };
   };

modules/servers/paperless.nix

@@ -1,7 +1,7 @@
-{ lib, config, ... }: {
+{ lib, config, ... }:
+{
   options.my.servers.paperless.enable = lib.mkEnableOption "enable";
-  config = lib.mkIf
+  config = lib.mkIf (config.my.servers.paperless.enable && config.my.servers.postgres.enable) {
-    (config.my.servers.paperless.enable && config.my.servers.postgres.enable) {
     services.paperless = {
       enable = true;
       address = "0.0.0.0";
@@ -11,8 +11,10 @@
         PAPERLESS_DBENGINE = "postgress";
         PAPERLESS_DBNAME = "paperless";
         PAPERLESS_DBHOST = config.my.postgresSocket;
-          PAPERLESS_CONSUMER_IGNORE_PATTERN =
+        PAPERLESS_CONSUMER_IGNORE_PATTERN = builtins.toJSON [
-            builtins.toJSON [ ".DS_STORE/*" "desktop.ini" ];
+          ".DS_STORE/*"
+          "desktop.ini"
+        ];
         PAPERLESS_TIME_ZONE = "America/Mexico_City";
         PAPERLESS_OCR_USER_ARGS = builtins.toJSON {
           optimize = 1;

modules/servers/postgres.nix

@@ -1,8 +1,15 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 let
   upgrade-pg-cluster =
-    let newPostgres = pkgs.postgresql_16.withPackages (_pp: [ ]);
+    let
-    in pkgs.writeScriptBin "upgrade-pg-cluster" ''
+      newPostgres = pkgs.postgresql_16.withPackages (_pp: [ ]);
+    in
+    pkgs.writeScriptBin "upgrade-pg-cluster" ''
       set -eux
       systemctl stop postgresql
       export NEWDATA="/var/lib/postgresql/${newPostgres.psqlSchema}"
@@ -26,7 +33,8 @@ let
     "shiori"
     "firefly-iii"
   ];
-in {
+in
+{
   options.my.servers.postgres.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.servers.postgres.enable {
     environment.systemPackages = [ upgrade-pg-cluster ];

modules/servers/prowlarr.nix

@@ -1,4 +1,10 @@
-{ lib, config, proxyReverseArr, ... }: {
+{
+  lib,
+  config,
+  proxyReverseArr,
+  ...
+}:
+{
   options.my.servers.prowlarr.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.servers.prowlarr.enable {
     users.users.prowlarr = {
@@ -7,8 +13,7 @@
     };
     services = {
       prowlarr.enable = true;
-      nginx.virtualHosts."indexer.${config.my.domain}" = proxyReverseArr 9696
+      nginx.virtualHosts."indexer.${config.my.domain}" = proxyReverseArr 9696 // { };
-        // { };
     };
     virtualisation.oci-containers.containers.flaresolverr = {
       autoStart = true;

modules/servers/qbittorrent.nix

@@ -1,7 +1,18 @@
-{ lib, config, pkgs, proxyReverse, ... }:
+{
+  lib,
+  config,
+  pkgs,
+  proxyReverse,
+  ...
+}:
 let
   port = 9091;
-  ports = [ port 51411 51412 51413 ];
+  ports = [
+    port
+    51411
+    51412
+    51413
+  ];
   bencodepy = pkgs.python3Packages.buildPythonPackage {
     pname = "bencodepy";
     version = "0.9.5";
@@ -15,7 +26,8 @@ let
     };
     build-system = with pkgs.python3Packages; [ setuptools ];
   };
-  qbit_manage_env = pkgs.python3.withPackages (ps:
+  qbit_manage_env = pkgs.python3.withPackages (
+    ps:
     [
       ps.croniter
       ps.gitpython
@@ -26,17 +38,19 @@ let
       ps.retrying
       ps.ruamel-yaml
       ps.schedule
-    ] ++ [ bencodepy ]);
+    ]
-in {
+    ++ [ bencodepy ]
+  );
+in
+{
   options.my.servers = {
     qbittorrent.enable = lib.mkEnableOption "enable";
     unpackerr.enable = lib.mkEnableOption "enable";
   };
   config = lib.mkIf config.my.servers.qbittorrent.enable {
     home-manager.users.jawz.xdg.configFile."unpackerr.conf" =
-      lib.mkIf config.my.servers.unpackerr.enable {
+      lib.mkIf config.my.servers.unpackerr.enable
-        source = ../../dotfiles/unpackerr.conf;
+        { source = ../../dotfiles/unpackerr.conf; };
-      };
     systemd = {
       packages = [ pkgs.qbittorrent-nox ];
       services = {
@@ -52,12 +66,14 @@ in {
             restartIfChanged = true;
             description = "Tidy up my torrents";
             wantedBy = [ "default.target" ];
-            serviceConfig = let env = "/home/jawz/Development/Git/qbit_manage";
+            serviceConfig =
-            in {
+              let
+                env = "/home/jawz/Development/Git/qbit_manage";
+              in
+              {
                 Restart = "on-failure";
                 RestartSec = 30;
-              ExecStart =
+                ExecStart = "${qbit_manage_env}/bin/python ${env}/qbit_manage.py -r -c ${env}/config.yml";
-                "${qbit_manage_env}/bin/python ${env}/qbit_manage.py -r -c ${env}/config.yml";
               };
           };
           unpackerr = lib.mkIf config.my.servers.unpackerr.enable {
@@ -68,8 +84,7 @@ in {
             serviceConfig = {
               Restart = "on-failure";
               RestartSec = 30;
-              ExecStart =
+              ExecStart = "${pkgs.unpackerr}/bin/unpackerr -c /home/jawz/.config/unpackerr.conf";
-                "${pkgs.unpackerr}/bin/unpackerr -c /home/jawz/.config/unpackerr.conf";
             };
           };
         };
@@ -77,12 +92,13 @@ in {
           enable = true;
           description = "Tidy up my torrents";
           wantedBy = [ "timers.target" ];
-          timerConfig = { OnCalendar = "*:0/10"; };
+          timerConfig = {
+            OnCalendar = "*:0/10";
           };
         };
       };
-    services.nginx.virtualHosts."xfwmrle6h6skqujbeizw.${config.my.domain}" =
+    };
-      proxyReverse port // { };
+    services.nginx.virtualHosts."xfwmrle6h6skqujbeizw.${config.my.domain}" = proxyReverse port // { };
     networking.firewall = {
       allowedTCPPorts = ports;
       allowedUDPPorts = ports;

modules/servers/radarr.nix

@@ -1,4 +1,10 @@
-{ lib, config, proxyReverseArr, ... }: {
+{
+  lib,
+  config,
+  proxyReverseArr,
+  ...
+}:
+{
   options.my.servers.radarr.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.servers.radarr.enable {
     services = {
@@ -6,8 +12,7 @@
         enable = true;
         group = "piracy";
       };
-      nginx.virtualHosts."movies.${config.my.domain}" = proxyReverseArr 7878
+      nginx.virtualHosts."movies.${config.my.domain}" = proxyReverseArr 7878 // { };
-        // { };
     };
   };
 }

modules/servers/ryot.nix

@@ -1,11 +1,16 @@
-{ lib, config, proxyReverse, ... }:
+{
+  lib,
+  config,
+  proxyReverse,
+  ...
+}:
 let
   port = 8765;
   url = "tracker.${config.my.domain}";
-in {
+in
+{
   options.my.servers.ryot.enable = lib.mkEnableOption "enable";
-  config = lib.mkIf
+  config = lib.mkIf (config.my.servers.ryot.enable && config.my.servers.postgres.enable) {
-    (config.my.servers.ryot.enable && config.my.servers.postgres.enable) {
     sops.secrets.ryot.sopsFile = ../../secrets/env.yaml;
     virtualisation.oci-containers.containers.ryot = {
       image = "ghcr.io/ignisda/ryot:v7.0.0";
@@ -25,7 +30,6 @@ in {
         "flame.icon" = "radar";
       };
     };
-      services.nginx.virtualHosts."tracker.${config.my.domain}" =
+    services.nginx.virtualHosts."tracker.${config.my.domain}" = proxyReverse port // { };
-        proxyReverse port // { };
   };
 }

modules/servers/sabnzbd.nix

@@ -1,4 +1,10 @@
-{ lib, config, proxyReverse, ... }: {
+{
+  lib,
+  config,
+  proxyReverse,
+  ...
+}:
+{
   options.my.servers.sabnzbd.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.servers.sabnzbd.enable {
     services = {
@@ -7,8 +13,7 @@
         group = "piracy";
         openFirewall = true;
       };
-      nginx.virtualHosts."HSoeJdGRd2Orj0n31UGI.${config.my.domain}" =
+      nginx.virtualHosts."HSoeJdGRd2Orj0n31UGI.${config.my.domain}" = proxyReverse 3399 // { };
-        proxyReverse 3399 // { };
     };
   };
 }

modules/servers/shiori.nix

@@ -1,9 +1,15 @@
-{ lib, config, pkgs, proxyReverse, ... }: {
+{
+  lib,
+  config,
+  pkgs,
+  proxyReverse,
+  ...
+}:
+{
   disabledModules = [ "services/web-apps/shiori.nix" ];
   imports = [ ../../pkgs/shiori/shiori-service.nix ];
   options.my.servers.shiori.enable = lib.mkEnableOption "enable";
-  config = lib.mkIf
+  config = lib.mkIf (config.my.servers.shiori.enable && config.my.servers.postgres.enable) {
-    (config.my.servers.shiori.enable && config.my.servers.postgres.enable) {
     sops.secrets.shiori.sopsFile = ../../secrets/env.yaml;
     services = {
       shiori = {

modules/servers/sonarr.nix

@@ -1,4 +1,10 @@
-{ lib, config, proxyReverse, ... }: {
+{
+  lib,
+  config,
+  proxyReverse,
+  ...
+}:
+{
   options.my.servers.sonarr.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.servers.sonarr.enable {
     services = {
@@ -6,8 +12,7 @@
         enable = true;
         group = "piracy";
       };
-      nginx.virtualHosts."series.${config.my.domain}" = proxyReverse 8989
+      nginx.virtualHosts."series.${config.my.domain}" = proxyReverse 8989 // { };
-        // { };
     };
   };
 }

modules/servers/vaultwarden.nix

@@ -1,7 +1,13 @@
-{ lib, config, pkgs, proxyReverse, ... }: {
+{
+  lib,
+  config,
+  pkgs,
+  proxyReverse,
+  ...
+}:
+{
   options.my.servers.vaultwarden.enable = lib.mkEnableOption "enable";
-  config = lib.mkIf (config.my.servers.vaultwarden.enable
+  config = lib.mkIf (config.my.servers.vaultwarden.enable && config.my.servers.postgres.enable) {
-    && config.my.servers.postgres.enable) {
     sops.secrets.vaultwarden.sopsFile = ../../secrets/env.yaml;
     services = {
       vaultwarden = {
@@ -13,8 +19,7 @@
           ROCKET_ADDRESS = "${config.my.localhost}";
           ROCKET_PORT = 8222;
           WEBSOCKET_PORT = 8333;
-            DATABASE_URL =
+          DATABASE_URL = "postgresql:///vaultwarden?host=${config.my.postgresSocket}";
-              "postgresql:///vaultwarden?host=${config.my.postgresSocket}";
           ENABLE_DB_WAL = false;
           WEBSOCKET_ENABLED = true;
           SHOW_PASSWORD_HINT = false;

modules/services.nix

@@ -1,4 +1,5 @@
-{ lib, ... }: {
+{ lib, ... }:
+{
   imports = [
     ./services/network.nix
     ./services/nvidia.nix

modules/services/network.nix

@@ -1,4 +1,5 @@
-{ config, lib, ... }: {
+{ config, lib, ... }:
+{
   options.my.services.network.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.services.network.enable {
     networking = {

modules/services/nvidia.nix

@@ -1,8 +1,13 @@
-{ config, lib, pkgs, ... }: {
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+{
   options.my.services.nvidia.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.services.nvidia.enable {
-    boot.kernelParams = lib.mkIf (config.networking.hostName == "workstation")
+    boot.kernelParams = lib.mkIf (config.networking.hostName == "workstation") [ "nvidia-drm.fbdev=1" ];
-      [ "nvidia-drm.fbdev=1" ];
     services.xserver.videoDrivers = [ "nvidia" ];
     hardware = {
       opengl = {

modules/services/printing.nix

@@ -1,6 +1,16 @@
-{ config, lib, pkgs, ... }:
+{
-let printingDrivers = [ pkgs.hplip pkgs.hplipWithPlugin ];
+  config,
-in {
+  lib,
+  pkgs,
+  ...
+}:
+let
+  printingDrivers = [
+    pkgs.hplip
+    pkgs.hplipWithPlugin
+  ];
+in
+{
   options.my.services.printing.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.services.printing.enable {
     users.users.jawz.packages = [ pkgs.gnome.simple-scan ];

modules/services/sound.nix

@@ -1,4 +1,10 @@
-{ config, lib, inputs, ... }: {
+{
+  config,
+  lib,
+  inputs,
+  ...
+}:
+{
   imports = [ inputs.nix-gaming.nixosModules.pipewireLowLatency ];
   options.my.services.sound.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.services.sound.enable {

modules/shell.nix

@@ -1,5 +1,10 @@
-{ lib, ... }: {
+{ lib, ... }:
-  imports = [ ./shell/exercism.nix ./shell/multimedia.nix ./shell/tools.nix ];
+{
+  imports = [
+    ./shell/exercism.nix
+    ./shell/multimedia.nix
+    ./shell/tools.nix
+  ];
   my.shell = {
     exercism.enable = lib.mkDefault false;
     multimedia.enable = lib.mkDefault false;

modules/shell/exercism.nix

@@ -1,4 +1,10 @@
-{ config, lib, pkgs, ... }: {
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+{
   options.my.shell.exercism.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.shell.exercism.enable {
     users.users.jawz.packages = with pkgs; [

modules/shell/multimedia.nix

@@ -1,12 +1,20 @@
-{ config, lib, pkgs, ... }: {
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+{
   options.my.shell.multimedia.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.shell.multimedia.enable {
-    users.users.jawz.packages = (with pkgs; [
+    users.users.jawz.packages =
+      (with pkgs; [
         gallery-dl # similar to yt-dlp but for most image gallery websites
         yt-dlp # downloads videos from most video websites
         ffmpeg # not ffmpreg, the coolest video conversion tool!
         imagemagick # photoshop what??
-    ]) ++ [
+      ])
+      ++ [
         (pkgs.python3Packages.buildPythonApplication rec {
           pname = "ffpb";
           version = "0.4.1";

modules/shell/tools.nix

@@ -1,4 +1,10 @@
-{ config, lib, pkgs, ... }: {
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+{
   options.my.shell.tools.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.shell.tools.enable {
     home-manager.users.jawz = {

overlay.nix

@@ -1,8 +1,15 @@
-{ pkgs, pkgsU, pkgsM }:
+{
+  pkgs,
+  pkgsU,
+  pkgsM,
+}:
 _self: super: {
-  gnome = super.gnome.overrideScope (_gFinal: gPrev: {
+  gnome = super.gnome.overrideScope (
+    _gFinal: gPrev: {
       nautilus = gPrev.nautilus.overrideAttrs (nsuper: {
-      buildInputs = nsuper.buildInputs ++ (with pkgs.gst_all_1; [
+        buildInputs =
+          nsuper.buildInputs
+          ++ (with pkgs.gst_all_1; [
             gst-libav
             gst-plugins-good
             gst-plugins-bad
@@ -10,7 +17,8 @@ _self: super: {
             gst-plugins-base
           ]);
       });
-  });
+    }
+  );
   lutris = super.lutris.override {
     extraPkgs = pkgs: [
       pkgs.winetricks
@@ -19,7 +27,12 @@ _self: super: {
     ];
   };
   nerdfonts = super.nerdfonts.override {
-    fonts = [ "CascadiaCode" "ComicShannsMono" "Iosevka" "Agave" ];
+    fonts = [
+      "CascadiaCode"
+      "ComicShannsMono"
+      "Iosevka"
+      "Agave"
+    ];
   };
   inherit (pkgsU) planify;
   inherit (pkgsU) gdtoolkit;

pkgs/citra/default.nix

@@ -1,15 +1,20 @@
-{ branch, qt6Packages, fetchFromGitHub, fetchurl }:
+{
+  branch,
+  qt6Packages,
+  fetchFromGitHub,
+  fetchurl,
+}:
 
 let
   # Fetched from https://api.citra-emu.org/gamedb
   # Please make sure to update this when updating citra!
   compat-list = fetchurl {
     name = "citra-compat-list";
-    url =
+    url = "https://web.archive.org/web/20230807103651/https://api.citra-emu.org/gamedb/";
-      "https://web.archive.org/web/20230807103651/https://api.citra-emu.org/gamedb/";
     hash = "sha256-J+zqtWde5NgK2QROvGewtXGRAWUTNSKHNMG6iu9m1fU=";
   };
-in {
+in
+{
   nightly = qt6Packages.callPackage ./generic.nix rec {
     pname = "citra-nightly";
     version = "2104";
@@ -24,4 +29,5 @@ in {
 
     inherit branch compat-list;
   };
-}.${branch}
+}
+.${branch}

pkgs/citra/generic.nix

@@ -1,28 +1,70 @@
-{ pname, version, src, branch, compat-list, lib, stdenv, cmake, boost
+{
-, pkg-config, libusb1, glslang, zstd, libressl, enableSdl2 ? true, SDL2
+  pname,
-, enableQt ? true, qtbase, qtmultimedia, wrapQtAppsHook
+  version,
-, enableQtTranslation ? enableQt, qttools, enableWebService ? true
+  src,
-, enableCubeb ? true, cubeb, enableFfmpegAudioDecoder ? true
+  branch,
-, enableFfmpegVideoDumper ? true, ffmpeg_4, useDiscordRichPresence ? true
+  compat-list,
-, rapidjson, enableFdk ? false, fdk_aac, python3 }:
+  lib,
-assert lib.assertMsg (!enableFfmpegAudioDecoder || !enableFdk)
+  stdenv,
-  "Can't enable both enableFfmpegAudioDecoder and enableFdk";
+  cmake,
+  boost,
+  pkg-config,
+  libusb1,
+  glslang,
+  zstd,
+  libressl,
+  enableSdl2 ? true,
+  SDL2,
+  enableQt ? true,
+  qtbase,
+  qtmultimedia,
+  wrapQtAppsHook,
+  enableQtTranslation ? enableQt,
+  qttools,
+  enableWebService ? true,
+  enableCubeb ? true,
+  cubeb,
+  enableFfmpegAudioDecoder ? true,
+  enableFfmpegVideoDumper ? true,
+  ffmpeg_4,
+  useDiscordRichPresence ? true,
+  rapidjson,
+  enableFdk ? false,
+  fdk_aac,
+  python3,
+}:
+assert lib.assertMsg (
+  !enableFfmpegAudioDecoder || !enableFdk
+) "Can't enable both enableFfmpegAudioDecoder and enableFdk";
 
 stdenv.mkDerivation rec {
   inherit pname version src;
 
-  nativeBuildInputs = [ cmake glslang pkg-config python3 ]
+  nativeBuildInputs = [
-    ++ lib.optionals enableQt [ wrapQtAppsHook ];
+    cmake
+    glslang
+    pkg-config
+    python3
+  ] ++ lib.optionals enableQt [ wrapQtAppsHook ];
 
-  buildInputs = [ boost libusb1 ]
+  buildInputs =
-    ++ lib.optionals enableQt [ qtbase qtmultimedia ]
+    [
-    ++ lib.optional enableSdl2 SDL2 ++ lib.optional enableQtTranslation qttools
+      boost
+      libusb1
+    ]
+    ++ lib.optionals enableQt [
+      qtbase
+      qtmultimedia
+    ]
+    ++ lib.optional enableSdl2 SDL2
+    ++ lib.optional enableQtTranslation qttools
     ++ lib.optionals enableCubeb cubeb.passthru.backendLibs
-    ++ lib.optional (enableFfmpegAudioDecoder || enableFfmpegVideoDumper)
+    ++ lib.optional (enableFfmpegAudioDecoder || enableFfmpegVideoDumper) ffmpeg_4
-    ffmpeg_4 ++ lib.optional useDiscordRichPresence rapidjson
+    ++ lib.optional useDiscordRichPresence rapidjson
     ++ lib.optional enableFdk fdk_aac;
 
-  cmakeFlags = [
+  cmakeFlags =
+    [
       "-DUSE_SYSTEM_BOOST=ON"
       "-DCITRA_WARNINGS_AS_ERRORS=OFF"
       "-DCITRA_USE_BUNDLED_FFMPEG=OFF"
@@ -34,7 +76,8 @@ stdenv.mkDerivation rec {
       # We dont want to bother upstream with potentially outdated compat reports
       "-DCITRA_ENABLE_COMPATIBILITY_REPORTING=ON"
       "-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=OFF" # We provide this deterministically
-  ] ++ lib.optional (!enableSdl2) "-DENABLE_SDL2=OFF"
+    ]
+    ++ lib.optional (!enableSdl2) "-DENABLE_SDL2=OFF"
     ++ lib.optional (!enableQt) "-DENABLE_QT=OFF"
     ++ lib.optional enableQtTranslation "-DENABLE_QT_TRANSLATION=ON"
     ++ lib.optional (!enableWebService) "-DENABLE_WEB_SERVICE=OFF"
@@ -44,10 +87,11 @@ stdenv.mkDerivation rec {
     ++ lib.optional useDiscordRichPresence "-DUSE_DISCORD_PRESENCE=ON"
     ++ lib.optional enableFdk "-DENABLE_FDK=ON";
 
-  postPatch = let
+  postPatch =
-    branchCaptialized = lib.toUpper (lib.substring 0 1 branch)
+    let
-      + lib.substring 1 (-1) branch;
+      branchCaptialized = lib.toUpper (lib.substring 0 1 branch) + lib.substring 1 (-1) branch;
-  in ''
+    in
+    ''
       # Fix file not found when looking in var/empty instead of opt
       mkdir externals/dynarmic/src/dynarmic/ir/var
       ln -s ../opt externals/dynarmic/src/dynarmic/ir/var/empty
@@ -73,15 +117,12 @@ stdenv.mkDerivation rec {
   # Fixes https://github.com/NixOS/nixpkgs/issues/171173
   postInstall = lib.optionalString (enableCubeb && enableSdl2) ''
     wrapProgram "$out/bin/citra" \
-      --prefix LD_LIBRARY_PATH : ${
+      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath cubeb.passthru.backendLibs}
-        lib.makeLibraryPath cubeb.passthru.backendLibs
-      }
   '';
 
   meta = {
     homepage = "https://citra-emu.org";
-    description =
+    description = "The ${branch} branch of an open-source emulator for the Ninteno 3DS";
-      "The ${branch} branch of an open-source emulator for the Ninteno 3DS";
     longDescription = ''
       A Nintendo 3DS Emulator written in C++
       Using the nightly branch is recommended for general usage.
@@ -91,6 +132,10 @@ stdenv.mkDerivation rec {
     mainProgram = if enableQt then "citra-qt" else "citra";
     platforms = lib.platforms.linux;
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ abbradar ashley ivar ];
+    maintainers = with lib.maintainers; [
+      abbradar
+      ashley
+      ivar
+    ];
   };
 }

pkgs/obs-studio.nix

@@ -1,7 +1,14 @@
-{ pkgs, lib, config, ... }:
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
 
-let cfg = config.programs.obs-studio;
+let
-in {
+  cfg = config.programs.obs-studio;
+in
+{
   options.programs.obs-studio = {
     enable = lib.mkEnableOption (lib.mdDoc "obs-studio");
 
@@ -32,8 +39,7 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
-    programs.obs-studio.finalPackage =
+    programs.obs-studio.finalPackage = pkgs.wrapOBS.override { obs-studio = cfg.package; } {
-      pkgs.wrapOBS.override { obs-studio = cfg.package; } {
       plugins = cfg.plugins;
     };
 

pkgs/polymc/default.nix

@@ -1,12 +1,43 @@
-{ stdenv, lib, fetchFromGitHub, cmake, ninja, jdk17, ghc_filesystem, zlib, file
+{
-, xorg, libpulseaudio, openal, qt6, glfw, pciutils, udev, glxinfo, qt6Packages
+  stdenv,
-, libGL, flite, addOpenGLRunpath, vulkan-loader, msaClientID ? null
+  lib,
-, extra-cmake-modules, makeWrapper, gamemode, mangohud, glfw-wayland-minecraft
+  fetchFromGitHub,
-, writeShellScript }:
+  cmake,
+  ninja,
+  jdk17,
+  ghc_filesystem,
+  zlib,
+  file,
+  xorg,
+  libpulseaudio,
+  openal,
+  qt6,
+  glfw,
+  pciutils,
+  udev,
+  glxinfo,
+  qt6Packages,
+  libGL,
+  flite,
+  addOpenGLRunpath,
+  vulkan-loader,
+  msaClientID ? null,
+  extra-cmake-modules,
+  makeWrapper,
+  gamemode,
+  mangohud,
+  glfw-wayland-minecraft,
+  writeShellScript,
+}:
 
 let
-  polymc = let
+  polymc =
-    binpath = lib.makeBinPath [ xorg.xrandr glxinfo pciutils ];
+    let
+      binpath = lib.makeBinPath [
+        xorg.xrandr
+        glxinfo
+        pciutils
+      ];
 
       libpath = lib.makeLibraryPath [
         xorg.libX11
@@ -26,10 +57,9 @@ let
 
       gameLibraryPath = libpath + ":${addOpenGLRunpath.driverLink}/lib";
 
-  in stdenv.mkDerivation rec {
+    in
-    pname = "polymc"
+    stdenv.mkDerivation rec {
-      + (lib.optionalString ((lib.versions.major qt6.qtbase.version) == "5")
+      pname = "polymc" + (lib.optionalString ((lib.versions.major qt6.qtbase.version) == "5") "-qt5");
-        "-qt5");
       version = "6.1";
 
       src = fetchFromGitHub {
@@ -61,8 +91,7 @@ let
       cmakeFlags = [
         "-GNinja"
         "-DLauncher_QT_VERSION_MAJOR=${lib.versions.major qt6.qtbase.version}"
-    ] ++ lib.optionals (msaClientID != null)
+      ] ++ lib.optionals (msaClientID != null) [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ];
-      [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ];
 
       postPatch = ''
         # hardcode jdk paths
@@ -79,41 +108,49 @@ let
       '';
       passthru = {
 
-      wrap = { extraJDKs ? [ ], extraPaths ? [ ], extraLibs ? [ ]
+        wrap =
-        , withWaylandGLFW ? false, withMangohud ? true, withGamemode ? true }:
+          {
+            extraJDKs ? [ ],
+            extraPaths ? [ ],
+            extraLibs ? [ ],
+            withWaylandGLFW ? false,
+            withMangohud ? true,
+            withGamemode ? true,
+          }:
           stdenv.mkDerivation rec {
             pname = "${polymc.pname}-wrapped";
             inherit (polymc) version;
-          libsPath = (lib.makeLibraryPath
+            libsPath =
-            (extraLibs ++ lib.optional withGamemode gamemode.lib))
+              (lib.makeLibraryPath (extraLibs ++ lib.optional withGamemode gamemode.lib))
               + lib.optionalString withMangohud "${mangohud + "/lib/mangohud"}";
-          binsPath =
+            binsPath = lib.makeBinPath (extraPaths ++ lib.optional withMangohud mangohud);
-            lib.makeBinPath (extraPaths ++ lib.optional withMangohud mangohud);
 
             waylandPreExec = writeShellScript "waylandGLFW" ''
               if [ -n "$WAYLAND_DISPLAY" ]; then
-              export LD_LIBRARY_PATH=${
+                export LD_LIBRARY_PATH=${lib.getLib glfw-wayland-minecraft}/lib:"$LD_LIBRARY_PATH"
-                lib.getLib glfw-wayland-minecraft
-              }/lib:"$LD_LIBRARY_PATH"
               fi
             '';
             src = polymc;
             nativeBuildInputs = [ makeWrapper ];
-          phases = [ "installPhase" "fixupPhase" ];
+            phases = [
+              "installPhase"
+              "fixupPhase"
+            ];
             installPhase = ''
               mkdir -p $out/bin
               ln -s $src/bin/polymc $out/bin/polymc
               ln -s $src/share $out/share
             '';
 
-          postFixup = let javaPaths = lib.makeSearchPath "bin/java" extraJDKs;
+            postFixup =
-          in ''
+              let
+                javaPaths = lib.makeSearchPath "bin/java" extraJDKs;
+              in
+              ''
                 wrapProgram $out/bin/polymc \
                   --suffix LD_LIBRARY_PATH : "${libsPath}" \
                   --suffix POLYMC_JAVA_PATHS : "${javaPaths}" \
-              --suffix PATH : "${binsPath}" ${
+                  --suffix PATH : "${binsPath}" ${lib.optionalString withWaylandGLFW "--run ${waylandPreExec}"}
-                lib.optionalString withWaylandGLFW "--run ${waylandPreExec}"
-              }
 
               '';
 
@@ -136,4 +173,5 @@ let
         license = licenses.gpl3Only;
       };
     };
-in polymc
+in
+polymc

pkgs/pureref/default.nix

@@ -1,13 +1,27 @@
-{ lib, appimageTools, runCommand, curl, gnugrep, cacert }:
+{
+  lib,
+  appimageTools,
+  runCommand,
+  curl,
+  gnugrep,
+  cacert,
+}:
 
 appimageTools.wrapType1 rec {
   pname = "pureref";
   version = "2.0.0";
 
-  src = runCommand "PureRef-${version}_x64.Appimage" {
+  src =
-    nativeBuildInputs = [ curl gnugrep cacert ];
+    runCommand "PureRef-${version}_x64.Appimage"
+      {
+        nativeBuildInputs = [
+          curl
+          gnugrep
+          cacert
+        ];
         outputHash = "sha256-47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=";
-  } ''
+      }
+      ''
         key="$(curl "https://www.pureref.com/download.php" --silent | grep '%3D%3D' | cut -d '"' -f2)"
         curl "https://www.pureref.com/files/build.php?build=LINUX64.Appimage&version=${version}&downloadKey=$key" --output $out
       '';

pkgs/shiori/shiori-service.nix

@@ -1,7 +1,14 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 
-let cfg = config.services.shiori;
+let
-in {
+  cfg = config.services.shiori;
+in
+{
   options = {
     services.shiori = {
       enable = lib.mkEnableOption "Shiori simple bookmarks manager";
@@ -54,18 +61,16 @@ in {
     systemd.services.shiori = {
       description = "Shiori simple bookmarks manager";
       wantedBy = [ "multi-user.target" ];
-      after = [ "postgresql.service" "mysql.service" ];
+      after = [
+        "postgresql.service"
+        "mysql.service"
+      ];
       environment = {
         SHIORI_DIR = "/var/lib/shiori";
-      } // lib.optionalAttrs (cfg.databaseUrl != null) {
+      } // lib.optionalAttrs (cfg.databaseUrl != null) { SHIORI_DATABASE_URL = cfg.databaseUrl; };
-        SHIORI_DATABASE_URL = cfg.databaseUrl;
-      };
 
       serviceConfig = {
-        ExecStart =
+        ExecStart = "${cfg.package}/bin/shiori server --address '${cfg.address}' --port '${toString cfg.port}' --webroot '${cfg.webRoot}'";
-          "${cfg.package}/bin/shiori server --address '${cfg.address}' --port '${
-            toString cfg.port
-          }' --webroot '${cfg.webRoot}'";
 
         DynamicUser = true;
         StateDirectory = "shiori";
@@ -73,17 +78,20 @@ in {
         RuntimeDirectory = "shiori";
 
         # Security options
-        EnvironmentFile =
+        EnvironmentFile = lib.optional (cfg.environmentFile != null) cfg.environmentFile;
-          lib.optional (cfg.environmentFile != null) cfg.environmentFile;
+        BindReadOnlyPaths =
-        BindReadOnlyPaths = [
+          [
             "/nix/store"
 
             # For SSL certificates, and the resolv.conf
             "/etc"
-        ] ++ lib.optional (lib.strings.hasInfix "postgres" cfg.databaseUrl
+          ]
-          && config.services.postgresql.enable) "/run/postgresql"
+          ++ lib.optional (
-          ++ lib.optional (lib.strings.hasInfix "mysql" cfg.databaseUrl
+            lib.strings.hasInfix "postgres" cfg.databaseUrl && config.services.postgresql.enable
-            && config.services.mysql.enable) "/var/run/mysqld";
+          ) "/run/postgresql"
+          ++ lib.optional (
+            lib.strings.hasInfix "mysql" cfg.databaseUrl && config.services.mysql.enable
+          ) "/var/run/mysqld";
 
         CapabilityBoundingSet = "";
         AmbientCapabilities = "CAP_NET_BIND_SERVICE";
@@ -106,7 +114,11 @@ in {
         ProtectKernelTunables = true;
 
         RestrictNamespaces = true;
-        RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" ];
+        RestrictAddressFamilies = [
+          "AF_INET"
+          "AF_INET6"
+          "AF_UNIX"
+        ];
         RestrictRealtime = true;
         RestrictSUIDSGID = true;
 
@@ -128,5 +140,8 @@ in {
     };
   };
 
-  meta.maintainers = with lib.maintainers; [ minijackson CaptainJawZ ];
+  meta.maintainers = with lib.maintainers; [
+    minijackson
+    CaptainJawZ
+  ];
 }

pkgs/shiori/shiori.nix

@@ -1,4 +1,9 @@
-{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  installShellFiles,
+}:
 
 buildGoModule rec {
   pname = "shiori";
@@ -30,6 +35,9 @@ buildGoModule rec {
     mainProgram = "shiori";
     homepage = "https://github.com/go-shiori/shiori";
     license = licenses.mit;
-    maintainers = with maintainers; [ minijackson CaptainJawZ ];
+    maintainers = with maintainers; [
+      minijackson
+      CaptainJawZ
+    ];
   };
 }

pkgs/vdhcoapp/default.nix

@@ -1,11 +1,22 @@
-{ lib, fetchFromGitHub, buildNpmPackage, toml2json, nodejs, ffmpeg
+{
-, substituteAll, makeWrapper, callPackage }:
+  lib,
+  fetchFromGitHub,
+  buildNpmPackage,
+  toml2json,
+  nodejs,
+  ffmpeg,
+  substituteAll,
+  makeWrapper,
+  callPackage,
+}:
 
 # This is an adaptation with buildNpmPackage based on https://github.com/milahu/nur-packages/commit/3022ffb3619182ffcd579194e1202e3978e4d55b
 
-let filepicker = callPackage ./filepicker.nix { };
+let
+  filepicker = callPackage ./filepicker.nix { };
 
-in buildNpmPackage rec {
+in
+buildNpmPackage rec {
   pname = "vdhcoapp";
   version = "2.0.19";
 
@@ -20,7 +31,10 @@ in buildNpmPackage rec {
   npmDepsHash = "sha256-E032U2XZdyTER6ROkBosOTn7bweDXHl8voC3BQEz8Wg=";
   dontNpmBuild = true;
 
-  nativeBuildInputs = [ toml2json makeWrapper ];
+  nativeBuildInputs = [
+    toml2json
+    makeWrapper
+  ];
 
   patches = [
     (substituteAll {
@@ -50,8 +64,7 @@ in buildNpmPackage rec {
   '';
 
   meta = with lib; {
-    description =
+    description = "Companion application for the Video DownloadHelper browser add-on";
-      "Companion application for the Video DownloadHelper browser add-on";
     homepage = "https://www.downloadhelper.net/";
     license = licenses.gpl2;
     maintainers = with maintainers; [ wolfangaukang ];

pkgs/vdhcoapp/filepicker.nix

@@ -1,4 +1,12 @@
-{ lib, rustPlatform, fetchFromGitHub, pkg-config, atk, gtk3, glib }:
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  atk,
+  gtk3,
+  glib,
+}:
 
 rustPlatform.buildRustPackage rec {
   pname = "filepicker";
@@ -13,7 +21,11 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-aal7ppFkCpNc+QTS4Qklsb9WfJ65QqG6p1eOskiX+/Q=";
 
-  buildInputs = [ atk gtk3 glib ];
+  buildInputs = [
+    atk
+    gtk3
+    glib
+  ];
 
   nativeBuildInputs = [ pkg-config ];