diff --git a/flake.nix b/flake.nix
index 873245e..8893e2a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -44,55 +44,66 @@
     musnix.url = "github:musnix/musnix";
   };
 
-  outputs = { self, nixpkgs, stablepkgs, home-manager, ... } @ inputs:
-  let
-    system = "x86_64-linux";
-    pkgs = nixpkgs.legacyPackages.${system};
-    stablepkgs = stablepkgs.legacyPacakges.${system};
-  in
-  {
-    nixosConfigurations.gabbielaptop = nixpkgs.lib.nixosSystem {
-      inherit system;
-      specialArgs = { inherit inputs; };
-      modules = [
-        # Import nixos modules here
-        ./hosts/gabbielaptop/configuration.nix
-	./modules/nh.nix
-        ./modules/waydroid.nix
-        ./modules/packages.nix
-        ./modules/aagl.nix
-        inputs.aagl.nixosModules.default
-	inputs.lanzaboote.nixosModules.lanzaboote
-	inputs.musnix.nixosModules.musnix
-#	inputs.stylix.nixosModules.stylix
-	{ nix.settings = inputs.aagl.nixConfig; } # Setup cachix for aagl projects
-
-        # Imports home-manager module for use within nixos, not reccomended for use WITH standalone version
-#       inputs.home-manager.nixosModules.default
-      ];
-    };
-    nixosConfigurations.biggerpi = nixpkgs.lib.nixosSystem {
+  outputs =
+    {
+      self,
+      nixpkgs,
+      stablepkgs,
+      home-manager,
+      ...
+    }@inputs:
+    let
       system = "x86_64-linux";
-      modules = [
-        inputs.disko.nixosModules.disko
-	inputs.satisfactory-server.nixosModules.satisfactory
-        ./hosts/biggerpi/configuration.nix
-	./modules/satisfactory-server.nix
-      ];
-    };
+      pkgs = nixpkgs.legacyPackages.${system};
+      stablepkgs = stablepkgs.legacyPacakges.${system};
+    in
+    {
+      nixosConfigurations.gabbielaptop = nixpkgs.lib.nixosSystem {
+        inherit system;
+        specialArgs = {
+          inherit inputs;
+        };
+        modules = [
+          # Import nixos modules here
+          ./hosts/gabbielaptop/configuration.nix
+          ./modules/nh.nix
+          ./modules/waydroid.nix
+          ./modules/packages.nix
+          ./modules/aagl.nix
+          inputs.aagl.nixosModules.default
+          inputs.lanzaboote.nixosModules.lanzaboote
+          inputs.musnix.nixosModules.musnix
+          #	inputs.stylix.nixosModules.stylix
+          { nix.settings = inputs.aagl.nixConfig; } # Setup cachix for aagl projects
 
-#  Standalone home-manager config
-    homeConfigurations.blue = home-manager.lib.homeManagerConfiguration {
-      inherit pkgs;
-      extraSpecialArgs = { inherit inputs; };
-      # Import home-manager modules here
-      modules = [
-        ./home-manager/home.nix
-#        ./home-manager/librewolf.nix
-        inputs.flatpaks.homeManagerModules.default
-	inputs.nixvim.homeManagerModules.default
-	inputs.stylix.homeManagerModules.stylix # Not compatible with NixOS module as they will interfere with one another, use this when building on a non-NixOS machine
-      ];
+          # Imports home-manager module for use within nixos, not reccomended for use WITH standalone version
+          #       inputs.home-manager.nixosModules.default
+        ];
+      };
+      nixosConfigurations.biggerpi = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        modules = [
+          inputs.disko.nixosModules.disko
+          inputs.satisfactory-server.nixosModules.satisfactory
+          ./hosts/biggerpi/configuration.nix
+          ./modules/satisfactory-server.nix
+        ];
+      };
+
+      #  Standalone home-manager config
+      homeConfigurations.blue = home-manager.lib.homeManagerConfiguration {
+        inherit pkgs;
+        extraSpecialArgs = {
+          inherit inputs;
+        };
+        # Import home-manager modules here
+        modules = [
+          ./home-manager/home.nix
+          #        ./home-manager/librewolf.nix
+          inputs.flatpaks.homeManagerModules.default
+          inputs.nixvim.homeManagerModules.default
+          inputs.stylix.homeManagerModules.stylix # Not compatible with NixOS module as they will interfere with one another, use this when building on a non-NixOS machine
+        ];
+      };
     };
-  };
 }
