formated using alejandra

flake.nix

@@ -18,18 +18,17 @@
     home-manager,
     stylix,
     ...
-  }:
+  }: let
-    let
     inherit (self) outputs;
     lib = nixpkgs.lib // home-manager.lib;
     systems = ["x86_64-linux" "aarch64-linux"];
     forEachSystem = f: lib.genAttrs systems (system: f pkgsFor.${system});
-      pkgsFor = lib.genAttrs systems (system: import nixpkgs {
+    pkgsFor = lib.genAttrs systems (system:
+      import nixpkgs {
         inherit system;
         config.allowUnfree = true;
       });
-    in
+  in {
-    {
     inherit lib;
     # nixosModules = import ./modules/nixos;
     # homeManagerModules = import ./modules/home-manager;

home/common/bash.nix

@@ -1,5 +1,8 @@
-{ config, pkgs, ... }:
 {
+  config,
+  pkgs,
+  ...
+}: {
   imports = [./bash_complition.nix];
   home.file.".bash_local".source = files/bash/bash_local;
   home.file.".bash_aliases".source = files/bash/bash_aliases;

home/common/btop.nix

@@ -1,5 +1,8 @@
-{ config, pkgs, ... }:
 {
+  config,
+  pkgs,
+  ...
+}: {
   #home.packages = with pkgs; [ btop ];
   programs.btop = {
     enable = true;

home/common/bufferline.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   programs.neovim = {
     plugins = with pkgs.vimPlugins; [
       {
@@ -99,3 +98,4 @@
   };
 }
 # vim: shiftwidth=2 tabstop=2 expandtab
+

home/common/default.nix

@@ -1,5 +1,8 @@
-{ config, pkgs, ... }:
 {
+  config,
+  pkgs,
+  ...
+}: {
   imports = [
     ./bash.nix
     ./btop.nix

home/common/git.nix

@@ -1,6 +1,8 @@
-{ pkgs, config, ... }:
-
 {
+  pkgs,
+  config,
+  ...
+}: {
   programs.lazygit = {
     settings = {
       os.editPreset = "lvim";

home/common/gnupg.nix

@@ -1,5 +1,4 @@
-{ ... }:
+{...}: {
-{
   programs.gpg = {
     enable = true;
     settings = {

home/common/khard.nix

@@ -1,5 +1,8 @@
-{ config, pkgs, ... }:
 {
+  config,
+  pkgs,
+  ...
+}: {
   programs.khard = {
     enable = true;
     settings = {

home/common/lf.nix

@@ -1,6 +1,8 @@
-{ pkgs, config, ... }:
-
 {
+  pkgs,
+  config,
+  ...
+}: {
   xdg.configFile."lf/icons".source = ./icons;
 
   programs.lf = {
@@ -17,7 +19,6 @@
     };
 
     keybindings = {
-
       "\\\"" = "";
       o = "";
       c = "mkdir";
@@ -45,10 +46,8 @@
       ignorecase = true;
     };
 
-    extraConfig = 
+    extraConfig = let
-    let 
+      previewer = pkgs.writeShellScriptBin "pv.sh" ''
-      previewer = 
-        pkgs.writeShellScriptBin "pv.sh" ''
         file=$1
         w=$2
         h=$3
@@ -65,8 +64,7 @@
       cleaner = pkgs.writeShellScriptBin "clean.sh" ''
         ${pkgs.kitty}/bin/kitty +kitten icat --clear --stdin no --silent --transfer-mode file < /dev/null > /dev/tty
       '';
-    in
+    in ''
-    ''
       set cleaner ${cleaner}/bin/clean.sh
       set previewer ${previewer}/bin/pv.sh
     '';

home/common/listadmin.nix

@@ -1,5 +1,8 @@
-{ config, pkgs, ... }:
 {
+  config,
+  pkgs,
+  ...
+}: {
   home.packages = with pkgs; [listadmin];
   home.file."listadmin.ini" = {
     enable = true;
@@ -18,4 +21,3 @@
     '';
   };
 }
-

home/common/mail.nix

@@ -1,5 +1,8 @@
-{ config, pkgs, ... }:
 {
+  config,
+  pkgs,
+  ...
+}: {
   accounts.email.accounts = {
     "don@donharper.org" = {
       primary = true;

home/common/mopidy.nix

@@ -1,6 +1,8 @@
-{ pkgs, config, ... }:
-
 {
+  pkgs,
+  config,
+  ...
+}: {
   services = {
     mopidy = {
       enable = true;

home/common/neovim.nix

@@ -1,13 +1,15 @@
-{ config, pkgs, ... }:
 {
+  config,
+  pkgs,
+  ...
+}: {
   programs.neovim = {
     enable = true;
     defaultEditor = false;
     viAlias = true;
     vimAlias = true;
     vimdiffAlias = true;
-    extraConfig = 
+    extraConfig = ''
-    ''
       colorscheme dracula
       set backspace="indent,eol,start"
       set autoindent

home/common/newsboat.nix

@@ -1,13 +1,15 @@
-{ config, pkgs, ... }:
 {
+  config,
+  pkgs,
+  ...
+}: {
   programs.newsboat = {
     enable = true;
     autoReload = true;
     browser = "~/bin/myweb";
     reloadThreads = 4;
     reloadTime = 45;
-    extraConfig = 
+    extraConfig = ''
-    ''
       article-sort-order date
       bind-key D mark-feed-read
       bind-key J next-feed

home/common/taskwarrior.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   home.packages = with pkgs; [taskwarrior taskwarrior-tui tasksh vit timewarrior];
   programs.taskwarrior = {
     enable = true;

home/common/tmux.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   programs.tmux = {
     enable = true;
     aggressiveResize = true;
@@ -21,16 +20,14 @@
       pkgs.tmuxPlugins.vim-tmux-navigator
       {
         plugin = pkgs.tmuxPlugins.online-status;
-        extraConfig =
+        extraConfig = ''
-          ''
           set -g @online_icon "ok"
           set -g @offline_icon "offline!"
         '';
       }
       {
         plugin = pkgs.tmuxPlugins.dracula;
-          extraConfig =
+        extraConfig = ''
-            ''
           set -g @dracula-plugins "cpu-usage network battery weather time"
           set -g @dracula-border-contrast true
           set -g @dracula-refresh-rate 10
@@ -45,8 +42,7 @@
         '';
       }
     ];
-        extraConfig =
+    extraConfig = ''
-          ''
       bind '~' split-window "exec btop"
       bind - split-window -v -c "#{pane_current_path}"
       bind | split-window -h -c "#{pane_current_path}"

home/common/todoman.nix

@@ -1,6 +1,10 @@
 {pkgs, ...}: {
   home.packages = with pkgs; [todoman];
-  xdg.configFile."todoman/config.py".text = /* python */ ''
+  xdg.configFile."todoman/config.py".text =
+    /*
+    python
+    */
+    ''
       path = "~/.config/vdirsyncer/storage/calendar/*"
       date_format = "%Y-%m-%d"
       time_format = "%H:%M"

home/common/topgrade.nix

@@ -1,5 +1,8 @@
-{ config, pkgs, ... }:
 {
+  config,
+  pkgs,
+  ...
+}: {
   programs.topgrade = {
     enable = true;
     settings = {

home/default.nix

@@ -1,6 +1,8 @@
-{ inputs, outputs, ... }:
-
 {
+  inputs,
+  outputs,
+  ...
+}: {
   imports = [inputs.home-manager.nixosModules.home-manager];
   home-manager.extraSpecialArgs = {inherit inputs outputs;};
   home-manager = {

home/gui/alacritty.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   programs.alacritty = {
     enable = true;
     settings = {
@@ -15,3 +14,4 @@
   };
 }
 # vim: shiftwidth=2 tabstop=2 expandtab
+

home/gui/default.nix

@@ -1,5 +1,8 @@
-{ pkgs, inputs, ... }:
 {
+  pkgs,
+  inputs,
+  ...
+}: {
   home-manager.users.don = {
     imports = [
       ./alacritty.nix
@@ -13,7 +16,8 @@
       ./sway.nix
       ./terminals.nix
     ];
-    home.packages = with pkgs; [
+    home.packages = with pkgs;
+      [
         anonymousPro
         at-spi2-core
         blueberry
@@ -70,7 +74,8 @@
         widevine-cdm
         wofi
         yt-dlp
-    ] ++ lib.optional (pkgs.hostPlatform.system == "x86_64-linux") sonixd;
+      ]
+      ++ lib.optional (pkgs.hostPlatform.system == "x86_64-linux") sonixd;
     xdg = {
       mimeApps = {
         enable = true;

home/gui/fuzzel.nix

@@ -1,5 +1,8 @@
-{ config, pkgs, ... }:
 {
+  config,
+  pkgs,
+  ...
+}: {
   home.packages = with pkgs; [fuzzel];
   programs.fuzzel = {
     enable = true;

home/gui/mpv.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   programs = {
     mpv = {
       enable = true;
@@ -41,8 +40,7 @@
     };
     yt-dlp = {
       enable = true;
-      extraConfig =
+      extraConfig = ''
-      ''
         --no-mtime
       '';
       settings = {

home/gui/qutebrowser.nix

@@ -1,5 +1,4 @@
-{ ... }:
+{...}: {
-{
   programs.qutebrowser = {
     enable = true;
     loadAutoconfig = true;
@@ -175,8 +174,7 @@
       wikipedia = "https://www.wikipedia.org/";
       zoom = "https://zoom.us/";
     };
-    extraConfig =
+    extraConfig = ''
-      ''
       import dracula.draw
       dracula.draw.blood(c, {
         'spacing': {

home/gui/redshift.nix

@@ -1,5 +1,8 @@
-{ config, pkgs, ... }:
 {
+  config,
+  pkgs,
+  ...
+}: {
   services.redshift = {
     enable = true;
     latitude = "29.74";

home/gui/services.nix

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

home/gui/sway.nix

@@ -1,5 +1,11 @@
-{ inputs, pkgs, hostname, outputs, osConfig, ... }:
 {
+  inputs,
+  pkgs,
+  hostname,
+  outputs,
+  osConfig,
+  ...
+}: {
   xdg.configFile."sway/config".source = ./files/sway/${osConfig.networking.hostName};
 
   programs = {
@@ -130,8 +136,7 @@
           };
         };
       };
-      style =
+      style = ''
-        ''
                 * {
         border: none; border-radius: 0;
                 font-family: "JetBrains Mono", FontAwesome6Free, SymbolsNerdFont, Roboto, Helvetica, Arial, sans-serif;

home/gui/terminals.nix

@@ -1,5 +1,8 @@
-{ config, pkgs, ... }:
 {
+  config,
+  pkgs,
+  ...
+}: {
   programs.kitty = {
     enable = true;
     settings = {

home/work/citrix.nix

@@ -1,5 +1,9 @@
-{ config, pkgs, inputs, ... }:
 {
+  config,
+  pkgs,
+  inputs,
+  ...
+}: {
   home.packages = with pkgs; [
     citrix_workspace
   ];

home/work/default.nix

@@ -1,5 +1,8 @@
-{ pkgs, inputs, ... }:
 {
+  pkgs,
+  inputs,
+  ...
+}: {
   home-manager.users.don = {
     imports = [
       ./citrix.nix

home/work/zoom.nix

@@ -1,5 +1,8 @@
-{ config, pkgs, ... }:
 {
+  config,
+  pkgs,
+  ...
+}: {
   home.packages = with pkgs; [zoom-us];
   xdg = {
     configFile."zoom.conf".source = files/zoom.conf;

hosts/ace/default.nix

@@ -1,8 +1,12 @@
-{ inputs, outputs, lib, config, pkgs, ... }:
-
 {
-  imports =
+  inputs,
-    [
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
+  imports = [
     inputs.stylix.nixosModules.stylix
     ./hardware-configuration.nix
     # ../disko/mmcblk.nix

hosts/ace/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" "ahci" "uas" "sd_mod"];
@@ -13,13 +17,13 @@
   boot.kernelModules = ["kvm-intel"];
   boot.extraModulePackages = [];
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "/dev/mmcblk0p2";
+    device = "/dev/mmcblk0p2";
     fsType = "ext4";
   };
 
-  fileSystems."/boot" =
+  fileSystems."/boot" = {
-    { device = "/dev/mmcblk0p1";
+    device = "/dev/mmcblk0p1";
     fsType = "vfat";
   };
 

hosts/disko/mmcblk.nix

@@ -30,4 +30,3 @@
     };
   };
 }
-

hosts/disko/nvme.nix

@@ -1,5 +1,11 @@
-{ inputs, outputs, lib, config, pkgs, ... }:
 {
+  inputs,
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
   disko.devices = {
     disk = {
       vdb = {
@@ -31,4 +37,3 @@
     };
   };
 }
-

hosts/disko/sda.nix

@@ -30,4 +30,3 @@
     };
   };
 }
-

hosts/display/default.nix

@@ -1,8 +1,12 @@
-{ inputs, outputs, lib, config, pkgs, ... }:
-
 {
-  imports =
+  inputs,
-    [
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
+  imports = [
     inputs.stylix.nixosModules.stylix
     inputs.nixos-hardware.nixosModules.raspberry-pi-4
     ./hardware-configuration.nix

hosts/dragon/default.nix

@@ -1,8 +1,10 @@
-{ inputs, config, pkgs, ... }:
-
 {
-  imports =
+  inputs,
-    [
+  config,
+  pkgs,
+  ...
+}: {
+  imports = [
     inputs.stylix.nixosModules.stylix
     ./hardware-configuration.nix
     inputs.nixos-hardware.nixosModules.common-cpu-intel

hosts/dragon/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" "ehci_pci" "ahci" "sd_mod" "rtsx_pci_sdmmc"];
@@ -13,18 +17,18 @@
   boot.kernelModules = ["kvm-intel"];
   boot.extraModulePackages = [];
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "/dev/disk/by-uuid/8f55014e-8c1b-475d-8fe6-501977358d97";
+    device = "/dev/disk/by-uuid/8f55014e-8c1b-475d-8fe6-501977358d97";
     fsType = "ext4";
   };
 
-  fileSystems."/boot" =
+  fileSystems."/boot" = {
-    { device = "/dev/disk/by-uuid/E6F0-40A0";
+    device = "/dev/disk/by-uuid/E6F0-40A0";
     fsType = "vfat";
   };
 
-  swapDevices =
+  swapDevices = [
-    [ { device = "/dev/disk/by-uuid/843421e5-cb74-4c43-b88d-5053e7f7dec4"; }
+    {device = "/dev/disk/by-uuid/843421e5-cb74-4c43-b88d-5053e7f7dec4";}
   ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking

hosts/eve/default.nix

@@ -1,8 +1,12 @@
-{ inputs, outputs, lib, config, pkgs, ... }:
-
 {
-  imports =
+  inputs,
-    [
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
+  imports = [
     inputs.nixos-hardware.nixosModules.google-pixelbook
     inputs.stylix.nixosModules.stylix
     ./hardware-configuration.nix

hosts/eve/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" "usb_storage" "usbhid" "sd_mod" "sdhci_pci"];
@@ -13,13 +17,13 @@
   boot.kernelModules = ["kvm-intel"];
   boot.extraModulePackages = [];
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "/dev/mmcblk0p2";
+    device = "/dev/mmcblk0p2";
     fsType = "ext4";
   };
 
-  fileSystems."/boot" =
+  fileSystems."/boot" = {
-    { device = "/dev/mmcblk0p1";
+    device = "/dev/mmcblk0p1";
     fsType = "vfat";
   };
 

hosts/eve/kernel.nix

@@ -1,5 +1,9 @@
-{ config, pkgs, lib, ... }:
 {
+  config,
+  pkgs,
+  lib,
+  ...
+}: {
   boot.kernelPatches = lib.singleton {
     name = "eve-config";
     patch = null;

hosts/fred/default.nix

@@ -1,8 +1,12 @@
-{ inputs, outputs, lib, config, pkgs, ... }:
-
 {
-  imports =
+  inputs,
-    [
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
+  imports = [
     inputs.stylix.nixosModules.stylix
     ./hardware-configuration.nix
     ../server

hosts/fred/disko.nix

@@ -37,4 +37,3 @@
     };
   };
 }
-

hosts/fred/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" "ehci_pci" "ahci" "usbhid" "ums_realtek" "sd_mod" "sr_mod"];
@@ -13,13 +17,13 @@
   boot.kernelModules = ["kvm-intel"];
   boot.extraModulePackages = [];
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "/dev/disk/by-uuid/4a1d2915-6964-4479-98c6-d17e333e83e9";
+    device = "/dev/disk/by-uuid/4a1d2915-6964-4479-98c6-d17e333e83e9";
     fsType = "ext4";
   };
 
-  fileSystems."/boot" =
+  fileSystems."/boot" = {
-    { device = "/dev/disk/by-uuid/FAE7-A0C7";
+    device = "/dev/disk/by-uuid/FAE7-A0C7";
     fsType = "vfat";
   };
 

hosts/fred/podman.nix

@@ -1,7 +1,9 @@
 # Auto-generated using compose2nix v0.1.6.
-{ pkgs, lib, ... }:
-
 {
+  pkgs,
+  lib,
+  ...
+}: {
   # Runtime
   virtualisation.podman = {
     enable = true;

hosts/harper/default.nix

@@ -1,8 +1,12 @@
-{ inputs, outputs, lib, config, pkgs, ... }:
-
 {
-  imports =
+  inputs,
-    [
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
+  imports = [
     inputs.stylix.nixosModules.stylix
     ./hardware-configuration.nix
     ../../server

hosts/harper2/default.nix

@@ -1,8 +1,12 @@
-{ inputs, outputs, lib, config, pkgs, ... }:
-
 {
-  imports =
+  inputs,
-    [
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
+  imports = [
     inputs.stylix.nixosModules.stylix
     ./hardware-configuration.nix
     ../../server

hosts/loki/default.nix

@@ -1,8 +1,12 @@
-{ inputs, outputs, lib, config, pkgs, ... }:
-
 {
-  imports =
+  inputs,
-    [
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
+  imports = [
     inputs.nixos-hardware.nixosModules.dell-xps-13-9310
     inputs.stylix.nixosModules.stylix
     ./hardware-configuration.nix

hosts/loki/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" "thunderbolt" "nvme" "uas" "sd_mod" "rtsx_pci_sdmmc"];
@@ -13,13 +17,13 @@
   boot.kernelModules = ["kvm-intel"];
   boot.extraModulePackages = [];
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "/dev/nvme0n1p2";
+    device = "/dev/nvme0n1p2";
     fsType = "ext4";
   };
 
-  fileSystems."/boot" =
+  fileSystems."/boot" = {
-    { device = "/dev/nvme0n1p1";
+    device = "/dev/nvme0n1p1";
     fsType = "vfat";
   };
 

hosts/loki/kernel.nix

@@ -1,5 +1,7 @@
-{ config, pkgs, ... }:
-
 {
+  config,
+  pkgs,
+  ...
+}: {
   boot.kernelModules = ["axge" "ax88179_178a"];
 }

hosts/nuwww/default.nix

@@ -1,8 +1,12 @@
-{ inputs, outputs, lib, config, pkgs, ... }:
-
 {
-  imports =
+  inputs,
-    [
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
+  imports = [
     inputs.stylix.nixosModules.stylix
     ./hardware-configuration.nix
     ../../server

hosts/pihole/default.nix

@@ -1,8 +1,12 @@
-{ inputs, outputs, lib, config, pkgs, ... }:
-
 {
-  imports =
+  inputs,
-    [
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
+  imports = [
     inputs.stylix.nixosModules.stylix
     ./hardware-configuration.nix
     ../../server

hosts/pocket2/default.nix

@@ -1,8 +1,10 @@
-{ inputs, config, pkgs, ... }:
-
 {
-  imports =
+  inputs,
-    [
+  config,
+  pkgs,
+  ...
+}: {
+  imports = [
     inputs.stylix.nixosModules.stylix
     ./hardware-configuration.nix
     inputs.nixos-hardware.nixosModules.common-cpu-intel

hosts/pocket2/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" "usb_storage" "usbhid" "sd_mod" "sdhci_pci"];
@@ -13,13 +17,13 @@
   boot.kernelModules = ["kvm-intel"];
   boot.extraModulePackages = [];
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "/dev/disk/by-uuid/90189466-8309-4b46-befe-cf476b8a7dd7";
+    device = "/dev/disk/by-uuid/90189466-8309-4b46-befe-cf476b8a7dd7";
     fsType = "ext4";
   };
 
-  fileSystems."/boot" =
+  fileSystems."/boot" = {
-    { device = "/dev/disk/by-uuid/A327-E803";
+    device = "/dev/disk/by-uuid/A327-E803";
     fsType = "vfat";
   };
 

hosts/server/default.nix

@@ -1,7 +1,13 @@
-{ inputs, outputs, lib, config, pkgs, ... }:
+{
-
+  inputs,
-let
+  outputs,
-  my-python-packages = python-packages: with python-packages; [
+  lib,
+  config,
+  pkgs,
+  ...
+}: let
+  my-python-packages = python-packages:
+    with python-packages; [
       pip
       # pipx
       python-dateutil
@@ -9,8 +15,7 @@ let
       requests
     ];
   python-with-my-packages = pkgs.python3Full.withPackages my-python-packages;
-in
+in {
-{
   nix = {
     settings = {
       experimental-features = ["nix-command" "flakes"];
@@ -24,8 +29,7 @@ in
       options = "--delete-older-than 7d";
     };
   };
-  imports =
+  imports = [
-    [
     ../../home
     ./systemd.nix
     ./tailscale.nix
@@ -43,7 +47,6 @@ in
     hardwareClockInLocalTime = false;
   };
 
-
   # Select internationalisation properties.
   i18n.defaultLocale = "en_US.utf8";
   i18n.inputMethod = {
@@ -82,11 +85,13 @@ in
     sudo.enable = false;
     doas = {
       enable = true;
-      extraRules = [{
+      extraRules = [
+        {
           users = ["don"];
           keepEnv = true;
           noPass = true;
-      }];
+        }
+      ];
     };
   };
 
@@ -185,7 +190,6 @@ in
     };
   };
 
-
   nixpkgs.overlays = [
     (final: super: {khal = super.khal.overridePythonAttrs (_: {doCheck = false;});})
   ];
@@ -199,21 +203,40 @@ in
 
     # allow the Tailscale UDP port through the firewall
     allowedUDPPorts = [config.services.tailscale.port];
-    allowedTCPPortRanges = [ { from = 1714 ; to = 1764; } ];
+    allowedTCPPortRanges = [
-    allowedUDPPortRanges = [ { from = 1714 ; to = 1764; } ];
+      {
+        from = 1714;
+        to = 1764;
+      }
+    ];
+    allowedUDPPortRanges = [
+      {
+        from = 1714;
+        to = 1764;
+      }
+    ];
 
     # allow you to SSH in over the public internet
     allowedTCPPorts = [22];
     interfaces = {
       "tailscale0" = {
         allowedTCPPorts = [22 8080 8443];
-        allowedTCPPortRanges = [ { from = 1714 ; to = 1764; } ];
+        allowedTCPPortRanges = [
-        allowedUDPPortRanges = [ { from = 1714 ; to = 1764; } ];
+          {
+            from = 1714;
+            to = 1764;
+          }
+        ];
+        allowedUDPPortRanges = [
+          {
+            from = 1714;
+            to = 1764;
+          }
+        ];
       };
     };
   };
 
-
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It's perfectly fine and recommended to leavecatenate(variables, "bootdev", bootdev)

hosts/server/systemd.nix

@@ -1,6 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: let
-
-let
   readlink = "${pkgs.coreutils}/bin/readlink";
   notify-send = "${pkgs.libnotify}/bin/notify-send";
 in {

hosts/smaug/default.nix

@@ -1,8 +1,12 @@
-{ inputs, outputs, lib, config, pkgs, ... }:
-
 {
-  imports =
+  inputs,
-    [
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
+  imports = [
     inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x260
     inputs.stylix.nixosModules.stylix
     ./hardware-configuration.nix

hosts/smaug/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" "ahci" "uas" "sd_mod" "rtsx_pci_sdmmc"];
@@ -13,14 +17,13 @@
   boot.kernelModules = ["kvm-intel"];
   boot.extraModulePackages = [];
 
-
+  fileSystems."/" = {
-  fileSystems."/" =
+    device = "/dev/sda2";
-    { device = "/dev/sda2";
     fsType = "ext4";
   };
 
-  fileSystems."/boot" =
+  fileSystems."/boot" = {
-    { device = "/dev/sda1";
+    device = "/dev/sda1";
     fsType = "vfat";
   };
 

hosts/smaug/podman.nix

@@ -1,7 +1,9 @@
 # Auto-generated using compose2nix v0.1.6.
-{ pkgs, lib, ... }:
-
 {
+  pkgs,
+  lib,
+  ...
+}: {
   # Runtime
   virtualisation.podman = {
     enable = true;

hosts/t2/default.nix

@@ -1,8 +1,12 @@
-{ inputs, outputs, lib, config, pkgs, ... }:
-
 {
-  imports =
+  inputs,
-    [
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
+  imports = [
     inputs.stylix.nixosModules.stylix
     ./hardware-configuration.nix
     ../workstation

hosts/t2/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 = [];
@@ -13,8 +17,8 @@
   boot.kernelModules = [];
   boot.extraModulePackages = [];
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "/dev/mmcblk0p2";
+    device = "/dev/mmcblk0p2";
     fsType = "ext4";
   };
 

hosts/themes.nix

@@ -1,6 +1,11 @@
-{ inputs, outputs, lib, config, pkgs, ... }:
-
 {
+  inputs,
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
   stylix = {
     base16Scheme = "${pkgs.base16-schemes}/share/themes/dracula.yaml";
     image = ./feed-me.png;

hosts/vm/default.nix

@@ -1,8 +1,12 @@
-{ inputs, outputs, lib, config, pkgs, ... }:
-
 {
-  imports =
+  inputs,
-    [
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
+  imports = [
     ./hardware-configuration.nix
     ../server
     ../themes.nix

hosts/vm/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 + "/profiles/qemu-guest.nix")
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}: {
+  imports = [
+    (modulesPath + "/profiles/qemu-guest.nix")
   ];
 
   boot.initrd.availableKernelModules = ["ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk"];
@@ -13,18 +17,18 @@
   boot.kernelModules = ["kvm-intel"];
   boot.extraModulePackages = [];
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "/dev/vda3";
+    device = "/dev/vda3";
     fsType = "ext4";
   };
 
-  fileSystems."/boot" =
+  fileSystems."/boot" = {
-    { device = "/dev/vda1";
+    device = "/dev/vda1";
     fsType = "vfat";
   };
 
-    swapDevices =
+  swapDevices = [
-      [ { device = "/dev/vda2"; }
+    {device = "/dev/vda2";}
   ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking

hosts/vm1/default.nix

@@ -1,8 +1,12 @@
-{ inputs, outputs, lib, config, pkgs, ... }:
-
 {
-  imports =
+  inputs,
-    [
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
+  imports = [
     ./hardware-configuration.nix
     ../themes.nix
   ];

hosts/vm1/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 + "/profiles/qemu-guest.nix")
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}: {
+  imports = [
+    (modulesPath + "/profiles/qemu-guest.nix")
   ];
 
   boot.initrd.availableKernelModules = ["ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk"];
@@ -13,18 +17,18 @@
   boot.kernelModules = ["kvm-intel"];
   boot.extraModulePackages = [];
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "/dev/vda3";
+    device = "/dev/vda3";
     fsType = "ext4";
   };
 
-  fileSystems."/boot" =
+  fileSystems."/boot" = {
-    { device = "/dev/vda1";
+    device = "/dev/vda1";
     fsType = "vfat";
   };
 
-    swapDevices =
+  swapDevices = [
-      [ { device = "/dev/vda2"; }
+    {device = "/dev/vda2";}
   ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking

hosts/wm/default.nix

@@ -1,4 +1,3 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-  {
   imports = [./sway];
 }

hosts/wm/kde/default.nix

@@ -1,6 +1,9 @@
-{ config, pkgs, lib, ... }:
-
 {
+  config,
+  pkgs,
+  lib,
+  ...
+}: {
   environment.systemPackages = with pkgs; [
     alacritty
     bemenu
@@ -22,7 +25,6 @@
     wl-clipboard
   ];
 
-
   services.pipewire = {
     enable = true;
     alsa.enable = true;
@@ -32,5 +34,4 @@
   services.enable = true;
   services.displayManager.sddm.enable = true;
   services.desktopManager.plasma6.enable = true;
-
 }

hosts/wm/sddm/default.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   environment.systemPackages = with pkgs; [sddm-chili-theme];
 
   services.displayManager = {

hosts/wm/sway/default.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: let
-let
   dbus-sway-environment = pkgs.writeTextFile {
     name = "dbus-sway-environment";
     destination = "/bin/dbus-sway-environment";
@@ -23,8 +22,7 @@ let
       gsettings set $gnome_schema gtk-theme 'Dracula'
     '';
   };
-in
+in {
-  {
   environment.systemPackages = with pkgs; [
     alacritty
     bemenu

hosts/workstation/default.nix

@@ -1,7 +1,13 @@
-{ inputs, outputs, lib, config, pkgs, ... }:
+{
-
+  inputs,
-let
+  outputs,
-  my-python-packages = python-packages: with python-packages; [
+  lib,
+  config,
+  pkgs,
+  ...
+}: let
+  my-python-packages = python-packages:
+    with python-packages; [
       pip
       # pipx
       python-dateutil
@@ -9,8 +15,7 @@ let
       requests
     ];
   python-with-my-packages = pkgs.python3Full.withPackages my-python-packages;
-in
+in {
-{
   nix = {
     settings = {
       experimental-features = ["nix-command" "flakes"];
@@ -24,8 +29,7 @@ in
       options = "--delete-older-than 7d";
     };
   };
-  imports =
+  imports = [
-    [
     ../../home
     ../../home/gui
     ./detect-reboot-needed.nix
@@ -46,7 +50,6 @@ in
     hardwareClockInLocalTime = false;
   };
 
-
   # Select internationalisation properties.
   i18n.defaultLocale = "en_US.utf8";
   i18n.inputMethod = {
@@ -61,8 +64,9 @@ in
   boot = {
     kernelPackages = pkgs.linuxPackages_latest;
     kernelParams = ["consoleblank=60"];
-    loader = if (pkgs.hostPlatform != lib.mkDefault "aarch64-linux") then
+    loader =
-    {
+      if (pkgs.hostPlatform != lib.mkDefault "aarch64-linux")
+      then {
         systemd-boot = {
           enable = true;
         };
@@ -71,8 +75,7 @@ in
           efiSysMountPoint = "/boot";
         };
       }
-    else
+      else {
-    {
         grub.enable = false;
         generic-extlinux-compatible.enable = true;
       };
@@ -91,11 +94,13 @@ in
     sudo.enable = false;
     doas = {
       enable = true;
-      extraRules = [{
+      extraRules = [
+        {
           users = ["don"];
           keepEnv = true;
           noPass = true;
-      }];
+        }
+      ];
     };
   };
 
@@ -267,7 +272,6 @@ in
     };
   };
 
-
   nixpkgs.overlays = [
     (final: prev: {qutebrowser = prev.qutebrowser.override {enableWideVine = true;};})
     (final: super: {khal = super.khal.overridePythonAttrs (_: {doCheck = false;});})
@@ -282,21 +286,40 @@ in
 
     # allow the Tailscale UDP port through the firewall
     allowedUDPPorts = [config.services.tailscale.port];
-    allowedTCPPortRanges = [ { from = 1714 ; to = 1764; } ];
+    allowedTCPPortRanges = [
-    allowedUDPPortRanges = [ { from = 1714 ; to = 1764; } ];
+      {
+        from = 1714;
+        to = 1764;
+      }
+    ];
+    allowedUDPPortRanges = [
+      {
+        from = 1714;
+        to = 1764;
+      }
+    ];
 
     # allow you to SSH in over the public internet
     allowedTCPPorts = [22];
     interfaces = {
       "tailscale0" = {
         allowedTCPPorts = [22 8080 8443];
-        allowedTCPPortRanges = [ { from = 1714 ; to = 1764; } ];
+        allowedTCPPortRanges = [
-        allowedUDPPortRanges = [ { from = 1714 ; to = 1764; } ];
+          {
+            from = 1714;
+            to = 1764;
+          }
+        ];
+        allowedUDPPortRanges = [
+          {
+            from = 1714;
+            to = 1764;
+          }
+        ];
       };
     };
   };
 
-
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It's perfectly fine and recommended to leavecatenate(variables, "bootdev", bootdev)

hosts/workstation/detect-reboot-needed.nix

@@ -1,6 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: let
-
-let
   readlink = "${pkgs.coreutils}/bin/readlink";
   notify-send = "${pkgs.libnotify}/bin/notify-send";
 in {

hosts/workstation/games/default.nix

@@ -1,6 +1,11 @@
-{ inputs, outputs, lib, config, pkgs, ... }:
-
 {
+  inputs,
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
   programs = {
     # GAMES!
     steam = {

hosts/workstation/kvm.nix

@@ -1,5 +1,8 @@
-{ pkgs, inputs, ... }:
 {
+  pkgs,
+  inputs,
+  ...
+}: {
   virtualisation.libvirtd.enable = true;
   environment.systemPackages = with pkgs; [gnome.gnome-boxes];
 }

hosts/workstation/systemd.nix

@@ -1,6 +1,8 @@
-{ pkgs, lib, ... }:
+{
-
+  pkgs,
-let
+  lib,
+  ...
+}: let
   readlink = "${pkgs.coreutils}/bin/readlink";
   notify-send = "${pkgs.libnotify}/bin/notify-send";
 in {

hosts/www2/default.nix

@@ -1,8 +1,12 @@
-{ inputs, outputs, lib, config, pkgs, ... }:
-
 {
-  imports =
+  inputs,
-    [
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
+  imports = [
     inputs.stylix.nixosModules.stylix
     ./hardware-configuration.nix
     ../../server

hosts/www2/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" "ehci_pci" "ahci" "usbhid" "ums_realtek" "sd_mod" "sr_mod"];
@@ -13,13 +17,13 @@
   boot.kernelModules = ["kvm-intel"];
   boot.extraModulePackages = [];
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "/dev/disk/by-uuid/4a1d2915-6964-4479-98c6-d17e333e83e9";
+    device = "/dev/disk/by-uuid/4a1d2915-6964-4479-98c6-d17e333e83e9";
     fsType = "ext4";
   };
 
-  fileSystems."/boot" =
+  fileSystems."/boot" = {
-    { device = "/dev/disk/by-uuid/FAE7-A0C7";
+    device = "/dev/disk/by-uuid/FAE7-A0C7";
     fsType = "vfat";
   };
 

iso.nix

@@ -1,7 +1,10 @@
 # This module defines a small NixOS installation CD.  It does not
 # contain any graphical stuff.
-{ config, pkgs, ... }:
 {
+  config,
+  pkgs,
+  ...
+}: {
   imports = [
     <nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix>