Reformat with nixfmt

externals/packages/avarice/default.nix

@@ -4,7 +4,8 @@ stdenv.mkDerivation rec {
   pname = "avarice";
   version = "2.14";
   src = fetchurl {
-    url = "mirror://sourceforge/project/avarice/avarice/avarice-${version}/avarice-${version}.tar.bz2";
+    url =
+      "mirror://sourceforge/project/avarice/avarice/avarice-${version}/avarice-${version}.tar.bz2";
     sha256 = "1ab2pxnkbw501iv1i9z9nj7hfzz4y7hid4l4q58cifm3aw17skjb";
   };
 
@@ -16,7 +17,8 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     homepage = "http://avarice.sourceforge.net/";
-    description = "A program to facilitate AVR debugging using an Atmel or AVR ICE";
+    description =
+      "A program to facilitate AVR debugging using an Atmel or AVR ICE";
     license = licenses.gpl2;
     platforms = platforms.unix;
     maintainers = [ maintainers.artemist ];

externals/packages/hll2300d/default.nix

@@ -1,18 +1,20 @@
-{ stdenv, lib, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file, a2ps, coreutils, gawk, perl, gnugrep, which }:
+{ stdenv, lib, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file
+, a2ps, coreutils, gawk, perl, gnugrep, which }:
 let
   version = "3.2.0-1";
   lprdeb = fetchurl {
-    url = "https://download.brother.com/welcome/dlf101900/hll2300dlpr-${version}.i386.deb";
+    url =
+      "https://download.brother.com/welcome/dlf101900/hll2300dlpr-${version}.i386.deb";
     sha256 = "093ya7qykhk8mnbiwz1wy0qly66mmk0ghd1rgla25biask5nnmwv";
   };
 
   cupsdeb = fetchurl {
-    url = "https://download.brother.com/welcome/dlf101901/hll2300dcupswrapper-${version}.i386.deb";
+    url =
+      "https://download.brother.com/welcome/dlf101901/hll2300dcupswrapper-${version}.i386.deb";
     sha256 = "1fylsbnxbljh517lbdr3324jsi4fwhbfh6gzrdvifg0wl20vfwqr";
   };
 
-in
+in stdenv.mkDerivation {
-stdenv.mkDerivation {
   name = "cups-brother-hll2300dw";
 
   nativeBuildInputs = [ makeWrapper ];
@@ -41,12 +43,9 @@ stdenv.mkDerivation {
       $out/opt/brother/Printers/HLL2300D/cupswrapper/paperconfigml1 \
     ; do
       wrapProgram $f \
-            --prefix PATH : ${lib.makeBinPath [
+        --prefix PATH : ${
-              coreutils
+          lib.makeBinPath [ coreutils ghostscript gnugrep gnused ]
-    ghostscript
+        }
-    gnugrep
-    gnused
-            ]}
     done
 
     mkdir -p $out/lib/cups/filter/
@@ -56,7 +55,9 @@ stdenv.mkDerivation {
     ln -s $out/opt/brother/Printers/HLL2300D/cupswrapper/brother-HLL2300D-cups-en.ppd $out/share/cups/model/
 
     wrapProgram $out/opt/brother/Printers/HLL2300D/lpd/filter_HLL2300D \
-          --prefix PATH ":" ${lib.makeBinPath [ ghostscript a2ps file gnused gnugrep coreutils which ] }
+      --prefix PATH ":" ${
+        lib.makeBinPath [ ghostscript a2ps file gnused gnugrep coreutils which ]
+      }
   '';
 
   meta = with lib; {
@@ -64,7 +65,8 @@ stdenv.mkDerivation {
     description = "Brother hl-l2300dw printer driver";
     license = licenses.unfree;
     platforms = platforms.linux;
-    downloadPage = "https://support.brother.com/g/b/downloadlist.aspx?c=de&lang=de&prod=hll2300d_us_eu_as&os=128&flang=English";
+    downloadPage =
+      "https://support.brother.com/g/b/downloadlist.aspx?c=de&lang=de&prod=hll2300d_us_eu_as&os=128&flang=English";
     maintainers = [ maintainers.artemist ];
   };
 }

externals/packages/jlink/default.nix

@@ -1,33 +1,14 @@
-{ stdenv
+{ stdenv, lib, fetchurl, autoPatchelfHook, substituteAll, qt4, fontconfig
-, lib
+, freetype, libusb, libICE, libSM, ncurses5, udev, libX11, libXext, libXcursor
-, fetchurl
+, libXfixes, libXrender, libXrandr }:
-, autoPatchelfHook
-, substituteAll
-, qt4
-, fontconfig
-, freetype
-, libusb
-, libICE
-, libSM
-, ncurses5
-, udev
-, libX11
-, libXext
-, libXcursor
-, libXfixes
-, libXrender
-, libXrandr
-}:
 let
-  conf = (lib.importJSON ./version.json).${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
+  conf = (lib.importJSON ./version.json).${stdenv.hostPlatform.system} or (throw
-in
+    "unsupported system ${stdenv.hostPlatform.system}");
-stdenv.mkDerivation rec {
+in stdenv.mkDerivation rec {
   pname = "jlink";
   version = conf.version;
 
-  src = fetchurl {
+  src = fetchurl { inherit (conf) url hash curlOpts; };
-    inherit (conf) url hash curlOpts;
-  };
 
   dontConfigure = true;
   dontBuild = true;

externals/packages/weechat-matrix-rs/default.nix

@@ -1,4 +1,5 @@
-{ stdenv, lib, rustPlatform, fetchFromGitHub, pkg-config, cmake, openssl, llvmPackages, weechat }:
+{ stdenv, lib, rustPlatform, fetchFromGitHub, pkg-config, cmake, openssl
+, llvmPackages, weechat }:
 
 rustPlatform.buildRustPackage rec {
   pname = "weechat-matrix-rs";

externals/systemd-boot-secure/default.nix

@@ -19,11 +19,15 @@ let
 
     nix = config.nix.package.out;
 
-    timeout = if config.boot.loader.timeout != null then config.boot.loader.timeout else "";
+    timeout = if config.boot.loader.timeout != null then
+      config.boot.loader.timeout
+    else
+      "";
 
     editor = if cfg.editor then "True" else "False";
 
-    configurationLimit = if cfg.configurationLimit == null then 0 else cfg.configurationLimit;
+    configurationLimit =
+      if cfg.configurationLimit == null then 0 else cfg.configurationLimit;
 
     inherit (cfg) consoleMode;
 
@@ -35,10 +39,10 @@ let
 
     signingKey = if cfg.signed then cfg.signing-key else "/no-signing-key";
 
-    signingCertificate = if cfg.signed then cfg.signing-certificate else "/no-signing-crt";
+    signingCertificate =
+      if cfg.signed then cfg.signing-certificate else "/no-signing-crt";
   };
-in
+in {
-{
 
   options.boot.loader.systemd-boot-secure = {
     enable = mkOption {
@@ -46,7 +50,8 @@ in
 
       type = types.bool;
 
-      description = "Whether to enable the systemd-boot (formerly gummiboot) EFI boot manager";
+      description =
+        "Whether to enable the systemd-boot (formerly gummiboot) EFI boot manager";
     };
 
     signed = mkOption {
@@ -154,13 +159,13 @@ in
   };
 
   config = mkIf cfg.enable {
-    assertions = [
+    assertions = [{
-      {
+      assertion =
-        assertion = (config.boot.kernelPackages.kernel.features or { efiBootStub = true; }) ? efiBootStub;
+        (config.boot.kernelPackages.kernel.features or { efiBootStub = true; })
+        ? efiBootStub;
 
       message = "This kernel does not support the EFI boot stub";
-      }
+    }];
-    ];
 
     boot.loader.grub.enable = mkDefault false;
 
@@ -171,9 +176,8 @@ in
 
       boot.loader.id = "systemd-boot";
 
-      requiredKernelConfig = with config.lib.kernelConfig; [
+      requiredKernelConfig = with config.lib.kernelConfig;
-        (isYes "EFI_STUB")
+        [ (isYes "EFI_STUB") ];
-      ];
     };
   };
 }

flake.lock

@@ -277,6 +277,7 @@
         "nixpkgs-unstable": "nixpkgs-unstable",
         "private": "private",
         "rustybar": "rustybar",
+        "utils": "utils_2",
         "wip-pinebook-pro": "wip-pinebook-pro"
       }
     },
@@ -341,6 +342,21 @@
         "type": "github"
       }
     },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "utils": {
       "locked": {
         "lastModified": 1637014545,
@@ -356,6 +372,24 @@
         "type": "github"
       }
     },
+    "utils_2": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1692799911,
+        "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "wip-pinebook-pro": {
       "flake": false,
       "locked": {

flake.nix

@@ -3,6 +3,8 @@
     nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05";
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
     nixos-hardware.url = "github:nixos/nixos-hardware";
+    utils.url = "github:numtide/flake-utils";
+
     lanzaboote = {
       url = "github:nix-community/lanzaboote/v0.3.0";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -18,7 +20,8 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    private.url = "git+ssh://git@github.com/artemist/nixos-config-private?ref=unified";
+    private.url =
+      "git+ssh://git@github.com/artemist/nixos-config-private?ref=unified";
 
     wip-pinebook-pro = {
       url = "github:samueldr/wip-pinebook-pro";
@@ -26,53 +29,46 @@
     };
   };
 
-  outputs = { self, nixpkgs, home-manager, rustybar, private, wip-pinebook-pro, nixpkgs-unstable, lanzaboote, ... } @ inputs:
+  outputs = { self, nixpkgs, home-manager, private, nixpkgs-unstable, utils, ...
+    }@inputs:
     let
-      makeSystem = conf: nixpkgs.lib.nixosSystem (nixpkgs.lib.recursiveUpdate conf
+      makeSystem = conf:
-        rec {
+        nixpkgs.lib.nixosSystem (nixpkgs.lib.recursiveUpdate conf rec {
           specialArgs = {
             inherit inputs;
-            pkgs-unstable = import nixpkgs-unstable { config.allowUnfree = true; system = conf.system; };
+            pkgs-unstable = import nixpkgs-unstable {
+              config.allowUnfree = true;
+              system = conf.system;
+            };
           };
           modules = [
             private.nixosModules.base
             home-manager.nixosModules.home-manager
-            {
+            { home-manager.extraSpecialArgs = specialArgs; }
-              home-manager.extraSpecialArgs = specialArgs;
-            }
           ] ++ (conf.modules or [ ]);
         });
-    in
+    in {
-    {
       nixosConfigurations.starlight = makeSystem {
         system = "x86_64-linux";
-        modules = [
+        modules = [ ./system/starlight private.nixosModules.starlight ];
-          ./system/starlight
-          private.nixosModules.starlight
-        ];
       };
 
       nixosConfigurations.rainbowdash = makeSystem {
         system = "x86_64-linux";
-        modules = [
+        modules = [ ./system/rainbowdash ];
-          ./system/rainbowdash
-        ];
       };
 
       nixosConfigurations.spike = makeSystem {
         system = "x86_64-linux";
-        modules = [
+        modules = [ ./system/spike ];
-          ./system/spike
-        ];
       };
 
       nixosConfigurations.mistmane = makeSystem {
         system = "aarch64-linux";
-        modules = [
+        modules = [ ./system/mistmane ];
-          ./system/mistmane
-        ];
-      };
-
       };
+    } // utils.lib.eachDefaultSystem (system:
+      let pkgs = import nixpkgs { inherit system; };
+      in { formatter = pkgs.nixfmt; });
 }
 

home/default.nix

@@ -6,15 +6,8 @@
     useGlobalPkgs = true;
   };
   home-manager.users.artemis = {
-    imports = [
+    imports =
-      ./fish.nix
+      [ ./fish.nix ./gtk.nix ./git.nix ./mpv.nix ./kitty.nix ./neovim ./ssh ];
-      ./gtk.nix
-      ./git.nix
-      ./mpv.nix
-      ./kitty.nix
-      ./neovim
-      ./ssh
-    ];
 
     home.stateVersion = config.system.stateVersion;
 

home/fish.nix

@@ -1,5 +1,4 @@
-{ ... }:
+{ ... }: {
-{
   programs.fish = {
     enable = true;
     interactiveShellInit = "set -g -x GPG_TTY (tty)";

home/git.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, ... }: {
-{
   programs.git = {
     enable = true;
     package = pkgs.gitAndTools.gitFull;
@@ -20,7 +19,8 @@
       init.defaultBranch = "canon";
       log.showSignature = true;
 
-      credential.helper = "!${pkgs.gitAndTools.pass-git-helper}/bin/pass-git-helper $@";
+      credential.helper =
+        "!${pkgs.gitAndTools.pass-git-helper}/bin/pass-git-helper $@";
       sendemail = {
         smtpServer = "smtp.fastmail.com";
         smtpUser = "me@artem.ist";

home/gtk.nix

@@ -1,10 +1,6 @@
 { ... }:
-let
+let common-gtk = { gtk-application-prefer-dark-theme = true; };
-  common-gtk = {
+in {
-    gtk-application-prefer-dark-theme = true;
-  };
-in
-{
   home.sessionVariables.GTK_THEME = "Adwaita:dark";
   gtk = {
     enable = true;

home/mpv.nix

@@ -2,10 +2,11 @@
 let
   ffmpeg_5 = pkgs.ffmpeg_5-full;
   scripts = with pkgs.mpvScripts; [ sponsorblock ];
-  mpv = pkgs.wrapMpv (pkgs.mpv-unwrapped.override { inherit ffmpeg_5; }) { inherit scripts; };
+  mpv = pkgs.wrapMpv (pkgs.mpv-unwrapped.override { inherit ffmpeg_5; }) {
-in
+    inherit scripts;
+  };
 
-{
+in {
   home.packages = [ ffmpeg_5 ];
   programs.mpv = {
     enable = true;
@@ -20,7 +21,8 @@ in
       audio-normalize-downmix = "yes";
       replaygain = "track";
 
-      script-opts-set = "sponsorblock-local_database=no,sponsorblock-skip_categories=[sponsor,intro,selfpromo]";
+      script-opts-set =
+        "sponsorblock-local_database=no,sponsorblock-skip_categories=[sponsor,intro,selfpromo]";
     };
     # Don't make this profile default since not all machines can handle it
     profiles.gpu-hq = {

home/neovim/default.nix

@@ -13,15 +13,14 @@ let
     };
     meta.homepage = "https://github.com/folke/lsp-colors.nvim";
   };
-in
+in {
-{
   programs.neovim = {
     enable = true;
     vimAlias = true;
-    extraConfig = (builtins.replaceStrings
+    extraConfig = (builtins.replaceStrings [ "{{CLANGDPATH}}" "{{JLSPATH}}" ] [
-      [ "{{CLANGDPATH}}" "{{JLSPATH}}" ]
+      "${pkgs.clang-tools}/bin/clangd"
-      [ "${pkgs.clang-tools}/bin/clangd" "${pkgs.java-language-server}/bin/java-language-server" ]
+      "${pkgs.java-language-server}/bin/java-language-server"
-      (builtins.readFile ./init.vim));
+    ] (builtins.readFile ./init.vim));
     plugins = with pkgs.vimPlugins; [
       editorconfig-vim
       fzf-vim

home/sway.nix

@@ -18,20 +18,15 @@ let
     F11 = "21";
     F12 = "22";
   };
-  extraGotoBindings = lib.mapAttrs'
+  extraGotoBindings = lib.mapAttrs' (name: value: {
-    (name: value: {
     name = "${mod}+${name}";
     value = "workspace ${value}";
-    })
+  }) extraWorkspaces;
-    extraWorkspaces;
+  extraMoveBindings = lib.mapAttrs' (name: value: {
-  extraMoveBindings = lib.mapAttrs'
-    (name: value: {
     name = "${mod}+Shift+${name}";
     value = "move container to workspace ${value}";
-    })
+  }) extraWorkspaces;
-    extraWorkspaces;
+in {
-in
-{
   home.sessionVariables = {
     MOZ_USE_XINPUT2 = 1;
     _JAVA_AWT_WM_NONREPARENTING = 1;
@@ -60,8 +55,14 @@ in
 
       startup = [
         { command = "mako"; }
-        { command = "dbus-update-activation-environment --systemd --all"; always = true; }
+        {
-        { command = "swayidle -w before-sleep 'swaylock -f' timeout 600 'swaylock -f' timeout 660 'swaymsg \"output * dpms off\"' resume 'swaymsg \"output * dpms on\"'"; }
+          command = "dbus-update-activation-environment --systemd --all";
+          always = true;
+        }
+        {
+          command =
+            "swayidle -w before-sleep 'swaylock -f' timeout 600 'swaylock -f' timeout 660 'swaymsg \"output * dpms off\"' resume 'swaymsg \"output * dpms on\"'";
+        }
       ];
 
       # I have to set these to something and can't set them to existing uses
@@ -69,8 +70,7 @@ in
       down = "Mod1+Down";
       up = "Mod1+Up";
       right = "Mod1+Right";
-      keybindings = lib.mkOptionDefault
+      keybindings = lib.mkOptionDefault ({
-        ({
         "${mod}+Shift+d" = "exec wofi -I -i -S drun";
         "${mod}+j" = "move workspace to left";
         "${mod}+k" = "move workspace to right";
@@ -82,8 +82,10 @@ in
         "XF86AudioMute" = "exec pactl set-sink-mute 0 toggle";
         "XF86MonBrightnessUp" = "exec light -A 5";
         "XF86MonBrightnessDown" = "exec light -U 5";
-          "Print" = "exec grim \"$(xdg-user-dir PICTURES)/Screenshot/$(date +'%F %H-%M-%S-%N_screenshot.png')\"";
+        "Print" = ''
-          "Shift+Print" = "exec grim -g \"$(slurp)\" \"$(xdg-user-dir PICTURES)/Screenshot/$(date +'%F %H-%M-%S-%N_screenshot.png')\"";
+          exec grim "$(xdg-user-dir PICTURES)/Screenshot/$(date +'%F %H-%M-%S-%N_screenshot.png')"'';
+        "Shift+Print" = ''
+          exec grim -g "$(slurp)" "$(xdg-user-dir PICTURES)/Screenshot/$(date +'%F %H-%M-%S-%N_screenshot.png')"'';
       } // extraGotoBindings // extraMoveBindings);
 
       floating.titlebar = true;
@@ -97,7 +99,11 @@ in
           background = "#000000d0";
           statusline = "#ffffff";
           separator = "#aaaaaa";
-          inactiveWorkspace = { border = "#000000d0"; background = "#323232d0"; text = "#ffffffd0"; };
+          inactiveWorkspace = {
+            border = "#000000d0";
+            background = "#323232d0";
+            text = "#ffffffd0";
+          };
         };
       }];
     };

sets/base.nix

@@ -47,5 +47,10 @@
   security.sudo.execWheelOnly = true;
 
   systemd.extraConfig = "DefaultLimitCORE=infinity";
-  security.pam.loginLimits = [{ domain = "*"; item = "core"; type = "hard"; value = "infinity"; }];
+  security.pam.loginLimits = [{
+    domain = "*";
+    item = "core";
+    type = "hard";
+    value = "infinity";
+  }];
 }

sets/buildMachines.nix

@@ -2,14 +2,12 @@
 
 {
   nix = {
-    buildMachines = [
+    buildMachines = [{
-      {
       hostName = "starlight";
       supportedFeatures = [ "kvm" "big-parallel" "benchmark" "nixos-text" ];
       system = "x86_64-linux";
       maxJobs = 2;
-      }
+    }];
-    ];
     distributedBuilds = true;
     extraOptions = ''
       builders-use-substitutes = true

sets/disc.nix

@@ -1,10 +1,7 @@
 { pkgs, ... }:
 
 {
-  environment.systemPackages = with pkgs; [
+  environment.systemPackages = with pkgs; [ cyanrip makemkv ];
-    cyanrip
-    makemkv
-  ];
 
   # Needed for MakeMKV
   boot.kernelModules = [ "sg" ];

sets/fpga.nix

@@ -1,9 +1,8 @@
 { pkgs, ... }:
 
 {
-  services.udev.packages = [
+  services.udev.packages =
-    (pkgs.callPackage ../externals/rules/fpga.nix { })
+    [ (pkgs.callPackage ../externals/rules/fpga.nix { }) ];
-  ];
   environment.systemPackages = with pkgs; [
     # Synthesis
     icestorm

sets/hardware.nix

@@ -1,8 +1,6 @@
 { config, pkgs, pkgs-unstable, ... }:
-let
+let jlink = pkgs.callPackage ../externals/packages/jlink { };
-  jlink = pkgs.callPackage ../externals/packages/jlink { };
+in {
-in
-{
   services.udev.packages = [
     (pkgs.callPackage ../externals/rules/adafruit.nix { })
     (pkgs.callPackage ../externals/rules/limesuite.nix { })

sets/ime.nix

@@ -10,7 +10,8 @@
   # Required for support in kitty, ibus/fcitx5 are somewhat compatible so this works
   environment.variables.GLFW_IM_MODULE = "ibus";
 
-  home-manager.users.artemis.wayland.windowManager.sway.config.startup = [
+  home-manager.users.artemis.wayland.windowManager.sway.config.startup = [{
-    { command = "fcitx5 -d --replace"; always = true; }
+    command = "fcitx5 -d --replace";
-  ];
+    always = true;
+  }];
 }

sets/kernelpatch.nix

@@ -3,9 +3,9 @@
 {
   boot.kernelPatches = [{
     name = "fix-execve";
-    patch = pkgs.fetchpatch
+    patch = pkgs.fetchpatch {
-      {
+      url =
-        url = "https://git.alpinelinux.org/aports/plain/main/linux-lts/0001-fs-exec-require-argv-0-presence-in-do_execveat_commo.patch?id=520e6dfd6e814414ab7cf862b897ca6ba427d30f";
+        "https://git.alpinelinux.org/aports/plain/main/linux-lts/0001-fs-exec-require-argv-0-presence-in-do_execveat_commo.patch?id=520e6dfd6e814414ab7cf862b897ca6ba427d30f";
       sha256 = "sha256-vrN64lGDiAFgMn5SGWiI9MwNRct4m9DJDxokFZ6EpiE=";
     };
   }];

sets/laptop.nix

@@ -1,9 +1,7 @@
 { config, pkgs, ... }:
 
 {
-  imports = [
+  imports = [ ./wifi.nix ];
-    ./wifi.nix
-  ];
 
   services = {
     tlp.enable = true;
@@ -12,7 +10,6 @@
   programs.light.enable = true;
   users.users.artemis.extraGroups = [ "video" ];
 
-  environment.systemPackages = with pkgs; [
+  environment.systemPackages = with pkgs;
-    config.boot.kernelPackages.cpupower
+    [ config.boot.kernelPackages.cpupower ];
-  ];
 }

sets/packages.nix

@@ -1,5 +1,4 @@
-{ config, pkgs, pkgs-unstable, lib, ... }:
+{ config, pkgs, pkgs-unstable, lib, ... }: {
-{
   environment.systemPackages = (with pkgs; [
     # Audiovisual
     pkgs-unstable.darktable
@@ -117,10 +116,8 @@
     hicolor-icon-theme
 
     # Dictionaries
-  ]) ++ (with pkgs.hunspellDicts; [
+  ]) ++ (with pkgs.hunspellDicts; [ en-us-large de_DE ])
-    en-us-large
+    ++ (lib.optionals (pkgs.system == "x86_64-linux") (with pkgs; [
-    de_DE
-  ]) ++ (lib.optionals (pkgs.system == "x86_64-linux") (with pkgs; [
       efibootmgr
       efitools
       sbsigntool

sets/pipewire.nix

@@ -12,8 +12,5 @@
   };
   hardware.pulseaudio.enable = lib.mkForce false;
   security.rtkit.enable = true;
-  environment.systemPackages = with pkgs; [
+  environment.systemPackages = with pkgs; [ pulseaudio qpwgraph ];
-    pulseaudio
-    qpwgraph
-  ];
 }

sets/radio.nix

@@ -1,11 +1,6 @@
 { config, pkgs, ... }:
 
 {
-  services.udev.packages = with pkgs; [
+  services.udev.packages = with pkgs; [ soapysdr-with-plugins ];
-    soapysdr-with-plugins
+  environment.systemPackages = with pkgs; [ soapysdr-with-plugins gqrx ];
-  ];
-  environment.systemPackages = with pkgs; [
-    soapysdr-with-plugins
-    gqrx
-  ];
 }

sets/sway.nix

@@ -1,5 +1,4 @@
-{ config, pkgs, pkgs-unstable, ... }:
+{ config, pkgs, pkgs-unstable, ... }: {
-{
   imports = [ ./fonts.nix ];
   security.polkit.enable = true;
   services = {
@@ -9,10 +8,7 @@
   };
   xdg.portal = {
     enable = true;
-    extraPortals = with pkgs; [
+    extraPortals = with pkgs; [ xdg-desktop-portal-gtk xdg-desktop-portal-wlr ];
-      xdg-desktop-portal-gtk
-      xdg-desktop-portal-wlr
-    ];
   };
   sound.enable = true;
   environment.systemPackages = with pkgs; [

sets/virtualization.nix

@@ -22,18 +22,36 @@
   # Breaks IPv4 on bridge
   boot.kernel.sysctl."net.bridge.bridge-nf-call-iptables" = 0;
 
-  environment.systemPackages = with pkgs; [
+  environment.systemPackages = with pkgs; [ virtmanager spice-gtk qemu ];
-    virtmanager
-    spice-gtk
-    qemu
-  ];
 
   users.users = {
     artemis.extraGroups = [ "lxd" "libvirtd" ];
     lxd = {
       isSystemUser = true;
-      subUidRanges = [{ startUid = 16777216; count = 16777216; } { startUid = config.users.users.artemis.uid; count = 1; }];
+      subUidRanges = [
-      subGidRanges = [{ startGid = 16777216; count = 16777216; } { startGid = 100; count = 1; } { startGid = config.users.groups.artemis.gid; count = 1; }];
+        {
+          startUid = 16777216;
+          count = 16777216;
+        }
+        {
+          startUid = config.users.users.artemis.uid;
+          count = 1;
+        }
+      ];
+      subGidRanges = [
+        {
+          startGid = 16777216;
+          count = 16777216;
+        }
+        {
+          startGid = 100;
+          count = 1;
+        }
+        {
+          startGid = config.users.groups.artemis.gid;
+          count = 1;
+        }
+      ];
       group = "lxd";
     };
   };

sets/wifi.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, ... }: {
-{
   services.udev.packages = [ pkgs.crda ];
   networking.networkmanager = {
     enable = true;

sets/workstation.nix

@@ -1,13 +1,7 @@
 { config, pkgs, pkgs-unstable, ... }:
 
 {
-  imports = [
+  imports = [ ./sway.nix ./packages.nix ./pipewire.nix ./base.nix ../home ];
-    ./sway.nix
-    ./packages.nix
-    ./pipewire.nix
-    ./base.nix
-    ../home
-  ];
 
   i18n.defaultLocale = "de_DE.UTF-8";
   i18n.supportedLocales = [ "all" ];
@@ -27,9 +21,7 @@
     fwupd.enable = true;
     pcscd.enable = true;
     printing.enable = true;
-    udev.packages = [
+    udev.packages = [ (pkgs.callPackage ../externals/rules/uhk.nix { }) ];
-      (pkgs.callPackage ../externals/rules/uhk.nix { })
-    ];
   };
 
   programs.ssh.startAgent = true;
@@ -44,11 +36,7 @@
     };
   };
 
-  nixpkgs.overlays = [
+  nixpkgs.overlays = [ (final: prev: { brscan5 = pkgs-unstable.brscan5; }) ];
-    (final: prev: {
-      brscan5 = pkgs-unstable.brscan5;
-    })
-  ];
 
   users.users.artemis.extraGroups = [ "scanner" ];
 }

system/mistmane/hardware-configuration.nix

@@ -4,32 +4,25 @@
 { config, lib, pkgs, modulesPath, ... }:
 
 {
-  imports =
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
-    [
-      (modulesPath + "/installer/scan/not-detected.nix")
-    ];
 
   boot.initrd.availableKernelModules = [ "usbhid" ];
   boot.initrd.kernelModules = [ "dm-snapshot" ];
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    {
     device = "/dev/disk/by-uuid/8b204d52-62c1-48e9-b487-e7138f49903a";
     fsType = "ext4";
   };
 
-  fileSystems."/boot" =
+  fileSystems."/boot" = {
-    {
     device = "/dev/disk/by-uuid/375e4660-be08-40ba-8961-0a9cc3a96187";
     fsType = "ext4";
   };
 
   swapDevices =
-    [
+    [{ device = "/dev/disk/by-uuid/1114039c-3329-4551-a56d-fccde77a31a7"; }];
-      { device = "/dev/disk/by-uuid/1114039c-3329-4551-a56d-fccde77a31a7"; }
-    ];
 
   powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
 }

system/rainbowdash/default.nix

@@ -24,10 +24,19 @@
   # Home
   home-manager.users.artemis = {
     wayland.windowManager.sway.config = {
-      output."eDP-1" = { mode = "3840x2400@59.994Hz"; scale = "2"; };
+      output."eDP-1" = {
+        mode = "3840x2400@59.994Hz";
+        scale = "2";
+      };
       input."1386:18753:Wacom_HID_4941_Finger".map_to_output = "eDP-1";
-      input."1739:52710:DLL096D:01_06CB:CDE6_Touchpad" = { middle_emulation = "enabled"; click_method = "clickfinger"; };
+      input."1739:52710:DLL096D:01_06CB:CDE6_Touchpad" = {
-      startup = [{ command = "swayidle -w before-sleep 'light -O' after-resume 'light -I'"; always = true; }];
+        middle_emulation = "enabled";
+        click_method = "clickfinger";
+      };
+      startup = [{
+        command = "swayidle -w before-sleep 'light -O' after-resume 'light -I'";
+        always = true;
+      }];
     };
     xdg.configFile."rustybar/config.toml".text = ''
       [[tile]]
@@ -44,14 +53,10 @@
     '';
   };
 
-  services.printing.drivers = with pkgs; [
+  services.printing.drivers = with pkgs; [ cups-dymo ];
-    cups-dymo
-  ];
 
   # Not in nixos-hardware for some reason
-  hardware.opengl.extraPackages = with pkgs; [
+  hardware.opengl.extraPackages = with pkgs; [ intel-compute-runtime ];
-    intel-compute-runtime
-  ];
 
   boot.blacklistedKernelModules = [ "psmouse" ];
   services.thermald.enable = true;

system/rainbowdash/hardware-configuration.nix

@@ -4,32 +4,27 @@
 { config, lib, pkgs, modulesPath, ... }:
 
 {
-  imports =
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
-    [
-      (modulesPath + "/installer/scan/not-detected.nix")
-    ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "sdhci_pci" ];
+  boot.initrd.availableKernelModules =
+    [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "sdhci_pci" ];
   boot.initrd.kernelModules = [ "dm-snapshot" ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    {
     device = "/dev/mapper/rainbowdash-root";
     fsType = "btrfs";
     options = [ "subvol=root" ];
   };
 
-  fileSystems."/home" =
+  fileSystems."/home" = {
-    {
     device = "/dev/mapper/rainbowdash-root";
     fsType = "btrfs";
     options = [ "subvol=home" ];
   };
 
-  fileSystems."/boot" =
+  fileSystems."/boot" = {
-    {
     device = "/dev/disk/by-uuid/642D-02DF";
     fsType = "vfat";
   };
@@ -39,5 +34,6 @@
 
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
   # High-DPI console
-  console.font = lib.mkDefault "${pkgs.terminus_font}/share/consolefonts/ter-u28n.psf.gz";
+  console.font =
+    lib.mkDefault "${pkgs.terminus_font}/share/consolefonts/ter-u28n.psf.gz";
 }

system/spike/default.nix

@@ -30,7 +30,11 @@
   '';
 
   home-manager.users.artemis.wayland.windowManager.sway.config = {
-    output."DSI-1" = { pos = "0 0"; mode = "720x1280@60.083Hz"; transform = "90"; };
+    output."DSI-1" = {
+      pos = "0 0";
+      mode = "720x1280@60.083Hz";
+      transform = "90";
+    };
     input."24704:32865:AMR-4630-XXX-0-_0-1023_USB_KEYBOARD_Mouse" = {
       scroll_method = "on_button_down";
       scroll_button = "BTN_MIDDLE";

system/spike/hardware-configuration.nix

@@ -4,39 +4,33 @@
 { config, lib, pkgs, modulesPath, ... }:
 
 {
-  imports =
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
-    [
-      (modulesPath + "/installer/scan/not-detected.nix")
-    ];
 
-  boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ];
+  boot.initrd.availableKernelModules =
+    [ "ahci" "xhci_pci" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ];
   boot.initrd.kernelModules = [ "dm-snapshot" ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    {
     device = "/dev/disk/by-uuid/ee50d2d7-34ee-4fec-bee8-53ae5f464de2";
     fsType = "btrfs";
     options = [ "subvol=root" ];
   };
 
-  fileSystems."/home" =
+  fileSystems."/home" = {
-    {
     device = "/dev/disk/by-uuid/ee50d2d7-34ee-4fec-bee8-53ae5f464de2";
     fsType = "btrfs";
     options = [ "subvol=home" ];
   };
 
-  fileSystems."/nix" =
+  fileSystems."/nix" = {
-    {
     device = "/dev/disk/by-uuid/ee50d2d7-34ee-4fec-bee8-53ae5f464de2";
     fsType = "btrfs";
     options = [ "subvol=nix" ];
   };
 
-  fileSystems."/boot" =
+  fileSystems."/boot" = {
-    {
     device = "/dev/disk/by-uuid/B78C-8B71";
     fsType = "vfat";
   };

system/starlight/boot-config.nix

@@ -1,8 +1,13 @@
 { config, pkgs, pkgs-unstable, ... }:
 let
-  net_opts = [ "x-systemd.automount" "noauto" "x-systemd.idle-timeout=60" "x-systemd.device-timeout=5s" "x-systemd.mount-timeout=5s" ];
+  net_opts = [
-in
+    "x-systemd.automount"
-{
+    "noauto"
+    "x-systemd.idle-timeout=60"
+    "x-systemd.device-timeout=5s"
+    "x-systemd.mount-timeout=5s"
+  ];
+in {
   imports = [ ../../externals/systemd-boot-secure ];
   boot = {
     kernelPackages = pkgs-unstable.linuxPackages_latest;

system/starlight/default.nix

@@ -96,9 +96,8 @@
     }))
   ];
 
-  services.udev.packages = [
+  services.udev.packages =
-    (pkgs.callPackage ../../externals/rules/m1n1.nix { })
+    [ (pkgs.callPackage ../../externals/rules/m1n1.nix { }) ];
-  ];
 
   hardware.opengl.extraPackages = with pkgs; [ vulkan-validation-layers ];
 
@@ -106,9 +105,21 @@
   home-manager.users.artemis = {
     programs.mpv.defaultProfiles = [ "gpu-hq" ];
     wayland.windowManager.sway.config.output = {
-      "DP-1" = { pos = "0 0"; mode = "3840x2160@59.997Hz"; scale = "2"; };
+      "DP-1" = {
-      "DP-2" = { pos = "1920 0"; mode = "3840x2160@59.997Hz"; scale = "2"; };
+        pos = "0 0";
-      "DP-3" = { pos = "3840 0"; mode = "3840x2160@60Hz"; scale = "2"; };
+        mode = "3840x2160@59.997Hz";
+        scale = "2";
+      };
+      "DP-2" = {
+        pos = "1920 0";
+        mode = "3840x2160@59.997Hz";
+        scale = "2";
+      };
+      "DP-3" = {
+        pos = "3840 0";
+        mode = "3840x2160@60Hz";
+        scale = "2";
+      };
     };
     # no toTOML generator so I guess we have to do this
     xdg.configFile."rustybar/config.toml".text = ''

system/starlight/hardware-configuration.nix

@@ -4,88 +4,74 @@
 { config, lib, pkgs, modulesPath, ... }:
 
 {
-  imports =
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
-    [
-      (modulesPath + "/installer/scan/not-detected.nix")
-    ];
 
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.availableKernelModules =
+    [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
   boot.initrd.kernelModules = [ "dm-snapshot" ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    {
     device = "/dev/disk/by-uuid/aca21111-a488-4bc7-90a7-e61517c24818";
     fsType = "btrfs";
     options = [ "subvol=root" ];
   };
 
-  fileSystems."/nix" =
+  fileSystems."/nix" = {
-    {
     device = "/dev/disk/by-uuid/aca21111-a488-4bc7-90a7-e61517c24818";
     fsType = "btrfs";
     options = [ "subvol=nix" ];
   };
 
-  fileSystems."/boot" =
+  fileSystems."/boot" = {
-    {
     device = "/dev/disk/by-uuid/1AC2-9317";
     fsType = "vfat";
   };
 
-  fileSystems."/home" =
+  fileSystems."/home" = {
-    {
     device = "/dev/disk/by-uuid/aca21111-a488-4bc7-90a7-e61517c24818";
     fsType = "btrfs";
     options = [ "subvol=home" ];
   };
 
-  fileSystems."/media/data" =
+  fileSystems."/media/data" = {
-    {
     device = "/dev/disk/by-uuid/c01b98d1-1eb9-42ce-8d05-4b9d852fca55";
     fsType = "btrfs";
   };
 
-  fileSystems."/var/lib/lxd/shmounts" =
+  fileSystems."/var/lib/lxd/shmounts" = {
-    {
     device = "tmpfs";
     fsType = "tmpfs";
   };
 
-  fileSystems."/var/lib/lxd/devlxd" =
+  fileSystems."/var/lib/lxd/devlxd" = {
-    {
     device = "tmpfs";
     fsType = "tmpfs";
   };
 
-  fileSystems."/var/lib/lxd/storage-pools/default" =
+  fileSystems."/var/lib/lxd/storage-pools/default" = {
-    {
     device = "/dev/disk/by-uuid/aca21111-a488-4bc7-90a7-e61517c24818";
     fsType = "btrfs";
     options = [ "subvol=root/var/lib/lxd/storage-pools/default" ];
   };
 
-  fileSystems."/media/luna/photos" =
+  fileSystems."/media/luna/photos" = {
-    {
     device = "10.69.0.69:/media/tank/photos";
     fsType = "nfs4";
   };
 
-  fileSystems."/media/luna/games" =
+  fileSystems."/media/luna/games" = {
-    {
     device = "10.69.0.69:/media/tank/games";
     fsType = "nfs4";
   };
 
-  fileSystems."/media/luna/media" =
+  fileSystems."/media/luna/media" = {
-    {
     device = "10.69.0.69:/media/tank/media";
     fsType = "nfs4";
   };
 
-  fileSystems."/media/luna/private" =
+  fileSystems."/media/luna/private" = {
-    {
     device = "10.69.0.69:/media/tank/users/artemis";
     fsType = "nfs4";
   };

system/starlight/scripts.nix

@@ -4,8 +4,7 @@ let
     #! ${pkgs.runtimeShell}
     PATH=${pkgs.sway}/bin
   '';
-in
+in {
-{
   home-manager.users.artemis.home.packages = [
     (pkgs.writeScriptBin "work" ''
       ${swayPrelude}