diff --git a/home-manager/git.nix b/home-manager/git.nix
index f85a429..c0510b4 100644
--- a/home-manager/git.nix
+++ b/home-manager/git.nix
@@ -1,3 +1,4 @@
-{config, ... }:{
+{ config, ... }:
+{
   programs.git.enable = true;
 }
diff --git a/home-manager/home.nix b/home-manager/home.nix
index 48bf928..9bfe9fa 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -1,4 +1,10 @@
-{ config, pkgs, lib, inputs, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  inputs,
+  ...
+}:
 
 {
   home.username = "blue";
@@ -10,7 +16,7 @@
     ./swaync.nix
     ./flatpak.nix
     ./sober.nix
-#    ./librewolf.nix
+    #    ./librewolf.nix
     ./zsh.nix
     ./eza.nix
     ./nixvim.nix
@@ -22,31 +28,31 @@
   # States home manager version that config was originally compatible with, do not change without reading all patch notes since this version and altering as needed
   home.stateVersion = "24.05";
 
-#  services.pass-secret-service.enable = true; # for use with protonmail-bridge
+  #  services.pass-secret-service.enable = true; # for use with protonmail-bridge
   services.gnome-keyring.enable = true; # used for protonmail-bridge and nextcloud-client
 
   # Cursor configuration that I hope to one day understand, currently has a scaling issue but thats probably my fault
-#  home.pointerCursor = 
-#    let 
-#      getFrom = url: hash: name: {
-#        gtk.enable = true;
-#        x11.enable = true;
-#        name = name;
-#        size = 24;
-#        package = 
-#          pkgs.runCommand "moveUp" {} ''
-#            mkdir -p $out/share/icons
-#            ln -s ${pkgs.fetchzip {
-#              url = url;
-#              hash = hash;
-#            }} $out/share/icons/${name}
-#          '';
-#      };
-#    in
-#      getFrom 
-#        "https://github.com/ful1e5/fuchsia-cursor/releases/download/v2.0.0/Fuchsia-Pop.tar.gz"
-#        "sha256-BvVE9qupMjw7JRqFUj1J0a4ys6kc9fOLBPx2bGaapTk="
-#        "Fuchsia-Pop";
+  #  home.pointerCursor = 
+  #    let 
+  #      getFrom = url: hash: name: {
+  #        gtk.enable = true;
+  #        x11.enable = true;
+  #        name = name;
+  #        size = 24;
+  #        package = 
+  #          pkgs.runCommand "moveUp" {} ''
+  #            mkdir -p $out/share/icons
+  #            ln -s ${pkgs.fetchzip {
+  #              url = url;
+  #              hash = hash;
+  #            }} $out/share/icons/${name}
+  #          '';
+  #      };
+  #    in
+  #      getFrom 
+  #        "https://github.com/ful1e5/fuchsia-cursor/releases/download/v2.0.0/Fuchsia-Pop.tar.gz"
+  #        "sha256-BvVE9qupMjw7JRqFUj1J0a4ys6kc9fOLBPx2bGaapTk="
+  #        "Fuchsia-Pop";
 
   # General use home packages that dont require a separate module
   home.packages = with pkgs; [
@@ -54,7 +60,7 @@
     grimblast
     powerline-fonts
     nix-output-monitor
-#   bitwarden-desktop
+    #   bitwarden-desktop
     xwaylandvideobridge
     virtualbox
     wofi
@@ -86,33 +92,33 @@
         lines = 3;
         columns = 200;
       };
-#      font.normal = {
-#        family = "hack";
-#      };
-#      keyboard.bindings = [
-#        {
-#          key = "K";
-#          mods = "Control";
-#          chars = "\\u000c";
-#        }
-#      ];
+      #      font.normal = {
+      #        family = "hack";
+      #      };
+      #      keyboard.bindings = [
+      #        {
+      #          key = "K";
+      #          mods = "Control";
+      #          chars = "\\u000c";
+      #        }
+      #      ];
     };
   };
 
-#  programs.hyprpaper = {
-#    enable = true;
-#    settings = {
-#      ipc = "on";
-#      splash = false;
-#      splash_offset = 2.0;
+  #  programs.hyprpaper = {
+  #    enable = true;
+  #    settings = {
+  #      ipc = "on";
+  #      splash = false;
+  #      splash_offset = 2.0;
 
