installed and ran alejandra as formatter

common.nix

@@ -1,12 +1,14 @@
 # Edit this configuration file to define what should be installed on
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
-
-{ config, pkgs, lib, ... }:
-
-with lib;
-with builtins;
 {
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+with lib;
+with builtins; {
   nix = {
     package = pkgs.nixVersions.stable;
     extraOptions = ''
@@ -29,11 +31,45 @@ with builtins;
     systemPackages = with pkgs; [
       htmlq
 
-      wget git neofetch pciutils zip unzip gnutar iw btop nodejs jdk8 jdk11
+      wget
-      jdk libsecret gh nix-prefetch-scripts fzf glab ripgrep
+      git
-      sl lolcat appimage-run git-crypt file whois p7zip file nmap cmatrix tree
+      neofetch
-      socat smartmontools mprocs
+      pciutils
-      dig aria2 usbutils numbat
+      zip
+      unzip
+      gnutar
+      iw
+      btop
+      nodejs
+      jdk8
+      jdk11
+      jdk
+      libsecret
+      gh
+      nix-prefetch-scripts
+      fzf
+      glab
+      ripgrep
+      sl
+      lolcat
+      appimage-run
+      git-crypt
+      file
+      whois
+      p7zip
+      file
+      nmap
+      cmatrix
+      tree
+      socat
+      smartmontools
+      mprocs
+      dig
+      aria2
+      usbutils
+      numbat
+
+      alejandra
     ];
   };
 
@@ -82,7 +118,11 @@ with builtins;
 
   time.timeZone = "Europe/Berlin";
 
-  home-manager.users.jade = { nixosConfig, pkgs, ... }: {
+  home-manager.users.jade = {
+    nixosConfig,
+    pkgs,
+    ...
+  }: {
     home.sessionVariables.TZ = nixosConfig.time.timeZone;
   };
 
@@ -117,4 +157,3 @@ with builtins;
 
   users.defaultUserShell = pkgs.nushellFull;
 }
-

flake.nix

@@ -24,7 +24,15 @@
     gumseite.url = "git+https://gitlab.com/schrottkatze/gum-schulsachen.git";
   };
 
-  outputs = { self, nixpkgs, nixpkgs-stable, home-manager, nixos-hardware, mac-brcm-fw, ... }@inputs: {
+  outputs = {
+    self,
+    nixpkgs,
+    nixpkgs-stable,
+    home-manager,
+    nixos-hardware,
+    mac-brcm-fw,
+    ...
+  } @ inputs: {
     nixosConfigurations = {
       monosodium-glutamate-g = nixpkgs.lib.nixosSystem {
         specialArgs = {
@@ -33,10 +41,15 @@
         system = "x86_64-linux";
         modules = [
           ./hosts/monosodium-glutamate-g/configuration.nix
-          home-manager.nixosModules.home-manager {
+          home-manager.nixosModules.home-manager
+          {
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
-            home-manager.users.jade = { nixosConfig, pkgs, ... }: {
+            home-manager.users.jade = {
+              nixosConfig,
+              pkgs,
+              ...
+            }: {
               home.sessionVariables.TZ = nixosConfig.time.timeZone;
               home.stateVersion = "${nixosConfig.system.stateVersion}";
             };
@@ -50,10 +63,15 @@
         system = "x86_64-linux";
         modules = [
           ./hosts/catbook-j/configuration.nix
-          home-manager.nixosModules.home-manager {
+          home-manager.nixosModules.home-manager
+          {
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
-            home-manager.users.jade = { nixosConfig, pkgs, ... }: {
+            home-manager.users.jade = {
+              nixosConfig,
+              pkgs,
+              ...
+            }: {
               home.sessionVariables.TZ = nixosConfig.time.timeZone;
               home.stateVersion = "22.11";
             };
@@ -68,10 +86,15 @@
         modules = [
           "${mac-brcm-fw}"
           ./hosts/potatobook-g/configuration.nix
-          home-manager.nixosModules.home-manager {
+          home-manager.nixosModules.home-manager
+          {
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
-            home-manager.users.jade = { nixosConfig, pkgs, ... }: {
+            home-manager.users.jade = {
+              nixosConfig,
+              pkgs,
+              ...
+            }: {
               home.sessionVariables.TZ = nixosConfig.time.timeZone;
               home.stateVersion = "${nixosConfig.system.stateVersion}";
             };

hosts/catbook-j/configuration.nix

@@ -1,10 +1,14 @@
 # Edit this configuration file to define what should be installed on
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
-
+{
-{ config, pkgs, lib, ... }: {
+  config,
-  imports =
+  pkgs,
-    [ # Include the results of the hardware scan.
+  lib,
+  ...
+}: {
+  imports = [
+    # Include the results of the hardware scan.
     ./hardware-configuration.nix
     ../../common.nix
     ../../modules
@@ -119,5 +123,4 @@
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
   system.stateVersion = "23.05"; # Did you read the comment?
-
 }

hosts/catbook-j/hardware-configuration.nix

@@ -1,11 +1,15 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-
 {
-  imports =
+  config,
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}: {
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
   boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"];
@@ -13,35 +17,37 @@
   boot.kernelModules = ["kvm-intel"];
   boot.extraModulePackages = [];
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "/dev/disk/by-uuid/4f9e8afa-f8d7-40bf-b3ea-17e8e8fbb694";
+    device = "/dev/disk/by-uuid/4f9e8afa-f8d7-40bf-b3ea-17e8e8fbb694";
     fsType = "btrfs";
     options = ["subvol=@" "compress=zstd:3" "noatime"];
   };
 
-  fileSystems."/home" =
+  fileSystems."/home" = {
-    { device = "/dev/disk/by-uuid/4f9e8afa-f8d7-40bf-b3ea-17e8e8fbb694";
+    device = "/dev/disk/by-uuid/4f9e8afa-f8d7-40bf-b3ea-17e8e8fbb694";
     fsType = "btrfs";
     options = ["subvol=@home" "compress=zstd:3"];
   };
 
-  fileSystems."/swap" =
+  fileSystems."/swap" = {
-    { device = "/dev/disk/by-uuid/4f9e8afa-f8d7-40bf-b3ea-17e8e8fbb694";
+    device = "/dev/disk/by-uuid/4f9e8afa-f8d7-40bf-b3ea-17e8e8fbb694";
     fsType = "btrfs";
     options = ["subvol=@/@swap" "noatime"];
   };
 
   boot.initrd.luks.devices."luks-9cd75cce-6829-4db8-8c5c-a9fb9ec3e122".device = "/dev/disk/by-uuid/9cd75cce-6829-4db8-8c5c-a9fb9ec3e122";
 
-  fileSystems."/boot" =
+  fileSystems."/boot" = {
-    { device = "/dev/disk/by-uuid/C6CA-5DE8";
+    device = "/dev/disk/by-uuid/C6CA-5DE8";
     fsType = "vfat";
   };
 
-  swapDevices = [{
+  swapDevices = [
+    {
       device = "/swap/swapfile";
-    size = (1024 * 24);
+      size = 1024 * 24;
-  }];
+    }
+  ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's

hosts/monosodium-glutamate-g/configuration.nix

@@ -1,9 +1,7 @@
 # Edit this configuration file to define what should be installed on
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
-
+{pkgs, ...}: {
-{ pkgs, ... }:
-{
   imports = [
     ./hardware-configuration.nix
     ../../common.nix
@@ -44,7 +42,6 @@
   };
   boot = {
     loader = {
-
       # Use the systemd-boot EFI boot loader.
       systemd-boot.enable = true;
       efi.canTouchEfiVariables = true;
@@ -65,11 +62,9 @@
 
   networking.hostName = "monosodium-glutamate-g";
   services = {
-
     # monitor control
     ddccontrol.enable = true;
     xserver = {
-
       layout = "us";
       xkbVariant = "altgr-intl";
       enable = true;
@@ -82,7 +77,6 @@
     gnome.gnome-keyring.enable = true;
   };
   hardware = {
-
     bluetooth.enable = true;
     keyboard.uhk.enable = true;
     enableRedistributableFirmware = true;
@@ -96,7 +90,8 @@
     wireshark
     awesomebump
 
-    zenstates zenmonitor
+    zenstates
+    zenmonitor
     nvtop-amd
     radeontop
     rgp
@@ -142,6 +137,3 @@
   # release channel
   system.stateVersion = "22.05"; # Did you read the comment?
 }
-
-
-

hosts/monosodium-glutamate-g/hardware-configuration.nix

@@ -1,11 +1,15 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-
 {
-  imports =
+  config,
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}: {
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
   boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod"];
@@ -13,27 +17,29 @@
   boot.kernelModules = ["kvm-amd"];
   boot.extraModulePackages = [];
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "/dev/disk/by-uuid/72ffbc9d-a319-42d7-8d26-13c921a679db";
+    device = "/dev/disk/by-uuid/72ffbc9d-a319-42d7-8d26-13c921a679db";
     fsType = "btrfs";
     options = ["subvol=@root" "compress=zstd:3"];
   };
 
-  fileSystems."/home" =
+  fileSystems."/home" = {
-    { device = "/dev/disk/by-uuid/72ffbc9d-a319-42d7-8d26-13c921a679db";
+    device = "/dev/disk/by-uuid/72ffbc9d-a319-42d7-8d26-13c921a679db";
     fsType = "btrfs";
     options = ["subvol=@home" "compress=zstd:3"];
   };
 
-  fileSystems."/boot" =
+  fileSystems."/boot" = {
-    { device = "/dev/disk/by-uuid/D63E-18C9";
+    device = "/dev/disk/by-uuid/D63E-18C9";
     fsType = "vfat";
   };
 
-  swapDevices = [{
+  swapDevices = [
+    {
       device = "/swap/swapfile";
       size = (1024 * 64) + (1024 * 8); # 72G
-  } ];
+    }
+  ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's

hosts/potatobook-g/configuration.nix

@@ -70,9 +70,13 @@
 
   networking.hostName = "potatobook-g";
 
-
   services.xserver = {
-    resolutions = [ { x = 1920; y = 1200; } ];
+    resolutions = [
+      {
+        x = 1920;
+        y = 1200;
+      }
+    ];
     # dpi = 180;
     layout = "us";
     xkbVariant = "altgr-intl";
@@ -95,9 +99,9 @@
   hardware.keyboard.uhk.enable = true;
   hardware.enableRedistributableFirmware = true;
 
-
   environment.systemPackages = with pkgs; [
-    android-tools evremap
+    android-tools
+    evremap
   ];
 
   environment.pathsToLink = [
@@ -175,5 +179,3 @@
   # i rly should put that important big comment back here
   system.stateVersion = "22.11"; # Did you read the comment?
 }
-
-

hosts/potatobook-g/hardware-configuration.nix

@@ -1,11 +1,15 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-
 {
-  imports =
+  config,
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}: {
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
   boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usbhid" "uas" "sd_mod"];
@@ -13,33 +17,35 @@
   boot.kernelModules = ["kvm-intel"];
   boot.extraModulePackages = [];
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "/dev/disk/by-uuid/f6d243ec-6be9-4551-8cbb-aefb7b691a62";
+    device = "/dev/disk/by-uuid/f6d243ec-6be9-4551-8cbb-aefb7b691a62";
     fsType = "btrfs";
     options = ["subvol=root"];
   };
 
-  fileSystems."/home" =
+  fileSystems."/home" = {
-    { device = "/dev/disk/by-uuid/f6d243ec-6be9-4551-8cbb-aefb7b691a62";
+    device = "/dev/disk/by-uuid/f6d243ec-6be9-4551-8cbb-aefb7b691a62";
     fsType = "btrfs";
     options = ["subvol=home"];
   };
 
-  fileSystems."/nix" =
+  fileSystems."/nix" = {
-    { device = "/dev/disk/by-uuid/f6d243ec-6be9-4551-8cbb-aefb7b691a62";
+    device = "/dev/disk/by-uuid/f6d243ec-6be9-4551-8cbb-aefb7b691a62";
     fsType = "btrfs";
     options = ["subvol=nix"];
   };
 
-  fileSystems."/boot" =
+  fileSystems."/boot" = {
-    { device = "/dev/disk/by-uuid/5F66-17ED";
+    device = "/dev/disk/by-uuid/5F66-17ED";
     fsType = "vfat";
   };
 
-  swapDevices = [{
+  swapDevices = [
+    {
       device = "/swap/swapfile";
-    size = (1024 * 12); # 12GB
+      size = 1024 * 12; # 12GB
-  }];
+    }
+  ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's

hosts/potatobook-g/iso.nix

@@ -1,9 +1,11 @@
-{config, pkgs, ...}:
 {
+  config,
+  pkgs,
+  ...
+}: {
   imports = [
     <nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix>
     <nixpkgs/nixos/modules/installer/cd-dvd/channel.nix>
     ./configuration.nix
   ];
 }
-

mac-brcm-fw/default.nix

@@ -1,3 +1,3 @@
 {...}: {}
-
 # dummy
+

modules/default.nix

@@ -1,5 +1,4 @@
-{ ... }:
+{...}: {
-{
   imports = [
     ./shell
     ./desktop

modules/desktop/audio.nix

@@ -1,6 +1,9 @@
-{ config, lib, pkgs, ... }:
-
 {
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
   config = {
     programs = {
       noisetorch.enable = true;

modules/desktop/cloud.nix

@@ -1,7 +1,12 @@
-{ config, lib, pkgs, ... }:
+{
-
+  config,
-let cfg = config.jade.desktop.cloud;
+  lib,
-in with lib; {
+  pkgs,
+  ...
+}: let
+  cfg = config.jade.desktop.cloud;
+in
+  with lib; {
     options.jade.desktop.cloud = {
       enable = mkEnableOption "Enable cloud things";
     };

modules/desktop/compositing.nix

@@ -1,8 +1,12 @@
-{ config, lib, pkgs, ... }:
+{
-
+  config,
-let 
+  lib,
+  pkgs,
+  ...
+}: let
   cfg = config.jade.desktop.compositing;
-in with lib; {
+in
+  with lib; {
     options.jade.desktop.compositing = {
       enable = mkEnableOption "Enable compositing with picom";
     };

modules/desktop/default.nix

@@ -1,6 +1,9 @@
-{ config, lib, pkgs, ... }:
+{
-
+  config,
-let 
+  lib,
+  pkgs,
+  ...
+}: let
   # window-screenshot = pkgs.writeTextFile "window-screenshot.nu" (builtins.readFile ../../other/scripts/desktop/window-screenshot.nu);
   window-screenshot = pkgs.writeShellScriptBin "window-screenshot.sh" (builtins.readFile ../../other/scripts/desktop/window-screenshot.sh);
   # desktop-ctl = pkgs.writeShellScriptBin "desktop-ctl.sh" (builtins.readFile ../scripts/desktop/desktop-ctl.sh);
@@ -9,7 +12,8 @@ let
   ocr-screenshot = pkgs.writeShellScriptBin "ocr-screenshot.sh" (builtins.readFile ../../other/scripts/desktop/ocr-screenshot.sh);
   # rofi calculator copied from https://github.com/barbuk/menu-qalc
   menu-qalc = pkgs.writeShellScriptBin "menu-qalc" (builtins.readFile ../../other/scripts/desktop/menu-qalc.sh);
-in with lib; {
+in
+  with lib; {
     imports = [
       ./audio.nix
       ./gaming.nix
@@ -71,8 +75,6 @@ in with lib; {
           enable = true;
         };
       };
-
-
     };
 
     programs.xss-lock = {
@@ -99,35 +101,79 @@ in with lib; {
         theme = ../../other/rofi-themes/applauncher.rasi;
       };
       home.packages = with pkgs; [
-      just bacon
+        just
+        bacon
 
         magic-wormhole-rs
 
         yt-dlp
 
-      i3lock rofimoji feh xorg.xinput arandr flameshot
+        i3lock
-      tesseract5 imagemagick xclip xmacro  xorg.xev
+        rofimoji
+        feh
+        xorg.xinput
+        arandr
+        flameshot
+        tesseract5
+        imagemagick
+        xclip
+        xmacro
+        xorg.xev
 
         syncplay
 
         # filemanager
-      xfce.thunar xfce.tumbler xfce.thunar-archive-plugin gnome.file-roller
+        xfce.thunar
+        xfce.tumbler
+        xfce.thunar-archive-plugin
+        gnome.file-roller
         # media/file viewers
-      vlc mpv evince nomacs
+        vlc
+        mpv
+        evince
+        nomacs
 
         # from environment.systemPackages cleanup
-      font-manager xdotool xorg.xwininfo  gparted uhk-agent
+        font-manager
-      cool-retro-term xdg-desktop-portal-gtk obsidian zettlr virt-manager
+        xdotool
-      ddccontrol-db firebird-emu gitg gpick qdirstat ffmpeg_5
+        xorg.xwininfo
+        gparted
+        uhk-agent
+        cool-retro-term
+        xdg-desktop-portal-gtk
+        obsidian
+        zettlr
+        virt-manager
+        ddccontrol-db
+        firebird-emu
+        gitg
+        gpick
+        qdirstat
+        ffmpeg_5
 
         # external
-      libnotify i3lock rofi rofimoji feh xorg.xinput arandr
+        libnotify
-      flameshot tesseract5 imagemagick xclip kitty xmacro
+        i3lock
-      brightnessctl drawing libqalculate 
+        rofi
+        rofimoji
+        feh
+        xorg.xinput
+        arandr
+        flameshot
+        tesseract5
+        imagemagick
+        xclip
+        kitty
+        xmacro
+        brightnessctl
+        drawing
+        libqalculate
 
         # custom scripts
-      window-screenshot desktop-ctl
+        window-screenshot
-      ocr-screenshot menu-qalc
+        desktop-ctl
+        ocr-screenshot
+        menu-qalc
 
         # meow
         oneko

modules/desktop/evremap.nix

@@ -1,5 +1,9 @@
-{ pkgs, config, lib, ... }: 
+{
-let
+  pkgs,
+  config,
+  lib,
+  ...
+}: let
   cfg = config.jade.desktop.evremap;
   evremap = pkgs.rustPlatform.buildRustPackage {
     pname = "evremap";
@@ -18,7 +22,8 @@ let
     nativeBuildInputs = [pkgs.pkg-config];
     buildInputs = [pkgs.libevdev];
   };
-in with lib; {
+in
+  with lib; {
     options.jade.desktop.evremap = {
       enable = mkEnableOption "Enable evremap";
     };

modules/desktop/firefox.nix

@@ -133,69 +133,101 @@
           default = "DuckDuckGo";
           engines = {
             "Nix Packages" = {
-							urls = [{
+              urls = [
+                {
                   template = "https://search.nixos.org/packages";
                   params = [
-									{ name = "query"; value = "{searchTerms}"; }
+                    {
+                      name = "query";
+                      value = "{searchTerms}";
+                    }
+                  ];
+                }
               ];
-							}];
               icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
               definedAliases = ["pkgs"];
             };
             "Nix Options" = {
-							urls = [{
+              urls = [
+                {
                   template = "https://search.nixos.org/options";
                   params = [
-									{ name = "query"; value = "{searchTerms}"; }
+                    {
+                      name = "query";
+                      value = "{searchTerms}";
+                    }
+                  ];
+                }
               ];
-							}];
               icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
               definedAliases = ["opts"];
             };
             "Home manager Options" = {
-							urls = [{
+              urls = [
+                {
                   template = "https://mipmip.github.io/home-manager-option-search/";
                   params = [
-									{ name = "query"; value = "{searchTerms}"; }
+                    {
+                      name = "query";
+                      value = "{searchTerms}";
+                    }
+                  ];
+                }
               ];
-							}];
               icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
               definedAliases = ["hm"];
             };
             "NixOS Wiki" = {
-							urls = [{
+              urls = [
+                {
                   template = "https://nixos.wiki/index.php?title=Special:Search&search={searchTerms}&namespace=0";
-							}];
+                }
+              ];
               icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
               definedAliases = ["nxwk"];
             };
             "lib.rs" = {
-							urls = [{
+              urls = [
+                {
                   template = "https://lib.rs/search";
                   params = [
-									{ name = "q"; value = "{searchTerms}"; }
+                    {
+                      name = "q";
+                      value = "{searchTerms}";
+                    }
+                  ];
+                }
               ];
-							}];
               icon = "https://lib.rs/favicon.png";
               definedAliases = ["libs"];
             };
             "rust docs" = {
-							urls = [{
+              urls = [
+                {
                   template = "https://docs.rs/releases/search";
                   params = [
-									{ name = "query"; value = "{searchTerms}"; }
+                    {
+                      name = "query";
+                      value = "{searchTerms}";
+                    }
+                  ];
+                }
               ];
-							}];
               icon = "https://docs.rs/-/static/favicon.ico";
               definedAliases = ["docs"];
             };
             "rust std docs" = {
-							urls = [{
+              urls = [
+                {
                   template = "https://docs.rust-lang.org/std/index.html";
                   params = [
-									{ name = "search"; value = "{searchTerms}"; }
+                    {
+                      name = "search";
+                      value = "{searchTerms}";
+                    }
+                  ];
+                }
               ];
-							}];
               icon = "https://doc.rust-lang.org/favicon.ico";
               definedAliases = ["std"];
             };

modules/desktop/gaming.nix

@@ -1,8 +1,12 @@
-{ config, lib, pkgs, ... }:
+{
-
+  config,
-let 
+  lib,
+  pkgs,
+  ...
+}: let
   cfg = config.jade.desktop.gaming;
-in with lib; {
+in
+  with lib; {
     options.jade.desktop.gaming = {
       enable = mkEnableOption "Enable gaming stuff";
     };

modules/desktop/ios-compat.nix

@@ -1,7 +1,12 @@
-{ config, lib, pkgs, ... }:
+{
-
+  config,
-let cfg = config.jade.desktop.ios-compat;
+  lib,
-in with lib; {
+  pkgs,
+  ...
+}: let
+  cfg = config.jade.desktop.ios-compat;
+in
+  with lib; {
     options.jade.desktop.ios-compat = {
       enable = mkEnableOption "Enable the ios compatability programs";
     };

modules/desktop/kdeconnect.nix

@@ -1,7 +1,12 @@
-{ config, lib, pkgs, ... }:
+{
-
+  config,
-let cfg = config.jade.desktop.kdeconnect;
+  lib,
-in with lib; {
+  pkgs,
+  ...
+}: let
+  cfg = config.jade.desktop.kdeconnect;
+in
+  with lib; {
     options.jade.desktop.kdeconnect = {
       enable = mkEnableOption "Enable KDE connect";
     };

modules/desktop/mail.nix

@@ -1,6 +1,9 @@
-{ config, lib, pkgs, ... }:
+{
-
+  config,
-let 
+  lib,
+  pkgs,
+  ...
+}: let
   cfg = config.jade.desktop.mail;
   imap = {
     host = "imap.migadu.com";
@@ -11,7 +14,8 @@ let
     port = 465;
     tls.enable = true;
   };
-in with lib; {
+in
+  with lib; {
     options.jade.desktop.mail = {
       enable = mkEnableOption "Enable thunderbird mail stuff";
     };

modules/desktop/networking.nix

@@ -1,7 +1,11 @@
-{ config, lib, pkgs, ... }:
+{
-
+  config,
-let 
+  lib,
-  addNuShebang = path: builtins.concatStringsSep "\n\n" [
+  pkgs,
+  ...
+}: let
+  addNuShebang = path:
+    builtins.concatStringsSep "\n\n" [
       "#!${pkgs.nushellFull}/bin/nu"
       (builtins.readFile path)
     ];
@@ -40,7 +44,7 @@ in {
         ];
       };
     };
-    environment.etc = (with builtins; (
+    environment.etc = with builtins; (
       listToAttrs (
         map (v: {
           name = "networkhooks/${v}";
@@ -51,7 +55,7 @@ in {
         })
         (attrNames (readDir ../../other/scripts/networkhooks))
       )
-    ));
+    );
     systemd.services."NetworkManager-wait-online".enable = false;
     services.mullvad-vpn.enable = true;
     home-manager.users.jade = {pkgs, ...}: {

modules/desktop/polybar.nix

@@ -1,6 +1,9 @@
-{ config, lib, pkgs, ... }:
-
 {
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
   config = {
     home-manager.users.jade = {pkgs, ...}: {
       #xsession.windowManager.i3.config.startup = [

modules/desktop/social.nix

@@ -1,7 +1,12 @@
-{ config, lib, pkgs, ... }:
+{
-
+  config,
-let cfg = config.jade.desktop.social;
+  lib,
-in with lib; {
+  pkgs,
+  ...
+}: let
+  cfg = config.jade.desktop.social;
+in
+  with lib; {
     options.jade.desktop.social = {
       enable = mkEnableOption "Enable social apps";
     };

modules/desktop/specific-hardware/default.nix

@@ -1,5 +1,9 @@
-{ config, lib, pkgs, ... }:
 {
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
   imports = [
     ./spacenav.nix
     ./wacom.nix

modules/desktop/specific-hardware/spacenav.nix

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

modules/desktop/syncthing.nix

@@ -1,7 +1,12 @@
-{ config, lib, pkgs, ... }:
+{
-
+  config,
-let cfg = config.jade.desktop.syncthing;
+  lib,
-in with lib; {
+  pkgs,
+  ...
+}: let
+  cfg = config.jade.desktop.syncthing;
+in
+  with lib; {
     options.jade.desktop.syncthing = {
       enable = mkEnableOption "Enable syncing via syncthing";
     };

modules/desktop/themeing.nix

@@ -1,6 +1,9 @@
-{ config, lib, pkgs, ... }:
-
 {
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
   config = {
     fonts.packages = with pkgs; [
       atkinson-hyperlegible

modules/desktop/xmonad.nix

@@ -1,4 +1,9 @@
-{ config, lib, pkgs, ... }: 
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 with lib; {
   home-manager.users.jade = {pkgs, ...}: {
     xsession.windowManager.xmonad = {

modules/firewall.nix

@@ -1,5 +1,9 @@
-{ config, lib, pkgs, ... }:
 {
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
   config = {
     networking = {
       firewall = {
@@ -9,7 +13,8 @@
           22
 
           # http, https
-          80 443
+          80
+          443
 
           # syncthing web ui
           8384

modules/flatpak.nix

@@ -1,7 +1,12 @@
-{ config, lib, pkgs, ... }:
+{
-
+  config,
-let cfg = config.jade.flatpak;
+  lib,
-in with lib; {
+  pkgs,
+  ...
+}: let
+  cfg = config.jade.flatpak;
+in
+  with lib; {
     options.jade.flatpak = {
       enable = mkEnableOption "Enable flatpak";
     };

modules/shell/helix.nix

@@ -1,5 +1,4 @@
-{ config, ... }:
+{config, ...}: {
-{
   home-manager.users.jade = {pkgs, ...}: {
     home = {
       sessionVariables.EDITOR = "hx";

modules/shell/zellij.nix

@@ -1,5 +1,8 @@
-{ config, lib, ... }:
 {
+  config,
+  lib,
+  ...
+}: {
   home-manager.users.jade = {pkgs, ...}: {
     home.file = {
       zellij-forgot = {

modules/template.nix

@@ -1,10 +1,16 @@
-{ config, lib, pkgs, ... }:
+{
-
+  config,
-let cfg = config.jade.NAME;
+  lib,
-in with lib; {
+  pkgs,
+  ...
+}: let
+  cfg = config.jade.NAME;
+in
+  with lib; {
     options.jade.NAME = {
       enable = mkEnableOption "Enable the module";
     };
-  config = mkIf cfg.enable {
+    config =
+      mkIf cfg.enable {
       };
   }

modules/terminal.nix

@@ -1,7 +1,12 @@
-{ config, lib, pkgs, ... }:
+{
-
+  config,
-let cfg = config.jade.terminal;
+  lib,
-in with lib; {
+  pkgs,
+  ...
+}: let
+  cfg = config.jade.terminal;
+in
+  with lib; {
     options.jade.terminal = {
       enable = mkEnableOption "Enable Kitty";
     };

modules/utils.nix

@@ -1,11 +1,14 @@
-{ pkgs, lib }: rec {
+{
+  pkgs,
+  lib,
+}: rec {
   # taken from https://github.com/NixOS/nixpkgs/blob/3650808d85dccbfa3be3d785dfd3ce33a757bd2c/pkgs/build-support/trivial-builders/default.nix#L335
-  writeNuShellApplication =
+  writeNuShellApplication = {
-    { name
+    name,
-    , text
+    text,
-    , runtimeInputs ? [ ]
+    runtimeInputs ? [],
-    , meta ? { }
+    meta ? {},
-    , checkPhase ? null
+    checkPhase ? null,
   }:
     writeTextFile {
       inherit name meta;
@@ -13,12 +16,15 @@
       destination = "/bin/${name}";
       allowSubstitutes = true;
       preferLocalBuild = false;
-      text = ''
+      text =
+        ''
           #!${pkgs.nushell}
-      '' + lib.optionalString (runtimeInputs != [ ]) ''
+        ''
+        + lib.optionalString (runtimeInputs != []) ''
 
           $env.PATH = ($env.PATH | split row (char esep) | prepend '${lib.makeBinPath runtimeInputs}');
-      '' + ''
+        ''
+        + ''
 
           ${text}
         '';
@@ -26,7 +32,8 @@
       checkPhase =
         # GHC (=> shellcheck) isn't supported on some platforms (such as risc-v)
         # but we still want to use writeShellApplication on those platforms
-        if checkPhase == null then ''
+        if checkPhase == null
+        then ''
           runHook preCheck
 
           nu -c "nu-check -d $target"
@@ -35,12 +42,12 @@
         ''
         else checkPhase;
     };
-  packageNushellApplication = 
+  packageNushellApplication = {
-    { name
+    name,
-    , path 
+    path,
-    , runtimeInputs ? [ ]
+    runtimeInputs ? [],
-    , meta ? { }
+    meta ? {},
-    , checkPhase ? null
+    checkPhase ? null,
   }:
     writeNuShellApplication {
       inherit name runtimeInputs meta checkPhase;