chore: update git-blame-ignore-revs

.git-blame-ignore-revs

@@ -1,2 +1,4 @@
 # Formatted code using treefmt and alejandra
 73bf158392a427d188b7aad36244b94506f57a15
+# nixfmt-rfc-style
+03e5a0ffdaab9b1331ab95ca3e730aaec1d7c151

default.nix

@@ -8,27 +8,16 @@ let
     "x86_64-linux"
   ];
 
-  filterSystems =
+  filterSystems = lib.filterAttrs (system: _: lib.elem system ciSystems);
-    lib.filterAttrs
-    (system: _: lib.elem system ciSystems);
 
   recurseIntoAttrsRecursive = lib.mapAttrs (
-    _: v:
+    _: v: if lib.isAttrs v then recurseIntoAttrsRecursive (lib.recurseIntoAttrs v) else v
-      if lib.isAttrs v
-      then recurseIntoAttrsRecursive (lib.recurseIntoAttrs v)
-      else v
   );
 
-  systemOutputs =
+  systemOutputs = lib.filterAttrs (
-    lib.filterAttrs
-    (
     name: set:
-        lib.isAttrs set
+    lib.isAttrs set && lib.any (system: set ? ${system} && name != "legacyPackages") ciSystems
-        && lib.any
+  ) default.outputs;
-        (system: set ? ${system} && name != "legacyPackages")
-        ciSystems
-    )
-    default.outputs;
 
   ciDrvs = lib.mapAttrs (_: system: filterSystems system) systemOutputs;
 in

flake.nix

@@ -53,7 +53,8 @@
     wayland-pipewire-idle-inhibit.inputs.flake-parts.follows = "flake-parts";
   };
 