-#      preload = [ "~/Pictures/wallpaper.png" ];
+  #      preload = [ "~/Pictures/wallpaper.png" ];
 
-#      wallpaper = [
-#        ",~/Pictures/wallpaper.png"
-#      ];
-#    };
-#  };
+  #      wallpaper = [
+  #        ",~/Pictures/wallpaper.png"
+  #      ];
+  #    };
+  #  };
   programs.hyprlock = {
     enable = true;
     settings = {
@@ -142,8 +148,8 @@
           inner_color = "rgb(91, 96, 120)";
           outer_color = "rgb(24, 25, 38)";
           outline_thickness = 5;
-#          placeholder_text = "<span foreground="##cad3f5">Password...</span>";
-#          shadow_passes = 2;
+          #          placeholder_text = "<span foreground="##cad3f5">Password...</span>";
+          #          shadow_passes = 2;
         }
       ];
     };
diff --git a/home-manager/hyprland.nix b/home-manager/hyprland.nix
index 5d1ec1a..a73f5d9 100644
--- a/home-manager/hyprland.nix
+++ b/home-manager/hyprland.nix
@@ -10,18 +10,17 @@
     systemd.enable = true;
     settings = {
       # Monitor config for home desk layout
-      monitor =
-        [
-          "eDP-2, 2560x1600@165, 0x0, auto" # main laptop monitor
-          "DP-2, 1920x1080@119.98, -960x-1080, auto" # left external monitor
-          "DP-3, 1920x1080@119.98, 960x-1080, auto" # right external monitor
-        ];    
+      monitor = [
+        "eDP-2, 2560x1600@165, 0x0, auto" # main laptop monitor
+        "DP-2, 1920x1080@119.98, -960x-1080, auto" # left external monitor
+        "DP-3, 1920x1080@119.98, 960x-1080, auto" # right external monitor
+      ];
 
       # Define SUPER key as mod key
       "$mod" = "SUPER";
 
       # Set keyboard layout
-      input = { 
+      input = {
         kb_layout = "gb";
         follow_mouse = 1;
         mouse_refocus = false;
@@ -39,24 +38,23 @@
       ];
 
       # Declare all keybinds
-      bind =
-        [
-          # Keybinds for starting programs
-          "$mod, F, exec, firefox"
-          "$mod, 1, exec, alacritty"
-          "$mod, D, exec, vesktop"
-          "$mod, space, exec, wofi --show drun, run"
+      bind = [
+        # Keybinds for starting programs
+        "$mod, F, exec, firefox"
+        "$mod, 1, exec, alacritty"
+        "$mod, D, exec, vesktop"
+        "$mod, space, exec, wofi --show drun, run"
 
-          # Screenshot tool
-          ", Print, exec, grimblast copy area"
+        # Screenshot tool
+        ", Print, exec, grimblast copy area"
 
-          # Screen locking tool
-          "$mod, l, exec, hyprlock" 
+        # Screen locking tool
+        "$mod, l, exec, hyprlock"
 
-          # Window management
-          "$mod, x, killactive"
-          "$mod, tab, togglefloating"
-        ];
+        # Window management
+        "$mod, x, killactive"
+        "$mod, tab, togglefloating"
+      ];
 
       # Prevent xwayland apps from looking pixellated, cursor scaling to compensate for this is defined in home.nix
       xwayland = {
diff --git a/home-manager/librewolf.nix b/home-manager/librewolf.nix
index 07e418c..794fa22 100644
--- a/home-manager/librewolf.nix
+++ b/home-manager/librewolf.nix
@@ -1,4 +1,9 @@
-{ config, pkgs, stablepkgs, ... }:
+{
+  config,
+  pkgs,
+  stablepkgs,
+  ...
+}:
 {
   programs.librewolf = {
     enable = true;
diff --git a/home-manager/nextcloud.nix b/home-manager/nextcloud.nix
index 6141c9d..b900f48 100644
--- a/home-manager/nextcloud.nix
+++ b/home-manager/nextcloud.nix
@@ -1,4 +1,5 @@
-{ config, pkgs, ... }: {
+{ config, pkgs, ... }:
+{
   services.nextcloud-client = {
     enable = true;
     startInBackground = true;
diff --git a/home-manager/nixvim.nix b/home-manager/nixvim.nix
index f721815..c1586bf 100644
--- a/home-manager/nixvim.nix
+++ b/home-manager/nixvim.nix
@@ -1,7 +1,8 @@
-{config, pkgs, ... }: {
+{ config, pkgs, ... }:
+{
   programs.nixvim = {
     enable = true;
 
-#    plugins.neotree.enable = true;
+    #    plugins.neotree.enable = true;
   };
 }
diff --git a/home-manager/sober.nix b/home-manager/sober.nix
index fe81b9f..9df8452 100644
--- a/home-manager/sober.nix
+++ b/home-manager/sober.nix
@@ -3,7 +3,7 @@
   services.flatpak = {
     packages = [
       "sober:/root/sober.flatpakref"
-#       https://sober.vinegarhq.org/sober.flatpakref
+      #       https://sober.vinegarhq.org/sober.flatpakref
     ];
     remotes = {
       "sober" = "https://sober.vinegarhq.org/";
diff --git a/home-manager/stylix.nix b/home-manager/stylix.nix
index a17bc4d..33b4e7f 100644
--- a/home-manager/stylix.nix
+++ b/home-manager/stylix.nix
@@ -1,7 +1,8 @@
-{ config, ... }: {
-   stylix = {
-     enable = true;
-#    base16Scheme = "${pkgs.base16-schemes}/share/themes/icy.yaml";
-     image = ./wallpaper.png; 
+{ config, ... }:
+{
+  stylix = {
+    enable = true;
+    #    base16Scheme = "${pkgs.base16-schemes}/share/themes/icy.yaml";
+    image = ./wallpaper.png;
   };
 }
diff --git a/home-manager/swaync.nix b/home-manager/swaync.nix
index f140285..19e2f5d 100644
--- a/home-manager/swaync.nix
+++ b/home-manager/swaync.nix
@@ -1,4 +1,4 @@
-{config, pkgs, ...}:
+{ config, pkgs, ... }:
 {
   # Enables swaync and automatically includes systemd user service to auto-start on login, this cannot be disabled so I am using it instead of hyprland exec-once otherwise home-manager complains that the service failed to start
   services.swaync = {
diff --git a/home-manager/waybar.nix b/home-manager/waybar.nix
index 405d701..d2fad3e 100644
--- a/home-manager/waybar.nix
+++ b/home-manager/waybar.nix
@@ -1,5 +1,11 @@
-{ config, pkgs, lib, inputs, ... }:
-{  
+{
+  config,
+  pkgs,
+  lib,
+  inputs,
+  ...
+}:
+{
   programs.waybar = {
     enable = true;
     systemd.enable = true; # using these instead of exec-once beacuse SOME packages (swaync) dont let you disable them
@@ -14,17 +20,25 @@
           "DP-3"
         ];
         modules-left = [ "wlr/taskbar" ];
-        modules-center = [ "clock" "custom/swaync" ];
-        modules-right = [ "pulseaudio/slider" "backlight/slider" "battery" "tray" ];
+        modules-center = [
+          "clock"
+          "custom/swaync"
+        ];
+        modules-right = [
+          "pulseaudio/slider"
+          "backlight/slider"
+          "battery"
+          "tray"
+        ];
         "clock" = {
           "format" = "{:%A %d %b %T}";
-#          "tooltip" = true;
-#          "tooltip-format" = "{=%A; %d %B %Y}\n<tt>{calendar}</tt>";
+          #          "tooltip" = true;
+          #          "tooltip-format" = "{=%A; %d %B %Y}\n<tt>{calendar}</tt>";
           "interval" = 1;
         };
         "custom/swaync" = {
           "tooltip" = false;
-          "format"= "{icon} {}";
+          "format" = "{icon} {}";
           "format-icons" = {
             "notification" = "🔔<span foreground='red'><sup>🔔</sup></span>";
             "none" = "🔔";
diff --git a/home-manager/zsh.nix b/home-manager/zsh.nix
index 78d1e1c..9f3e000 100644
--- a/home-manager/zsh.nix
+++ b/home-manager/zsh.nix
@@ -1,4 +1,9 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 
 {
   programs.zsh = {
diff --git a/hosts/biggerpi/configuration.nix b/hosts/biggerpi/configuration.nix
index 9efaa4c..87eb48d 100644
--- a/hosts/biggerpi/configuration.nix
+++ b/hosts/biggerpi/configuration.nix
@@ -2,17 +2,25 @@
 # your system. Help is available in the configuration.nix(5) man page, on
 # https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
 
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 
 {
-  imports =
-    [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
-      ./disk-config.nix
-    ];
+  imports = [
+    # Include the results of the hardware scan.
+    ./hardware-configuration.nix
+    ./disk-config.nix
+  ];
 
   # Enable flakes
-  nix.settings.experimental-features = [ "nix-command" "flakes" ];
+  nix.settings.experimental-features = [
+    "nix-command"
+    "flakes"
+  ];
 
   nixpkgs.config.allowUnfree = true;
 
@@ -33,7 +41,7 @@
 
   users.users.jellyfin.uid = null;
   users.users.jellyfin.group = "media";
-  users.users.jellyfin.isSystemUser = true;  
+  users.users.jellyfin.isSystemUser = true;
 
   services.jellyfin = {
     enable = true;
@@ -45,21 +53,21 @@
   };
 
   # Define a user account. Don't forget to set a password with ‘passwd’. Please change the initialHashedPassword for each deployment to avoid a brute force attack on this password allowing login to the system before an actual password is set.
-    users.users.blue = {
-      isNormalUser = true;
-      extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
-      initialHashedPassword = "$y$j9T$TbW09JXLRpNJ924xc5JEf1$YNroqf2T7AUnVzKi933eLRUp/0Bez8itOeMYsLw9g3A";
-#      packages = with pkgs; [
-#        neovim
-#        tree
-#      ];
-     openssh.authorizedKeys.keys = [
-       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBqczzd/CZJMg+jmxqhl0NS7GTNymsddrxDXyTtoG9zo blue@gabbielaptop"
-     ];
-    };
+  users.users.blue = {
+    isNormalUser = true;
+    extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
+    initialHashedPassword = "$y$j9T$TbW09JXLRpNJ924xc5JEf1$YNroqf2T7AUnVzKi933eLRUp/0Bez8itOeMYsLw9g3A";
+    #      packages = with pkgs; [
+    #        neovim
+    #        tree
+    #      ];
+    openssh.authorizedKeys.keys = [
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBqczzd/CZJMg+jmxqhl0NS7GTNymsddrxDXyTtoG9zo blue@gabbielaptop"
+    ];
+  };
 
-# List packages installed in system profile. To search, run:
-# $ nix search wget
+  # List packages installed in system profile. To search, run:
+  # $ nix search wget
   environment.systemPackages = with pkgs; [
     wget
     neovim
@@ -89,4 +97,3 @@
   system.stateVersion = "24.05"; # Did you read the comment?
 
 }
-
diff --git a/hosts/biggerpi/hardware-configuration.nix b/hosts/biggerpi/hardware-configuration.nix
index 0c95955..be7760b 100644
--- a/hosts/biggerpi/hardware-configuration.nix
+++ b/hosts/biggerpi/hardware-configuration.nix
@@ -1,14 +1,26 @@
 # 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,
+  pkgs,
+  modulesPath,
+  ...
+}:
 
 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" ];
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "ahci"
+    "nvme"
+    "usb_storage"
+    "sd_mod"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
diff --git a/hosts/gabbielaptop/configuration.nix b/hosts/gabbielaptop/configuration.nix
index 624e4b0..adf1a48 100644
--- a/hosts/gabbielaptop/configuration.nix
+++ b/hosts/gabbielaptop/configuration.nix
@@ -2,17 +2,22 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ config, lib, pkgs, inputs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  inputs,
+  ...
+}:
 
 {
 
-  imports =
-  [
+  imports = [
     ./hardware-configuration.nix
   ];
 
   # Bootloader.
-#  boot.loader.efi.canTouchEfiVariables = true;
+  #  boot.loader.efi.canTouchEfiVariables = true;
 
   boot = {
     initrd.systemd.enable = true;
@@ -25,10 +30,13 @@
     };
   };
 
-  nix.settings.experimental-features = [ "nix-command" "flakes" ];
+  nix.settings.experimental-features = [
+    "nix-command"
+    "flakes"
+  ];
 
   # default kernel causes issues with wpa_supplicant meaning shutdown times are > 10 mins updating to kernel 69+ fixes this
-# boot.kernelPackages = pkgs.linuxKernel.packages.linux_zen;
+  # boot.kernelPackages = pkgs.linuxKernel.packages.linux_zen;
 
   # I was told that adding these helps but it doesnt seemt to work as monitors are still buggy at 144hz, may as well keep them
   boot.kernelParams = [
@@ -75,16 +83,16 @@
 
   # Enable the X11 windowing system.
   # You can disable this if you're only using the Wayland session.
-#  services.xserver.enable = true;
+  #  services.xserver.enable = true;
 
   # Enable the KDE Plasma Desktop Environment.
   services.displayManager.sddm.enable = true;
   services.displayManager.sddm.wayland.enable = true;
-#  services.desktopManager.plasma6.enable = true;
+  #  services.desktopManager.plasma6.enable = true;
 
   # Enable the Hyprland WM functionality for NixOS (xdg portals etc.)
-  programs.hyprland.enable = true;  
-#  programs.waybar.enable = true;
+  programs.hyprland.enable = true;
+  #  programs.waybar.enable = true;
 
   # Configure keymap in X11
   services.xserver.xkb.layout = "gb";
@@ -116,43 +124,50 @@
     # no need to redefine it in your config for now)
     #media-session.enable = true;
   };
-  
+
   musnix.enable = true;
 
-
-# pam.services = [
-#   { name = "gnome_keyring"
-#     text = ''
-#       auth     optional    ${gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so
-#       session  optional    ${gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so auto_start
-#
-#       password  optional    ${gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so
-#     '';
-#   }
-# ];
+  # pam.services = [
+  #   { name = "gnome_keyring"
+  #     text = ''
+  #       auth     optional    ${gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so
+  #       session  optional    ${gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so auto_start
+  #
+  #       password  optional    ${gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so
+  #     '';
+  #   }
+  # ];
 
   services.gnome.gnome-keyring.enable = true;
 
-  nix.settings.trusted-users = [ "root" "blue" ];
+  nix.settings.trusted-users = [
+    "root"
+    "blue"
+  ];
 
   programs.zsh.enable = true;
   users.users.blue = {
     isNormalUser = true;
     description = "Gabriella Bere";
-    extraGroups = [ "networkmanager" "wheel" "dialout" "audio" ];
+    extraGroups = [
+      "networkmanager"
+      "wheel"
+      "dialout"
+      "audio"
+    ];
     shell = pkgs.zsh;
   };
 
-#  home-manager = {
-#    extraSpecialArgs = { inherit inputs; };
-#    users = {
-#      "blue" = import ../../home-manager/home.nix;
-#    };
-#  };
+  #  home-manager = {
+  #    extraSpecialArgs = { inherit inputs; };
+  #    users = {
+  #      "blue" = import ../../home-manager/home.nix;
+  #    };
+  #  };
 
   # Enable fingerprint daemon
   services.fprintd.enable = true;
-#  services.fprintd.tod.enable = true;
+  #  services.fprintd.tod.enable = true;
 
   # Enable bluetooth and blueman
   hardware.bluetooth = {
@@ -179,10 +194,10 @@
 
   # Enable steam and enable steam remoteplay
   programs.steam.enable = true;
-  programs.steam.remotePlay.openFirewall = true;  
+  programs.steam.remotePlay.openFirewall = true;
 
   # This desperately needs moving to home.nix but the home-manager module is not yet available
-  
+
   services.protonmail-bridge = {
     enable = true;
     path = [ pkgs.gnome-keyring ];
@@ -190,15 +205,15 @@
   };
 
   # protonmail daemon config
-#  systemd.user.services.protonmail-bridge = {
-#    enable = true;
-#    wantedBy = [ "default.target" ];
-#    description = "autostart protonmail-bridge on login as a daemon";
-#    serviceConfig = {
-#      Type = "simple";
-#      ExecStart = "${lib.getExe pkgs.protonmail-bridge} --noninteractive --no-window";
-#    };
-#  };
+  #  systemd.user.services.protonmail-bridge = {
+  #    enable = true;
+  #    wantedBy = [ "default.target" ];
+  #    description = "autostart protonmail-bridge on login as a daemon";
+  #    serviceConfig = {
+  #      Type = "simple";
+  #      ExecStart = "${lib.getExe pkgs.protonmail-bridge} --noninteractive --no-window";
+  #    };
+  #  };
 
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
@@ -214,7 +229,7 @@
   # services.openssh.enable = true;
 
   # Open ports in the firewall.
-  networking.firewall.allowedTCPPorts = [ 
+  networking.firewall.allowedTCPPorts = [
     43391 # used to forward minecraft traffic to minecraft.gabbie.blue:33991
     4455 # used for OBS websocket
     7777 # used for Satisfactory Server
diff --git a/hosts/gabbielaptop/hardware-configuration.nix b/hosts/gabbielaptop/hardware-configuration.nix
index f4b1e96..db34535 100644
--- a/hosts/gabbielaptop/hardware-configuration.nix
+++ b/hosts/gabbielaptop/hardware-configuration.nix
@@ -1,33 +1,49 @@
 # 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,
+  pkgs,
+  modulesPath,
+  ...
+}:
 
 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
 
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "usbhid" "sd_mod" ];
+  boot.initrd.availableKernelModules = [
+    "nvme"
+    "xhci_pci"
+    "thunderbolt"
+    "usb_storage"
+    "usbhid"
+    "sd_mod"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/c5c7a251-2bd1-4c10-99fa-17069bc66161";
-      fsType = "ext4";
-    };
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/c5c7a251-2bd1-4c10-99fa-17069bc66161";
+    fsType = "ext4";
+  };
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/3650-CF80";
-      fsType = "vfat";
-      options = [ "fmask=0077" "dmask=0077" ];
-    };
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/3650-CF80";
+    fsType = "vfat";
+    options = [
+      "fmask=0077"
+      "dmask=0077"
+    ];
+  };
 
-  fileSystems."/home" =
-    { device = "/dev/disk/by-uuid/7b70ea86-8c19-4089-ac1c-0fdcf24bfa8e";
-      fsType = "ext4";
-    };
+  fileSystems."/home" = {
+    device = "/dev/disk/by-uuid/7b70ea86-8c19-4089-ac1c-0fdcf24bfa8e";
+    fsType = "ext4";
+  };
 
   swapDevices = [ ];
 
diff --git a/modules/aagl.nix b/modules/aagl.nix
index 6e10788..2f332c1 100644
--- a/modules/aagl.nix
+++ b/modules/aagl.nix
@@ -1,3 +1,4 @@
-{config, ... }: {
+{ config, ... }:
+{
   programs.honkers-railway-launcher.enable = true;
 }
diff --git a/modules/packages.nix b/modules/packages.nix
index 1eb7098..aa05883 100644
--- a/modules/packages.nix
+++ b/modules/packages.nix
@@ -1,6 +1,13 @@
-{ config, lib, pkgs, stablepkgs, ... }: {
+{
+  config,
+  lib,
+  pkgs,
+  stablepkgs,
+  ...
+}:
+{
   # All packaged needed from nixos-unstable
-  environment.systemPackages = 
+  environment.systemPackages =
     (with pkgs; [
       neovim # nano is installed by default
       wget
@@ -41,11 +48,11 @@
       ardour
       v4l-utils
       libreoffice
-  ])
+    ])
 
-  ++
+    ++
 
-  (with stablepkgs; [
-#    librewolf
-  ]);
+      (with stablepkgs; [
+        #    librewolf
+      ]);
 }
diff --git a/modules/satisfactory-server.nix b/modules/satisfactory-server.nix
index ec51ae9..4cade7f 100644
--- a/modules/satisfactory-server.nix
+++ b/modules/satisfactory-server.nix
@@ -1,4 +1,5 @@
-{ config, pkgs, ... }: {
+{ config, pkgs, ... }:
+{
 
   services.satisfactory = {
     enable = true;
diff --git a/modules/stylix.nix b/modules/stylix.nix
index 50d552b..f75d579 100644
--- a/modules/stylix.nix
+++ b/modules/stylix.nix
@@ -1,7 +1,8 @@
-{ config, ... }: {
+{ config, ... }:
+{
   stylix = {
     enable = true;
-#    base16Scheme = "${pkgs.base16-schemes}/share/themes/icy.yaml";
-    stylix.image = /home/blue/Pictures/wallpaper.png; 
+    #    base16Scheme = "${pkgs.base16-schemes}/share/themes/icy.yaml";
+    stylix.image = /home/blue/Pictures/wallpaper.png;
   };
 }