.helix/languages.toml

@@ -1,3 +0,0 @@
-[[language]]
-name = "nix"
-formatter = { command = "alejandra" }

.vscode/settings.json

@@ -1,15 +1,5 @@
 {
     "editor.detectIndentation": true,
     "editor.insertSpaces": true,
-    "editor.defaultFormatter": "jnoortheen.nix-ide",
+    "editor.defaultFormatter": "jnoortheen.nix-ide"
-    "nix.formatterPath": "alejandra",
-    "nix.serverSettings": {
-        "nil": {
-            "formatting": {
-                "command": [
-                    "alejandra"
-                ]
-            }
-        }
-    }
 }

flake.nix

@@ -64,14 +64,14 @@
 		vscode-extensions = {
 			url = "github:nix-community/nix-vscode-extensions";
 			inputs.nixpkgs.follows = "nixpkgs-unstable-raw";
+
 		};
 		nix-flatpak.url = "github:gmodena/nix-flatpak/main";
 
 		nur.url = "github:nix-community/NUR";
 	};
 
-  outputs = {...} @ inputs:
+	outputs = { ... } @inputs: with inputs; 
-    with inputs;
 	# Patch nixpkgs
 	# https://ertt.ca/nix/patch-nixpkgs/
 	let
@@ -92,7 +92,8 @@
 		# https://discourse.nixos.org/t/proper-way-of-applying-patch-to-system-managed-via-flake/21073/26
 		nixpkgs-unstable = (import "${nixpkgs-unstable-patched}/flake.nix").outputs { self = inputs.self; };
 		nixpkgs = (import "${nixpkgs-patched}/flake.nix").outputs { self = inputs.self; };