-  outputs = inputs@{ self, ...}:
+  outputs =
+    inputs@{ self, ... }:
     inputs.flake-parts.lib.mkFlake { inherit inputs; } {
       systems = [
         "x86_64-linux"
@@ -71,14 +72,19 @@
         ./overlays
       ];
 
-      perSystem = args@{ system, pkgs, config, ... }: {
+      perSystem =
+        args@{
+          system,
+          pkgs,
+          config,
+          ...
+        }:
+        {
           _module.args = {
             inherit inputs;
             pkgs = import inputs.nixpkgs {
               inherit system;
-            overlays = [
+              overlays = [ inputs.agenix.overlays.default ];
-              inputs.agenix.overlays.default
-            ];
             };
             unstable = import inputs.unstable { inherit system; };
             master = import inputs.master { inherit system; };
@@ -86,17 +92,18 @@
 
           devShells.default = pkgs.mkShell {
             buildInputs = with pkgs; [
-            deploy-rs
-            nixpkgs-fmt
               agenix
               cachix
+              deploy-rs
+              nixd
+              nixos-generators
+              nvfetcher
+
               editorconfig-checker
               nodePackages.prettier
-            nvfetcher
               shellcheck
               shfmt
               treefmt
-            nixos-generators
             ];
           };
         };
@@ -123,7 +130,10 @@
           powder = {
             hostname = "80.71.153.194";
             sshUser = "root";
-          profilesOrder = ["system" "direnv"];
+            profilesOrder = [
+              "system"
+              "direnv"
+            ];
             profiles.direnv = {
               user = "pub-solar";
               path = self.pkgs.x86_64-linux.nixos.deploy-rs.lib.x86_64-linux.activate.home-manager self.homeConfigurationsPortable.x86_64-linux.pub-solar;

hosts/PubSolarOS.nix

@@ -1,15 +1,17 @@
-{suites, ...}: {
+{ suites, ... }:
+{
   ### root password is empty by default ###
   ### default password: pub-solar, optional: add your SSH keys
-  imports =
+  imports = suites.iso;
-    suites.iso;
 
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
   networking.networkmanager.enable = true;
 
-  fileSystems."/" = {device = "/dev/disk/by-label/nixos";};
+  fileSystems."/" = {
+    device = "/dev/disk/by-label/nixos";
+  };
 
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions

hosts/bootstrap.nix

@@ -10,15 +10,16 @@ let
 
   # Gets hostname of host to be bundled inside iso
   # Copied from https://github.com/divnix/digga/blob/30ffa0b02272dc56c94fd3c7d8a5a0f07ca197bf/modules/bootstrap-iso.nix#L3-L11
-  getFqdn = config: let
+  getFqdn =
+    config:
+    let
       net = config.networking;
       fqdn =
-      if (net ? domain) && (net.domain != null)
+        if (net ? domain) && (net.domain != null) then "${net.hostName}.${net.domain}" else net.hostName;
-      then "${net.hostName}.${net.domain}"
-      else net.hostName;
     in
     fqdn;
-in {
+in
+{
   # build with: `nix build ".#nixosConfigurations.bootstrap.config.system.build.isoImage"`
   imports = [
     # profiles.networking
@@ -33,7 +34,9 @@ in {
     boot.loader.systemd-boot.enable = true;
 
     # will be overridden by the bootstrapIso instrumentation
-    fileSystems."/" = {device = "/dev/disk/by-label/nixos";};
+    fileSystems."/" = {
+      device = "/dev/disk/by-label/nixos";
+    };
 
     system.nixos.label = "PubSolarOS-" + config.system.nixos.version;
 

hosts/default.nix

@@ -1,4 +1,9 @@
-{ withSystem, self, inputs, ...}:
+{
+  withSystem,
+  self,
+  inputs,
+  ...
+}:
 {
   flake = {
     nixosConfigurations = {
@@ -91,7 +96,12 @@
           self.nixosModules.graphical
           self.nixosModules.audio
           self.nixosModules.bluetooth
-          ({ ... }: { pub-solar.graphical.wayland.software-renderer.enable = true; })
+          (
+            { ... }:
+            {
+              pub-solar.graphical.wayland.software-renderer.enable = true;
+            }
+          )
         ];
       };
     };

hosts/dumpyourvms/default.nix

@@ -1,4 +1,5 @@
-{ ... }: {
+{ ... }:
+{
   imports = [
     ./dumpyourvms.nix
     ./hardware-configuration.nix

hosts/dumpyourvms/dumpyourvms.nix

@@ -7,7 +7,8 @@
 let
   psCfg = config.pub-solar;
   xdg = config.home-manager.users."${psCfg.user.name}".xdg;
-in {
+in
+{
   pub-solar = {
     terminal-life.full = true;
     core.hibernation = {
@@ -23,7 +24,13 @@ in {
   # Explicitly set amdgpu support in place of radeon
   # Source: https://github.com/NixOS/nixos-hardware/blob/master/common/gpu/amd/southern-islands/default.nix
   # Try again after https://lists.freedesktop.org/archives/amd-gfx/2023-March/090096.html lands
-  boot.kernelParams = ["acpi_backlight=video" "hid_apple.fnmode=2" "intel_pstate=passive" "radeon.si_support=0" "amdgpu.si_support=1"];
+  boot.kernelParams = [
+    "acpi_backlight=video"
+    "hid_apple.fnmode=2"
+    "intel_pstate=passive"
+    "radeon.si_support=0"
+    "amdgpu.si_support=1"
+  ];
   boot.loader.efi.canTouchEfiVariables = true;
 
   # Fix for Error switching console mode to 1: unsupported on startup
@@ -113,24 +120,22 @@ in {
     # to be powered on.
     powerUpCommands = lib.mkBefore (
       "${pkgs.kmod}/bin/modprobe brcmfmac"
-      + lib.optionalString
+      + lib.optionalString (lib.versionAtLeast config.boot.kernelPackages.kernel.version "6.2") " brcmfmac_wcc"
-      (lib.versionAtLeast config.boot.kernelPackages.kernel.version "6.2") " brcmfmac_wcc"
     );
     powerDownCommands = lib.mkBefore (
-      lib.optionalString
+      lib.optionalString (lib.versionAtLeast config.boot.kernelPackages.kernel.version "6.2") "${pkgs.kmod}/bin/rmmod brcmfmac_wcc\n"
-      (lib.versionAtLeast config.boot.kernelPackages.kernel.version "6.2")
-      "${pkgs.kmod}/bin/rmmod brcmfmac_wcc\n"
       + ''
         ${pkgs.kmod}/bin/rmmod brcmfmac
         ${pkgs.systemd}/bin/systemctl stop amd-hybrid-graphics-power-save.service
       ''
     );
     resumeCommands =
-      if config.systemd.services."amd-hybrid-graphics-power-save".enable == true
+      if config.systemd.services."amd-hybrid-graphics-power-save".enable == true then
-      then ''
+        ''
           ${pkgs.systemd}/bin/systemctl start amd-hybrid-graphics-power-save.service
         ''
-      else "";
+      else
+        "";
   };
 
   # Change lid switch behaviour
@@ -150,11 +155,16 @@ in {
   services.udev.extraRules =
     # Disable XHC1 wakeup signal to avoid resume getting triggered some time
     # after suspend. Reboot required for this to take effect.
-    lib.optionalString
+    lib.optionalString (lib.versionAtLeast config.boot.kernelPackages.kernel.version "3.13")
-    (lib.versionAtLeast config.boot.kernelPackages.kernel.version "3.13")
       ''SUBSYSTEM=="pci", KERNEL=="0000:00:14.0", ATTR{power/wakeup}="disabled"'';
 
-  home-manager = pkgs.lib.setAttrByPath ["users" psCfg.user.name] {
+  home-manager =
+    pkgs.lib.setAttrByPath
+      [
+        "users"
+        psCfg.user.name
+      ]
+      {
         # Custom device sway configs
         xdg.configFile = {
           "sway/config.d/10-applications.conf".source = ./.config/sway/config.d/applications.conf;

hosts/dumpyourvms/hardware-configuration.nix

@@ -7,13 +7,20 @@
   pkgs,
   modulesPath,
   ...
-}: {
+}:
+{
   imports = [
     #(modulesPath + "/hardware/network/broadcom-43xx.nix")
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod"];
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "nvme"
+    "usbhid"
+    "usb_storage"
+    "sd_mod"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];

hosts/dumpyourvms/networking.nix

@@ -1,8 +1,4 @@
-{
+{ pkgs, lib, ... }:
-  pkgs,
-  lib,
-  ...
-}:
 {
   systemd.services.wg-quick-wg5.serviceConfig.Type = lib.mkForce "simple";
   systemd.services.wg-quick-wg5.serviceConfig.Restart = "on-failure";
@@ -16,10 +12,16 @@
     #];
 
     hosts = {
-      "10.0.0.42" = ["nomad.service.consul" "nomad.service.cgn-1.consul"];
+      "10.0.0.42" = [
+        "nomad.service.consul"
+        "nomad.service.cgn-1.consul"
+      ];
       "10.0.0.66" = [ "consul.service.cgn-1.consul" ];
       "10.0.1.9" = [ "consul.service.lev-1.consul" ];
-      "10.0.0.70" = ["vault.service.consul" "vault.service.cgn-1.consul"];
+      "10.0.0.70" = [
+        "vault.service.consul"
+        "vault.service.cgn-1.consul"
+      ];
       "10.0.0.200" = [ "headnode.cgn-1" ];
       "10.0.0.201" = [ "cn01.cgn-1" ];
       "10.0.0.202" = [ "cn02.cgn-1" ];
@@ -44,7 +46,10 @@
       "80.71.153.10" = [ "lev-1.api.greenbaum.cloud" ];
       "80.71.153.12" = [ "lev-1.docker.greenbaum.cloud" ];
       "80.71.153.56" = [ "lev-1.monitor.greenbaum.cloud" ];
-      "192.168.13.25" = ["ryzensun.local" "cloudapi.coal-1.mnx.io"];
+      "192.168.13.25" = [
+        "ryzensun.local"
+        "cloudapi.coal-1.mnx.io"
+      ];
     };
 
     wireguard.enable = true;
@@ -57,7 +62,11 @@
         peers = [
           {
             publicKey = "l0DJLicCrcrixNP6zAWTXNSEaNM2jML253BXEZ1KpiU=";
-            allowedIPs = ["10.8.8.16/32" "10.0.0.0/24" "10.88.88.0/24"];
+            allowedIPs = [
+              "10.8.8.16/32"
+              "10.0.0.0/24"
+              "10.88.88.0/24"
+            ];
             endpoint = "85.88.23.16:51820";
             persistentKeepalive = 25;
           }
@@ -88,7 +97,10 @@
           {
             publicKey = "nYMmaCIW8lZ7SokivN8HXxYDch+SS1G7ab1SC9meDAw=";
             presharedKeyFile = "/etc/wireguard/wg2.presharedkey";
-            allowedIPs = ["10.6.6.1/32" "10.1.1.0/24"];
+            allowedIPs = [
+              "10.6.6.1/32"
+              "10.1.1.0/24"
+            ];
             endpoint = "85.88.23.127:51820";
             persistentKeepalive = 16;
           }
@@ -103,7 +115,11 @@
           {
             publicKey = "7RRgfZSneqAtAHBeI6+aaYLqz9e1jikg/lIK8mhW928=";
             presharedKeyFile = "/etc/wireguard/wg3.presharedkey";
-            allowedIPs = ["10.11.11.0/24" "192.168.1.0/24" "10.0.1.0/24"];
+            allowedIPs = [
+              "10.11.11.0/24"
+              "192.168.1.0/24"
+              "10.0.1.0/24"
+            ];
             endpoint = "80.71.153.1:51820";
             persistentKeepalive = 16;
           }
@@ -147,33 +163,52 @@
         ];
       };
       wg6 = {
-        address = ["10.7.6.201/32" "fd00:fae:fae:fae:fae:201::/96"];
+        address = [
+          "10.7.6.201/32"
+          "fd00:fae:fae:fae:fae:201::/96"
+        ];
         privateKeyFile = "/etc/wireguard/wg6.privatekey";
 
         peers = [
-          { # nachtigall.pub.solar
+          {
+            # nachtigall.pub.solar
             publicKey = "qzNywKY9RvqTnDO8eLik75/SHveaSk9OObilDzv+xkk=";
-            allowedIPs = [ "10.7.6.1/32" "fd00:fae:fae:fae:fae:1::/96" ];
+            allowedIPs = [
+              "10.7.6.1/32"
+              "fd00:fae:fae:fae:fae:1::/96"
+            ];
             #endpoint = "138.201.80.102:51820";
             endpoint = "[2a01:4f8:172:1c25::1]:51820";
             persistentKeepalive = 15;
           }
-          { # flora-6.pub.solar
+          {
+            # flora-6.pub.solar
             publicKey = "jtSR5G2P/nm9s8WrVc26Xc/SQLupRxyXE+5eIeqlsTU=";
-            allowedIPs = [ "10.7.6.2/32" "fd00:fae:fae:fae:fae:2::/96" ];
+            allowedIPs = [
+              "10.7.6.2/32"
+              "fd00:fae:fae:fae:fae:2::/96"
+            ];
             endpoint = "80.71.153.210:51820";
             persistentKeepalive = 15;
           }
-          { # metronom.pub.solar
+          {
+            # metronom.pub.solar
             publicKey = "zOSYGO7MfnOOUnzaTcWiKRQM0qqxR3JQrwx/gtEtHmo=";
-            allowedIPs = [ "10.7.6.3/32" "fd00:fae:fae:fae:fae:3::/96" ];
+            allowedIPs = [
+              "10.7.6.3/32"
+              "fd00:fae:fae:fae:fae:3::/96"
+            ];
             endpoint = "49.13.236.167:51820";
             #endpoint = "[2a01:4f8:c2c:7082::]:51820";
             persistentKeepalive = 15;
           }
-          { # tankstelle.pub.solar
+          {
+            # tankstelle.pub.solar
             publicKey = "iRTlY1lB7nPXf2eXzX8ZZDkfMmXyGjff5/joccbP8Cg=";
-            allowedIPs = [ "10.7.6.4/32" "fd00:fae:fae:fae:fae:4::/96" ];
+            allowedIPs = [
+              "10.7.6.4/32"
+              "fd00:fae:fae:fae:fae:4::/96"
+            ];
             #endpoint = "80.244.242.5:51820";
             endpoint = "[2001:4d88:1ffa:26::5]:51820";
             persistentKeepalive = 15;
@@ -183,7 +218,10 @@
       # mozillavpn
       moz0 = {
         autostart = false;
-        address = ["10.142.131.196/32" "fc00:bbbb:bbbb:bb01:d:0:e:83c4/128"];
+        address = [
+          "10.142.131.196/32"
+          "fc00:bbbb:bbbb:bb01:d:0:e:83c4/128"
+        ];
         privateKeyFile = "/etc/wireguard/moz0.privatekey";
         #postUp = "resolvectl dns wg4 fdaa:1:3234::3; resolvectl domain wg4 ~internal";
         #preDown = "resolvectl revert wg4";
@@ -194,7 +232,10 @@
         peers = [
           {
             publicKey = "ku1NYeOAGbY65YL/JKZhrqVzDJKXQiVj9USXbfkOBA0=";
-            allowedIPs = ["0.0.0.0/0" "::/0"];
+            allowedIPs = [
+              "0.0.0.0/0"
+              "::/0"
+            ];
             endpoint = "185.254.75.3:36294";
           }
         ];

hosts/fae/default.nix

@@ -1,4 +1,5 @@
-{...}: {
+{ ... }:
+{
   imports = [
     ./paperless.nix
     ./invoiceplane.nix

hosts/fae/fae.nix

@@ -3,7 +3,8 @@
   lib,
   pkgs,
   ...
-}: {
+}:
+{
   config = {
     pub-solar.core.disk-encryption-active = false;
 
@@ -23,9 +24,7 @@
       allowSFTP = true;
     };
 
-    boot.kernelParams = [
+    boot.kernelParams = [ "boot.shell_on_fail=1" ];
-	    "boot.shell_on_fail=1"
-    ];
 
     # Would decrease closure size, but currenly broken (cairo)
     #environment.noXlibs = true;
@@ -39,7 +38,10 @@
         auto-optimise-store = true;
         sandbox = true;
         allowed-users = [ "@wheel" ];
-        trusted-users = ["root" "@wheel"];
+        trusted-users = [
+          "root"
+          "@wheel"
+        ];
       };
 
       extraOptions = ''

hosts/fae/invoiceplane.nix

@@ -4,11 +4,13 @@
   pkgs,
   lib,
   ...
-}: let
+}:
+let
   psCfg = config.pub-solar;
   xdg = config.home-manager.users."${psCfg.user.name}".xdg;
   backupDir = "/var/lib/invoiceplane/backup";
-in {
+in
+{
   security.acme.certs = {
     "billing.faenix.eu" = { };
   };
@@ -25,7 +27,9 @@ in {
     sites."billing.faenix.eu" = {
       enable = true;
 
-      invoiceTemplates = [ flake.self.inputs.invoiceplane-template.packages.${pkgs.system}.invoiceplane-template ];
+      invoiceTemplates = [
+        flake.self.inputs.invoiceplane-template.packages.${pkgs.system}.invoiceplane-template
+      ];
 
       settings = {
         IP_URL = "https://billing.faenix.eu";
@@ -49,9 +53,7 @@ in {
     };
   };
 
-  systemd.tmpfiles.rules = [
+  systemd.tmpfiles.rules = [ "d '${backupDir}' 0700 root root - -" ];
-    "d '${backupDir}' 0700 root root - -"
-  ];
 
   #services.restic.backups = {
   #  invoiceplane = {

hosts/fae/paperless.nix

@@ -13,7 +13,8 @@ let
   backupDir = "${xdg.dataHome}/PaperlessBackup";
   consumptionDir = "/home/${psCfg.user.name}/.local/share/scandir";
 
-in {
+in
+{
   services.paperless = {
     enable = true;
     user = psCfg.user.name;
@@ -81,7 +82,10 @@ in {
   #  };
   #};
 
-  networking.firewall.allowedTCPPorts = [ 80 443 ];
+  networking.firewall.allowedTCPPorts = [
+    80
+    443
+  ];
 
   systemd.tmpfiles.rules = [
     "d /home/${psCfg.user.name}/.local 0700 ${psCfg.user.name} users - -"

hosts/iso/default.nix

@@ -1,8 +1,5 @@
+{ pkgs, lib, ... }:
 {
-  pkgs,
-  lib,
-  ...
-}: {
   pub-solar.core.disk-encryption-active = false;
   isoImage.squashfsCompression = "gzip -Xcompression-level 1";
   systemd.services.sshd.wantedBy = lib.mkForce [ "multi-user.target" ];

hosts/powder/default.nix

@@ -1,5 +1,4 @@
-{...}: {
+{ ... }:
-  imports = [
+{
-    ./powder.nix
+  imports = [ ./powder.nix ];
-  ];
 }

hosts/powder/hardware-configuration.nix

@@ -7,10 +7,17 @@
   pkgs,
   modulesPath,
   ...
-}: {
+}:
+{
   imports = [ ];
 
-  boot.initrd.availableKernelModules = ["ahci" "virtio_pci" "xhci_pci" "sr_mod" "virtio_blk"];
+  boot.initrd.availableKernelModules = [
+    "ahci"
+    "virtio_pci"
+    "xhci_pci"
+    "sr_mod"
+    "virtio_blk"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];

hosts/powder/powder.nix

@@ -5,7 +5,8 @@
   pkgs,
   profiles,
   ...
-}: {
+}:
+{
   imports = [
     # Include the results of the hardware scan.
     ./hardware-configuration.nix

hosts/ryzensun/default.nix

@@ -1,4 +1,5 @@
-{ ... }: {
+{ ... }:
+{
   imports = [
     ./ryzensun.nix
     ./hardware-configuration.nix

hosts/ryzensun/hardware-configuration.nix

@@ -7,12 +7,18 @@
   pkgs,
   modulesPath,
   ...
-}: {
+}:
-  imports = [
+{
-    (modulesPath + "/installer/scan/not-detected.nix")
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
-  ];
 
-  boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usbhid" "sd_mod" "sr_mod"];
+  boot.initrd.availableKernelModules = [
+    "nvme"
+    "xhci_pci"
+    "ahci"
+    "usbhid"
+    "sd_mod"
+    "sr_mod"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];

hosts/ryzensun/networking.nix

@@ -1,10 +1,16 @@
 {
   networking = {
     hosts = {
-      "10.0.0.42" = ["nomad.service.consul" "nomad.service.cgn-1.consul"];
+      "10.0.0.42" = [
+        "nomad.service.consul"
+        "nomad.service.cgn-1.consul"
+      ];
       "10.0.0.66" = [ "consul.service.cgn-1.consul" ];
       "10.0.1.9" = [ "consul.service.lev-1.consul" ];
-      "10.0.0.70" = ["vault.service.consul" "vault.service.cgn-1.consul"];
+      "10.0.0.70" = [
+        "vault.service.consul"
+        "vault.service.cgn-1.consul"
+      ];
       "10.0.0.200" = [ "headnode.cgn-1" ];
       "10.0.0.201" = [ "cn01.cgn-1" ];
       "10.0.0.202" = [ "cn02.cgn-1" ];
@@ -34,7 +40,11 @@
         peers = [
           {
             publicKey = "l0DJLicCrcrixNP6zAWTXNSEaNM2jML253BXEZ1KpiU=";
-            allowedIPs = ["10.8.8.16/32" "10.0.0.0/24" "10.88.88.0/24"];
+            allowedIPs = [
+              "10.8.8.16/32"
+              "10.0.0.0/24"
+              "10.88.88.0/24"
+            ];
             endpoint = "85.88.23.16:51820";
             persistentKeepalive = 25;
           }
@@ -49,7 +59,11 @@
           {
             publicKey = "7RRgfZSneqAtAHBeI6+aaYLqz9e1jikg/lIK8mhW928=";
             presharedKeyFile = "/etc/wireguard/wg1.presharedkey";
-            allowedIPs = ["10.11.11.0/24" "192.168.1.0/24" "10.0.1.0/24"];
+            allowedIPs = [
+              "10.11.11.0/24"
+              "192.168.1.0/24"
+              "10.0.1.0/24"
+            ];
             endpoint = "80.71.153.1:51820";
             #persistentKeepalive = 16;
           }
@@ -60,29 +74,45 @@
         privateKeyFile = "/etc/wireguard/wg2.privatekey";
 
         peers = [
-          { # nachtigall.pub.solar
+          {
+            # nachtigall.pub.solar
             publicKey = "qzNywKY9RvqTnDO8eLik75/SHveaSk9OObilDzv+xkk=";
-            allowedIPs = [ "10.7.6.1/32" "fd00:fae:fae:fae:fae:1::/96" ];
+            allowedIPs = [
+              "10.7.6.1/32"
+              "fd00:fae:fae:fae:fae:1::/96"
+            ];
             #endpoint = "138.201.80.102:51820";
             endpoint = "[2a01:4f8:172:1c25::1]:51820";
             persistentKeepalive = 15;
           }
-          { # flora-6.pub.solar
+          {
+            # flora-6.pub.solar
             publicKey = "jtSR5G2P/nm9s8WrVc26Xc/SQLupRxyXE+5eIeqlsTU=";
-            allowedIPs = [ "10.7.6.2/32" "fd00:fae:fae:fae:fae:2::/96" ];
+            allowedIPs = [
+              "10.7.6.2/32"
+              "fd00:fae:fae:fae:fae:2::/96"
+            ];
             endpoint = "80.71.153.210:51820";
             persistentKeepalive = 15;
           }
-          { # metronom.pub.solar
+          {
+            # metronom.pub.solar
             publicKey = "zOSYGO7MfnOOUnzaTcWiKRQM0qqxR3JQrwx/gtEtHmo=";
-            allowedIPs = [ "10.7.6.3/32" "fd00:fae:fae:fae:fae:3::/96" ];
+            allowedIPs = [
+              "10.7.6.3/32"
+              "fd00:fae:fae:fae:fae:3::/96"
+            ];
             endpoint = "49.13.236.167:51820";
             #endpoint = "[2a01:4f8:c2c:7082::]:51820";
             persistentKeepalive = 15;
           }
-          { # tankstelle.pub.solar
+          {
+            # tankstelle.pub.solar
             publicKey = "iRTlY1lB7nPXf2eXzX8ZZDkfMmXyGjff5/joccbP8Cg=";
-            allowedIPs = [ "10.7.6.4/32" "fd00:fae:fae:fae:fae:4::/96" ];
+            allowedIPs = [
+              "10.7.6.4/32"
+              "fd00:fae:fae:fae:fae:4::/96"
+            ];
             #endpoint = "80.244.242.5:51820";
             endpoint = "[2001:4d88:1ffa:26::5]:51820";
             persistentKeepalive = 15;

hosts/ryzensun/ryzensun.nix

@@ -8,7 +8,8 @@
 let
   psCfg = config.pub-solar;
   xdg = config.home-manager.users."${psCfg.user.name}".xdg;
-in {
+in
+{
   config = {
     age.secrets.docker-ci-runner-secrets = {
       file = "${flake.self}/secrets/docker-ci-runner-secrets.age";

lib/compat/default.nix

@@ -1,16 +1,16 @@
 let
-  lock = builtins.fromJSON (builtins.readFile builtins.path {
+  lock = builtins.fromJSON (
+    builtins.readFile builtins.path {
       path = ../../flake.lock;
       name = "lockPath";
-  });
+    }
+  );
   flake =
     import
-    (
+      (fetchTarball {
-      fetchTarball {
         url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
         sha256 = lock.nodes.flake-compat.locked.narHash;
-      }
+      })
-    )
       {
         src = builtins.path {
           path = ../../.;

lib/compat/nixos/default.nix

@@ -1,4 +1,5 @@
-{...}: let
+{ ... }:
+let
   inherit (default.inputs.nixos) lib;
 
   host = configs.${hostname} or configs.PubSolarOS;

lib/default.nix

@@ -1,9 +1,12 @@
-{ lib, inputs, ... }: {
+{ lib, inputs, ... }:
+{
   # Configuration common to all Linux systems
   flake = {
-    lib = let
+    lib =
+      let
         callLibs = file: import file { inherit lib; };
-    in rec {
+      in
+      rec {
         ## Define your own library functions here!
         #id = x: x;
         ## Or in files, containing functions that take {lib}
@@ -12,7 +15,6 @@
 
         deploy = import ./deploy.nix { inherit inputs lib; };
         addLocalHostname = callLibs ./add-local-hostname.nix;
-      recursiveMerge = callLibs ./recursive-merge.nix;
       };
   };
 }

lib/deploy.nix

@@ -1,8 +1,8 @@
 /*
- * The contents of this file are adapted from digga
+  The contents of this file are adapted from digga
- * https://github.com/divnix/digga
+  https://github.com/divnix/digga
- *
+
- * Licensed under the MIT license
+  Licensed under the MIT license
 */
 
 { lib, inputs }:
@@ -15,7 +15,8 @@ let
         if (net ? domain) && (net.domain != null) then "${net.hostName}.${net.domain}" else net.hostName;
     in
     fqdn;
-in {
+in
+{
   mkDeployNodes =
     systemConfigurations: extraConfig:
     /*

lib/recursive-merge.nix

@@ -1,16 +0,0 @@
-{ lib }:
-attrList:
-let
-  f = attrPath:
-    zipAttrsWith (
-      n: values:
-        if tail values == []
-        then head values
-        else if all isList values
-        then unique (concatLists values)
-        else if all isAttrs values
-        then f (attrPath ++ [n]) values
-        else last values
-    );
-in
-  f [] attrList;

modules/acme/default.nix

@@ -4,7 +4,8 @@
   pkgs,
   lib,
   ...
-}: {
+}:
+{
   age.secrets."hosting-de-acme-secrets" = {
     file = "${flake.self}/secrets/hosting-de-acme-secrets.age";
     mode = "400";

modules/adb/default.nix

@@ -6,7 +6,8 @@
 }:
 let
   psCfg = config.pub-solar;
-in {
+in
+{
   programs.adb.enable = true;
 
   users.users."${psCfg.user.name}" = {

modules/arduino/default.nix

@@ -6,7 +6,8 @@
 }:
 let
   psCfg = config.pub-solar;
-in {
+in
+{
   users.users."${psCfg.user.name}" = {
     extraGroups = [ "dialout" ];
     packages = with pkgs; [

modules/audio/default.nix

@@ -7,7 +7,8 @@
 let
   psCfg = config.pub-solar;
   xdg = config.home-manager.users."${psCfg.user.name}".xdg;
-in {
+in
+{
   users.users."${psCfg.user.name}" = {
     extraGroups = [ "audio" ];
     packages = with pkgs; [
@@ -42,7 +43,10 @@ in {
         "context.properties" = {
           default = {
             "clock.rate" = 48000; # Pipewire default
-            "clock.allowed-rates" = [ 44100 48000 ];
+            "clock.allowed-rates" = [
+              44100
+              48000
+            ];
           };
         };
       };

modules/bluetooth/default.nix

@@ -3,15 +3,14 @@
   config,
   pkgs,
   ...
-}: {
+}:
+{
   hardware.bluetooth = {
     enable = true;
     # Disable bluetooth on startup to save battery
     powerOnBoot = false;
     # Disable useless SIM Access Profile plugin
-    disabledPlugins = [
+    disabledPlugins = [ "sap" ];
-      "sap"
-    ];
     settings = {
       General = {
         # Enables experimental features and interfaces.

modules/core/boot.nix

@@ -6,7 +6,8 @@
 }:
 let
   cfg = config.pub-solar.core;
-in {
+in
+{
   options.pub-solar.core.disk-encryption-active = lib.mkOption {
     type = lib.types.bool;
     default = true;

modules/core/default.nix

@@ -1,12 +1,9 @@
-{
+{ config, lib, ... }:
-  config,
-  lib,
-  ...
-}:
 let
   cfg = config.pub-solar.core;
   psCfg = config.pub-solar;
-in {
+in
+{
   imports = [
     ./boot.nix
     ./hibernation.nix

modules/core/hibernation.nix

@@ -7,7 +7,8 @@
 let
   cfg = config.pub-solar.core.hibernation;
   inherit (lib) mkOption types mkIf;
-in {
+in
+{
   options.pub-solar.core.hibernation = {
     enable = mkOption {
       type = types.bool;
@@ -31,7 +32,9 @@ in {
   config = {
     boot = mkIf cfg.enable {
       resumeDevice = mkIf (cfg.resumeDevice != null) cfg.resumeDevice;
-      kernelParams = mkIf (cfg.resumeOffset != null) ["resume_offset=${builtins.toString cfg.resumeOffset}"];
+      kernelParams = mkIf (cfg.resumeOffset != null) [
+        "resume_offset=${builtins.toString cfg.resumeOffset}"
+      ];
     };
   };
 }

modules/core/networking.nix

@@ -4,7 +4,8 @@
   pkgs,
   lib,
   ...
-}: {
+}:
+{
   # disable NetworkManager and systemd-networkd -wait-online by default
   systemd.services.NetworkManager-wait-online.enable = lib.mkDefault false;
   systemd.services.systemd-networkd-wait-online.enable = lib.mkDefault false;

modules/core/packages.nix

@@ -7,7 +7,8 @@
 let
   psCfg = config.pub-solar;
   cfg = config.pub-solar.core;
-in {
+in
+{
   environment.systemPackages = with pkgs; [
     # Core unix utility packages
     coreutils-full

modules/crypto/default.nix

@@ -6,16 +6,15 @@
 }:
 let
   psCfg = config.pub-solar;
-in {
+in
+{
   services.udev.packages = [ pkgs.yubikey-personalization ];
   services.dbus.packages = [ pkgs.gcr ];
   services.pcscd.enable = true;
 
   services.gnome.gnome-keyring.enable = true;
 
-  users.users."${psCfg.user.name}".packages = with pkgs; [
+  users.users."${psCfg.user.name}".packages = with pkgs; [ libsecret ];
-    libsecret
-  ];
 
   home-manager.users."${psCfg.user.name}" = {
     systemd.user.services.polkit-gnome-authentication-agent = import ./polkit-gnome-authentication-agent.service.nix pkgs;

modules/ddclient/default.nix

@@ -22,7 +22,12 @@ let
     cache=${dataDir}/ddclient.cache
     foreground=yes
     login=${cfg.username}
-    password=${if cfg.protocol == "nsupdate" then "/run/${RuntimeDirectory}/ddclient.key" else "@password_placeholder@"}
+    password=${
+      if cfg.protocol == "nsupdate" then
+        "/run/${RuntimeDirectory}/ddclient.key"
+      else
+        "@password_placeholder@"
+    }
     protocol=${cfg.protocol}
     ${lib.optionalString (cfg.script != "") "script=${cfg.script}"}
     ${lib.optionalString (cfg.server != "") "server=${cfg.server}"}
@@ -38,26 +43,60 @@ let
 
   preStart = ''
     install --mode=600 --owner=$USER ${configFile} /run/${RuntimeDirectory}/ddclient.conf
-    ${lib.optionalString (cfg.configFile == null) (if (cfg.protocol == "nsupdate") then ''
+    ${lib.optionalString (cfg.configFile == null) (
+      if (cfg.protocol == "nsupdate") then
+        ''
           install --mode=600 --owner=$USER ${cfg.passwordFile} /run/${RuntimeDirectory}/ddclient.key
-    '' else if (cfg.passwordFile != null) then ''
+        ''
+      else if (cfg.passwordFile != null) then
+        ''
           "${pkgs.replace-secret}/bin/replace-secret" "@password_placeholder@" "${cfg.passwordFile}" "/run/${RuntimeDirectory}/ddclient.conf"
-    '' else ''
+        ''
+      else
+        ''
           sed -i '/^password=@password_placeholder@$/d' /run/${RuntimeDirectory}/ddclient.conf
-    '')}
+        ''
+    )}
   '';
-in with lib; {
+in
-  disabledModules = [
+with lib;
-    "services/networking/ddclient.nix"
+{
-  ];
+  disabledModules = [ "services/networking/ddclient.nix" ];
 
   imports = [
-    (mkChangedOptionModule [ "services" "ddclient" "domain" ] [ "services" "ddclient" "domains" ]
+    (mkChangedOptionModule
-      (config:
+      [
-        let value = getAttrFromPath [ "services" "ddclient" "domain" ] config;
+        "services"
-        in if value != "" then [ value ] else []))
+        "ddclient"
-    (mkRemovedOptionModule [ "services" "ddclient" "homeDir" ] "")
+        "domain"
-    (mkRemovedOptionModule [ "services" "ddclient" "password" ] "Use services.ddclient.passwordFile instead.")
+      ]
+      [
+        "services"
+        "ddclient"
+        "domains"
+      ]
+      (
+        config:
+        let
+          value = getAttrFromPath [
+            "services"
+            "ddclient"
+            "domain"
+          ] config;
+        in
+        if value != "" then [ value ] else [ ]
+      )
+    )
+    (mkRemovedOptionModule [
+      "services"
+      "ddclient"
+      "homeDir"
+    ] "")
+    (mkRemovedOptionModule [
+      "services"
+      "ddclient"
+      "password"
+    ] "Use services.ddclient.passwordFile instead.")
   ];
 
   ###### interface
@@ -91,7 +130,9 @@ in with lib; {
 
       username = mkOption {
         # For `nsupdate` username contains the path to the nsupdate executable
-        default = lib.optionalString (config.services.ddclient.protocol == "nsupdate") "${pkgs.bind.dnsutils}/bin/nsupdate";
+        default = lib.optionalString (
+          config.services.ddclient.protocol == "nsupdate"
+        ) "${pkgs.bind.dnsutils}/bin/nsupdate";
         defaultText = "";
         type = str;
         description = lib.mdDoc ''
@@ -212,7 +253,6 @@ in with lib; {
     };
   };
 
-
   ###### implementation
 
   config = mkIf config.services.ddclient.enable {

modules/default.nix

@@ -1,8 +1,5 @@
+{ self, inputs, ... }:
 {
-  self,
-  inputs,
-  ...
-}: {
   flake = {
     nixosModules = rec {
       acme = import ./acme;

modules/desktop-extended/default.nix

@@ -1,11 +1,8 @@
-{
+{ config, pkgs, ... }:
-  config,
-  pkgs,
-  ...
-}:
 let
   psCfg = config.pub-solar;
-in {
+in
+{
   users.users."${psCfg.user.name}".packages = with pkgs; [
     ungoogled-chromium
 

modules/docker/default.nix

@@ -6,14 +6,13 @@
 }:
 let
   psCfg = config.pub-solar;
-in {
+in
+{
   virtualisation.docker.enable = true;
 
   users.users."${psCfg.user.name}" = {
     extraGroups = [ "docker" ];
   };
 
-  environment.systemPackages = with pkgs; [
+  environment.systemPackages = with pkgs; [ docker-compose ];
-    docker-compose
-  ];
 }

modules/email/default.nix

@@ -6,7 +6,8 @@
 }:
 let
   psCfg = config.pub-solar;
-in {
+in
+{
   users.users."${psCfg.user.name}".packages = with pkgs; [
     w3m
     urlscan
@@ -37,17 +38,23 @@ in {
       macro index <f5> '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/admins@pub.solar.muttrc<enter><change-folder>!<enter>'
       macro index <f6> '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/crew@pub.solar.muttrc<enter><change-folder>!<enter>'
     '';
-    xdg.configFile."mutt/hello@benjaminbaedorf.eu.muttrc".source = ./.config/mutt + "/hello@benjaminbaedorf.eu.muttrc";
+    xdg.configFile."mutt/hello@benjaminbaedorf.eu.muttrc".source =
-    xdg.configFile."mutt/benjamin.baedorf@rwth-aachen.de.muttrc".source = ./.config/mutt + "/benjamin.baedorf@rwth-aachen.de.muttrc";
+      ./.config/mutt + "/hello@benjaminbaedorf.eu.muttrc";
-    xdg.configFile."mutt/hello@benjaminbaedorf.eu.signature".source = ./.config/mutt + "/hello@benjaminbaedorf.eu.signature";
+    xdg.configFile."mutt/benjamin.baedorf@rwth-aachen.de.muttrc".source =
+      ./.config/mutt + "/benjamin.baedorf@rwth-aachen.de.muttrc";
+    xdg.configFile."mutt/hello@benjaminbaedorf.eu.signature".source =
+      ./.config/mutt + "/hello@benjaminbaedorf.eu.signature";
     xdg.configFile."mutt/byb@miom.space.muttrc".source = ./.config/mutt + "/byb@miom.space.muttrc";
-    xdg.configFile."mutt/byb@miom.space.signature".source = ./.config/mutt + "/byb@miom.space.signature";
+    xdg.configFile."mutt/byb@miom.space.signature".source =
+      ./.config/mutt + "/byb@miom.space.signature";
     xdg.configFile."mutt/mail@b12f.io.muttrc".source = ./.config/mutt + "/mail@b12f.io.muttrc";
     xdg.configFile."mutt/mail@b12f.io.signature".source = ./.config/mutt + "/mail@b12f.io.signature";
     xdg.configFile."mutt/admins@pub.solar.muttrc".source = ./.config/mutt + "/admins@pub.solar.muttrc";
-    xdg.configFile."mutt/admins@pub.solar.signature".source = ./.config/mutt + "/admins@pub.solar.signature";
+    xdg.configFile."mutt/admins@pub.solar.signature".source =
+      ./.config/mutt + "/admins@pub.solar.signature";
     xdg.configFile."mutt/crew@pub.solar.muttrc".source = ./.config/mutt + "/crew@pub.solar.muttrc";
-    xdg.configFile."mutt/crew@pub.solar.signature".source = ./.config/mutt + "/crew@pub.solar.signature";
+    xdg.configFile."mutt/crew@pub.solar.signature".source =
+      ./.config/mutt + "/crew@pub.solar.signature";
     xdg.configFile."offlineimap/config".source = ./.config/offlineimap/config;
     xdg.configFile."msmtp/config".source = ./.config/msmtp/config;
   };

modules/gaming/default.nix

@@ -6,11 +6,10 @@
 }:
 let
   psCfg = config.pub-solar;
-in {
+in
+{
   programs.steam.enable = true;
-  nixpkgs.config.packageOverrides = pkgs: {
+  nixpkgs.config.packageOverrides = pkgs: { steam = pkgs.steam.override { }; };
-    steam = pkgs.steam.override {};
-  };
 
   users.users."${psCfg.user.name}".packages = with pkgs; [
     playonlinux

modules/graphical/default.nix

@@ -8,18 +8,14 @@ let
   psCfg = config.pub-solar;
   tomlFormat = pkgs.formats.toml { };
   sessionVariables = {
-    WLR_RENDERER =
+    WLR_RENDERER = if psCfg.graphical.wayland.software-renderer.enable then "pixman" else "gles2";
-      if psCfg.graphical.wayland.software-renderer.enable
-      then "pixman"
-      else "gles2";
     # Fix KeepassXC rendering issue
     # https://github.com/void-linux/void-packages/issues/23517
     QT_AUTO_SCREEN_SCALE_FACTOR = "0";
   };
-in {
+in
-  imports = [
+{
-    ./sway
+  imports = [ ./sway ];
-  ];
 
   options.pub-solar.graphical = {
     wayland.software-renderer.enable = lib.mkOption {

modules/graphical/sway/config/config.d/mode_system.conf.nix

@@ -1,17 +1,14 @@
-{
+{ pkgs, psCfg, ... }:
-  pkgs,
-  psCfg,
-  ...
-}:
 ''
   # Set shut down, restart and locking features
 ''
 + (
-  if psCfg.core.hibernation.enable
+  if psCfg.core.hibernation.enable then
-  then ''
+    ''
       set $mode_system (e)xit, (h)ibernate, (l)ock, (s)uspend, (r)eboot, (Shift+s)hutdown
     ''
-  else ''
+  else
+    ''
       set $mode_system (e)xit, (l)ock, (s)uspend, (r)eboot, (Shift+s)hutdown
     ''
 )
@@ -22,11 +19,12 @@
     bindsym e exec swaymsg exit, mode "default"
 ''
 + (
-  if psCfg.core.hibernation.enable
+  if psCfg.core.hibernation.enable then
-  then ''
+    ''
       bindsym h exec systemctl hibernate, mode "default"
     ''
-  else ""
+  else
+    ""
 )
 + ''
       bindsym l exec ${pkgs.swaylock-bg}/bin/swaylock-bg, mode "default"

modules/graphical/sway/config/config.nix

@@ -1,8 +1,5 @@
-{
+{ config, pkgs, ... }:
-  config,
+''
-  pkgs,
-  ...
-}: ''
   # Default config for sway
   #
   # Copy this to ~/.config/sway/config and edit it to your liking.

modules/graphical/sway/config/wayvnc/config.nix

@@ -1,7 +1,5 @@
-{
+{ psCfg, pkgs }:
-  psCfg,
+"
-  pkgs,
-}: "
 address=0.0.0.0
 enable_auth=true
 username=${psCfg.user.name}

modules/graphical/sway/default.nix

@@ -8,7 +8,8 @@
 let
   psCfg = config.pub-solar;
   inherit (lib) mkIf mkOption types;
-in {
+in
+{
   options.pub-solar.graphical = {
     v4l2loopback.enable = mkOption {
       type = types.bool;
@@ -80,9 +81,7 @@ in {
     ];
 
     home-manager.users."${psCfg.user.name}" = {
-      imports = [
+      imports = [ flake.self.inputs.wayland-pipewire-idle-inhibit.homeModules.default ];
-        flake.self.inputs.wayland-pipewire-idle-inhibit.homeModules.default
-      ];
 
       services.wayland-pipewire-idle-inhibit = {
         enable = true;
@@ -117,7 +116,9 @@ in {
       xdg.configFile."sway/config.d/theme.conf".source = ./config/config.d/theme.conf;
       xdg.configFile."sway/config.d/gaps.conf".source = ./config/config.d/gaps.conf;
       xdg.configFile."sway/config.d/custom-keybindings.conf".source = ./config/config.d/custom-keybindings.conf;
-      xdg.configFile."sway/config.d/mode_system.conf".text = import ./config/config.d/mode_system.conf.nix {inherit pkgs psCfg;};
+      xdg.configFile."sway/config.d/mode_system.conf".text =
+        import ./config/config.d/mode_system.conf.nix
+          { inherit pkgs psCfg; };
       xdg.configFile."sway/config.d/applications.conf".source = ./config/config.d/applications.conf;
       xdg.configFile."sway/config.d/systemd.conf".source = ./config/config.d/systemd.conf;
     };

modules/graphical/sway/gammastep.service.nix

@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   Unit = {
     Description = "set color temperature of display according to time of day";
     Documentation = [ "man:gammastep(1)" ];

modules/graphical/sway/libinput-gestures.service.nix

@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   Unit = {
     Description = "Actions gestures on your touchpad using libinput";
     Documentation = [ "https://github.com/bulletmark/libinput-gestures" ];

modules/graphical/sway/mako.service.nix

@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   Unit = {
     Description = "Lightweight Wayland notification daemon";
     Documentation = [ "man:mako(1)" ];

modules/graphical/sway/sway-session.target.nix

@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   Unit = {
     Description = "sway compositor session";
     Documentation = [ "man:systemd.special(7)" ];

modules/graphical/sway/sway.service.nix

@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   Unit = {
     Description = "sway - SirCmpwn's Wayland window manager";
     Documentation = [ "man:sway(5)" ];

modules/graphical/sway/swayidle.service.nix

@@ -1,8 +1,5 @@
+{ pkgs, psCfg, ... }:
 {
-  pkgs,
-  psCfg,
-  ...
-}: {
   Unit = {
     Description = "Idle manager for Wayland";
     Documentation = [ "man:swayidle(1)" ];

modules/graphical/sway/waybar.service.nix

@@ -1,10 +1,18 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   Unit = {
     Description = "Highly customizable Wayland bar for Sway and Wlroots based compositors.";
     Documentation = "https://github.com/Alexays/Waybar/wiki/";
     BindsTo = [ "sway-session.target" ];
-    After = ["sway-session.target" "network-online.target"];
+    After = [
-    Wants = ["graphical-session-pre.target" "network-online.target" "blueman-applet.service"];
+      "sway-session.target"
+      "network-online.target"
+    ];
+    Wants = [
+      "graphical-session-pre.target"
+      "network-online.target"
+      "blueman-applet.service"
+    ];
     ConditionEnvironment = [ "WAYLAND_DISPLAY" ];
   };
 

modules/graphical/sway/xsettingsd.service.nix

@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   Unit = {
     Description = "X Settings Daemon";
     Documentation = [ "https://github.com/derat/xsettingsd/wiki/Installation" ];

modules/graphical/sway/ydotool.service.nix

@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   Unit = {
     Description = "ydotool - Generic command-line automation tool (no X!)";
     Documentation = [ "https://github.com/ReimuNotMoe/ydotool" ];

modules/hm-system-defaults.nix

@@ -1,11 +1,11 @@
-{config, ...}: {
+{ config, ... }:
+{
   home-manager.sharedModules = [
     {
       home.sessionVariables = {
         inherit (config.environment.sessionVariables) NIX_PATH;
       };
-      xdg.configFile."nix/registry.json".text =
+      xdg.configFile."nix/registry.json".text = config.environment.etc."nix/registry.json".text;
-        config.environment.etc."nix/registry.json".text;
     }
   ];
 }

modules/invoiceplane/default.nix

@@ -1,4 +1,9 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 
 let
   inherit (lib)
@@ -24,14 +29,17 @@ let
     mkOption
     nameValuePair
     optionalString
-    types;
+    types
+    ;
 
   cfg = config.services.invoiceplane;
   eachSite = cfg.sites;
   user = "invoiceplane";
   webserver = config.services.${cfg.webserver};
 
-  invoiceplane-config = hostName: cfg: pkgs.writeText "ipconfig.php" ''
+  invoiceplane-config =
+    hostName: cfg:
+    pkgs.writeText "ipconfig.php" ''
       IP_URL=http://${hostName}
       ENABLE_DEBUG=false
       DISABLE_SETUP=false
@@ -39,7 +47,11 @@ let
       DB_HOSTNAME=${cfg.database.host}
       DB_USERNAME=${cfg.database.user}
       # NOTE: file_get_contents adds newline at the end of returned string
-    DB_PASSWORD=${optionalString (cfg.database.passwordFile != null) "trim(file_get_contents('${cfg.database.passwordFile}'), \"\\r\\n\")"}
+      DB_PASSWORD=${
+        optionalString (
+          cfg.database.passwordFile != null
+        ) "trim(file_get_contents('${cfg.database.passwordFile}'), \"\\r\\n\")"
+      }
       DB_DATABASE=${cfg.database.name}
       DB_PORT=${toString cfg.database.port}
       SESS_EXPIRATION=864000
@@ -51,20 +63,30 @@ let
       REMOVE_INDEXPHP=true
     '';
 
-  mkPhpValue = v:
+  mkPhpValue =
-    if isString v then escapeShellArg v
+    v:
+    if isString v then
+      escapeShellArg v
     # NOTE: If any value contains a , (comma) this will not get escaped
-    else if isList v && any lib.strings.isCoercibleToString v then escapeShellArg (concatMapStringsSep "," toString v)
+    else if isList v && any lib.strings.isCoercibleToString v then
-    else if isInt v then toString v
+      escapeShellArg (concatMapStringsSep "," toString v)
-    else if isBool v then boolToString v
+    else if isInt v then
-    else abort "The Invoiceplane config value ${lib.generators.toPretty {} v} can not be encoded."
+      toString v
-  ;
+    else if isBool v then
+      boolToString v
+    else
+      abort "The Invoiceplane config value ${lib.generators.toPretty { } v} can not be encoded.";
 
-  extraConfig = hostName: cfg: let
+  extraConfig =
+    hostName: cfg:
+    let
       settings = mapAttrsToList (k: v: "${k}=${mkPhpValue v}") cfg.settings;
-  in pkgs.writeText "extraConfig.php" (concatStringsSep "\n" settings);
+    in
+    pkgs.writeText "extraConfig.php" (concatStringsSep "\n" settings);
 
-  pkg = hostName: cfg: pkgs.stdenv.mkDerivation rec {
+  pkg =
+    hostName: cfg:
+    pkgs.stdenv.mkDerivation rec {
       pname = "invoiceplane-${hostName}";
       version = src.version;
       src = pkgs.invoiceplane;
@@ -92,11 +114,14 @@ let
         ln -s ${extraConfig hostName cfg} $out/extraConfig.php
 
         # symlink additional templates
-      ${concatMapStringsSep "\n" (template: "cp -r ${template}/. $out/application/views/invoice_templates/pdf/") cfg.invoiceTemplates}
+        ${concatMapStringsSep "\n" (
+          template: "cp -r ${template}/. $out/application/views/invoice_templates/pdf/"
+        ) cfg.invoiceTemplates}
       '';
     };
 
-  siteOpts = { name, ... }:
+  siteOpts =
+    { name, ... }:
     {
       options = {
 
@@ -187,7 +212,13 @@ let
         };
 
         poolConfig = mkOption {
-          type = with types; attrsOf (oneOf [ str int bool ]);
+          type =
+            with types;
+            attrsOf (oneOf [
+              str
+              int
+              bool
+            ]);
           default = {
             "pm" = "dynamic";
             "pm.max_children" = 32;
@@ -241,9 +272,7 @@ let
     };
 in
 {
-  disabledModules = [
+  disabledModules = [ "services/web-apps/invoiceplane.nix" ];
-    "services/web-apps/invoiceplane.nix"
-  ];
 
   # interface
   options = {
@@ -257,7 +286,10 @@ in
         };
 
         options.webserver = mkOption {
-          type = types.enum [ "caddy" "nginx" ];
+          type = types.enum [
+            "caddy"
+            "nginx"
+          ];
           default = "caddy";
           example = "nginx";
           description = ''
@@ -272,50 +304,59 @@ in
   };
 
   # implementation
-  config = mkIf (eachSite != {}) (mkMerge [{
+  config = mkIf (eachSite != { }) (mkMerge [
+    {
 
-    assertions = flatten (mapAttrsToList (hostName: cfg: [
+      assertions = flatten (
-      { assertion = cfg.database.createLocally -> cfg.database.user == user;
+        mapAttrsToList (hostName: cfg: [
+          {
+            assertion = cfg.database.createLocally -> cfg.database.user == user;
             message = ''services.invoiceplane.sites."${hostName}".database.user must be ${user} if the database is to be automatically provisioned'';
           }
-      { assertion = cfg.database.createLocally -> cfg.database.passwordFile == null;
+          {
+            assertion = cfg.database.createLocally -> cfg.database.passwordFile == null;
             message = ''services.invoiceplane.sites."${hostName}".database.passwordFile cannot be specified if services.invoiceplane.sites."${hostName}".database.createLocally is set to true.'';
           }
-      { assertion = cfg.cron.enable -> cfg.cron.key != null;
+          {
+            assertion = cfg.cron.enable -> cfg.cron.key != null;
             message = ''services.invoiceplane.sites."${hostName}".cron.key must be set in order to use cron service.'';
           }
-    ]) eachSite);
+        ]) eachSite
+      );
 
       services.mysql = mkIf (any (v: v.database.createLocally) (attrValues eachSite)) {
         enable = true;
         package = mkDefault pkgs.mariadb;
         ensureDatabases = mapAttrsToList (hostName: cfg: cfg.database.name) eachSite;
-      ensureUsers = mapAttrsToList (hostName: cfg:
+        ensureUsers = mapAttrsToList (hostName: cfg: {
-        { name = cfg.database.user;
+          name = cfg.database.user;
-          ensurePermissions = { "${cfg.database.name}.*" = "ALL PRIVILEGES"; };
+          ensurePermissions = {
-        }
+            "${cfg.database.name}.*" = "ALL PRIVILEGES";
-      ) eachSite;
+          };
+        }) eachSite;
       };
 
       services.phpfpm = {
         phpPackage = pkgs.php81;
-      pools = mapAttrs' (hostName: cfg: (
+        pools = mapAttrs' (
-        nameValuePair "invoiceplane-${hostName}" {
+          hostName: cfg:
+          (nameValuePair "invoiceplane-${hostName}" {
             inherit user;
             group = webserver.group;
             settings = {
               "listen.owner" = webserver.user;
               "listen.group" = webserver.group;
             } // cfg.poolConfig;
-        }
+          })
-      )) eachSite;
+        ) eachSite;
       };
 
     }
 
     {
 
-    systemd.tmpfiles.rules = flatten (mapAttrsToList (hostName: cfg: [
+      systemd.tmpfiles.rules = flatten (
+        mapAttrsToList (hostName: cfg: [
           "d ${cfg.stateDir} 0750 ${user} ${webserver.group} - -"
           "f ${cfg.stateDir}/ipconfig.php 0750 ${user} ${webserver.group} - -"
           "d ${cfg.stateDir}/logs 0750 ${user} ${webserver.group} - -"
@@ -325,18 +366,20 @@ in
           "d ${cfg.stateDir}/uploads/temp 0750 ${user} ${webserver.group} - -"
           "d ${cfg.stateDir}/uploads/temp/mpdf 0750 ${user} ${webserver.group} - -"
           "d ${cfg.stateDir}/tmp 0750 ${user} ${webserver.group} - -"
-    ]) eachSite);
+        ]) eachSite
+      );
 
       systemd.services.invoiceplane-config = {
         serviceConfig.Type = "oneshot";
-      script = concatStrings (mapAttrsToList (hostName: cfg:
+        script = concatStrings (
-        ''
+          mapAttrsToList (hostName: cfg: ''
             mkdir -p ${cfg.stateDir}/logs \
                      ${cfg.stateDir}/uploads
             if ! grep -q IP_URL "${cfg.stateDir}/ipconfig.php"; then
               cp "${invoiceplane-config hostName cfg}" "${cfg.stateDir}/ipconfig.php"
             fi
-        '') eachSite);
+          '') eachSite
+        );
         wantedBy = [ "multi-user.target" ];
       };
 
@@ -350,50 +393,57 @@ in
 
       # Cron service implementation
 
-    systemd.timers = mapAttrs' (hostName: cfg: (
+      systemd.timers = mapAttrs' (
-      nameValuePair "invoiceplane-cron-${hostName}" (mkIf cfg.cron.enable {
+        hostName: cfg:
+        (nameValuePair "invoiceplane-cron-${hostName}" (
+          mkIf cfg.cron.enable {
             wantedBy = [ "timers.target" ];
             timerConfig = {
               OnBootSec = "5m";
               OnUnitActiveSec = "5m";
               Unit = "invoiceplane-cron-${hostName}.service";
             };
-      })
+          }
-    )) eachSite;
+        ))
+      ) eachSite;
 
-    systemd.services =
+      systemd.services = mapAttrs' (
-      mapAttrs' (hostName: cfg: (
+        hostName: cfg:
-        nameValuePair "invoiceplane-cron-${hostName}" (mkIf cfg.cron.enable {
+        (nameValuePair "invoiceplane-cron-${hostName}" (
+          mkIf cfg.cron.enable {
             serviceConfig = {
               Type = "oneshot";
               User = user;
               ExecStart = "${pkgs.curl}/bin/curl --header 'Host: ${hostName}' http://localhost/invoices/cron/recur/${cfg.cron.key}";
             };
-        })
+          }
-    )) eachSite;
+        ))
+      ) eachSite;
 
     }
 
     (mkIf (cfg.webserver == "caddy") {
       services.caddy = {
         enable = true;
-      virtualHosts = mapAttrs' (hostName: cfg: (
+        virtualHosts = mapAttrs' (
-        nameValuePair "http://${hostName}" {
+          hostName: cfg:
+          (nameValuePair "http://${hostName}" {
             extraConfig = ''
               root * ${pkg hostName cfg}
               file_server
               php_fastcgi unix/${config.services.phpfpm.pools."invoiceplane-${hostName}".socket}
             '';
-        }
+          })
-      )) eachSite;
+        ) eachSite;
       };
     })
 
     (mkIf (cfg.webserver == "nginx") {
       services.nginx = {
         enable = true;
-      virtualHosts = mapAttrs' (hostName: cfg: (
+        virtualHosts = mapAttrs' (
-        nameValuePair hostName {
+          hostName: cfg:
+          (nameValuePair hostName {
             root = pkg hostName cfg;
             extraConfig = ''
               index index.php index.html index.htm;
@@ -422,8 +472,8 @@ in
                 '';
               };
             };
-        }
+          })
-      )) eachSite;
+        ) eachSite;
       };
     })
 

modules/nextcloud/default.nix

@@ -6,7 +6,8 @@
 }:
 let
   psCfg = config.pub-solar;
-in {
+in
+{
   home-manager.users."${psCfg.user.name}" = {
     systemd.user.services.nextcloud-client = import ./nextcloud.service.nix pkgs;
   };

modules/nix/default.nix

@@ -4,8 +4,11 @@
   lib,
   flake,
   ...
-}: {
+}:
-  nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
+{
+  nixpkgs.config.allowUnfreePredicate =
+    pkg:
+    builtins.elem (lib.getName pkg) [
       "1password"
       "1password-cli"
       "brscan5"
@@ -42,24 +45,22 @@
       system.flake = flake.self;
     };
 
-
     settings = {
       # Improve nix store disk usage
       auto-optimise-store = true;
       # Prevents impurities in builds
       sandbox = true;
       # Give root and @wheel special privileges with nix
-      trusted-users = ["root" "@wheel"];
+      trusted-users = [
+        "root"
+        "@wheel"
+      ];
       # Allow only group wheel to connect to the nix daemon
       allowed-users = [ "@wheel" ];
 
-      substituters = [
+      substituters = [ "https://pub-solar.cachix.org/" ];
-        "https://pub-solar.cachix.org/"
-      ];
 
-      trusted-public-keys = [
+      trusted-public-keys = [ "pub-solar.cachix.org-1:ZicXIxKgdxMtgSJECWR8iihZxHRvu8ObL4n2cuBmtos=" ];
-        "pub-solar.cachix.org-1:ZicXIxKgdxMtgSJECWR8iihZxHRvu8ObL4n2cuBmtos="
-      ];
     };
 
     # Generally useful nix option defaults

modules/office/default.nix

@@ -6,7 +6,8 @@
 }:
 let
   psCfg = config.pub-solar;
-in {
+in
+{
   programs.evince.enable = true;
 
   users.users."${psCfg.user.name}".packages = with pkgs; [

modules/printing/default.nix

@@ -7,7 +7,8 @@
 }:
 let
   psCfg = config.pub-solar;
-in {
+in
+{
   services.avahi.enable = true;
   services.avahi.ipv6 = true;
   services.avahi.nssmdns4 = true;
@@ -30,7 +31,10 @@ in {
   };
 
   users.users."${psCfg.user.name}" = {
-    extraGroups = ["lp" "scanner"];
+    extraGroups = [
+      "lp"
+      "scanner"
+    ];
   };
 
   networking.hosts = flake.self.lib.addLocalHostname [ "cups.local" ];

modules/terminal-life/bash/default.nix

@@ -3,19 +3,28 @@
   flake,
   pkgs,
   ...
-}: let
+}:
+let
   psCfg = config.pub-solar;
   xdg = config.home-manager.users."${psCfg.user.name}".xdg;
-in {
+in
+{
   enable = true;
 
-  historyControl = ["ignoredups" "ignorespace"];
+  historyControl = [
+    "ignoredups"
+    "ignorespace"
+  ];
   historyFileSize = 300000;
 
   # Run when initializing a login shell
-  profileExtra = if config.programs.sway.enable then ''
+  profileExtra =
+    if config.programs.sway.enable then
+      ''
         [ "$(tty)" = "/dev/tty1" ] && exec systemd-cat --identifier=sway ${pkgs.sway}/bin/sway
-  '' else "";
+      ''
+    else
+      "";
 
   # Run when initializing an interactive shell
   initExtra = ''

modules/terminal-life/default.nix

@@ -8,7 +8,8 @@
 let
   psCfg = config.pub-solar;
   cfg = config.pub-solar.terminal-life;
-in {
+in
+{
   options.pub-solar.terminal-life = {
     full = lib.mkOption {
       description = ''
@@ -26,7 +27,9 @@ in {
     # until https://github.com/nix-community/nix-index/pull/227 is merged
     programs.nix-index.enableBashIntegration = false;
 
-    users.users."${psCfg.user.name}".packages = with pkgs; [
+    users.users."${psCfg.user.name}".packages =
+      with pkgs;
+      [
         asciinema
         bat
         blesh
@@ -35,17 +38,16 @@ in {
         fd
         jump
         (nnn.overrideAttrs (o: {
-        patches =
+          patches = (o.patches or [ ]) ++ [ ./nnn/0001-feat-use-wasd-keybindings-for-jkli.patch ];
-          (o.patches or [])
-          ++ [
-            ./nnn/0001-feat-use-wasd-keybindings-for-jkli.patch
-          ];
         }))
         powerline
         ripgrep
         screen
         watson
-    ] ++ (if cfg.full then [
+      ]
+      ++ (
+        if cfg.full then
+          [
             binutils
             jq
 
@@ -58,7 +60,10 @@ in {
             nixpkgs-review
             nix-update
             nix-search-cli
-    ] else []);
+          ]
+        else
+          [ ]
+      );
 
     # Get completion for system packages
     # https://nix-community.github.io/home-manager/options.xhtml#opt-programs.bash.enableCompletion

modules/terminal-life/fzf/default.nix

@@ -1,8 +1,5 @@
+{ config, pkgs, ... }:
 {
-  config,
-  pkgs,
-  ...
-}: {
   enable = true;
   defaultCommand = "fd --hidden --type f --exclude .git";
   defaultOptions = [

modules/terminal-life/nvim/default.nix

@@ -3,11 +3,13 @@
   pkgs,
   lib,
   ...
-}: let
+}:
+let
   psCfg = config.pub-solar;
   cfg = config.pub-solar.terminal-life;
   xdg = config.home-manager.users."${psCfg.user.name}".xdg;
-in {
+in
+{
   enable = true;
 
   viAlias = true;
@@ -25,7 +27,7 @@ in {
     # ansible-language-server
     # clang-tools
     # gopls
-    # nodePackages.bash-language-server
+    nodePackages.bash-language-server
     # nodePackages.svelte-language-server
     # nodePackages.typescript
     # nodePackages.typescript-language-server
@@ -35,18 +37,18 @@ in {
     # lua-language-server
     # cmake-language-server
     # vim-language-server
-    # yaml-language-server
+    yaml-language-server
-    # python3Packages.python-lsp-server
+    nodePackages.dockerfile-language-server-nodejs
-    # nodePackages.dockerfile-language-server-nodejs
+    docker-compose-language-service
-    # docker-compose-language-service
     # rust-analyzer
     # cargo
     # solargraph
     # terraform-ls
-    # python3Full
   ];
 
-  plugins = with pkgs.vimPlugins; [
+  plugins =
+    with pkgs.vimPlugins;
+    [
       # The status bar in the bottom of the screen with the mode indication and file location
       vim-airline
 
@@ -99,7 +101,10 @@ in {
 
       # Work with tags files
       vim-gutentags
-  ] ++ (if cfg.full then [
+    ]
+    ++ (
+      if cfg.full then
+        [
           nvim-treesitter.withAllGrammars
 
           # Dependencies for nvim-lspconfig
@@ -120,9 +125,13 @@ in {
 
           # JSON schemas
           SchemaStore-nvim
-  ] else []);
+        ]
+      else
+        [ ]
+    );
 
-  extraConfig = builtins.concatStringsSep "\n" ([
+  extraConfig = builtins.concatStringsSep "\n" (
+    [
       ''
         " Persistent undo
         set undofile
@@ -136,8 +145,15 @@ in {
       (builtins.readFile ./clipboard.vim)
       (builtins.readFile ./ui.vim)
       (builtins.readFile ./lastplace.lua)
-  ] ++ (if cfg.full then [
+    ]
+    ++ (
+      if cfg.full then
+        [
           (builtins.readFile ./lsp.vim)
           (builtins.readFile ./cmp.vim)
-  ] else []));
+        ]
+      else
+        [ ]
+    )
+  );
 }

modules/user/default.nix

@@ -3,14 +3,13 @@
   pkgs,
   lib,
   ...
-}: let
+}:
+let
   psCfg = config.pub-solar;
   inherit (lib) mkIf mkOption types;
 in
 {
-  imports = [
+  imports = [ ./home.nix ];
-    ./home.nix
-  ];
 
   options.pub-solar = {
     user = {
@@ -74,14 +73,8 @@ in
           "wheel"
         ];
         shell = pkgs.bash;
-        initialHashedPassword =
+        initialHashedPassword = if psCfg.user.password != null then psCfg.user.password else "";
-          if psCfg.user.password != null
+        openssh.authorizedKeys.keys = if psCfg.user.publicKeys != null then psCfg.user.publicKeys else [ ];
-          then psCfg.user.password
-          else "";
-        openssh.authorizedKeys.keys =
-          if psCfg.user.publicKeys != null
-          then psCfg.user.publicKeys
-          else [];
       };
     };
 

modules/user/home.nix

@@ -7,10 +7,9 @@
 let
   psCfg = config.pub-solar;
   xdg = config.home-manager.users."${psCfg.user.name}".xdg;
-in {
+in
-  imports = [
+{
-    ./session-variables.nix
+  imports = [ ./session-variables.nix ];
-  ];
 
   home-manager.users."${psCfg.user.name}" = {
     # Let Home Manager install and manage itself.

modules/user/session-variables.nix

@@ -3,7 +3,8 @@
   pkgs,
   lib,
   ...
-}: let
+}:
+let
   psCfg = config.pub-solar;
   xdg = config.home-manager.users."${psCfg.user.name}".xdg;
   variables = {
@@ -84,7 +85,8 @@
     FZF_DEFAULT_OPTS = lib.mkForce "--color=bg+:#2d2a2e,bg:#1a181a,spinner:#ef9062,hl:#7accd7 --color=fg:#d3d1d4,header:#7accd7,info:#e5c463,pointer:#ef9062 --color=marker:#ef9062,fg+:#d3d1d4,prompt:#e5c463,hl+:#7accd7";
 
     # nnn theme colors
-    NNN_FCOLORS = let
+    NNN_FCOLORS =
+      let
         BLK = "04";
         CHR = "04";
         DIR = "04";
@@ -100,7 +102,8 @@
       in
       BLK + CHR + DIR + EXE + REG + HARDLINK + SYMLINK + MISSING + ORPHAN + FIFO + SOCK + OTHER;
   };
-in {
+in
+{
   environment.variables = variables;
 
   home-manager.users."${psCfg.user.name}" = {

modules/virtualisation/default.nix

@@ -6,7 +6,8 @@
 }:
 let
   psCfg = config.pub-solar;
-in {
+in
+{
   boot.kernelParams = [
     "amd_iommu=on"
     "intel_iommu=on"
@@ -40,9 +41,7 @@ in {
     home.packages = [ pkgs.obs-studio-plugins.looking-glass-obs ];
   };
 
-  systemd.tmpfiles.rules = [
+  systemd.tmpfiles.rules = [ "f  /dev/shm/looking-glass  0660  ${psCfg.user.name}  kvm" ];
-    "f  /dev/shm/looking-glass  0660  ${psCfg.user.name}  kvm"
-  ];
   #networking.bridges.virbr1.interfaces = [];
   #networking.interfaces.virbr1 = {
   #  ipv4.addresses = [

modules/wireguard-client/default.nix

@@ -8,7 +8,8 @@ let
   psCfg = config.pub-solar;
   cfg = config.pub-solar.wireguard-client;
   inherit (lib) mkOption types;
-in {
+in
+{
   options.pub-solar.wireguard-client = {
     ownIPs = mkOption {
       description = ''

overlays/blesh.nix

@@ -3,18 +3,14 @@ final: prev: {
     inherit (prev.sources.blesh-nvfetcher) version src;
 
     dontBuild = false;
-    buildInputs = [
+    buildInputs = [ prev.gitMinimal ];
-      prev.gitMinimal
-    ];
 
     patchPhase = ''
       substituteInPlace GNUmakefile \
         --replace "git submodule update --init --recursive" ""
     '';
 
-    installFlags = [
+    installFlags = [ "PREFIX=$(out)" ];
-      "PREFIX=$(out)"
-    ];
 
     installPhase = ''
       source $stdenv/setup

overlays/default.nix

@@ -3,16 +3,22 @@
   lib,
   inputs,
   ...
-}: {
+}:
+{
   flake = {
     nixosModules = rec {
-      overlays = ({ ... }: {
+      overlays = (
+        { ... }:
+        {
           nixpkgs.overlays = [
-          (final: prev:
+            (
+              final: prev:
               let
                 unstable = import inputs.unstable {
                   system = prev.system;
-              config.allowUnfreePredicate = pkg: builtins.elem (prev.lib.getName pkg) [
+                  config.allowUnfreePredicate =
+                    pkg:
+                    builtins.elem (prev.lib.getName pkg) [
                       "1password"
                       "1password-cli"
                       "slack"
@@ -23,7 +29,8 @@
                 neovim-unwrapped = unstable.neovim-unwrapped;
                 vimPlugins = unstable.vimPlugins;
                 #vimPlugins = prev.vimPlugins // {inherit (unstable.vimPlugins) nvim-lspconfig;};
-          })
+              }
+            )
             (import ../pkgs)
             (import ./blesh.nix)
             (import ./mdbook-multilang.nix inputs)
@@ -31,7 +38,8 @@
             (import ./prr.nix)
             (import ./neovim-plugins.nix)
           ];
-      });
+        }
+      );
     };
   };
 }

overlays/mdbook-multilang.nix

@@ -11,10 +11,12 @@ inputs: final: prev: {
       sha256 = "sha256-gJnQKHssO2ChiT4d037Lncd7hiOa5uh756p8TzPzbgQ=";
     };
 
-    cargoDeps = oldAttrs.cargoDeps.overrideAttrs (prev.lib.const {
+    cargoDeps = oldAttrs.cargoDeps.overrideAttrs (
+      prev.lib.const {
         name = "${pname}-vendor.tar.gz";
         inherit src;
         outputHash = "sha256-QCEyl5FZqECYYb5eRm8mn+R6owt+CLQwCq/AMMPygE0=";
-    });
+      }
+    );
   });
 }

overlays/neovim-plugins.nix

@@ -1,7 +1,5 @@
 final: prev: {
-  vimPlugins =
+  vimPlugins = prev.vimPlugins // {
-    prev.vimPlugins
-    // {
     instant-nvim-nvfetcher = prev.vimUtils.buildVimPlugin {
       inherit (prev.sources.instant-nvim-nvfetcher) pname version src;
     };

overlays/nix-index.nix

@@ -9,11 +9,13 @@ final: prev: {
     };
     version = "unstable-2024-06-12";
 
-    cargoDeps = oldAttrs.cargoDeps.overrideAttrs (prev.lib.const {
+    cargoDeps = oldAttrs.cargoDeps.overrideAttrs (
+      prev.lib.const {
         name = "${pname}-vendor.tar.gz";
         inherit src;
         outputHash = "sha256-pZCGeZK5AJrxcrqXC5NZhGDda+90rRdWXy00CYD8SYY=";
-    });
+      }
+    );
 
     postInstall = ''
       substituteInPlace etc/command-not-found.* \

pkgs/default.nix

@@ -1,10 +1,11 @@
-final: prev:
+final: prev: with prev; {
-with prev; {
   # keep sources this first
   sources = callPackage (import ./_sources/generated.nix) { };
   # then, call packages with `final.callPackage`
   gpu-switch = writeShellScriptBin "gpu-switch" (import ./gpu-switch.nix final);
-  import-gtk-settings = writeShellScriptBin "import-gtk-settings" (import ./import-gtk-settings.nix final);
+  import-gtk-settings = writeShellScriptBin "import-gtk-settings" (
+    import ./import-gtk-settings.nix final
+  );
   lgcl = writeShellScriptBin "lgcl" (import ./lgcl.nix final);
   mailto-mutt = writeShellScriptBin "mailto-mutt" (import ./mailto-mutt.nix final);
   mopidy-jellyfin = import ./mopidy-jellyfin.nix final;
@@ -18,7 +19,9 @@ with prev; {
   swaylock-bg = writeShellScriptBin "swaylock-bg" (import ./swaylock-bg.nix final);
   toggle-kbd-layout = writeShellScriptBin "toggle-kbd-layout" (import ./toggle-kbd-layout.nix final);
   wcwd = writeShellScriptBin "wcwd" (import ./wcwd.nix final);
-  drone-docker-runner = writeShellScriptBin "drone-docker-runner" (import ./drone-docker-runner.nix final);
+  drone-docker-runner = writeShellScriptBin "drone-docker-runner" (
+    import ./drone-docker-runner.nix final
+  );
   record-screen = writeShellScriptBin "record-screen" (import ./record-screen.nix final);
   cockroach-bin = import ./cockroach.nix final;
   prison-break = import ./prison-break.nix final;

pkgs/drone-docker-runner.nix

@@ -1,5 +1,4 @@
-self:
+self: with self; ''
-with self; ''
   case $1 in
     start)
       ${self.docker}/bin/docker run --detach \

pkgs/gpu-switch.nix

@@ -1,5 +1,4 @@
-self:
+self: with self; ''
-with self; ''
   # Copyright (c) 2014-2015 Bruno Bierbaumer, Andreas Heider
 
   readonly sysfs_efi_vars='/sys/firmware/efi/efivars'

pkgs/import-gtk-settings.nix

@@ -1,5 +1,4 @@
-self:
+self: with self; ''
-with self; ''
   # usage: import-gsettings <gsettings key>:<settings.ini key> <gsettings key>:<settings.ini key> ...
 
   expression=""

pkgs/lgcl.nix

@@ -1,8 +1,13 @@
 self:
-with self; let
+with self;
+let
   looking-glass-client = self.looking-glass-client.overrideAttrs (old: {
-    meta.platforms = ["x86_64-linux" "aarch64-linux"];
+    meta.platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+    ];
   });
-in ''
+in
+''
   ${looking-glass-client}/bin/looking-glass-client -f /dev/shm/looking-glass input:ignoreWindowsKeys=yes input:grabKeyboardOnFocus=no
 ''

pkgs/mailto-mutt.nix

@@ -1,5 +1,4 @@
-self:
+self: with self; ''
-with self; ''
   mkdir -p $XDG_CACHE_HOME/log
 
   LOGFILE=$XDG_CACHE_HOME/log/mailto.log

pkgs/mopidy-jellyfin.nix

@@ -1,5 +1,6 @@
 self:
-with self; let
+with self;
+let
   websocket-client = python3.pkgs.buildPythonPackage rec {
     pname = "websocket-client";
     version = "1.2.1";

pkgs/mu.nix

@@ -1,4 +1,3 @@
-self:
+self: with self; ''
-with self; ''
   exec ${alacritty}/bin/alacritty --class mu_vimpc --option dimensions.columns=120 --option dimensions.lines=80 -e vimpc -- "$@"
 ''

pkgs/notes.nix

@@ -1,5 +1,4 @@
-self:
+self: with self; ''
-with self; ''
   #
   # ack recursively through notes
   #

pkgs/prison-break.nix

@@ -34,8 +34,6 @@ python3.pkgs.buildPythonPackage {
     notify2
     straight-plugin
   ];
-  patches = [
+  patches = [ ./prison-break-url.patch ];
-    ./prison-break-url.patch
-  ];
   checkInputs = [ python3.pkgs.black ];
 }

pkgs/psos-docs.nix

@@ -10,7 +10,10 @@ with self;
 
   src = ../docs/..; # wut
 
-    phases = ["buildPhase" "installPhase"];
+  phases = [
+    "buildPhase"
+    "installPhase"
+  ];
 
   buildPhase = ''
     cp -r $src/doc ./doc

pkgs/psos.nix

@@ -1,5 +1,4 @@
-self:
+self: with self; ''
-with self; ''
   case $1 in
     rebuild)
       shift;

pkgs/record-screen.nix

@@ -1,5 +1,4 @@
-self:
+self: with self; ''
-with self; ''
   mkdir -p "$HOME/Videos/Screenrecordings"
   GEOMETRY="$(slurp -d -b \#ffffff11)"
   RESOLUTION="$(echo $GEOMETRY | awk '{print $2}')"

pkgs/s.nix

@@ -1,5 +1,4 @@
-self:
+self: with self; ''
-with self; ''
   case $1 in
     d)
       shift;

pkgs/scan2paperless.nix

@@ -1,5 +1,4 @@
-self:
+self: with self; ''
-with self; ''
   echo "$@"
   DUPLEX=,Duplex
   removeempty="true"

pkgs/sway-launcher.nix

@@ -1,5 +1,4 @@
-self:
+self: with self; ''
-with self; ''
   #!/usr/bin/env bash
   # terminal application launcher for sway, using fzf
   # original command:

pkgs/swaylock-bg.nix

@@ -1,5 +1,4 @@
-self:
+self: with self; ''
-with self; ''
   # Dependencies:
   # swaylock
   IMAGE="$XDG_CONFIG_HOME/wallpaper.jpg"

pkgs/toggle-kbd-layout.nix

@@ -1,5 +1,4 @@
-self:
+self: with self; ''
-with self; ''
   set -e
 
   current_layout=$(${sway}/bin/swaymsg -t get_inputs | ${jq}/bin/jq -r '.[] | select(.type == "keyboard") | .xkb_active_layout_index' | head -1)

pkgs/uhk-agent.nix

@@ -1,5 +1,6 @@
 self:
-with self; let
+with self;
+let
   uhk-agent-bin = stdenv.mkDerivation rec {
     pname = "uhk-agent-bin";
     version = "1.5.14";
@@ -7,7 +8,10 @@ with self; let
       url = "https://github.com/UltimateHackingKeyboard/agent/releases/download/v1.5.14/UHK.Agent-1.5.14-linux-x86_64.AppImage";
       sha256 = "sha256:1yzh4ixy0cqg02xf84vcqj3h67mkxyzs6jf1h935ay582n70nyqg";
     };
-    phases = ["installPhase" "patchPhase"];
+    phases = [
+      "installPhase"
+      "patchPhase"
+    ];
     installPhase = ''
       mkdir -p $out/bin
       cp $src $out/bin/uhk-agent
@@ -30,7 +34,11 @@ in
     appimage-run
   ];
 
-    phases = ["buildPhase" "installPhase" "patchPhase"];
+  phases = [
+    "buildPhase"
+    "installPhase"
+    "patchPhase"
+  ];
 
   buildPhase = ''
     echo "${script}" >> uhk-agent

pkgs/wcwd.nix

@@ -1,5 +1,4 @@
-self:
+self: with self; ''
-with self; ''
   pid=$(${sway}/bin/swaymsg -t get_tree | ${jq}/bin/jq '.. | select(.type?) | select(.type=="con") | select(.focused==true).pid')
   ppid=$(${procps}/bin/pgrep --newest --parent ''${pid})
   readlink /proc/''${ppid}/cwd || echo $HOME

secrets/secrets.nix

@@ -9,8 +9,14 @@ let
     teutat3s = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHcU6KPy4b1MQXd6EJhcYwbJu7E+0IrBZF/IP6T7gbMf teutat3s@dumpyourvms";
     teutat3s-5-nfc = "age1yubikey1qdxpc9qenrkhqxnu2p6sgyfxhnxcvz99jcaq36uqcztuzsy92q596shqxkf";
   };
-  allKeys = [machines.dumpyourvms machines.ryzensun users.teutat3s users.teutat3s-5-nfc];
+  allKeys = [
-in {
+    machines.dumpyourvms
+    machines.ryzensun
+    users.teutat3s
+    users.teutat3s-5-nfc
+  ];
+in
+{
   "example-secret.age".publicKeys = allKeys;
   "environment-secrets.age".publicKeys = allKeys;
   "github-api-token.age".publicKeys = allKeys;
@@ -20,5 +26,9 @@ in {
   "mnx-bonanza-pf1.p12.age".publicKeys = allKeys;
   "docker-ci-runner-secrets.age".publicKeys = allKeys;
   "test-secret.age".publicKeys = [ users.teutat3s-5-nfc ];
-  "hosting-de-acme-secrets.age".publicKeys = [machines.fae users.teutat3s users.teutat3s-5-nfc];
+  "hosting-de-acme-secrets.age".publicKeys = [
+    machines.fae
+    users.teutat3s
+    users.teutat3s-5-nfc
+  ];
 }

tests/first-test.nix

@@ -1,11 +1,13 @@
+{ pkgs, lib, ... }:
 {
-  pkgs,
-  lib,
-  ...
-}: {
   name = "firstTest";
 
-  nodes.test-machine = {suites ? null, ...}: {
+  nodes.test-machine =
+    {
+      suites ? null,
+      ...
+    }:
+    {
       imports = suites.iso;
 
       home-manager.users.pub-solar.programs.bash.shellAliases = {
@@ -16,7 +18,11 @@
       # source: https://github.com/NixOS/nixpkgs/blob/nixos-unstable/nixos/tests/sway.nix
       environment = {
         # For glinfo and wayland-info:
-      systemPackages = with pkgs; [mesa-demos wayland-utils alacritty];
+        systemPackages = with pkgs; [
+          mesa-demos
+          wayland-utils
+          alacritty
+        ];
         # Use a fixed SWAYSOCK path (for swaymsg):
         variables = {
           "SWAYSOCK" = "/tmp/sway-ipc.sock";