Formatting pass with alejandra

H0615.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   imports = [
     ./home
     ./common.nix

J0162.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   imports = [
     ./home
     ./common.nix

Vanguard.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   imports = [
     ./home
     ./common.nix
@@ -18,7 +17,10 @@
   networking.hostName = "Vanguard"; # Define your hostname.
   #networking.wireless.networks."LAN LAN Ranch".pskRaw = "d4c31e976456783b61d573ee49c94f93914a81bf1048c2f2e1e166c36bdfcd4a";
   networking.nameservers = ["192.168.1.166" "9.9.9.9"];
-  networking.firewall = { enable = true; allowedTCPPorts = [ 22 ]; };
+  networking.firewall = {
+    enable = true;
+    allowedTCPPorts = [22];
+  };
 
   users.users.xenia = {
     isNormalUser = true;

common.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   nix.settings.experimental-features = ["nix-command" "flakes"];
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;

desktop/hyprland.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   nixpkgs.overlays = [
     (self: super: {
       waybar = super.waybar.overrideAttrs (oldAttrs: {

desktop/i3.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   imports = [
     ./xserver.nix
     ./sddm.nix

desktop/pkgs/sddm-catppuccin-macchiato.nix

@@ -1,5 +1,7 @@
-{ stdenv, fetchFromGitHub }:
 {
+  stdenv,
+  fetchFromGitHub,
+}: {
   sddm-catppuccin-macchiato = stdenv.mkDerivation rec {
     pname = "sddm-catppuccin-macchiato-theme";
     version = "1.0";

desktop/plasma.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   imports = [./xserver.nix ./sddm.nix];
   services.xserver.desktopManager.plasma5.enable = true;
   programs.kdeconnect.enable = true;

desktop/sddm.nix

@@ -1,8 +1,6 @@
-{ pkgs, ... }:
+{pkgs, ...}: let
-let
   sddm-catppuccin-macchiato = pkgs.callPackage ./pkgs/sddm-catppuccin-macchiato.nix {};
-in
+in {
-{
   environment.systemPackages = [
     sddm-catppuccin-macchiato.sddm-catppuccin-macchiato
   ];

desktop/steam.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   environment.systemPackages = [pkgs.mesa];
   programs.gamescope.enable = true;
   programs.steam = {

desktop/xfce-bspwm.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   imports = [
     ./xserver.nix
     ./sddm.nix

desktop/xfce.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   imports = [
     ./xserver.nix
     ./sddm.nix

desktop/xserver.nix

@@ -1,5 +1,4 @@
-{ ... }:
+{...}: {
-{
   services.xserver = {
     enable = true;
     layout = "gb";

hardware/audio.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   # Enable sound with pipewire.
   sound.enable = true;
   hardware.pulseaudio.enable = false;

hardware/bluetooth.nix

@@ -1,5 +1,4 @@
-{ ... }:
+{...}: {
-{
   hardware.bluetooth = {
     enable = true;
     powerOnBoot = true;

home/Monarch/tux.nix

@@ -1,5 +1,4 @@
-{ ... }:
+{...}: {
-{
   imports = [
     ../env
     ../tui

home/default.nix

@@ -1,5 +1,3 @@
-{ ... }:
+{...}: let
-let
   home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/master.tar.gz";
-in
+in {imports = [(import "${home-manager}/nixos")];}
-{ imports = [ (import "${home-manager}/nixos") ]; }

home/desktop/bspwm.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   home.packages = with pkgs; [
     nitrogen
     polybar
@@ -37,6 +36,6 @@
       "Bitwarden".desktop = "^7";
       "Nxplayer.bin".desktop = "^8";
     };
-    extraConfig = builtins.readFile (./config/bspwm/startup.sh);
+    extraConfig = builtins.readFile ./config/bspwm/startup.sh;
   };
 }

home/desktop/dunst.nix

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

home/desktop/eww.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   home.packages = with pkgs; [
     jq
     socat

home/desktop/gtk.nix

@@ -1,5 +1,8 @@
-{ pkgs, config, ... }:
 {
+  pkgs,
+  config,
+  ...
+}: {
   gtk = {
     enable = true;
     cursorTheme = {

home/desktop/hyprland.nix

@@ -1,12 +1,12 @@
-{ pkgs, ... }:
+{pkgs, ...}: let
-let
   flake-compat = builtins.fetchTarball "https://github.com/edolstra/flake-compat/archive/master.tar.gz";
 
-  hyprland = (import flake-compat {
+  hyprland =
+    (import flake-compat {
       src = builtins.fetchTarball "https://github.com/hyprwm/Hyprland/archive/2df0d034bc4a18fafb3524401eeeceaa6b23e753.tar.gz";
-  }).defaultNix;
+    })
-in
+    .defaultNix;
-{
+in {
   imports = [
     hyprland.homeManagerModules.default
     ./swaylock.nix
@@ -29,6 +29,9 @@ in
   xdg.configFile."hypr/window-rules.conf".source = ./config/hypr/window-rules.conf;
   wayland.windowManager.hyprland = {
     enable = true;
-    xwayland = { enable = true; hidpi = true; };
+    xwayland = {
+      enable = true;
+      hidpi = true;
+    };
   };
 }

home/desktop/picom.nix

@@ -1,5 +1,4 @@
-{ ... }:
+{...}: {
-{
   services.picom = {
     enable = true;
     backend = "glx";

home/desktop/polybar.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   home.packages = with pkgs; [bluez];
   services.polybar = {
     enable = true;

home/desktop/rofi.nix

@@ -1,9 +1,7 @@
-{ pkgs, ... }:
+{pkgs, ...}: let
-let
   powermenu = pkgs.writeShellScriptBin "powermenu" (builtins.readFile ./scripts/powermenu);
   power-profiles = pkgs.writeShellScriptBin "power-profiles" (builtins.readFile ./scripts/power-profiles);
-in
+in {
-{
   imports = [../gui/foot.nix];
   home.packages = with pkgs; [papirus-icon-theme powermenu power-profiles];
   programs.rofi = {

home/desktop/sway.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   #xdg.configFile."sway".source = ./config/sway;
   home.packages = with pkgs; [brightnessctl];
   wayland.windowManager.sway = {enable = true;};

home/desktop/swaylock.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   programs.swaylock = {
     enable = true;
     package = pkgs.swaylock-effects;

home/desktop/sxhkd.nix

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

home/desktop/waybar.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   home.packages = with pkgs; [
     (nerdfonts.override {fonts = ["FiraCode"];})
     bluez

home/desktop/xfce.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   imports = [
     ./gtk.nix
     ./bspwm.nix

home/desktop/xresources.nix

@@ -1,6 +1,6 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
+  xresources.extraConfig =
-  xresources.extraConfig = builtins.readFile
+    builtins.readFile
     (
       pkgs.fetchFromGitHub
       {
@@ -8,14 +8,18 @@
         repo = "xresources";
         rev = "d82c02323e05158ad35f302771e3695affafab78";
         sha256 = "irRQPjvcTH6AUC07Sm2l77CkrZQNHNJXxBDBSIhl1Fg=";
-        } + "/macchiato.Xresources"
+      }
-    ) + "\n" + builtins.readFile (
+      + "/macchiato.Xresources"
+    )
+    + "\n"
+    + builtins.readFile (
       pkgs.fetchFromGitHub
       {
         owner = "catppuccin";
         repo = "urxvt";
         rev = "ccd8eb763edd0a382b5e9bbfbd9697c4d4129edf";
         sha256 = "YFlSGJzWWB57eSXiUY4l/mSBbOY0an+qej6//YLSiuE=";
-      } + "/macchiato.Xresources"
+      }
+      + "/macchiato.Xresources"
     );
 }

home/env/bash.nix

@@ -1,6 +1,4 @@
-{ ... }:
+{...}: {
-
-{
   programs.bash = {
     enable = true;
     shellAliases = {

home/env/bat.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   programs.bat = {
     enable = true;
     config = {
@@ -12,7 +11,8 @@
           repo = "bat";
           rev = "ba4d16880d63e656acced2b7d4e034e4a93f74b1";
           sha256 = "6WVKQErGdaqb++oaXnY3i6/GuH2FhTgK0v4TN4Y0Wbw=";
-        } + "/Catppuccin-macchiato.tmTheme");
+        }
+        + "/Catppuccin-macchiato.tmTheme");
     };
   };
 }

home/env/default.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   imports = [
     ./bash.nix
     ./bat.nix

home/env/direnv.nix

@@ -1,4 +1,3 @@
-{ ... }:
+{...}: {
-{
   programs.direnv.enable = true;
 }

home/env/fish.nix

@@ -1,6 +1,4 @@
-{ ... }:
+{...}: {
-
-{
   programs.fish = {
     enable = true;
     shellAbbrs = {

home/env/keychain.nix

@@ -1,5 +1,4 @@
-{ ... }:
+{...}: {
-{
   programs.keychain = {
     enable = true;
     extraFlags = ["--quiet" "--noask" "--ignore-missing"];

home/env/nix-index.nix

@@ -1,4 +1,3 @@
-{ ... }:
+{...}: {
-{
   programs.nix-index.enable = true;
 }

home/env/readline.nix

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

home/env/starship.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   home.packages = with pkgs; [(nerdfonts.override {fonts = ["FiraCode"];})];
   xdg.configFile."starship.toml".source = ./config/starship.toml;
   programs.starship.enable = true;

home/env/zsh.nix

@@ -1,6 +1,4 @@
-{ config, ... }:
+{config, ...}: {
-
-{
   programs.zsh = {
     enable = true;
     shellAliases = {

home/git/common.nix

@@ -1,5 +1,4 @@
-{ ... }:
+{...}: {
-{
   programs.git = {
     enable = true;
     userName = "Evie Litherland-Smith";

home/git/personal.nix

@@ -1,5 +1,4 @@
-{ ... }:
+{...}: {
-{
   imports = [./common.nix];
   programs.git.userEmail = "evie@xenia.me.uk";
 }

home/git/work.nix

@@ -1,5 +1,4 @@
-{ ... }:
+{...}: {
-{
   imports = [./common.nix];
   programs.git.userEmail = "evie.litherland-smith@ukaea.uk";
 }

home/gui/default.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   imports = [./wezterm.nix];
   programs.firefox.enable = true;
   programs.librewolf.enable = true;

home/gui/foot.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   home.packages = with pkgs; [(nerdfonts.override {fonts = ["FiraCode"];})];
   programs.foot = {
     enable = true;

home/gui/kitty.nix

@@ -1,6 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-
-{
   programs.kitty = {
     enable = true;
     font = {

home/gui/urxvt.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   home.packages = with pkgs; [(nerdfonts.override {fonts = ["FiraCode"];})];
   programs.urxvt = {
     enable = true;

home/gui/wezterm.nix

@@ -1,5 +1,4 @@
-{ ... }:
+{...}: {
-{
   programs.wezterm = {
     enable = true;
     extraConfig = ''

home/personal.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   imports = [
     ./env
     ./gui

home/ssh/common.nix

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

home/ssh/personal.nix

@@ -1,5 +1,4 @@
-{ lib, ... }:
+{lib, ...}: {
-{
   imports = [./common.nix];
   programs.ssh.matchBlocks = {
     "vanguard" = {user = "xenia";};

home/ssh/work.nix

@@ -1,5 +1,8 @@
-{ pkgs, lib, ... }:
 {
+  pkgs,
+  lib,
+  ...
+}: {
   imports = [./common.nix];
   home.packages = with pkgs; [sshfs];
   programs.ssh.matchBlocks = {

home/tui/default.nix

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

home/tui/lazygit.nix

@@ -1,6 +1,4 @@
-{ ... }:
+{...}: {
-
-{
   programs.lazygit = {
     enable = true;
     settings = import ./config/lazygit.nix;

home/tui/tmux.nix

@@ -1,17 +1,20 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   imports = [./common.nix];
   programs.tmux = {
     enable = true;
     clock24 = true;
-    extraConfig = builtins.readFile (./config/tmux.conf) + "\n" + builtins.readFile (
+    extraConfig =
+      builtins.readFile ./config/tmux.conf
+      + "\n"
+      + builtins.readFile (
         pkgs.fetchFromGitHub
         {
           owner = "catppuccin";
           repo = "tmux";
           rev = "4e48b09a76829edc7b55fbb15467cf0411f07931";
           sha256 = "bXEsxt4ozl3cAzV3ZyvbPsnmy0RAdpLxHwN82gvjLdU=";
-        } + "/catppuccin-macchiato.tmuxtheme"
+        }
+        + "/catppuccin-macchiato.tmuxtheme"
       );
   };
 }

home/work.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   imports = [
     ./env
     ./gui

locales/en_GB.nix

@@ -1,5 +1,8 @@
-{ config, pkgs, ... }:
 {
+  config,
+  pkgs,
+  ...
+}: {
   # Set your time zone.
   time.timeZone = "Europe/London";
 

server/adguardhome.nix

@@ -1,5 +1,4 @@
-{ ... }:
+{...}: {
-{
   imports = [./traefik.nix];
   services.adguardhome = {
     enable = true;
@@ -12,7 +11,11 @@
     allowedUDPPorts = [53];
   };
   services.traefik.dynamicConfigOptions.http = {
-    routers.adguard = { rule = "Host(`guard.xenia.me.uk`)"; service = "adguard-webinterface"; tls = { certResolver = "default"; }; };
+    routers.adguard = {
+      rule = "Host(`guard.xenia.me.uk`)";
+      service = "adguard-webinterface";
+      tls = {certResolver = "default";};
+    };
     services.adguard-webinterface.loadBalancer.servers = [{url = "http://localhost:3001";}];
   };
 }

server/fail2ban.nix

@@ -1,5 +1,4 @@
-{ ... }:
+{...}: {
-{
   services.fail2ban = {
     enable = true;
     ignoreIP = ["127.0.0.1/8" "::1" "192.168.1.0/16"];

server/gitea.nix

@@ -1,5 +1,4 @@
-{ ... }:
+{...}: {
-{
   imports = [./traefik.nix ./fail2ban.nix];
   services.gitea = {
     enable = true;
@@ -15,7 +14,11 @@
   };
   networking.firewall.allowedTCPPorts = [80 443 2222];
   services.traefik.dynamicConfigOptions.http = {
-    routers.gitea = { rule = "Host(`git.xenia.me.uk`)"; service = "gitea-websecure"; tls = { certResolver = "default"; }; };
+    routers.gitea = {
+      rule = "Host(`git.xenia.me.uk`)";
+      service = "gitea-websecure";
+      tls = {certResolver = "default";};
+    };
     services.gitea-websecure.loadBalancer.servers = [{url = "http://localhost:3000";}];
   };
   services.fail2ban.jails.gitea = ''

server/nextcloud.nix

@@ -1,5 +1,8 @@
-{ pkgs, config, ... }:
 {
+  pkgs,
+  config,
+  ...
+}: {
   imports = [./traefik.nix ./fail2ban.nix];
   services.nextcloud = {
     enable = true;
@@ -10,7 +13,12 @@
       adminpassFile = "/secrets/nextcloud_admin.txt";
     };
   };
-  services.nginx.virtualHosts.${config.services.nextcloud.hostName}.listen = [{ addr = "localhost"; port = 8000; }];
+  services.nginx.virtualHosts.${config.services.nextcloud.hostName}.listen = [
+    {
+      addr = "localhost";
+      port = 8000;
+    }
+  ];
   services.traefik.dynamicConfigOptions.http = {
     routers.nextcloud = {
       rule = "Host(`cloud.xenia.me.uk`)";

server/sshd.nix

@@ -1,5 +1,4 @@
-{ ... }:
+{...}: {
-{
   services.openssh = {
     enable = true;
     ports = [2222];

server/traefik.nix

@@ -1,5 +1,4 @@
-{ ... }:
+{...}: {
-{
   imports = [./fail2ban.nix];
   services.traefik = {
     enable = true;
@@ -20,11 +19,18 @@
       };
     };
     dynamicConfigOptions.http = {
-      routers.traefik = { rule = "Host(`traefik.xenia.me.uk`)"; service = "traefik-webinterface"; tls = { certResolver = "default"; }; };
+      routers.traefik = {
+        rule = "Host(`traefik.xenia.me.uk`)";
+        service = "traefik-webinterface";
+        tls = {certResolver = "default";};
+      };
       services.traefik-webinterface.loadBalancer.servers = [{url = "http://localhost:8080";}];
     };
   };
-  networking.firewall = { enable = true; allowedTCPPorts = [ 80 443 8080 ]; };
+  networking.firewall = {
+    enable = true;
+    allowedTCPPorts = [80 443 8080];
+  };
   services.fail2ban.jails.traefik = ''
     enabled = true
     filter = traefik-auth

syncthing/H0615.nix

@@ -1,5 +1,4 @@
-{ ... }:
+{...}: {
-{
   imports = [./default.nix ./devices/ion.nix];
   services.syncthing = {
     user = "elitherl";

syncthing/Vanguard.nix

@@ -1,5 +1,4 @@
-{ ... }:
+{...}: {
-{
   imports = [
     ./default.nix
     ./devices/ion.nix

syncthing/default.nix

@@ -1,5 +1,4 @@
-{ lib, ... }:
+{lib, ...}: {
-{
   imports = [./folders];
   services.syncthing = {
     enable = true;

syncthing/devices/H0615.nix

@@ -1,4 +1,3 @@
-{ ... }:
+{...}: {
-{
   services.syncthing.devices."H0615" = {id = "VVKKUT6-DMNEJ6J-ZI2QREG-SOLG7S5-V2V6WN3-UCQH2EN-6S2XXLS-FKN6KQF";};
 }

syncthing/devices/ion.nix

@@ -1,4 +1,3 @@
-{ ... }:
+{...}: {
-{
   services.syncthing.devices."ion" = {id = "7DD4NPH-6T2ET5A-4FCLFWW-CS6UR2W-IO5XQXC-DM5B2Q4-6X7DGU2-UKKVEAB";};
 }

syncthing/devices/monarch.nix

@@ -1,4 +1,3 @@
-{ ... }:
+{...}: {
-{
   services.syncthing.devices."monarch" = {id = "CJSUZQY-67XBLEZ-VKVHQHI-BLEUZNF-G4237AV-AW44CGH-F3JDKXU-CWT3RQZ";};
 }

syncthing/devices/northstar.nix

@@ -1,4 +1,3 @@
-{ ... }:
+{...}: {
-{
   services.syncthing.devices."northstar" = {id = "DMQZNMB-BM3SSE4-5XV2GHE-IDRNFTS-QNZSICS-6JWHUCV-O3NHMWY-2OBC2QD";};
 }

syncthing/devices/remarkable.nix

@@ -1,4 +1,3 @@
-{ ... }:
+{...}: {
-{
   services.syncthing.devices."remarkable" = {id = "GHB6JKS-JOA3HHP-TYHB3IJ-GLV26QW-RWRZAMG-XYFGFB6-QLUHDSH-GNPZVAO";};
 }

syncthing/devices/vanguard.nix

@@ -1,4 +1,3 @@
-{ ... }:
+{...}: {
-{
   services.syncthing.devices."vanguard" = {id = "YNGBLJP-TWY6Y3C-DPPYAWL-3ZQFNQH-RDPIU5T-L54UI62-FPPA3JQ-WYXBZQZ";};
 }

syncthing/folders/default.nix

@@ -1,5 +1,4 @@
-{ lib, ... }:
+{lib, ...}: {
-{
   services.syncthing = {
     folders = {
       "Archive" = {

systemd/nixos-pull.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   systemd.timers."nixos-pull-config" = {
     wantedBy = ["timers.target"];
     description = "Timer to update /etc/nixos/config/ repository";

templates/poetry.nix

@@ -1,10 +0,0 @@
-{ pkgs ? import <nixpkgs> { } }:
-let
-  myAppEnv = pkgs.poetry2nix.mkPoetryEnv {
-    projectDir = ./.;
-    editablePackageSources = {
-      my-app = ./src;
-    };
-  };
-in
-myAppEnv.env

templates/venv.nix

@@ -1,4 +1,8 @@
-{ pkgs ? import <nixpkgs> { }, python ? pkgs.python39, ... }:
+{
+  pkgs ? import <nixpkgs> {},
+  python ? pkgs.python39,
+  ...
+}:
 pkgs.mkShell {
   nativeBuildInputs = with pkgs; [(python.withPackages (ps: with ps; [pip wheel])) poetry git];
   shellHook = ''