diff --git a/home-manager/cobray.nix b/home-manager/cobray.nix
index 02189a3..f416e5b 100644
--- a/home-manager/cobray.nix
+++ b/home-manager/cobray.nix
@@ -1,7 +1,5 @@
 {
-  config,
   pkgs,
-  lib,
   ...
 }: {
   imports = [
diff --git a/home-manager/modules/dunst.nix b/home-manager/modules/dunst.nix
index df6dd53..765bad9 100644
--- a/home-manager/modules/dunst.nix
+++ b/home-manager/modules/dunst.nix
@@ -1,7 +1,5 @@
 {
-  config,
   pkgs,
-  lib,
   ...
 }: {
   home.packages = with pkgs; [
diff --git a/home-manager/modules/fish.nix b/home-manager/modules/fish.nix
index 9673e14..e93b3ee 100644
--- a/home-manager/modules/fish.nix
+++ b/home-manager/modules/fish.nix
@@ -1,7 +1,5 @@
 {
-  config,
   pkgs,
-  lib,
   ...
 }: {
   home.packages = with pkgs; [
diff --git a/home-manager/modules/ghostty.nix b/home-manager/modules/ghostty.nix
index f6bfb42..af2ccdc 100644
--- a/home-manager/modules/ghostty.nix
+++ b/home-manager/modules/ghostty.nix
@@ -1,7 +1,5 @@
 {
-  config,
   pkgs,
-  lib,
   ...
 }: {
   home.packages = with pkgs; [
diff --git a/home-manager/modules/lazygit.nix b/home-manager/modules/lazygit.nix
index b35c895..df3baf7 100644
--- a/home-manager/modules/lazygit.nix
+++ b/home-manager/modules/lazygit.nix
@@ -1,7 +1,5 @@
 {
-  config,
   pkgs,
-  lib,
   ...
 }: {
   home.packages = with pkgs; [
diff --git a/home-manager/modules/nvim.nix b/home-manager/modules/nvim.nix
index 5a0004e..70fbc83 100644
--- a/home-manager/modules/nvim.nix
+++ b/home-manager/modules/nvim.nix
@@ -1,5 +1,8 @@
-{ config, pkgs, lib, ... }:
 {
+  config,
+  pkgs,
+  ...
+}: {
   home.packages = with pkgs; [
     neovim
     gnugrep
diff --git a/home-manager/modules/picom.nix b/home-manager/modules/picom.nix
index cd0ea0f..09c58fc 100644
--- a/home-manager/modules/picom.nix
+++ b/home-manager/modules/picom.nix
@@ -1,7 +1,5 @@
 {
-  config,
   pkgs,
-  lib,
   ...
 }: {
   home.packages = with pkgs; [
diff --git a/home-manager/modules/polybar.nix b/home-manager/modules/polybar.nix
index 6e49875..cae7d9a 100644
--- a/home-manager/modules/polybar.nix
+++ b/home-manager/modules/polybar.nix
@@ -1,7 +1,5 @@
 {
-  config,
   pkgs,
-  lib,
   ...
 }: {
   home.packages = with pkgs; [
diff --git a/home-manager/modules/rofi.nix b/home-manager/modules/rofi.nix
index 511832f..b64defc 100644
--- a/home-manager/modules/rofi.nix
+++ b/home-manager/modules/rofi.nix
@@ -1,7 +1,5 @@
 {
-  config,
   pkgs,
-  lib,
   ...
 }: {
   home.packages = with pkgs; [
diff --git a/home-manager/modules/starship.nix b/home-manager/modules/starship.nix
index 1e60569..5528de8 100644
--- a/home-manager/modules/starship.nix
+++ b/home-manager/modules/starship.nix
@@ -1,7 +1,5 @@
 {
-  config,
   pkgs,
-  lib,
   ...
 }: {
   home.packages = with pkgs; [
diff --git a/home-manager/modules/zellij.nix b/home-manager/modules/zellij.nix
index a668691..25a434d 100644
--- a/home-manager/modules/zellij.nix
+++ b/home-manager/modules/zellij.nix
@@ -1,7 +1,5 @@
 {
-  config,
   pkgs,
-  lib,
   ...
 }: {
   home.packages = with pkgs; [
diff --git a/hosts/configuration.nix b/hosts/configuration.nix
index 194087a..a0aad19 100644
--- a/hosts/configuration.nix
+++ b/hosts/configuration.nix
@@ -2,10 +2,6 @@
 # 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,
-  inputs,
   ...
 }: {
   imports = [
diff --git a/hosts/local-packages.nix b/hosts/local-packages.nix
index 22b691f..1ad0be1 100644
--- a/hosts/local-packages.nix
+++ b/hosts/local-packages.nix
@@ -1,21 +1,24 @@
-{ config, pkgs, lib, ... }:
-let
-  customPkgs = import ../pkgs { inherit pkgs lib; };
+{
+  pkgs,
+  lib,
+  ...
+}: let
+  customPkgs = import ../pkgs {inherit pkgs lib;};
 in {
   imports = [
     ../modules/python.nix
   ];
   python.enable = true;
   environment.systemPackages = with pkgs; [
-    (python311.withPackages (pyPkgs: with pyPkgs; [
-      requests
-      pip
-      virtualenv
-      ipython
-    ]))
+    (python311.withPackages (pyPkgs:
+      with pyPkgs; [
+        requests
+        pip
+        virtualenv
+        ipython
+      ]))
     python3Packages.pip
     black
-    ruff
     brave # TODO: make a module to save browser stuff
     vesktop
     git
@@ -43,6 +46,7 @@ in {
     gawk
     obs-studio
     lazygit
+    lazydocker
     jdk17
     bun
     maven
diff --git a/modules/audio.nix b/modules/audio.nix
index 2ca23c8..5a2ffff 100644
--- a/modules/audio.nix
+++ b/modules/audio.nix
@@ -1,7 +1,5 @@
 {
-  config,
   pkgs,
-  lib,
   ...
 }: {
   security.rtkit.enable = true;
diff --git a/modules/bluetooth.nix b/modules/bluetooth.nix
index e704bde..be4d765 100644
--- a/modules/bluetooth.nix
+++ b/modules/bluetooth.nix
@@ -1,7 +1,5 @@
 {
-  config,
   pkgs,
-  lib,
   ...
 }: {
   hardware.bluetooth = {
diff --git a/modules/boot.nix b/modules/boot.nix
index d313ed0..7ee7d23 100644
--- a/modules/boot.nix
+++ b/modules/boot.nix
@@ -1,7 +1,5 @@
 {
-  config,
   pkgs,
-  lib,
   ...
 }: {
   # Bootloader
diff --git a/modules/default.nix b/modules/default.nix
index c0fda17..a8d190f 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,7 +1,5 @@
 {
-  config,
   pkgs,
-  lib,
   ...
 }: {
   imports = [
diff --git a/modules/docker.nix b/modules/docker.nix
index 76407d8..4a14735 100644
--- a/modules/docker.nix
+++ b/modules/docker.nix
@@ -1,7 +1,5 @@
 {
-  config,
   pkgs,
-  lib,
   ...
 }: {
   virtualisation.docker = {
diff --git a/modules/env.nix b/modules/env.nix
index ef6077b..9836023 100644
--- a/modules/env.nix
+++ b/modules/env.nix
@@ -1,5 +1,4 @@
 {
-  config,
   pkgs,
   lib,
   ...
diff --git a/modules/fonts.nix b/modules/fonts.nix
index 2ce9a49..1237375 100644
--- a/modules/fonts.nix
+++ b/modules/fonts.nix
@@ -1,7 +1,5 @@
 {
-  config,
   pkgs,
-  lib,
   ...
 }: let
   clear-sans = pkgs.stdenv.mkDerivation {
diff --git a/modules/home-manager.nix b/modules/home-manager.nix
index 1e08aff..f33d71a 100644
--- a/modules/home-manager.nix
+++ b/modules/home-manager.nix
@@ -1,7 +1,4 @@
 {
-  config,
-  pkgs,
-  lib,
   inputs,
   ...
 }: {
diff --git a/modules/i3-xfce.nix b/modules/i3-xfce.nix
index 78450c9..7f88ec8 100644
--- a/modules/i3-xfce.nix
+++ b/modules/i3-xfce.nix
@@ -1,5 +1,4 @@
 {
-  config,
   pkgs,
   lib,
   ...
diff --git a/modules/net.nix b/modules/net.nix
index bb2230f..963181f 100644
--- a/modules/net.nix
+++ b/modules/net.nix
@@ -1,7 +1,5 @@
 {
-  config,
   pkgs,
-  lib,
   ...
 }: {
   environment.systemPackages = with pkgs; [
diff --git a/modules/nixos.nix b/modules/nixos.nix
index b2bc73e..5f6c83a 100644
--- a/modules/nixos.nix
+++ b/modules/nixos.nix
@@ -1,7 +1,4 @@
 {
-  config,
-  pkgs,
-  lib,
   ...
 }: {
   nixpkgs.config.allowUnfree = true;
diff --git a/modules/nvidia.nix b/modules/nvidia.nix
index 27234b6..714e011 100644
--- a/modules/nvidia.nix
+++ b/modules/nvidia.nix
@@ -1,7 +1,6 @@
 {
   config,
   pkgs,
-  lib,
   ...
 }: {
   services.xserver.videoDrivers = ["nvidia"];
diff --git a/modules/python.nix b/modules/python.nix
index 25d2c5e..0986487 100644
--- a/modules/python.nix
+++ b/modules/python.nix
@@ -1,5 +1,4 @@
 { config, pkgs, lib, ... }:
-
 let
   customPkgs = pkgs.callPackage ../pkgs { inherit pkgs lib; };
   pipConf = pkgs.writeText "pip.conf" ''
@@ -29,13 +28,14 @@ let
       pkgs.python311Packages.pynvml
       pkgs.python311Packages.pyqtgraph
       pkgs.python311Packages.pyqt6
-      pkgs.python311Packages.cppcheck
       pkgs.python311Packages.click
       pkgs.python311Packages.typer
       pkgs.python311Packages.rich
       pkgs.python311Packages.pyyaml
       pkgs.python311Packages.pytz
       pkgs.python311Packages.pillow
+      pkgs.python311Packages.jedi
+      pkgs.python311Packages.libcst
     ];
   };
 in {
@@ -47,14 +47,13 @@ in {
       pythonEnv
       python3Packages.pip
       black
-      ruff
+      isort
       uv
       stdenv.cc.cc.lib
     ];
-    # Environment variables
     environment.variables = {
       PIP_PREFIX = "$HOME/.local";
-      PIP_CONFIG_FILE = "${pipConf}";  # Force pip to use our config
+      PIP_CONFIG_FILE = "${pipConf}";
       PYTHONPATH = "$HOME/.local/lib/python3.11/site-packages";
     };
     system.userActivationScripts.removeNumpy2 = ''
diff --git a/modules/steam.nix b/modules/steam.nix
index 89d21b5..e0172f6 100644
--- a/modules/steam.nix
+++ b/modules/steam.nix
@@ -1,9 +1,5 @@
 {
-  config,
   pkgs,
-  lib,
-  inputs,
-  system,
   ...
 }: {
   programs.steam = {
diff --git a/modules/timezone.nix b/modules/timezone.nix
index cb9f39e..9e5451d 100644
--- a/modules/timezone.nix
+++ b/modules/timezone.nix
@@ -1,7 +1,4 @@
 {
-  config,
-  pkgs,
-  lib,
   ...
 }: {
   time.timeZone = "America/Edmonton";
diff --git a/modules/user.nix b/modules/user.nix
index 66928eb..a5f871d 100644
--- a/modules/user.nix
+++ b/modules/user.nix
@@ -1,7 +1,5 @@
 {
-  config,
   pkgs,
-  lib,
   ...
 }: let
   fish-rust = pkgs.callPackage ../pkgs/fish-rust {};
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 4442009..06f554e 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,6 +1,7 @@
-{ pkgs ? import <nixpkgs> {}, lib ? pkgs.lib }:
-
-let
+{
+  pkgs ? import <nixpkgs> {},
+  lib ? pkgs.lib,
+}: let
   numpy-1 = pkgs.python311Packages.numpy.overridePythonAttrs (oldAttrs: rec {
     version = "1.26.4";
     src = pkgs.fetchPypi {
@@ -16,9 +17,7 @@ let
       numpy = numpy-1;
     };
   };
-
 in {
-
   fish-rust = pkgs.callPackage ./fish-rust {};
 
   python-pymatting = pkgs.callPackage ./python-pymatting {
diff --git a/pkgs/python-opencv-headless/default.nix b/pkgs/python-opencv-headless/default.nix
index babc7da..a542c4d 100644
--- a/pkgs/python-opencv-headless/default.nix
+++ b/pkgs/python-opencv-headless/default.nix
@@ -1,10 +1,10 @@
-{ lib
-, python311Packages
-, fetchPypi
-, stdenv
-, makeWrapper
-, cmake
-, pkg-config
+{ lib,
+python311Packages,
+fetchPypi,
+stdenv,
+makeWrapper,
+cmake,
+pkg-config
 }:
 
 python311Packages.buildPythonPackage rec {
diff --git a/pkgs/python-pymatting/default.nix b/pkgs/python-pymatting/default.nix
index fa4b814..889cce7 100644
--- a/pkgs/python-pymatting/default.nix
+++ b/pkgs/python-pymatting/default.nix
@@ -34,6 +34,6 @@ python311Packages.buildPythonPackage rec {
     homepage = "https://github.com/pymatting/pymatting";
     license = licenses.mit;
     platforms = platforms.all;
-    maintainers = with maintainers; [ "Cobray" ];
+    maintainers = with maintainers; ["Cobray"];
   };
 }
diff --git a/pkgs/python-rembg/default.nix b/pkgs/python-rembg/default.nix
index 030a6d1..6a7e5e3 100644
--- a/pkgs/python-rembg/default.nix
+++ b/pkgs/python-rembg/default.nix
@@ -1,8 +1,8 @@
-{ lib
-, python311Packages
-, fetchPypi
-, python-pymatting
-, python-opencv-headless
+{ lib,
+python311Packages,
+fetchPypi,
+python-pymatting,
+python-opencv-headless
 }:
 python311Packages.buildPythonPackage rec {
   pname = "rembg";
diff --git a/pkgs/tokyo-night/default.nix b/pkgs/tokyo-night/default.nix
deleted file mode 100644
index 2278384..0000000
--- a/pkgs/tokyo-night/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  gtk-engine-murrine,
-  gnome-themes-extra,
-  bash,
-  sassc,
-}:
-stdenv.mkDerivation {
-  pname = "tokyo-night-gtk";
-  version = "main";
-
-  src = fetchFromGitHub {
-    owner = "Fausto-Korpsvart";
-    repo = "Tokyonight-GTK-Theme";
-    rev = "4dc45d60bf35f50ebd9ee41f16ab63783f80dd64";
-    sha256 = "0c7sp9n2pc70yy9msmbmcyhqbr63v1ssnsxk6vg10zwwc3wl19h0";
-  };
-
-  nativeBuildInputs = [bash sassc];
-  buildInputs = [gtk-engine-murrine gnome-themes-extra];
-  propagatedUserEnvPkgs = [gtk-engine-murrine];
-
-  buildPhase = ''
-    bash ./install.sh --dest $out/share/themes -n Tokyonight
-    bash ./install.sh --dest $out/share/themes -n Tokyonight --tweaks storm
-    bash ./install.sh --dest $out/share/themes -n Tokyonight --tweaks storm black
-    bash ./install.sh --dest $out/share/themes -n Tokyonight --tweaks storm black outline
-  '';
-
-  installPhase = "";
-
-  meta = with lib; {
-    description = "Tokyo Night GTK Theme";
-    homepage = "https://github.com/Fausto-Korpsvart/Tokyonight-GTK-Theme";
-    license = licenses.gpl3;
-    platforms = platforms.all;
-    maintainers = ["Cobray"];
-  };
-}