diff --git a/flake.nix b/flake.nix
index 593dedc..d0eb6a5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,21 +14,27 @@
   };
 
   outputs =
-    { nixpkgs, nixpkgs-stable, home-manager, nixos-hardware, ... }:
+    {
+      nixpkgs,
+      nixpkgs-stable,
+      home-manager,
+      nixos-hardware,
+      ...
+    }:
     let
       system = "x86_64-linux";
     in
     {
       nixosConfigurations = {
         TARS = nixpkgs.lib.nixosSystem {
-        inherit system;
-        modules = [
-          ./nixos/configuration.nix
-          nixos-hardware.nixosModules.framework-amd-ai-300-series         
-        ];
-        specialArgs = {
-          pkgs-stable = nixpkgs-stable.legacyPackages.${system};
-        };
+          inherit system;
+          modules = [
+            ./nixos/configuration.nix
+            nixos-hardware.nixosModules.framework-amd-ai-300-series
+          ];
+          specialArgs = {
+            pkgs-stable = nixpkgs-stable.legacyPackages.${system};
+          };
         };
       };
 
diff --git a/home-manager/home.nix b/home-manager/home.nix
index 61983f8..0132642 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
   imports = [
     ./modules/bundle.nix
   ];
diff --git a/home-manager/modules/bash.nix b/home-manager/modules/bash.nix
index 27fd760..12c4c03 100644
--- a/home-manager/modules/bash.nix
+++ b/home-manager/modules/bash.nix
@@ -1,14 +1,15 @@
-{ config, pkgs, ...}: {
+{ config, pkgs, ... }:
+{
   # This is to launch fish interactively, to avoid problems
   # with fish's non-POSIX compliance
   programs.bash = {
-  enable = true;
-  initExtra = ''
-    if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]
-    then
-      shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""
-      exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
-    fi
-  '';
-};
+    enable = true;
+    initExtra = ''
+      if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]
+      then
+        shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""
+        exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
+      fi
+    '';
+  };
 }
diff --git a/home-manager/modules/desktop_overrides.nix b/home-manager/modules/desktop_overrides.nix
index 638e61b..da8cf9d 100644
--- a/home-manager/modules/desktop_overrides.nix
+++ b/home-manager/modules/desktop_overrides.nix
@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   # This file contains all the desktop entries that I don't want in my app finder,
   # either because I open them with shortcuts or because I never use them (but they come with an app)
   xdg.desktopEntries = {
@@ -17,7 +18,7 @@
       name = "thunar-bulk-rename";
       noDisplay = true;
     };
-    
+
     # I open this with a shortcut
     "foot" = {
       name = "foot";
@@ -38,7 +39,6 @@
       terminal = false;
     };
 
-
     # Fixes missing icons
     # TODO: Doesn't work
     # "protonvpn-app" = {
@@ -49,5 +49,5 @@
     #   name = "Sioyek";
     #   icon = "${pkgs.sioyek}/share/pixmaps/sioyek-linux-logo.png";
     # };
-};
+  };
 }
