diff --git a/flake.nix b/flake.nix
index 74a7b44..712ca7a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,7 +5,6 @@
   inputs.nixos-hardware.url = "github:NixOS/nixos-hardware/master";
 
   outputs = {
-    self,
     nixpkgs,
     nixos-hardware,
     ...
diff --git a/raspberry-pi/apply-overlays/apply-overlays-dtmerge.nix b/raspberry-pi/apply-overlays/apply-overlays-dtmerge.nix
index 3806673..5c4929e 100644
--- a/raspberry-pi/apply-overlays/apply-overlays-dtmerge.nix
+++ b/raspberry-pi/apply-overlays/apply-overlays-dtmerge.nix
@@ -3,7 +3,6 @@ paramsPerOverlayMap: {
   stdenvNoCC,
   dtc,
   libraspberrypi,
-  pkgs,
 }:
 with lib; (base: overlays':
     stdenvNoCC.mkDerivation {
diff --git a/raspberry-pi/apply-overlays/default.nix b/raspberry-pi/apply-overlays/default.nix
index 45ddc48..c072c09 100644
--- a/raspberry-pi/apply-overlays/default.nix
+++ b/raspberry-pi/apply-overlays/default.nix
@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  pkgs,
   ...
 }:
 with lib; let
diff --git a/raspberry-pi/packages/deskpi-tools/default.nix b/raspberry-pi/packages/deskpi-tools/default.nix
index 0e7514b..05c16db 100644
--- a/raspberry-pi/packages/deskpi-tools/default.nix
+++ b/raspberry-pi/packages/deskpi-tools/default.nix
@@ -1,7 +1,5 @@
 {
-  lib,
   stdenv,
-  pkgs,
   fetchFromGitHub,
   gcc,
   device ? "/dev/deskPi",
@@ -17,7 +15,7 @@
     hash = "sha256-cetBXTqe8zZXpn5jjZ/g61j9y39exKWIvJH9IMgJj5c=";
   };
 in
-  stdenv.mkDerivation rec {
+  stdenv.mkDerivation {
     inherit pname version src;
 
     nativeBuildInputs = [gcc];
diff --git a/raspberry-pi/packages/rpi-utils/default.nix b/raspberry-pi/packages/rpi-utils/default.nix
index db61d55..f5b96b9 100644
--- a/raspberry-pi/packages/rpi-utils/default.nix
+++ b/raspberry-pi/packages/rpi-utils/default.nix
@@ -16,7 +16,7 @@
     hash = "sha256-qYpfy3PtPXzzunKsKSgsQXRUALQz6FSCsHQLe7djSt0=";
   };
 in
-  stdenv.mkDerivation rec {
+  stdenv.mkDerivation {
     inherit pname version src;
     nativeBuildInputs = [gcc cmake];
     buildInputs = [dtc];
diff --git a/uconsole/configs/configuration.nix b/uconsole/configs/configuration.nix
index 94c7fbb..3f96317 100644
--- a/uconsole/configs/configuration.nix
+++ b/uconsole/configs/configuration.nix
@@ -120,5 +120,5 @@
   # and migrated your data accordingly.
   #
   # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
-  system.stateVersion = "24.11"; # Did you read the comment?
+  system.stateVersion = "25.05"; # Did you read the comment?
 }
diff --git a/uconsole/kernel/default.nix b/uconsole/kernel/default.nix
index a60186a..c44e698 100644
--- a/uconsole/kernel/default.nix
+++ b/uconsole/kernel/default.nix
@@ -1,9 +1,4 @@
-{
-  nixpkgs,
-  pkgs,
-  config,
-  ...
-}: let
+{pkgs, ...}: let
   kernelPackagesCfg = {
     linuxPackagesFor,
     linux_rpi4,
diff --git a/uconsole/module-4g.nix b/uconsole/module-4g.nix
index 037d589..c66d5fb 100644
--- a/uconsole/module-4g.nix
+++ b/uconsole/module-4g.nix
@@ -1,9 +1,4 @@
-{
-  pkgs,
-  lib,
-  ...
-}: let
-  inherit (lib) mkDefault;
+{pkgs, ...}: let
   rpi-utils = pkgs.callPackage ../raspberry-pi/packages/rpi-utils {};
   uconsole-4g-cm4 = pkgs.writeShellScriptBin "uconsole-4g-cm4" ''
     function tip {
@@ -51,7 +46,6 @@ in {
     environment.systemPackages = [
       rpi-utils
       uconsole-4g-cm4
-      # pkgs.modemmanager
     ];
   };
 }