-      in {
+	in
+	{
 		devShells.x86_64-linux.default = nixpkgs.legacyPackages.x86_64-linux.mkShell {
 			name = "toast-devshell";
 			# The agenix cli is not needed to activate a configuration, so instead of installing it
@@ -102,7 +103,7 @@
 				git
 				nix-diff
 				just
-            alejandra
+				nix-diff
 			];
 			shellHook =''
 				export PS1="$PS1(toast-configs)> "
@@ -117,10 +118,7 @@
 		nixosConfigurations = {
 			Archie = nixpkgs-unstable.lib.nixosSystem {
 				system = "x86_64-linux";
-            specialArgs = {
+				specialArgs = { systemPkgs = inputs.nixpkgs-unstable-raw; flakeSelf = self; };
-              systemPkgs = inputs.nixpkgs-unstable-raw;
-              flakeSelf = self;
-            };
 				/*
 				I used to set up nixpkgs in the flake, but doing that made
 				defining overlays in modules impossible (or at least I could
@@ -142,10 +140,7 @@
 
 			SurfaceGo = nixpkgs-unstable.lib.nixosSystem {
 				system = "x86_64-linux";
-            specialArgs = {
+				specialArgs = { systemPkgs = inputs.nixpkgs-unstable-raw; flakeSelf = self; };
-              systemPkgs = inputs.nixpkgs-unstable-raw;
-              flakeSelf = self;
-            };
 				modules = [
 					agenix.nixosModules.default
 					home-manager-unstable.nixosModule
@@ -160,10 +155,7 @@
 
 			SteamDeck = nixpkgs-unstable.lib.nixosSystem {
 				system = "x86_64-linux";
-            specialArgs = {
+				specialArgs = { systemPkgs = inputs.nixpkgs-unstable-raw; flakeSelf = self; };
-              systemPkgs = inputs.nixpkgs-unstable-raw;
-              flakeSelf = self;
-            };
 				modules = [
 					agenix.nixosModules.default
 					jovian.nixosModules.default
@@ -180,10 +172,7 @@
 
 			WinMax2 = nixpkgs-unstable.lib.nixosSystem {
 				system = "x86_64-linux";
-            specialArgs = {
+				specialArgs = { systemPkgs = inputs.nixpkgs-unstable-raw; flakeSelf = self; };
-              systemPkgs = inputs.nixpkgs-unstable-raw;
-              flakeSelf = self;
-            };
 				modules = [
 					agenix.nixosModules.default
 					jovian.nixosModules.default
@@ -201,10 +190,7 @@
 
 			Everest = nixpkgs.lib.nixosSystem {
 				system = "x86_64-linux";
-            specialArgs = {
+				specialArgs = { systemPkgs = inputs.nixpkgs-raw; flakeSelf = self; };
-              systemPkgs = inputs.nixpkgs-raw;
-              flakeSelf = self;
-            };
 				modules = [
 					agenix.nixosModules.default
 					home-manager.nixosModule

machines/Archie/configuration.nix

@@ -1,11 +1,10 @@
 # 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, ... }:
+
 {
-  config,
-  pkgs,
-  ...
-}: {
 	# Use grub boot loader
 	boot.loader = {
 		systemd-boot.enable = false;
@@ -44,6 +43,7 @@
 	# Enable touchpad support (enabled default in most desktopManager).
 	# services.xserver.libinput.enable = true;
 
+
 	hardware.bluetooth.enable = true;
 
 	# List packages installed in system profile. To search, run:
@@ -76,4 +76,6 @@
 	# (/run/current-system/configuration.nix). This is useful in case you
 	# accidentally delete configuration.nix.
 	# system.copySystemConfiguration = true;
+
 }
+

machines/Archie/default.nix

@@ -1,4 +1,6 @@
-{...}: {
+{ ... }:
+
+{
 	imports = [
 		./configuration.nix
 		./hardware-configuration.nix

machines/Archie/hardware-configuration.nix

@@ -1,14 +1,11 @@
 # 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, ... }:
+
 {
-  config,
+	imports =
-  lib,
+		[ (modulesPath + "/installer/scan/not-detected.nix")
-  modulesPath,
-  ...
-}: {
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
 		];
 
 	# Enable support for the Xbox One wireless dongle
@@ -19,26 +16,26 @@
 	boot.kernelModules = [ "kvm-amd" ];
 	boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
+	fileSystems."/" =
-    device = "/dev/disk/by-uuid/5322c217-b87b-4150-8b4c-a8fa17a899bf";
+		{ device = "/dev/disk/by-uuid/5322c217-b87b-4150-8b4c-a8fa17a899bf";
 			fsType = "btrfs";
 			options = [ "subvol=@root" "compress=zstd" ];
 		};
 
-  fileSystems."/nix" = {
+	fileSystems."/nix" =
-    device = "/dev/disk/by-uuid/5322c217-b87b-4150-8b4c-a8fa17a899bf";
+		{ device = "/dev/disk/by-uuid/5322c217-b87b-4150-8b4c-a8fa17a899bf";
 			fsType = "btrfs";
 			options = [ "subvol=@nix" "compress=zstd" ];
 		};
 
-  fileSystems."/boot" = {
+	fileSystems."/boot" =
-    device = "/dev/disk/by-uuid/5322c217-b87b-4150-8b4c-a8fa17a899bf";
+		{ device = "/dev/disk/by-uuid/5322c217-b87b-4150-8b4c-a8fa17a899bf";
 			fsType = "btrfs";
 			options = [ "subvol=@boot" "compress=zstd" ];
 		};
 
-  fileSystems."/boot/efi" = {
+	fileSystems."/boot/efi" =
-    device = "/dev/disk/by-uuid/FB87-4CBC";
+		{ device = "/dev/disk/by-uuid/FB87-4CBC";
 			fsType = "vfat";
 		};
 

machines/Everest/configuration.nix

@@ -1,7 +1,10 @@
 # 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’).
-{lib, ...}: {
+
+{ config, pkgs, lib, ... }:
+
+{
 	# Bootloader.
 	boot.loader.systemd-boot.enable = true;
 	boot.loader.timeout = 5;
@@ -20,12 +23,10 @@
 		dhcpcd.enable = false;
 		interfaces.eno1 = {
 			wakeOnLan.enable = true;
-      ipv4.addresses = [
+			ipv4.addresses = [ {
-        {
 				address = "192.168.0.160";
 				prefixLength = 24;
-        }
+			} ];
-      ];
 		};
 		# I use networkd, so I need to declare the interface for the default gateway
 		defaultGateway = {

machines/Everest/default.nix

@@ -1,4 +1,6 @@
-{...}: {
+{ ... }:
+
+{
 	imports = [
 		./configuration.nix
 		./hardware-configuration.nix

machines/Everest/hardware-configuration.nix

@@ -1,14 +1,11 @@
 # 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, ... }:
+
 {
-  config,
+	imports =
-  lib,
+		[ (modulesPath + "/installer/scan/not-detected.nix")
-  modulesPath,
-  ...
-}: {
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
 		];
 
 	boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
@@ -45,8 +42,8 @@
 		}; 
 	};
 
-  fileSystems."/boot/efi" = {
+	fileSystems."/boot/efi" =
-    device = "/dev/disk/by-label/Boot";
+		{ device = "/dev/disk/by-label/Boot";
 			fsType = "vfat";
 		};
 

machines/SteamDeck/configuration.nix

@@ -1,12 +1,10 @@
 # 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,
-  pkgs,
-  lib,
-  ...
-}: {
 	# Use grub boot loader
 	boot.loader = {
 		systemd-boot.enable = false;
@@ -100,4 +98,6 @@
 	# (/run/current-system/configuration.nix). This is useful in case you
 	# accidentally delete configuration.nix.
 	# system.copySystemConfiguration = true;
+
 }
+

machines/SteamDeck/default.nix

@@ -1,4 +1,6 @@
-{...}: {
+{ ... }:
+
+{
 	imports = [
 		./configuration.nix
 		./hardware-configuration.nix

machines/SteamDeck/hardware-configuration.nix

@@ -1,17 +1,16 @@
 # 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, ... }:
-  config,
+
-  lib,
+let
-  modulesPath,
-  ...
-}: let
 	# \x20 is the escape code for a space
 	ssdLabel = ''Deck\\x20SSD'';
-in {
+in
-  imports = [
+
-    (modulesPath + "/installer/scan/not-detected.nix")
+{
+	imports =
+		[ (modulesPath + "/installer/scan/not-detected.nix")
 		];
 
 	# Enable support for the Xbox One wireless dongle

machines/SurfaceGo/configuration.nix

@@ -1,12 +1,10 @@
 # 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,
-  pkgs,
-  lib,
-  ...
-}: {
 	boot = {
 		loader = {
 			# Use grub boot loader
@@ -89,4 +87,6 @@
 	# (/run/current-system/configuration.nix). This is useful in case you
 	# accidentally delete configuration.nix.
 	# system.copySystemConfiguration = true;
+
 }
+

machines/SurfaceGo/default.nix

@@ -1,4 +1,6 @@
-{...}: {
+{ ... }:
+
+{
 	imports = [
 		./configuration.nix
 		./hardware-configuration.nix

machines/SurfaceGo/hardware-configuration.nix

@@ -1,11 +1,10 @@
 	# 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, ... }:
+
 {
-  config,
+
-  lib,
-  ...
-}: {
 	boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usbhid" "rtsx_pci_sdmmc" ];
 	boot.initrd.kernelModules = [ ];
 	boot.kernelModules = [ "kvm-intel" ];

machines/WinMax2/configuration.nix

@@ -1,12 +1,10 @@
 	# 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,
-  pkgs,
-  lib,
-  ...
-}: {
 	# Use grub boot loader
 	boot = {
 		loader = {
@@ -150,4 +148,6 @@
 	# (/run/current-system/configuration.nix). This is useful in case you
 	# accidentally delete configuration.nix.
 	# system.copySystemConfiguration = true;
+
 }
+

machines/WinMax2/default.nix

@@ -1,4 +1,6 @@
-{...}: {
+{ ... }:
+
+{
 	imports = [
 		./configuration.nix
 		./hardware-configuration.nix

machines/WinMax2/hardware-configuration.nix

@@ -1,15 +1,14 @@
 # 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, modulesPath, ... }:
-  config,
+
-  lib,
+let
-  modulesPath,
-  ...
-}: let
 	# \x20 is the escape code for a space
 	ssdLabel = ''Win\\x20Max\\x202\\x20SSD'';
-in {
+in
+
+{
 	imports = [
 			(modulesPath + "/installer/scan/not-detected.nix")
 		];

pkgs/anything-sync-daemon/default.nix

@@ -1,17 +1,16 @@
-{
+{ stdenv
-  stdenv,
+, lib
-  lib,
+, fetchFromGitHub
-  fetchFromGitHub,
+, makeWrapper
-  makeWrapper,
+, rsync
-  rsync,
+, gawk
-  gawk,
+, pv
-  pv,
+, gnutar
-  gnutar,
+, zstd
-  zstd,
+, util-linux
-  util-linux,
+, coreutils
-  coreutils,
+, gnugrep
-  gnugrep,
+, findutils
-  findutils,
 }:
 stdenv.mkDerivation rec {
 	pname = "anything-sync-daemon";

roles/common/configuration.nix

@@ -1,10 +1,6 @@
+{ config, lib, pkgs, flakeSelf, ... }:
+
 {
-  config,
-  lib,
-  pkgs,
-  flakeSelf,
-  ...
-}: {
 	imports = [ flakeSelf.inputs.nur.nixosModules.nur ];
 	environment = {
 		# As of the 1st of May 2023, the default packages are nano, perl, rsync and strace
@@ -94,7 +90,7 @@
 		backupFileExtension = "hm-backup";
 		useGlobalPkgs = true;
 		verbose = true;
-    users.toast = {...}: {
+		users.toast = { config, ... }: {
 			home.stateVersion = "23.11";
 			xdg = {
 				userDirs = {

roles/common/default.nix

@@ -1,4 +1,6 @@
-{...}: {
+{ ... }:
+
+{
 	imports = [
 		./programs
 		./services

roles/common/programs/bash.nix

@@ -1,5 +1,7 @@
-{...}: {
+{ config, ... }:
-  home-manager.users.toast = {...}: {
+
+{
+	home-manager.users.toast = { config, ... }: {
 		programs.bash = {
 			enable = true;
 			enableVteIntegration = true;

roles/common/programs/bat.nix

@@ -1,13 +1,9 @@
+{ config, pkgs, ... }:
+
+let
+	themeName = if config.system.nixos.release == "23.11" then "Catppuccin-mocha" else "Catppuccin Mocha";
+in
 {
-  config,
-  pkgs,
-  ...
-}: let
-  themeName =
-    if config.system.nixos.release == "23.11"
-    then "Catppuccin-mocha"
-    else "Catppuccin Mocha";
-in {
 	home-manager = {
 		users.toast.programs.bat = {
 			enable = true;

roles/common/programs/btop.nix

@@ -1,4 +1,6 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+
+{
   home-manager = {
     users.toast = {
       programs.btop = {

roles/common/programs/comma.nix

@@ -1,4 +1,6 @@
-{...}: {
+{ config, pkgs, ... }:
+
+{
 	 # Use nix-index-database's comma wrapper
 	 programs.nix-index-database.comma.enable = true;
 	 # Run programs from the system's nixpkgs

roles/common/programs/command-not-found.nix

@@ -1,4 +1,6 @@
-{...}: {
+{ config, ... }:
+
+{
 	# The nixpkgs command-not-found script does not work with flakes, so I disable it
 	programs.command-not-found.enable = false;
 }

roles/common/programs/default.nix

@@ -1,4 +1,6 @@
-{pkgs, ...}: {
+{ config, pkgs, ... }:
+
+{
 	imports = [
 		./htop.nix
 		./nix.nix

roles/common/programs/direnv.nix

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

roles/common/programs/git.nix

@@ -1,11 +1,15 @@
-{pkgs, ...}: let
+{ config, pkgs, ... }:
+
+let
 	catppuccinDelta = pkgs.fetchFromGitHub {
 		owner = "catppuccin";
 		repo = "delta";
 		rev = "main";
 		hash = "sha256-0QQLkfLBVuB2re6tjtPNuOQZNK0MDBAIFgNGHZM8afs=";
 	};
-in {
+in
+
+{
 	home-manager.users.toast = {
 		programs.git = {
 			enable = true;
@@ -27,3 +31,4 @@ in {
 		};
 	};
 }
+

roles/common/programs/helix.nix

@@ -1,4 +1,6 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+
+{
   home-manager.users.toast = {
     programs.helix = {
       enable = true;

roles/common/programs/htop.nix

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

roles/common/programs/micro.nix

@@ -1,6 +1,9 @@
-{...}: {
+{ config, pkgs, ... }:
+
+{
 	home-manager = {
-    users.toast = {...}: {
+		users.toast = { config, pkgs, ... }:
+		{
 			programs.micro = {
 				enable = true;
 				settings = {

roles/common/programs/nix-index.nix

@@ -1,10 +1,10 @@
-{...}: {
+{ config, ... }:
-  /*
+
-      environment.systemPackages = [ pkgs.nix-index ];
+{
+	/* environment.systemPackages = [ pkgs.nix-index ];
 	programs.bash.interactiveShellInit = ''
 source ${pkgs.nix-index}/etc/profile.d/command-not-found.sh
-  	'';
+	''; */
-  */
 	programs.nix-index = {
 		enable = true;
 		enableBashIntegration = true;

roles/common/programs/nix.nix

@@ -1,4 +1,6 @@
-{systemPkgs, ...}: {
+{ config, systemPkgs, ... }:
+
+{
 	nix = {
 		settings = {
 			auto-optimise-store = true;
@@ -10,15 +12,8 @@
 		};
 		registry = {
 			agenix = {
-        from = {
+				from = { id = "agenix"; type = "indirect"; };
-          id = "agenix";
+				to = { owner = "ryantm"; repo = "agenix"; type = "github"; };
-          type = "indirect";
-        };
-        to = {
-          owner = "ryantm";
-          repo = "agenix";
-          type = "github";
-        };
 			};
 			# Write the system's nixpkgs into the registry to avoid mixing nixpkgs versions
 			# https://dataswamp.org/~solene/2022-07-20-nixos-flakes-command-sync-with-system.html

roles/common/programs/starship.nix

@@ -1,10 +1,9 @@
-{
+{ pkgs, lib, ... }:
-  pkgs,
+
-  lib,
-  ...
-}:
 with lib;
-with builtins; let
+with builtins;
+
+let
 	catppuccinFlavour = "mocha";
 	catppuccinStarship = pkgs.catppuccin + /starship/${catppuccinFlavour}.toml;
 
@@ -22,11 +21,13 @@ with builtins; let
 	*/
 	# Takes a list of attrSets and merges them
 	mergeAllAttrSets = attrsSets:
-    foldl' recursiveUpdate {} attrsSets;
+  	foldl' (recursiveUpdate) {} attrsSets;
 
 	# Reads a TOML file and parses it 
 	readTomlPreset = file: (fromTOML (readFile file));
-in {
+
+in
+{
 	programs.starship = {
 		enable = true;
 		settings = mergeAllAttrSets [

roles/common/services/avahi.nix

@@ -1,23 +1,19 @@
-{config, ...}: let
+{ config, ... }:
+let
 	old = {
 		nssmdns = true;
 	};
 	new = {
 		nssmdns4 = true;
 	};
-in {
+in
+{
 	/*
 		NixOS 24.05 changed the option for mnds to be able to turn on/off IPv6
 		23.11 doesn't support this, so I need to use the conditional to be able to
 		use the same config for both
 	*/
-  services.avahi =
+	services.avahi = {
-    {
 		enable = true;
-    }
+	} // (if config.system.nixos.release == "23.11" then old else new);
-    // (
-      if config.system.nixos.release == "23.11"
-      then old
-      else new
-    );
 }

roles/common/services/default.nix

@@ -1,4 +1,6 @@
-{...}: {
+{ ... }:
+
+{
 	imports = [
 		./avahi.nix
 		./tailscale.nix

roles/common/services/syncthing.nix

@@ -1,10 +1,10 @@
-{
+{ config, flakeSelf, ... }:
-  config,
+
-  flakeSelf,
+let
-  ...
-}: let
 	hostSecrets = "${flakeSelf.inputs.secrets}/" + config.networking.hostName;
-in {
+in
+
+{
 	# Get secrets
 	age.secrets = {
 		syncthingKey.file = hostSecrets + "/syncthingKey.age";

roles/common/services/tailscale.nix

@@ -1,4 +1,6 @@
-{lib, ...}: {
+{ config, lib, ... }:
+
+{
 	services.tailscale = {
 		enable = true;
 		useRoutingFeatures = lib.mkDefault "client";

roles/desktop/configuration.nix

@@ -1,4 +1,6 @@
-{pkgs, ...}: {
+{ config, pkgs, ... }:
+
+{
 	# Enable scanning
 	hardware.sane = {
 		enable = true;

roles/desktop/default.nix

@@ -1,4 +1,6 @@
-{...}: {
+{ ... }:
+
+{
 	imports = [
 		./services
 		./programs

roles/desktop/programs/default.nix

@@ -1,4 +1,6 @@
-{...}: {
+{ ... }:
+
+{
 	imports = [
 		./discord.nix
 		./firefox.nix

roles/desktop/programs/discord.nix

@@ -1,16 +1,13 @@
-{
+{ config, pkgs, lib, ... }:
-  pkgs,
+
-  lib,
+	let
-  ...
+		discordOverlay = self: super: {
-}: let
-  discordOverlay = _self: super: {
 			discord = super.discord.override {
 				withOpenASAR = true;
 				withVencord = true;
 			};
 			# Update some stuff while I wait for nixpkgs
-    /*
+			/*vencord = super.vencord.overrideAttrs rec {
-      vencord = super.vencord.overrideAttrs rec {
 				version = "522fdcd";
 				src = pkgs.fetchFromGitHub {
 					owner = "Vendicated";
@@ -19,16 +16,16 @@
 					#rev = "v${version}";
 					hash = "sha256-9G7FNL4pHaaLachzJmeAol0WpNUj533K2FNa7DH0eBM=";
 				};
+			};*/
 		};
-    */
+		stock-discord = self: super: {
-  };
-  stock-discord = _self: super: {
 			discord = super.discord.override {
 				withOpenASAR = false;
 				withVencord = false;
 			};
 		};
-in {
+	in
+{
 	# Sometimes discord breaks after updates, and launching it stock once fixes it
 	specialisation.stockDiscord.configuration = {
 		nixpkgs.overlays = lib.mkAfter [ stock-discord ];

roles/desktop/programs/firefox.nix

@@ -1,4 +1,6 @@
-{lib, ...}: {
+{ config, lib, ... }:
+
+{
 	# System wide firefox settings
 	programs.firefox = {
 		enable = true;

roles/desktop/programs/git.nix

@@ -1,8 +1,6 @@
+{ pkgs, lib, ... }:
+
 {
-  pkgs,
-  lib,
-  ...
-}: {
   home-manager.users.toast = {
     programs.git = {
       package = pkgs.gitFull;

roles/desktop/programs/jamesdsp.nix

@@ -1,3 +1,5 @@
-{pkgs, ...}: {
+{ config, pkgs, ... }:
+
+{
 	users.users.toast.packages = [ pkgs.jamesdsp ];
 }

roles/desktop/programs/keepassxc.nix

@@ -1,4 +1,6 @@
-{lib, ...}: let
+{ config, pkgs, lib, ... }:
+
+let
 	kpxcSettings = lib.generators.toINI {} {
 		General = {
 			# Not sure what changing this does, I'll leave it alone
@@ -23,14 +25,12 @@
 		};
 		SSHAgent.Enabled = true;
 	};
-in {
+in
+
+{
 	home-manager = {
 		extraSpecialArgs = { kpxcSettings = kpxcSettings; };
-    users.toast = {
+		users.toast = { config, pkgs, kpxcSettings, ... }: {
-      pkgs,
-      kpxcSettings,
-      ...
-    }: {
 			# No module for KeePassXC config :(
 			home = {
 				packages = [ pkgs.keepassxc ];

roles/desktop/programs/micro.nix

@@ -1,6 +1,9 @@
-{lib, ...}: {
+{ config, pkgs, lib, ... }:
+
+{
 	home-manager = {
-    users.toast = {pkgs, ...}: {
+		users.toast = { config, pkgs, ... }:
+		{
 			programs.micro = {
 				enable = true;
 				settings = {

roles/desktop/programs/ssh.nix

@@ -1,4 +1,6 @@
-{...}: {
+{ ... }:
+
+{
   home-manager.users.toast = {
     programs.ssh = {
       enable = true;

roles/desktop/programs/vscode.nix

@@ -1,10 +1,6 @@
+{ config, pkgs, flakeSelf, ... }:
+let inputs = flakeSelf.inputs; in
 {
-  pkgs,
-  flakeSelf,
-  ...
-}: let
-  inputs = flakeSelf.inputs;
-in {
 	nixpkgs.overlays = [ inputs.catppuccin-vsc.overlays.default ];
 	home-manager.users.toast = {
 		home.packages = with pkgs; [

roles/desktop/services/default.nix

@@ -1,4 +1,6 @@
-{...}: {
+{ ... }:
+
+{
 	imports = [
 		./ssh-agent.nix
 		./flatpak.nix

roles/desktop/services/flatpak.nix

@@ -1,4 +1,6 @@
-{flakeSelf, ...}: {
+{ config, pkgs, flakeSelf, ... }:
+
+{
 	services.flatpak.enable = true;
 
 	home-manager = {

roles/desktop/services/networkmanager.nix

@@ -1,6 +1,10 @@
-{config, ...}: let
+{ config, ... }:
+
+let
   tailscaleName = config.services.tailscale.interfaceName;
-in {
+in
+
+{
   networking.networkmanager = {
     enable = true;
     unmanaged = [

roles/desktop/services/pipewire.nix

@@ -1,4 +1,6 @@
-{...}: {
+{ config, ... }:
+
+{
 	services.pipewire = {
 		enable = true;
 		pulse.enable = true;

roles/desktop/services/printing.nix

@@ -1,4 +1,6 @@
-{...}: {
+{ config, ... }:
+
+{
 	services.printing = {
 		enable = true;
 		startWhenNeeded = true;

roles/desktop/services/ssh-agent.nix

@@ -1,4 +1,6 @@
-{...}: {
+{ config, pkgs, ... }:
+
+{
 	programs.ssh.startAgent = true;
 	/*
 	Home assistant added an option that does this

roles/desktop/services/syncthing.nix

@@ -1,4 +1,6 @@
-{config, ...}: {
+{ config, ... }:
+
+{
 	services.syncthing = {
 		enable = true;
 		user = "toast";

roles/gaming/default.nix

@@ -1,4 +1,6 @@
-{...}: {
+{ ... }:
+
+{
 	imports = [
 		./programs
 		./services

roles/gaming/programs/default.nix

@@ -1,4 +1,6 @@
-{pkgs, ...}: {
+{ config, pkgs, ... }:
+
+{
 	imports = [
 		./steam.nix
 		./mangohud.nix

roles/gaming/programs/mangohud.nix

@@ -1,5 +1,8 @@
-{...}: {
+{ config, ... }:
-  home-manager.users.toast = {...}: {
+
+{
+	home-manager.users.toast = { config, ... }:
+	{
 		programs.mangohud = {
 			enable = true;
 			# This only works for Vulkan, openGL programs still need the mangohud wrapper

roles/gaming/programs/retroarch.nix

@@ -1,4 +1,5 @@
-{pkgs, ...}: let
+{ pkgs, ... }:
+let
   snes-roms = [
     # ActRaiser
     ( pkgs.fetchzip {
@@ -16,11 +17,11 @@
       hash = "sha256-RLBxPBmBrXCuPdnWE07KamBNgGJ5IntQVUPeij+2HUI=";
     } )
   ];
-in {
+in
+{
   home-manager.users.toast = {
     home = {
-      packages = [
+      packages = [(
-        (
         pkgs.retroarch.override {
           cores = with pkgs.libretro; [
             snes9x
@@ -60,8 +61,7 @@ in {
             assets_directory = "${pkgs.retroarch-assets}/share/retroarch/assets";
           };
         }
-        )
+      )];
-      ];
       file."Games/Roms/SNES/" = {
         onChange = ''
           ${pkgs.retroarch}/bin/retroarch --scan "/home/toast/Games/Roms/SNES"

roles/gaming/programs/rpcs3.nix

@@ -1,4 +1,6 @@
-{config, ...}: {
+{ config, pkgs, ... }:
+
+{
 	environment.systemPackages = with config; [
 		nur.repos.ataraxiasjel.rpcs3
 	];
@@ -9,12 +11,10 @@
 	};
 
 	# Increase the memory lock limit
-  security.pam.loginLimits = [
+	security.pam.loginLimits = [{
-    {
 		domain = "*";
 		item = "memlock";
 		type = "-"; # Applies to both hard and soft limits
 		value = "unlimited";
-    }
+	}];
-  ];
 }

roles/gaming/programs/steam.nix

@@ -1,8 +1,6 @@
+	{ config, pkgs, ... }:
+
 {
-  config,
-  pkgs,
-  ...
-}: {
 	programs.steam = {
 		enable = true;
 		# Doubt that I'll use it, but I'll enable it anyways
@@ -14,10 +12,7 @@
 	};
 
 	# Some linux native games (rise of the tomb raider) use alsa for sound
-  services.pipewire.alsa.enable =
+	services.pipewire.alsa.enable = if config.services.pipewire.pulse.enable == true then true else false;
-    if config.services.pipewire.pulse.enable == true
-    then true
-    else false;
 
 	# Celeste mod manager
 	home-manager.users.toast.services.flatpak.packages = [

roles/gaming/services/default.nix

@@ -1,4 +1,6 @@
-{...}: {
+{ ... }:
+
+{
 	imports = [
 		./syncthing.nix
 	];

roles/gaming/services/syncthing.nix

@@ -1,4 +1,6 @@
-{...}: {
+{ config, ... }:
+
+{
 	/*
 	This file will sync saves for games that don't have cloud saves
 	TODO: turn this into a module eventually

roles/kde/default.nix

@@ -1,4 +1,6 @@
-{...}: {
+{ ... }:
+
+{
 	imports = [
 		./plasma.nix
 		./sddm.nix

roles/kde/plasma.nix

@@ -1,10 +1,6 @@
-{
+{ config, pkgs, lib, flakeSelf, ... }:
-  config,
+
-  pkgs,
+let
-  lib,
-  flakeSelf,
-  ...
-}: let
 	# Set up the default kde options
 	balooExcludedDirs = lib.strings.intersperse "," [
 		"$HOME/.cache/"
@@ -48,7 +44,10 @@
 			runHook postInstall
 		'';
 	};
-in {
+
+in
+
+{
 	services.xserver = {
 		# Enable the Plasma 5 Desktop Environment
 		desktopManager.plasma5.enable = true;
@@ -66,9 +65,9 @@ in {
 	# Plasma configs should be on all users
 	home-manager.sharedModules = [
 		(
-      {config, ...}: let
+			{ config, ... }:
-        gtk2rc = "${config.xdg.configHome}/gtk-2.0/gtkrc";
+			let gtk2rc = "${config.xdg.configHome}/gtk-2.0/gtkrc"; in
-      in {
+			{
 				gtk.gtk2.configLocation = gtk2rc;
 				# Kde has an annoying habit of overwriting the gtk2 config file
 				home.file."${gtk2rc}".force = true;
@@ -79,31 +78,20 @@ in {
 			gtk = {
 				enable = true;
 				# Most apps are dark, so a white cursor is easier to spot
-        cursorTheme = {
+				cursorTheme = { package = pkgs.breeze-qt5; name = "Breeze_Snow"; };
-          package = pkgs.breeze-qt5;
+				iconTheme = { package = pkgs.breeze-icons; name = "breeze-dark"; };
-          name = "Breeze_Snow";
+				theme = { package = pkgs.breeze-gtk; name = "Breeze"; };
-        };
-        iconTheme = {
-          package = pkgs.breeze-icons;
-          name = "breeze-dark";
-        };
-        theme = {
-          package = pkgs.breeze-gtk;
-          name = "Breeze";
-        };
 				# Gtk2 doesn't have a dark mode, so I just tell gtk 3 and 4 to use the dark variant
 				gtk3.extraConfig.gtk-application-prefer-dark-theme = true;
 				gtk4.extraConfig.gtk-application-prefer-dark-theme = true;
 			};
-      home.packages = [
+			home.packages = [(
-        (
 				pkgs.catppuccin-kde.override {
 					flavour = [ "mocha" ];
 					accents = [ "mauve" ];
 					winDecStyles = [ "classic" ];
 				}
-        )
+			)];
-      ];
 			programs.plasma = {
 				enable = true;
 				overrideConfig = true;
@@ -126,8 +114,7 @@ in {
 						right = [ "minimize" "maximize" "close" ];
 					};
 				};
-        panels = [
+				panels = [{
-          {
 					location = "bottom";
 					height = 44;
 					widgets = [
@@ -145,8 +132,7 @@ in {
 						}
 						"org.kde.plasma.showdesktop"
 					];
-          }
+				}];
-        ];
 				shortcuts = {
 					"kwin" = {
 						"Switch One Desktop to the Left" = [ "Meta+Ctrl+Left" ];

roles/kde/programs/default.nix

@@ -1,4 +1,6 @@
-{...}: {
+{ config, ... }:
+
+{
 	imports = [
 		./kate.nix
 		./firefox.nix

roles/kde/programs/firefox.nix

@@ -1,4 +1,6 @@
-{...}: {
+{ config, pkgs, ... }:
+
+{
 	# KDE specific firefox settings
 	programs.firefox = {
 		policies = {

roles/kde/programs/git.nix

@@ -1,4 +1,6 @@
-{...}: {
+{ pkgs, lib, ... }:
+
+{
   home-manager.users.toast = {
     programs.git = {
       extraConfig = {

roles/kde/programs/kate.nix

@@ -1,4 +1,6 @@
-{pkgs, ...}: {
+{ config, pkgs, ... }:
+
+{
 	environment.systemPackages = [ pkgs.kate ];
 
 	# Use kwrite to open text files, and kate if I'm developing stuff

roles/kde/programs/konsole.nix

@@ -1,14 +1,14 @@
-{pkgs, ...}: let
+{ pkgs, ... }:
-  catppuccinKonsole =
+let
-    pkgs.fetchFromGitHub {
+  catppuccinKonsole = pkgs.fetchFromGitHub {
     owner = "catppuccin";
     repo = "konsole";
     # Latest commit is 7d86b8a1e56e58f6b5649cdaac543a573ac194ca
     rev = "main";
     hash = "sha256-EwSJMTxnaj2UlNJm1t6znnatfzgm1awIQQUF3VPfCTM=";
-    }
+  } + /Catppuccin-Mocha.colorscheme;
-    + /Catppuccin-Mocha.colorscheme;
+in
-in {
+{
   home-manager.users.toast = {
     xdg.dataFile = {
       "konsole/Catppuccin-Mocha.colorscheme".source = catppuccinKonsole;

roles/kde/programs/neochat.nix

@@ -1,4 +1,6 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+
+{
   home-manager.users.toast = {
     home.packages = [ pkgs.neochat ];
   };

roles/kde/programs/skanpage.nix

@@ -1,9 +1,6 @@
+{ config, lib, pkgs, ... }:
+
 {
-  config,
-  lib,
-  pkgs,
-  ...
-}: {
 	# Only install skanpage if scanning is set up
 	config = lib.mkIf config.hardware.sane.enable {
 		environment.systemPackages = [ pkgs.skanpage ];

roles/kde/sddm.nix

@@ -1,8 +1,6 @@
-{
+{ config, pkgs, ... }:
-  config,
+
-  pkgs,
+let
-  ...
-}: let
 	currentTheme = config.services.xserver.displayManager.sddm.theme;
 
 	sddm-sugar-candy = pkgs.stdenv.mkDerivation {
@@ -41,7 +39,9 @@
 			runHook postInstall
 		'';
 	};
-in {
+in
+
+{
 	# Enable SDDM.
 	services.xserver.displayManager.sddm = {
 		enable = true;

roles/school/default.nix

@@ -1,4 +1,6 @@
-{...}: {
+{ ... }:
+
+{
 	imports = [
 		./services
 		./programs

roles/school/programs/default.nix

@@ -1,4 +1,6 @@
-{pkgs, ...}: {
+ { config, pkgs, ... }:
+
+{
 	imports = [
 		./virtualbox.nix
 		./idea.nix

roles/school/programs/helix.nix

@@ -1,4 +1,7 @@
-{pkgs, ...}: {
+
+{ pkgs, ... }:
+
+{
   home-manager.users.toast = {
     programs.helix = {
       extraPackages = with pkgs; [

roles/school/programs/idea.nix

@@ -1,5 +1,7 @@
-{pkgs, ...}:
+{ config, pkgs, ... }:
-with pkgs; {
+
+with pkgs;
+{
 	environment.systemPackages = with jetbrains; [
 		idea-ultimate
 	];

roles/school/programs/unity.nix

@@ -1,9 +1,9 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+
+{
   home-manager.users.toast = {
-    home.packages = [
+    home.packages = [(
-      (
       pkgs.unityhub
-      )
+    )];
-    ];
   };
 }

roles/school/programs/virtualbox.nix

@@ -1,15 +1,15 @@
-{...}: {
+{ config, ... }:
+
+{
 	# Need to use visual studio 2019 :(
 	virtualisation.virtualbox.host = {
 		enable = true;
 	};
-  home-manager.sharedModules = [
+	home-manager.sharedModules = [{
-    {
 		systemd.user.tmpfiles.rules = [ 
 			"d '/%h/VirtualBox VMs'"
 			"h '/%h/VirtualBox VMs' - - - - C "
 		];
-    }
+	}];
-  ];
 	users.users.toast.extraGroups = [ "vboxusers" ];
 }

roles/school/programs/vscode.nix

@@ -1,11 +1,6 @@
+{ config, pkgs, lib, flakeSelf, ... }:
+let inputs = flakeSelf.inputs; in
 {
-  pkgs,
-  lib,
-  flakeSelf,
-  ...
-}: let
-  inputs = flakeSelf.inputs;
-in {
 	home-manager.users.toast.programs.vscode = {
 		# The redhat xml extension needs an fhs environment
 		package = lib.mkForce pkgs.vscodium-fhs;

roles/school/services/default.nix

@@ -1,4 +1,6 @@
-{...}: {
+{ ... }:
+
+{
 	imports = [
 		./syncthing.nix
 		./mysql.nix

roles/school/services/mongodb.nix

@@ -1,9 +1,6 @@
+{ config, pkgs, lib, ... }:
+
 {
-  config,
-  pkgs,
-  lib,
-  ...
-}: {
 	services.mongodb = {
 		enable = true;
 		package = pkgs.mongodb-4_4;

roles/school/services/mysql.nix

@@ -1,9 +1,6 @@
+{ config, pkgs, lib, ... }:
+
 {
-  config,
-  pkgs,
-  lib,
-  ...
-}: {
 	services.mysql = {
 		enable = true;
 		package = pkgs.mysql80;

roles/school/services/syncthing.nix

@@ -1,4 +1,6 @@
-{...}: {
+{ config, ... }:
+
+{
 	services.syncthing.settings.folders = {
 		"school-things" = {
 			label = "School things";

roles/school/services/xampp.nix

@@ -1,9 +1,11 @@
-{pkgs, ...}: let
+{ config, pkgs, ... }:
+let
 	booDark = pkgs.fetchzip {
 		url = "https://github.com/adorade/boodark/releases/download/v1.1.1/boodark-v1.1.1.zip";
 		hash = "sha256-GE/FtFlU6A4I9sRyjMhQIidGpDLD99Wzzngz3QI/rSo=";
 	};
-in {
+in
+{
 	# I tried setting up httpd + php in class but I just gave up
 	virtualisation.oci-containers = {
 		containers."xampp" = {

roles/server/avahi.nix

@@ -1,4 +1,6 @@
-{...}: {
+{ config, ... }:
+
+{
 	services.avahi = {
 		openFirewall = true;
 		publish = {

roles/server/beep.nix

@@ -1,16 +1,16 @@
-{pkgs, ...}: {
+{ config, pkgs, ... }:
+
+{
 	# Beep as soon as possible in the initrd
 	boot.initrd = {
 		kernelModules = [ "pcspkr" ];
 		extraFiles.beep.source = pkgs.beep;
 		postDeviceCommands = "/beep/bin/beep -f 3000 -l 50 -r 2";
 	};
-  /*
+	/*systemd.services.startupBeep = {
-    systemd.services.startupBeep = {
 		description = "Beep when system started booting";
 		wantedBy = [ "sysinit.target" ];
 		script = "${pkgs.beep}/bin/beep -f 3000 -l 50 -r 2";
  		serviceConfig = { Type = "oneshot"; }; 
-  };
+	};*/
-  */
 }

roles/server/ddclient.nix

@@ -1,10 +1,10 @@
-{
+{ config, flakeSelf, ... }:
-  config,
+
-  flakeSelf,
+let
-  ...
-}: let
 	hostSecrets = "${flakeSelf.inputs.secrets}/" + config.networking.hostName;
-in {
+in
+
+{
 	# Set up secrets
 	age.secrets = { ddclient-passwd.file = hostSecrets + "/ddclient-password.age"; };
 

roles/server/default.nix

@@ -1,4 +1,6 @@
-{...}: {
+{ ... }:
+
+{
 	imports = [
 		./avahi.nix
 		./nfs.nix

roles/server/dns.nix

@@ -1,4 +1,6 @@
-{...}: {
+{ ... }:
+
+{
   services.dnsmasq = {
     enable = true;
     

roles/server/endlessh.nix

@@ -1,4 +1,6 @@
-{...}: {
+{ config, ... }: 
+
+{
 	# I prefer using the go implementation
 	services.endlessh-go = {
 		enable = true;

roles/server/forgejo.nix

@@ -1,8 +1,6 @@
+{ config, lib, ... }:
+
 {
-  config,
-  lib,
-  ...
-}: {
   specialisation.forgejoEnableRegistration.configuration.services.forgejo.settings.service.DISABLE_REGISTRATION = false;
   services.forgejo = {
     enable = true;

roles/server/minecraft.nix

@@ -1,9 +1,5 @@
-{
+{ config, pkgs, flakeSelf, ... }:
-  config,
+let
-  pkgs,
-  flakeSelf,
-  ...
-}: let
 	atfc = builtins.fetchurl {
 		url = "https://www.curseforge.com/api/v1/mods/813246/files/4732590/download";
 		sha256 = "0yl6ixmhfgqvcj3kfshpf8fy42vkkmjbn7d7yg86jx0ykiiq5f9x";
@@ -19,7 +15,8 @@
 	
 	port = 25565;
 	users = config.users;
-in {
+in
+{
 	users = {
 		groups.minecraft = {
 			members = [ "toast" ];
@@ -106,11 +103,13 @@ in {
 		mountPoint = "/mnt/minecraftTmpfs";
 		options = [ "size=4G "];
 	};
-  environment.etc."asd.conf".text = ''    WHATTOSYNC=('/var/lib/minecraft')
+	environment.etc."asd.conf".text =
+''WHATTOSYNC=('/var/lib/minecraft')
 VOLATILE="${config.fileSystems.minecraftTmpfs.mountPoint}"
 USE_OVERLAYFS="yes" '';
 	systemd.services.asd = {
 		wantedBy = [ "podman-minecraft-atfc.service" ];
 		before = [ "podman-minecraft-atfc.service" ];
 	};
+	
 }

roles/server/nfs.nix

@@ -1,4 +1,6 @@
-{config, ...}: {
+{ config, lib, ... }:
+
+{
 	services = {
 		nfs.server = {
 			enable = true;

roles/server/samba.nix

@@ -1,4 +1,6 @@
-{config, ...}: {
+{ config, lib, ... }:
+
+{
 	services = {
 		samba = {
 			enable = true;

roles/server/ssh.nix

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

roles/server/syncthing.nix

@@ -1,4 +1,6 @@
-{config, ...}: {
+{ config, ... }:
+
+{
 	services.syncthing = {
 		enable = true;
 		key = config.age.secrets.syncthingKey.path;

roles/server/tailscale.nix

@@ -1,4 +1,6 @@
-{...}: {
+{ config, ... }:
+
+{
 	services.tailscale = {
 		# This is needed for being an exit node
 		useRoutingFeatures = "server";