nix fmt rcf-style

common/default.nix

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

common/globalinstalls.nix

@@ -1,7 +1,8 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   config = {
     environment = {
-      pathsToLink = ["/share/zsh"];
+      pathsToLink = [ "/share/zsh" ];
       systemPackages = with pkgs; [
         ncdu
         glances

common/i18n.nix

@@ -1,4 +1,5 @@
-{...}: {
+{ ... }:
+{
   config = {
     time.timeZone = "Europe/Berlin";
     i18n = {

common/networking.nix

@@ -1,4 +1,5 @@
-{...}: {
+{ ... }:
+{
   config = {
     services.openssh = {
       enable = true;

common/nixpkgs.nix

@@ -1,12 +1,9 @@
+{ config, lib, ... }:
 {
-  config,
-  lib,
-  ...
-}: {
   options.allowedUnfreePackages = lib.mkOption {
     type = lib.types.listOf lib.types.str;
-    default = [];
+    default = [ ];
-    example = ["steam"];
+    example = [ "steam" ];
   };
   config = {
     nixpkgs.config = {
@@ -16,9 +13,15 @@
 
     nix = {
       settings = {
-        substituters = ["https://nix-community.cachix.org" "https://cache.nixos.org/"];
+        substituters = [
-        trusted-public-keys = ["nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="];
+          "https://nix-community.cachix.org"
-        experimental-features = ["nix-command" "flakes"];
+          "https://cache.nixos.org/"
+        ];
+        trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" ];
+        experimental-features = [
+          "nix-command"
+          "flakes"
+        ];
       };
       gc = {
         automatic = true;

flake.nix

@@ -11,32 +11,41 @@
     };
   };
 
-  outputs = {
+  outputs =
-    nixpkgs,
+    {
-    home-manager,
+      nixpkgs,
-    lix-module,
+      home-manager,
-    ...
+      lix-module,
-  }: {
+      ...
-    nixosConfigurations = let
+    }:
-      host-params = {
+    {
-        inherit nixpkgs;
+      nixosConfigurations =
-        inherit home-manager;
+        let
-        inherit lix-module;
+          host-params = {
-        common-modules = [
+            inherit nixpkgs;
-          lix-module.nixosModules.default
+            inherit home-manager;
-          ./common
+            inherit lix-module;
-        ];
+            common-modules = [
-        desktop-modules = [
+              lix-module.nixosModules.default
-          home-manager.nixosModules.home-manager
+              ./common
-          ./home
+            ];
-          ./modules/desktop-environment.nix
+            desktop-modules = [
-          ./modules/desktop-hardware.nix
+              home-manager.nixosModules.home-manager
-        ];
+              ./home
+              ./modules/desktop-environment.nix
+              ./modules/desktop-hardware.nix
+            ];
+          };
+        in
+        {
+          vinzenz-lpt2 = import ./hosts/vinzenz-lpt2 host-params;
+          vinzenz-pc2 = import ./hosts/vinzenz-pc2 host-params;
+          hetzner-vpn1 = import ./hosts/hetzner-vpn1 host-params;
+        };
+
+      formatter = {
+        x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt-rfc-style;
+        aarch64-linux = nixpkgs.legacyPackages.aarch64-linux.nixfmt-rfc-style;
       };
-    in {
-      vinzenz-lpt2 = import ./hosts/vinzenz-lpt2 host-params;
-      vinzenz-pc2 = import ./hosts/vinzenz-pc2 host-params;
-      hetzner-vpn1 = import ./hosts/hetzner-vpn1 host-params;
     };
-  };
 }

home/default.nix

@@ -1,4 +1,5 @@
-{config, ...}: {
+{ config, ... }:
+{
   config = {
     home-manager = {
       useGlobalPkgs = true;

home/gnome-shared-dconf.nix

@@ -20,7 +20,7 @@
   };
   "org/gnome/shell" = {
     disable-user-extensions = false;
-    disabled-extensions = [];
+    disabled-extensions = [ ];
     enabled-extensions = [
       "appindicatorsupport@rgcjonas.gmail.com"
       "workspace-indicator@gnome-shell-extensions.gcampax.github.com"
@@ -34,9 +34,9 @@
     show-warning = false;
   };
   "org/gnome/desktop/wm/keybindings" = {
-    switch-windows = ["<Alt>Tab"];
+    switch-windows = [ "<Alt>Tab" ];
-    switch-windows-backward = ["<Shift><Alt>Tab"];
+    switch-windows-backward = [ "<Shift><Alt>Tab" ];
-    switch-applications = ["<Super>Tab"];
+    switch-applications = [ "<Super>Tab" ];
-    switch-applications-backward = ["<Shift><Super>Tab"];
+    switch-applications-backward = [ "<Shift><Super>Tab" ];
   };
 }

home/gnome.nix

@@ -1,15 +1,11 @@
+{ config, pkgs, ... }:
 {
-  config,
+  imports = [ ../modules/gnome.nix ];
-  pkgs,
-  ...
-}: {
-  imports = [
-    ../modules/gnome.nix
-  ];
   config = {
     home-manager.sharedModules = [
       {
-        home.packages = with pkgs;
+        home.packages =
+          with pkgs;
           [
             amberol
             gitg
@@ -48,14 +44,8 @@
       }
 
       {
-        home.packages = with pkgs;
+        home.packages = with pkgs; [ trayscale ] ++ (with gnomeExtensions; [ tailscale-qs ]);
-          [
+        dconf.settings."org/gnome/shell".enabled-extensions = [ "tailscale@joaophi.github.com" ];
-            trayscale
-          ]
-          ++ (with gnomeExtensions; [
-            tailscale-qs
-          ]);
-        dconf.settings."org/gnome/shell".enabled-extensions = ["tailscale@joaophi.github.com"];
       }
     ];
   };

home/ronja.nix

@@ -1,8 +1,5 @@
+{ config, pkgs, ... }:
 {
-  config,
-  pkgs,
-  ...
-}: {
   home.packages = with pkgs; [
     ## Apps
     telegram-desktop
@@ -22,7 +19,11 @@
       oh-my-zsh = {
         enable = true;
         theme = "agnoster";
-        plugins = ["git" "sudo" "systemadmin"];
+        plugins = [
+          "git"
+          "sudo"
+          "systemadmin"
+        ];
       };
     };
 

home/shared-modules.nix

@@ -1,8 +1,6 @@
 [
   # set stateVersion
-  {
+  { home.stateVersion = "22.11"; }
-    home.stateVersion = "22.11";
-  }
   # make nano the default editor
   {
     home = {

home/vinzenz/default.nix

@@ -1,4 +1,5 @@
-inputs @ {pkgs, ...}: {
+inputs@{ pkgs, ... }:
+{
   programs = {
     home-manager.enable = true;
     fzf.enable = true;

home/vinzenz/vscode.nix

@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   enable = true;
   package = pkgs.vscodium;
   enableUpdateCheck = false;

home/vinzenz/zsh.nix

@@ -1,4 +1,5 @@
-{config, ...}: {
+{ config, ... }:
+{
   initExtra = ''
     eval "$(direnv hook zsh)";
     export PATH=$PATH:/home/vinzenz/.cargo/bin
@@ -24,6 +25,11 @@
   oh-my-zsh = {
     enable = true;
     theme = "agnoster";
-    plugins = ["git" "sudo" "docker" "systemadmin"];
+    plugins = [
+      "git"
+      "sudo"
+      "docker"
+      "systemadmin"
+    ];
   };
 }

hosts/hetzner-vpn1/default.nix

@@ -1,42 +1,34 @@
-{
+{ nixpkgs, common-modules, ... }:
-  nixpkgs,
-  common-modules,
-  ...
-}:
 nixpkgs.lib.nixosSystem {
   system = "aarch64-linux";
-  modules =
+  modules = common-modules ++ [
-    common-modules
+    ./hardware.nix
-    ++ [
+    ./nginx.nix
-      ./hardware.nix
+    ../../users/vinzenz.nix
-      ./nginx.nix
+    ../../users/ronja.nix
-      ../../users/vinzenz.nix
+    { networking.hostName = "hetzner-vpn1"; }
-      ../../users/ronja.nix
+    {
-      {
+      # uncomment for build check on non arm system (requires --impure)
-        networking.hostName = "hetzner-vpn1";
+      # nixpkgs.buildPlatform = builtins.currentSystem;
-      }
+    }
-      {
+    {
-        # uncomment for build check on non arm system (requires --impure)
+      users.users = {
-        # nixpkgs.buildPlatform = builtins.currentSystem;
+        root.openssh.authorizedKeys.keys = [
-      }
+          ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICdYqY3Y1/f1bsAi5Qfyr/UWuX9ixu96IeAlhoQaJkbf''
-      {
+          ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFCJUpbpB3KEKVoKWsKoar9J4RNah8gmQoSH6jQEw5dY vinzenz-pixel-JuiceSSH''
-        users.users = {
+          ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO1CRn4yYTL4XUdCebE8Z4ZeuMujBjorTdWifg911EOv vinzenz-pc2 home roaming''
-          root.openssh.authorizedKeys.keys = [
+          ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPDNpLDmctyqGpow/ElQvdhY4BLBPS/sigDJ1QEcC7wC vinzenz-lpt2-roaming''
-            ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICdYqY3Y1/f1bsAi5Qfyr/UWuX9ixu96IeAlhoQaJkbf''
+        ];
-            ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFCJUpbpB3KEKVoKWsKoar9J4RNah8gmQoSH6jQEw5dY vinzenz-pixel-JuiceSSH''
+        vinzenz.openssh.authorizedKeys.keys = [
-            ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO1CRn4yYTL4XUdCebE8Z4ZeuMujBjorTdWifg911EOv vinzenz-pc2 home roaming''
+          ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICdYqY3Y1/f1bsAi5Qfyr/UWuX9ixu96IeAlhoQaJkbf''
-            ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPDNpLDmctyqGpow/ElQvdhY4BLBPS/sigDJ1QEcC7wC vinzenz-lpt2-roaming''
+          ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFCJUpbpB3KEKVoKWsKoar9J4RNah8gmQoSH6jQEw5dY vinzenz-pixel-JuiceSSH''
-          ];
+          ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO1CRn4yYTL4XUdCebE8Z4ZeuMujBjorTdWifg911EOv vinzenz-pc2 home roaming''
-          vinzenz.openssh.authorizedKeys.keys = [
+          ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPDNpLDmctyqGpow/ElQvdhY4BLBPS/sigDJ1QEcC7wC vinzenz-lpt2-roaming''
-            ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICdYqY3Y1/f1bsAi5Qfyr/UWuX9ixu96IeAlhoQaJkbf''
+        ];
-            ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFCJUpbpB3KEKVoKWsKoar9J4RNah8gmQoSH6jQEw5dY vinzenz-pixel-JuiceSSH''
+        ronja.openssh.authorizedKeys.keys = [
-            ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO1CRn4yYTL4XUdCebE8Z4ZeuMujBjorTdWifg911EOv vinzenz-pc2 home roaming''
+          ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIALWKm+d6KL6Vl3grPOcGouiNTkvdhXuWJmcrdEBY2nw ronja-ssh-host-key''
-            ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPDNpLDmctyqGpow/ElQvdhY4BLBPS/sigDJ1QEcC7wC vinzenz-lpt2-roaming''
+        ];
-          ];
+      };
-          ronja.openssh.authorizedKeys.keys = [
+    }
-            ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIALWKm+d6KL6Vl3grPOcGouiNTkvdhXuWJmcrdEBY2nw ronja-ssh-host-key''
+  ];
-          ];
-        };
-      }
-    ];
 }

hosts/hetzner-vpn1/hardware.nix

@@ -1,11 +1,6 @@
+{ lib, modulesPath, ... }:
 {
-  lib,
+  imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
-  modulesPath,
-  ...
-}: {
-  imports = [
-    (modulesPath + "/profiles/qemu-guest.nix")
-  ];
 
   config = {
     nixpkgs = {
@@ -26,8 +21,12 @@
         };
       };
       initrd = {
-        availableKernelModules = ["ata_piix" "uhci_hcd" "xen_blkfront"];
+        availableKernelModules = [
-        kernelModules = ["nvme"];
+          "ata_piix"
+          "uhci_hcd"
+          "xen_blkfront"
+        ];
+        kernelModules = [ "nvme" ];
       };
     };
 
@@ -48,7 +47,7 @@
     # This file was populated at runtime with the networking
     # details gathered from the active system.
     networking = {
-      nameservers = ["8.8.8.8"];
+      nameservers = [ "8.8.8.8" ];
       defaultGateway = "172.31.1.1";
       defaultGateway6 = {
         address = "fe80::1";

hosts/hetzner-vpn1/nginx.nix

@@ -1,8 +1,5 @@
+{ pkgs, lib, ... }:
 {
-  pkgs,
-  lib,
-  ...
-}: {
   security.acme = {
     acceptTerms = true;
     defaults.email = "acme@zerforschen.plus";
@@ -10,46 +7,51 @@
 
   security.pam.services.nginx.setEnvironment = false;
   systemd.services.nginx.serviceConfig = {
-    SupplementaryGroups = ["shadow"];
+    SupplementaryGroups = [ "shadow" ];
   };
 
   services.nginx = {
     enable = true;
-    additionalModules = [pkgs.nginxModules.pam];
+    additionalModules = [ pkgs.nginxModules.pam ];
 
     recommendedProxySettings = true;
     recommendedTlsSettings = true;
     recommendedGzipSettings = true;
     recommendedOptimisation = true;
 
-    virtualHosts = let
+    virtualHosts =
-      servicesDomain = "services.zerforschen.plus";
+      let
-      mkServiceConfig = host: port: {
+        servicesDomain = "services.zerforschen.plus";
-        addSSL = true;
+        mkServiceConfig = host: port: {
-        enableACME = true;
+          addSSL = true;
-        locations."/" = {
+          enableACME = true;
-          proxyPass = "http://${host}:${toString port}/";
+          locations."/" = {
-          extraConfig = ''
+            proxyPass = "http://${host}:${toString port}/";
-            # bind to tailscale ip
+            extraConfig = ''
-            proxy_bind 100.88.118.60;
+              # bind to tailscale ip
-            # pam auth
+              proxy_bind 100.88.118.60;
-            limit_except OPTIONS {
+              # pam auth
-              auth_pam  "Password Required";
+              limit_except OPTIONS {
-              auth_pam_service_name "nginx";
+                auth_pam  "Password Required";
-            }
+                auth_pam_service_name "nginx";
-          '';
+              }
+            '';
+          };
         };
+        pc2 = "vinzenz-pc2.donkey-pentatonic.ts.net";
+      in
+      {
+        "vscode.${servicesDomain}" = lib.mkMerge [
+          (mkServiceConfig pc2 8542)
+          { locations."/".proxyWebsockets = true; }
+        ];
+        "preon-app.${servicesDomain}" = mkServiceConfig pc2 8543;
+        "preon-api.${servicesDomain}" = mkServiceConfig pc2 8544;
       };
-      pc2 = "vinzenz-pc2.donkey-pentatonic.ts.net";
-    in {
-      "vscode.${servicesDomain}" = lib.mkMerge [
-        (mkServiceConfig pc2 8542)
-        {locations."/" .proxyWebsockets = true;}
-      ];
-      "preon-app.${servicesDomain}" = mkServiceConfig pc2 8543;
-      "preon-api.${servicesDomain}" = mkServiceConfig pc2 8544;
-    };
   };
 
-  networking.firewall.allowedTCPPorts = [80 443];
+  networking.firewall.allowedTCPPorts = [
+    80
+    443
+  ];
 }

hosts/vinzenz-lpt2/default.nix

@@ -23,7 +23,7 @@ nixpkgs.lib.nixosSystem {
 
       {
         networking.hostName = "vinzenz-lpt2";
-        nix.settings.extra-platforms = ["aarch64-linux"];
+        nix.settings.extra-platforms = [ "aarch64-linux" ];
       }
 
       {

hosts/vinzenz-lpt2/hardware.nix

@@ -1,10 +1,9 @@
-{lib, ...}: {
+{ lib, ... }:
-  imports = [
+{
-    ../../modules/intel-graphics.nix
+  imports = [ ../../modules/intel-graphics.nix ];
-  ];
   config = {
     # intel cpu
-    boot.kernelModules = ["kvm-intel"];
+    boot.kernelModules = [ "kvm-intel" ];
     hardware.cpu.intel.updateMicrocode = true;
 
     boot.loader = {
@@ -23,7 +22,11 @@
     nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
 
     boot.initrd = {
-      availableKernelModules = ["xhci_pci" "thunderbolt" "nvme"];
+      availableKernelModules = [
+        "xhci_pci"
+        "thunderbolt"
+        "nvme"
+      ];
       luks.devices = {
         "luks-2c654ff2-3c42-48d3-a1e3-9545679afaa3" = {
           device = "/dev/disk/by-uuid/2c654ff2-3c42-48d3-a1e3-9545679afaa3";
@@ -35,7 +38,7 @@
       "/" = {
         device = "/dev/disk/by-uuid/e4dad0c8-26a1-45e9-bbd9-48565eb6574e";
         fsType = "btrfs";
-        options = ["subvol=@"];
+        options = [ "subvol=@" ];
       };
 
       "/boot" = {

hosts/vinzenz-lpt2/nginx.nix

@@ -1,4 +1,5 @@
-{...}: {
+{ ... }:
+{
   services.nginx = {
     enable = true;
 
@@ -14,13 +15,17 @@
           proxyWebsockets = true;
         };
 
-        serverAliases = ["172.23.42.96"];
+        serverAliases = [ "172.23.42.96" ];
       };
     };
   };
 
   networking.firewall = {
-    allowedTCPPorts = [80 8001 3000];
+    allowedTCPPorts = [
-    allowedUDPPorts = [2342];
+      80
+      8001
+      3000
+    ];
+    allowedUDPPorts = [ 2342 ];
   };
 }

hosts/vinzenz-pc2/default.nix

@@ -19,9 +19,7 @@ nixpkgs.lib.nixosSystem {
       ../../modules/gaming.nix
       ../../modules/printing.nix
       ../../modules/podman.nix
-      {
+      { networking.hostName = "vinzenz-pc2"; }
-        networking.hostName = "vinzenz-pc2";
-      }
       {
         home-manager.users = {
           vinzenz = import ../../home/vinzenz;

hosts/vinzenz-pc2/fstab.nix

@@ -2,19 +2,19 @@
   "/" = {
     device = "/dev/disk/by-uuid/0e9c983a-e733-447e-8181-f41d6670c4b8";
     fsType = "btrfs";
-    options = ["subvol=@"];
+    options = [ "subvol=@" ];
   };
 
   "/home" = {
     device = "/dev/disk/by-uuid/0e9c983a-e733-447e-8181-f41d6670c4b8";
     fsType = "btrfs";
-    options = ["subvol=@home"];
+    options = [ "subvol=@home" ];
   };
 
   "/games" = {
     device = "/dev/disk/by-uuid/0e9c983a-e733-447e-8181-f41d6670c4b8";
     fsType = "btrfs";
-    options = ["subvol=@games"];
+    options = [ "subvol=@games" ];
   };
 
   "/boot" = {
@@ -27,7 +27,7 @@
     # this is convenient for managing the flat subvolume hierarchy
     device = "/dev/disk/by-uuid/0e9c983a-e733-447e-8181-f41d6670c4b8";
     fsType = "btrfs";
-    options = ["subvolid=5"];
+    options = [ "subvolid=5" ];
   };
 
   "/mnt/ssd2" = {

hosts/vinzenz-pc2/hardware.nix

@@ -1,19 +1,24 @@
-{...}: {
+{ ... }:
-  imports = [
+{
-    ../../modules/amd-graphics.nix
+  imports = [ ../../modules/amd-graphics.nix ];
-  ];
   config = {
     # amd cpu
-    boot.kernelModules = ["kvm-amd"];
+    boot.kernelModules = [ "kvm-amd" ];
     hardware.cpu.amd.updateMicrocode = true;
 
     boot = {
-      initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usbhid" "sd_mod"]; # "usb_storage"
+      initrd.availableKernelModules = [
+        "nvme"
+        "xhci_pci"
+        "ahci"
+        "usbhid"
+        "sd_mod"
+      ]; # "usb_storage"
       loader.efi.efiSysMountPoint = "/boot";
     };
 
     fileSystems = import ./fstab.nix;
-    swapDevices = [];
+    swapDevices = [ ];
 
     networking.interfaces.eno1.wakeOnLan.enable = true;
   };

hosts/vinzenz-pc2/vscode-server.nix

@@ -1,16 +1,27 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   services.openvscode-server = {
     enable = true;
     telemetryLevel = "off";
     port = 8542;
     host = "100.125.93.127"; # tailscale
     withoutConnectionToken = true;
-    extraPackages = with pkgs; [nodejs git gh direnv];
+    extraPackages = with pkgs; [
+      nodejs
+      git
+      gh
+      direnv
+    ];
   };
 
   networking = {
     firewall = {
-      allowedTCPPorts = [8542 8543 8544 80];
+      allowedTCPPorts = [
+        8542
+        8543
+        8544
+        80
+      ];
     };
   };
 }

modules/amd-graphics.nix

@@ -1,22 +1,14 @@
+{ pkgs, ... }:
 {
-  pkgs,
-  ...
-}: {
   config = {
-    boot.kernelModules = ["amdgpu"];
+    boot.kernelModules = [ "amdgpu" ];
-    services.xserver.videoDrivers = ["amdgpu"];
+    services.xserver.videoDrivers = [ "amdgpu" ];
 
     hardware.opengl = {
-      extraPackages = with pkgs; [
+      extraPackages = with pkgs; [ amdvlk ];
-        amdvlk
+      extraPackages32 = with pkgs; [ driversi686Linux.amdvlk ];
-      ];
-      extraPackages32 = with pkgs; [
-        driversi686Linux.amdvlk
-      ];
     };
 
-    environment.systemPackages = with pkgs; [
+    environment.systemPackages = with pkgs; [ nvtopPackages.amd ];
-      nvtopPackages.amd
-    ];
   };
 }

modules/desktop-environment.nix

@@ -1,8 +1,5 @@
+{ config, pkgs, ... }:
 {
-  config,
-  pkgs,
-  ...
-}: {
   config = {
     services = {
       xserver.enable = true;
@@ -31,7 +28,10 @@
       kdeconnect.enable = true;
       firefox = {
         enable = true;
-        languagePacks = ["en-US" "de"];
+        languagePacks = [
+          "en-US"
+          "de"
+        ];
       };
       nix-ld = {
         enable = true;
@@ -101,10 +101,8 @@
 
     fonts = {
       enableDefaultPackages = true;
-      fontconfig.defaultFonts.monospace = ["FiraCode Nerd Font"];
+      fontconfig.defaultFonts.monospace = [ "FiraCode Nerd Font" ];
-      packages = with pkgs; [
+      packages = with pkgs; [ (nerdfonts.override { fonts = [ "FiraCode" ]; }) ];
-        (nerdfonts.override {fonts = ["FiraCode"];})
-      ];
     };
 
     hardware.logitech.wireless = {

modules/desktop-hardware.nix

@@ -3,13 +3,17 @@
   pkgs,
   config,
   ...
-}: {
+}:
+{
   config = {
     boot = {
       kernelPackages = pkgs.linuxPackages_zen;
-      kernelParams = ["quiet" "udev.log_level=3"];
+      kernelParams = [
-      supportedFilesystems = ["btrfs"];
+        "quiet"
-      initrd.supportedFilesystems = ["btrfs"];
+        "udev.log_level=3"
+      ];
+      supportedFilesystems = [ "btrfs" ];
+      initrd.supportedFilesystems = [ "btrfs" ];
       consoleLogLevel = 0;
       initrd.verbose = false;
       plymouth.enable = true;

modules/gaming.nix

@@ -1,15 +1,12 @@
+{ config, pkgs, ... }:
 {
-  config,
-  pkgs,
-  ...
-}: {
   config = {
     hardware = {
       opengl = {
         driSupport = true;
         driSupport32Bit = true;
-        extraPackages = with pkgs; [mangohud];
+        extraPackages = with pkgs; [ mangohud ];
-        extraPackages32 = with pkgs; [mangohud];
+        extraPackages32 = with pkgs; [ mangohud ];
       };
 
       steam-hardware.enable = true;

modules/gnome.nix

@@ -1,8 +1,5 @@
+{ config, pkgs, ... }:
 {
-  config,
-  pkgs,
-  ...
-}: {
   config = {
     services = {
       xserver = {
@@ -41,9 +38,12 @@
       pkgs.gnome-tour
     ];
 
-    environment.systemPackages = with pkgs; [gnome.ghex impression];
+    environment.systemPackages = with pkgs; [
+      gnome.ghex
+      impression
+    ];
 
     # RDP connections
-    networking.firewall.allowedTCPPorts = [3389];
+    networking.firewall.allowedTCPPorts = [ 3389 ];
   };
 }

modules/intel-graphics.nix

@@ -1,8 +1,5 @@
+{ config, pkgs, ... }:
 {
-  config,
-  pkgs,
-  ...
-}: {
   config = {
     hardware.opengl = {
       extraPackages = with pkgs; [
@@ -19,9 +16,7 @@
         libvdpau-va-gl
       ];
     };
-    environment.systemPackages = with pkgs; [
+    environment.systemPackages = with pkgs; [ nvtopPackages.intel ];
-      nvtopPackages.intel
+    allowedUnfreePackages = [ "intel-ocl" ];
-    ];
-    allowedUnfreePackages = ["intel-ocl"];
   };
 }

modules/latex.nix

@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   config = {
     environment.systemPackages = with pkgs; [
       fontconfig

modules/podman.nix

@@ -1,4 +1,5 @@
-{...}: {
+{ ... }:
+{
   virtualisation = {
     containers.enable = true;
     podman = {

modules/printing.nix

@@ -1,4 +1,5 @@
-{...}: {
+{ ... }:
+{
   config = {
     services = {
       # Enable CUPS to print documents.

users/ronja.nix

@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   config = {
     # Define user account
     users.users.ronja = {
@@ -6,7 +7,12 @@
       name = "ronja";
       description = "Ronja";
       home = "/home/ronja";
-      extraGroups = ["networkmanager" "wheel" "games" "podman"];
+      extraGroups = [
+        "networkmanager"
+        "wheel"
+        "games"
+        "podman"
+      ];
       shell = pkgs.zsh;
     };
   };

users/vinzenz.nix

@@ -1,11 +1,19 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   config = {
     users.users.vinzenz = {
       isNormalUser = true;
       name = "vinzenz";
       description = "Vinzenz";
       home = "/home/vinzenz";
-      extraGroups = ["networkmanager" "wheel" "games" "dialout" "podman" "nginx"];
+      extraGroups = [
+        "networkmanager"
+        "wheel"
+        "games"
+        "dialout"
+        "podman"
+        "nginx"
+      ];
       shell = pkgs.zsh;
       autoSubUidGidRange = true;
     };