diff --git a/home-manager/modules/fish.nix b/home-manager/modules/fish.nix
index 665fd0a..1ec2419 100644
--- a/home-manager/modules/fish.nix
+++ b/home-manager/modules/fish.nix
@@ -1,18 +1,23 @@
-{ config, pkgs, ... }: {
+{ config, pkgs, ... }:
+{
   programs.fish = {
     enable = true;
     interactiveShellInit = ''
       set fish_greeting
       starship init fish | source
     '';
-    shellAliases = let flakeDir = "~/nix"; in {
-      rb = "sudo nixos-rebuild switch --flake ${flakeDir}";
-      upg = "sudo nix flake update --flake ${flakeDir} && sudo nixos-rebuild switch --flake ${flakeDir}";
-      hms = "home-manager switch --flake ${flakeDir}";
-      ed = "hx ${flakeDir}";
-      ff = "fastfetch -c neofetch";
-      ls = "lsd";
-    };
+    shellAliases =
+      let
+        flakeDir = "~/nix";
+      in
+      {
+        rb = "sudo nixos-rebuild switch --flake ${flakeDir}";
+        upg = "sudo nix flake update --flake ${flakeDir} && sudo nixos-rebuild switch --flake ${flakeDir}";
+        hms = "home-manager switch --flake ${flakeDir}";
+        ed = "hx ${flakeDir}";
+        ff = "fastfetch -c neofetch";
+        ls = "lsd";
+      };
     shellAbbrs = {
       dcu = "podman-compose up";
       dcub = "podman-compose up --build";
diff --git a/home-manager/modules/foot.nix b/home-manager/modules/foot.nix
index 25d7044..b0db30c 100644
--- a/home-manager/modules/foot.nix
+++ b/home-manager/modules/foot.nix
@@ -1,4 +1,5 @@
-{ config, pkgs, ... }: {
+{ config, pkgs, ... }:
+{
   programs.foot.enable = true;
   programs.foot.settings = {
     main = {
@@ -8,26 +9,26 @@
 
     colors = {
       alpha = 0.85;
-    
+
       # Gruvbox; copied from https://codeberg.org/dnkl/foot/src/branch/master/themes/gruvbox-dark
-      background="282828";
-      foreground="ebdbb2";
-      regular0="282828";
-      regular1="cc241d";
-      regular2="98971a";
-      regular3="d79921";
-      regular4="458588";
-      regular5="b16286";
-      regular6="689d6a";
-      regular7="a89984";
-      bright0="928374";
-      bright1="fb4934";
-      bright2="b8bb26";
-      bright3="fabd2f";
-      bright4="83a598";
-      bright5="d3869b";
-      bright6="8ec07c";
-      bright7="ebdbb2";
+      background = "282828";
+      foreground = "ebdbb2";
+      regular0 = "282828";
+      regular1 = "cc241d";
+      regular2 = "98971a";
+      regular3 = "d79921";
+      regular4 = "458588";
+      regular5 = "b16286";
+      regular6 = "689d6a";
+      regular7 = "a89984";
+      bright0 = "928374";
+      bright1 = "fb4934";
+      bright2 = "b8bb26";
+      bright3 = "fabd2f";
+      bright4 = "83a598";
+      bright5 = "d3869b";
+      bright6 = "8ec07c";
+      bright7 = "ebdbb2";
     };
   };
 }
diff --git a/home-manager/modules/fuzzel.nix b/home-manager/modules/fuzzel.nix
index fd47272..80b8fbc 100644
--- a/home-manager/modules/fuzzel.nix
+++ b/home-manager/modules/fuzzel.nix
@@ -1,4 +1,5 @@
-{ config, pkgs, ... }: {
+{ config, pkgs, ... }:
+{
   programs.fuzzel.enable = true;
   programs.fuzzel.settings = {
     main = {
diff --git a/home-manager/modules/git.nix b/home-manager/modules/git.nix
index d724c9f..28a1a5e 100644
--- a/home-manager/modules/git.nix
+++ b/home-manager/modules/git.nix
@@ -1,4 +1,5 @@
-{ config, pkgs, ... }: {
+{ config, pkgs, ... }:
+{
   programs.git = {
     enable = true;
     settings = {
diff --git a/home-manager/modules/helix.nix b/home-manager/modules/helix.nix
index 7c11769..b818e97 100644
--- a/home-manager/modules/helix.nix
+++ b/home-manager/modules/helix.nix
@@ -1,4 +1,5 @@
-{ config, pkgs, ...}: {
+{ config, pkgs, ... }:
+{
   programs.helix.enable = true;
   programs.helix.settings = {
     # theme = "everforest_dark";
@@ -18,17 +19,17 @@
         normal = "block";
         select = "underline";
       };
-      
+
       soft-wrap = {
         enable = true;
         wrap-indicator = "↩ ";
       };
-      
+
       whitespace = {
         render = {
           space = "all";
           tab = "all";
-          newline = "none"; 
+          newline = "none";
         };
         characters = {
           space = " ";
@@ -40,8 +41,17 @@
       };
 
       statusline = {
-        left = [ "mode" "spinner" "diagnostics" ];
-        center = [ "file-name" "separator" "version-control" "separator"];
+        left = [
+          "mode"
+          "spinner"
+          "diagnostics"
+        ];
+        center = [
+          "file-name"
+          "separator"
+          "version-control"
+          "separator"
+        ];
         separator = "│";
         mode.normal = "NORMAL";
         mode.insert = "INSERT";
@@ -62,7 +72,10 @@
     keys = {
       normal = {
         l = "insert_mode";
-        esc = ["collapse_selection" "keep_primary_selection"];
+        esc = [
+          "collapse_selection"
+          "keep_primary_selection"
+        ];
         n = "move_char_left";
         o = "move_char_right";
         e = "move_line_down";
diff --git a/home-manager/modules/hypr/cursor.nix b/home-manager/modules/hypr/cursor.nix
index b39be90..b528555 100644
--- a/home-manager/modules/hypr/cursor.nix
+++ b/home-manager/modules/hypr/cursor.nix
@@ -1,3 +1,5 @@
-{ config, pkgs, ... }: {
-  home.file.".icons/default".source = "${pkgs.capitaine-cursors}/share/icons/\"Capitaine Cursors (Gruvbox)\"";
+{ config, pkgs, ... }:
+{
+  home.file.".icons/default".source =
+    "${pkgs.capitaine-cursors}/share/icons/\"Capitaine Cursors (Gruvbox)\"";
 }
diff --git a/home-manager/modules/hypr/hyprland.nix b/home-manager/modules/hypr/hyprland.nix
index ed0dc08..4bd754a 100644
--- a/home-manager/modules/hypr/hyprland.nix
+++ b/home-manager/modules/hypr/hyprland.nix
@@ -1,17 +1,19 @@
-{ config, pkgs, ... }: {
+{ config, pkgs, ... }:
+{
   wayland.windowManager.hyprland.enable = true;
   wayland.windowManager.hyprland.settings = {
 
-  exec-once = [
-    "hyprpaper" "systemctl --user start hyprpolkitagent"
-    "hyprctl setcursor \"Capitaine Cursors (Gruvbox)\" 24"
-    "swayosd-server"
-    "hyprsunset"
-  ];
-  
+    exec-once = [
+      "hyprpaper"
+      "systemctl --user start hyprpolkitagent"
+      "hyprctl setcursor \"Capitaine Cursors (Gruvbox)\" 24"
+      "swayosd-server"
+      "hyprsunset"
+    ];
+
     monitor = [
       "eDP-1,2880x1920@120,auto,auto"
-      ",preferred,auto,2,"     
+      ",preferred,auto,2,"
     ];
 
     general = {
@@ -87,7 +89,6 @@
       preserve_split = true;
     };
 
-
     misc = {
       force_default_wallpaper = 0;
       disable_hyprland_logo = false;
@@ -114,7 +115,7 @@
     "$emoji" = "BEMOJI_PICKER_CMD=\"fuzzel --dmenu\" bemoji -t --private";
     "$browser" = "librewolf";
     "$browser_private" = "librewolf --private-window";
-    
+
     bind = [
       "$mainMod, RETURN, exec, $terminal"
       "$mainMod, Q, killactive,"
@@ -128,7 +129,7 @@
       "$mainMod, J, togglesplit,"
       "$mainMod, F, fullscreen, 0"
 
-      "$mainMod, N, movefocus, l" 
+      "$mainMod, N, movefocus, l"
       "$mainMod, O, movefocus, r"
       "$mainMod, I, movefocus, u"
       "$mainMod, E, movefocus, d"
@@ -139,7 +140,6 @@
       "$mainMod SHIFT, M, layoutmsg, swapnext"
       "$mainMod SHIFT, K, layoutmsg, swapprev"
 
-    
       "$mainMod, 1, workspace, 1"
       "$mainMod, 2, workspace, 2"
       "$mainMod, 3, workspace, 3"
@@ -158,7 +158,6 @@
       "$mainMod SHIFT, 3, movetoworkspace, 3"
       "$mainMod SHIFT, 4, movetoworkspace, 4"
 
-      
     ];
 
     bindel = [
@@ -177,7 +176,6 @@
       ", XF86AudioPrev, exec, playerctl previous"
     ];
 
-
     # windowrule = [
     #   "suppressevent maximize, class:.*"
     #   "nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0"
diff --git a/home-manager/modules/hypr/hyprlock.nix b/home-manager/modules/hypr/hyprlock.nix
index a7c9277..1458d18 100644
--- a/home-manager/modules/hypr/hyprlock.nix
+++ b/home-manager/modules/hypr/hyprlock.nix
@@ -23,7 +23,7 @@
         "fadeIn, 1, 5, linear"
         "fadeOut, 1, 5, linear"
         "inputFieldDots, 1, 2, linear"
-      ];    
+      ];
     };
 
     background = {
@@ -53,7 +53,7 @@
 
     label = [
       {
-        text = "$TIME"; 
+        text = "$TIME";
         font_size = 90;
         font_family = "$font";
         position = "-30, 0";
diff --git a/home-manager/modules/hypr/hyprpaper/hyprpaper.nix b/home-manager/modules/hypr/hyprpaper/hyprpaper.nix
index 79bf040..6fbb4b1 100644
--- a/home-manager/modules/hypr/hyprpaper/hyprpaper.nix
+++ b/home-manager/modules/hypr/hyprpaper/hyprpaper.nix
@@ -1,4 +1,5 @@
-{ config, pkgs, ... }: {
+{ config, pkgs, ... }:
+{
   services.hyprpaper.enable = true;
   services.hyprpaper.settings = {
     wallpaper = [
diff --git a/home-manager/modules/hypr/theming.nix b/home-manager/modules/hypr/theming.nix
index c1c90aa..dc953f7 100644
--- a/home-manager/modules/hypr/theming.nix
+++ b/home-manager/modules/hypr/theming.nix
@@ -5,16 +5,16 @@
     enable = true;
     theme = {
       package = pkgs.gruvbox-gtk-theme;
-      name    = "Gruvbox-Dark";
+      name = "Gruvbox-Dark";
     };
     iconTheme = {
       package = pkgs.adwaita-icon-theme;
-      name    = "Adwaita";
+      name = "Adwaita";
     };
     cursorTheme = {
       package = pkgs.capitaine-cursors;
-      name    = "Capitaine Cursors (Gruvbox)";
-      size    = 24;
+      name = "Capitaine Cursors (Gruvbox)";
+      size = 24;
     };
   };
 
@@ -25,17 +25,17 @@
 
   dconf.settings = {
     "org/gnome/desktop/interface" = {
-      gtk-theme    = "Gruvbox-Dark";
-      icon-theme   = "Adwaita";
+      gtk-theme = "Gruvbox-Dark";
+      icon-theme = "Adwaita";
       cursor-theme = "Capitaine Cursors (Gruvbox)";
-      cursor-size  = 24;
+      cursor-size = 24;
       color-scheme = "prefer-dark";
     };
   };
 
   home.sessionVariables = {
     XCURSOR_THEME = "Capitaine Cursors (Gruvbox)";
-    XCURSOR_SIZE  = "24";
+    XCURSOR_SIZE = "24";
     HYPRCURSOR_SIZE = "24";
 
     GTK_THEME = "Gruvbox-Dark";
diff --git a/home-manager/modules/hypr/waybar.nix b/home-manager/modules/hypr/waybar.nix
index 5f3a01d..11f800f 100644
--- a/home-manager/modules/hypr/waybar.nix
+++ b/home-manager/modules/hypr/waybar.nix
@@ -1,4 +1,5 @@
-{ config, pkgs, ... }: {
+{ config, pkgs, ... }:
+{
   programs.waybar = {
     enable = true;
     settings = {
@@ -9,7 +10,12 @@
 
         modules-left = [ "hyprland/workspaces" ];
         modules-center = [ "clock" ];
-        modules-right = [ "cpu" "memory" "temperature" "battery" ];
+        modules-right = [
+          "cpu"
+          "memory"
+          "temperature"
+          "battery"
+        ];
 
         "hyprland/workspaces" = {
           disable-scroll = true;
@@ -32,13 +38,30 @@
           interval = 1;
         };
 
-        "cpu" = { format = " {usage: >3}%"; };
-        "memory" = { format = " {used:0.1f}G"; tooltip = false; };
-        "temperature" = { format = " {temperatureC}°C"; tooltip = false; };
+        "cpu" = {
+          format = " {usage: >3}%";
+        };
+        "memory" = {
+          format = " {used:0.1f}G";
+          tooltip = false;
+        };
+        "temperature" = {
+          format = " {temperatureC}°C";
+          tooltip = false;
+        };
         "battery" = {
-          states = { warning = 30; critical = 15; };
+          states = {
+            warning = 30;
+            critical = 15;
+          };
           format = "{icon} {capacity}%";
-          format-icons = [ "" "" "" "" "" ];
+          format-icons = [
+            ""
+            ""
+            ""
+            ""
+            ""
+          ];
         };
       };
     };
@@ -112,4 +135,3 @@
     '';
   };
 }
-
diff --git a/home-manager/modules/mako.nix b/home-manager/modules/mako.nix
index d58599f..62ced93 100644
--- a/home-manager/modules/mako.nix
+++ b/home-manager/modules/mako.nix
@@ -40,4 +40,3 @@
     '';
   };
 }
-
diff --git a/home-manager/modules/starship.nix b/home-manager/modules/starship.nix
index 53985a8..9416b0b 100644
--- a/home-manager/modules/starship.nix
+++ b/home-manager/modules/starship.nix
@@ -1,4 +1,10 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
   programs.starship = {
     enable = true;
 
@@ -109,7 +115,9 @@
         format = "[[  $time ](fg:color_fg0 bg:color_bg1)]($style)";
       };
 
-      line_break = { disabled = false; };
+      line_break = {
+        disabled = false;
+      };
 
       character = {
         disabled = false;
@@ -123,5 +131,4 @@
     };
   };
 
-
 }
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index eaf0f85..d830c7b 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -2,41 +2,44 @@
 # 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
-      ./pkgs.nix
-      ./fonts.nix
-      ./modules/bundle.nix
-    ];
+  imports = [
+    # Include the results of the hardware scan.
+    ./hardware-configuration.nix
+    ./pkgs.nix
+    ./fonts.nix
+    ./modules/bundle.nix
+  ];
 
   # Use the systemd-boot EFI boot loader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
   boot.kernelPackages = pkgs.linuxPackages_latest;
-  
-  networking.hostName = "TARS"; 
-  networking.networkmanager.enable = true; 
+
+  networking.hostName = "TARS";
+  networking.networkmanager.enable = true;
   networking.firewall.checkReversePath = "loose";
   networking.firewall.allowedTCPPorts = [ 53317 ];
   networking.firewall.allowedUDPPorts = [ 53317 ];
 
   time.timeZone = "Europe/Paris";
 
-  
   i18n.defaultLocale = "en_US.UTF-8";
   console = {
     font = "Lat2-Terminus16";
     keyMap = "mod-dh-iso-us";
   };
 
-  
   # I need to figure out how this works
   # services.printing.enable = true;
-  
+
   services.pipewire = {
     enable = true;
 
@@ -56,9 +59,11 @@
   };
 
   programs.nix-ld.enable = true;
- 
-  nix.settings.experimental-features = [ "nix-command" "flakes" ];   
+
+  nix.settings.experimental-features = [
+    "nix-command"
+    "flakes"
+  ];
 
   system.stateVersion = "25.05";
 }
-
diff --git a/nixos/fonts.nix b/nixos/fonts.nix
index 8f4e9db..6c7af53 100644
--- a/nixos/fonts.nix
+++ b/nixos/fonts.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
   fonts.packages = with pkgs; [
     nerd-fonts.iosevka-term
     nerd-fonts.jetbrains-mono
diff --git a/nixos/hardware-configuration.nix b/nixos/hardware-configuration.nix
index a368ac0..bab9feb 100644
--- a/nixos/hardware-configuration.nix
+++ b/nixos/hardware-configuration.nix
@@ -1,30 +1,48 @@
 # 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" "sd_mod" ];
-  boot.initrd.kernelModules = [ "dm-snapshot" "cryptd" ];
+  boot.initrd.availableKernelModules = [
+    "nvme"
+    "xhci_pci"
+    "thunderbolt"
+    "usb_storage"
+    "sd_mod"
+  ];
+  boot.initrd.kernelModules = [
+    "dm-snapshot"
+    "cryptd"
+  ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-label/NixOS-Root";
-      fsType = "ext4";
-    };
+  fileSystems."/" = {
+    device = "/dev/disk/by-label/NixOS-Root";
+    fsType = "ext4";
+  };
 
   boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-label/NixOS-Encrypted";
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-label/NixOS-Boot";
-      fsType = "vfat";
-      options = [ "fmask=0022" "dmask=0022" ];
-    };
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-label/NixOS-Boot";
+    fsType = "vfat";
+    options = [
+      "fmask=0022"
+      "dmask=0022"
+    ];
+  };
 
   swapDevices = [
     {
diff --git a/nixos/modules/brightness.nix b/nixos/modules/brightness.nix
index ee2db7e..feaf5b4 100644
--- a/nixos/modules/brightness.nix
+++ b/nixos/modules/brightness.nix
@@ -1,5 +1,5 @@
 {
   services.udev.extraRules = ''
-  ACTION=="add", SUBSYSTEM=="backlight", KERNEL=="amdgpu_bl1", GROUP="video", MODE="0660"
-'';
+    ACTION=="add", SUBSYSTEM=="backlight", KERNEL=="amdgpu_bl1", GROUP="video", MODE="0660"
+  '';
 }
diff --git a/nixos/modules/bundle.nix b/nixos/modules/bundle.nix
index 5ffa512..b569cf7 100644
--- a/nixos/modules/bundle.nix
+++ b/nixos/modules/bundle.nix
@@ -13,4 +13,3 @@
     ./lidswitch.nix
   ];
 }
-
diff --git a/nixos/modules/foot.nix b/nixos/modules/foot.nix
index 6c3b6e1..2dc6033 100644
--- a/nixos/modules/foot.nix
+++ b/nixos/modules/foot.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
   programs.foot = {
     enable = true;
     enableBashIntegration = true;
diff --git a/nixos/modules/git.nix b/nixos/modules/git.nix
index e263935..8f086be 100644
--- a/nixos/modules/git.nix
+++ b/nixos/modules/git.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
   # For libsecret
   services.gnome.gnome-keyring.enable = true;
   security.pam.services.login.enableGnomeKeyring = true;
diff --git a/nixos/modules/hypr/hyprland.nix b/nixos/modules/hypr/hyprland.nix
index 1541916..fddfd65 100644
--- a/nixos/modules/hypr/hyprland.nix
+++ b/nixos/modules/hypr/hyprland.nix
@@ -1,5 +1,5 @@
-{ pkgs, ...}: {
+{ pkgs, ... }:
+{
   programs.hyprland.enable = true;
   environment.sessionVariables.NIXOS_OZONE_WL = "1";
 }
-
diff --git a/nixos/modules/rebinding.nix b/nixos/modules/rebinding.nix
index f71c07f..2fe9dde 100644
--- a/nixos/modules/rebinding.nix
+++ b/nixos/modules/rebinding.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
   services.keyd.enable = true;
 
   services.keyd.keyboards = {
diff --git a/nixos/modules/steam.nix b/nixos/modules/steam.nix
index 05415b2..bbabe64 100644
--- a/nixos/modules/steam.nix
+++ b/nixos/modules/steam.nix
@@ -1,3 +1,4 @@
-{ lib, pkgs, ... }: {
+{ lib, pkgs, ... }:
+{
   programs.steam.enable = true;
 }
diff --git a/nixos/modules/user.nix b/nixos/modules/user.nix
index 6bd6d07..9e79bcf 100644
--- a/nixos/modules/user.nix
+++ b/nixos/modules/user.nix
@@ -1,4 +1,5 @@
-{ pkgs, ...} : {
+{ pkgs, ... }:
+{
   programs.fish.enable = true;
   documentation.man.generateCaches = false;
 
@@ -9,7 +10,9 @@
       enable = true;
 
       dockerCompat = true;
-      defaultNetwork.settings = { dns_enabled = true; };
+      defaultNetwork.settings = {
+        dns_enabled = true;
+      };
     };
   };
   services.flatpak.enable = true;
@@ -21,7 +24,6 @@
     '';
   };
 
-
   users = {
     defaultUserShell = pkgs.bash;
     users.zeph = {
@@ -33,7 +35,7 @@
         "kvm"
         "docker"
       ];
-      packages = with pkgs; [];
+      packages = with pkgs; [ ];
     };
   };
   services.fwupd.enable = true;
diff --git a/nixos/modules/xfce.nix b/nixos/modules/xfce.nix
index e5e763e..724de5e 100644
--- a/nixos/modules/xfce.nix
+++ b/nixos/modules/xfce.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
   services.xserver = {
     enable = true;
     desktopManager.xfce.enable = true;
diff --git a/nixos/pkgs.nix b/nixos/pkgs.nix
index ebd9794..486b639 100644
--- a/nixos/pkgs.nix
+++ b/nixos/pkgs.nix
@@ -1,94 +1,99 @@
-{ pkgs, pkgs-stable, lib, config, ... }: {
-  environment.systemPackages = (with pkgs; [
-    # Editors
-    helix
-    vim
-    sioyek
+{
+  pkgs,
+  pkgs-stable,
+  lib,
+  config,
+  ...
+}:
+{
+  environment.systemPackages =
+    (with pkgs; [
+      # Editors
+      helix
+      vim
+      sioyek
 
-    # Dev stuff
-    podman-compose
-    gitFull
-    go-swag
-    gcc
-    go
-    gopls
-    bun
-    svelte-language-server
-    typescript-language-server
-    nixd
-    # texlive.combined.scheme-medium
-    (pkgs.texlive.combine { inherit (pkgs.texlive) scheme-medium csvsimple; })
-    texlab
-    typst
-    tinymist
-    ffmpeg
-    localsend
-    flutter
-    jdk17
-    android-studio
+      # Dev stuff
+      podman-compose
+      gitFull
+      go-swag
+      gcc
+      go
+      gopls
+      bun
+      svelte-language-server
+      typescript-language-server
+      nixd
+      # texlive.combined.scheme-medium
+      (pkgs.texlive.combine { inherit (pkgs.texlive) scheme-medium csvsimple; })
+      texlab
+      typst
+      tinymist
+      ffmpeg
+      localsend
+      flutter
+      jdk17
+      android-studio
 
+      # Rust toolchain
+      cargo
+      cargo-cache
+      rust-analyzer
+      rustc
+      rustfmt
+      clippy
 
-    # Rust toolchain
-    cargo
-    cargo-cache
-    rust-analyzer
-    rustc
-    rustfmt
-    clippy
+      # System stuff
+      thunar
+      fprintd
+      rclone
+      unzip
+      brightnessctl
+      wl-clipboard
+      fastfetch
+      starship
+      home-manager
+      capitaine-cursors-themed
+      libsecret
+      lsd
+      htop
 
-    # System stuff
-    thunar
-    fprintd
-    rclone
-    unzip
-    brightnessctl
-    wl-clipboard
-    fastfetch
-    starship
-    home-manager
-    capitaine-cursors-themed
-    libsecret
-    lsd
-    htop
+      # Internet
+      bitwarden-desktop
+      protonvpn-gui
+      # ente-auth
+      signal-desktop
+      strawberry
 
-    # Internet
-    bitwarden-desktop
-    protonvpn-gui
-    # ente-auth
-    signal-desktop
-    strawberry
+      # Office (and fun)
+      godot
+      libreoffice
+      mpv
+      surge-XT
+      ardour
+      qpwgraph
+      gimp
 
-    # Office (and fun)
-    godot
-    libreoffice
-    mpv
-    surge-XT
-    ardour
-    qpwgraph
-    gimp
-
-    # Important hypr* things
-    fuzzel
-    bemoji
-    wtype
-    hyprpaper
-    hyprpolkitagent
-    hyprsunset
-    hyprshot
-    mako
-    swayosd
-  ])
-  ++
-  # Misbehaving packages
-  (with pkgs-stable; [
-    librewolf
-  ]);
+      # Important hypr* things
+      fuzzel
+      bemoji
+      wtype
+      hyprpaper
+      hyprpolkitagent
+      hyprsunset
+      hyprshot
+      mako
+      swayosd
+    ])
+    ++
+      # Misbehaving packages
+      (with pkgs-stable; [
+        librewolf
+      ]);
 
   # Unfree pkgs
   nixpkgs.config = {
     allowUnfree = true;
     android_sdk.accept_license = true;
-    };
+  };
 }
-
-