diff --git a/audio.nix b/audio.nix
index 8040d3f..30ac6f4 100644
--- a/audio.nix
+++ b/audio.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, ... }:
 
 {
   # Enable sound with pipewire.
diff --git a/bootloader.nix b/bootloader.nix
index f318a32..e7cd08b 100644
--- a/bootloader.nix
+++ b/bootloader.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, ... }:
 
 {
   # Bootloader.
diff --git a/configuration.nix b/configuration.nix
index e916979..19668b0 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -1,12 +1,8 @@
-# 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, ... }:
 
 {
   imports =
-    [ # Include the results of the hardware scan.a
+    [
       <nixos-hardware/framework>
       ./hardware-configuration.nix
       <home-manager/nixos>
@@ -24,11 +20,6 @@
   };
 
   networking.hostName = "Zenith-nixos"; # Define your hostname.
-  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
-
-  # Configure network proxy if necessary
-  # networking.proxy.default = "http://user:password@proxy:port/";
-  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
 
   # Enable networking
   networking.networkmanager.enable = true;
@@ -51,19 +42,6 @@
     LC_TIME = "nl_NL.UTF-8";
   };
 
-  # Enable the X11 windowing system.
-  services.xserver.enable = true;
-
-  # Enable the GNOME Desktop Environment.
-  services.xserver.displayManager.gdm.enable = true;
-  services.xserver.desktopManager.gnome.enable = true;
-
-  # Configure keymap in X11
-  services.xserver = {
-    layout = "us";
-    xkbVariant = "altgr-intl";
-  };
-
   # Enable CUPS to print documents.
   services.printing.enable = true;
 
@@ -78,26 +56,6 @@
   
   services.udev.packages = with pkgs; [ gnome.gnome-settings-daemon ];
 
-  #console.font = roboto-regular;
-  # Some programs need SUID wrappers, can be configured further or are
-  # started in user sessions.
-  # programs.mtr.enable = true;
-  # programs.gnupg.agent = {
-  #   enable = true;
-  #   enableSSHSupport = true;
-  # };
-
-  # List services that you want to enable:
-
-  # Enable the OpenSSH daemon.
-  # services.openssh.enable = true;
-
-  # Open ports in the firewall.
-  # networking.firewall.allowedTCPPorts = [ ... ];
-  # networking.firewall.allowedUDPPorts = [ ... ];
-  # Or disable the firewall altogether.
-  # networking.firewall.enable = false;
-
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave
@@ -105,10 +63,4 @@
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
   system.stateVersion = "23.05"; # Did you read the comment?
-  
-#  services.logind.extraConfig = ''
-#    HandleLidSwitch=suspend-then-hibernate
-#    HibernateDelaySec=5min
-#  '';
-
 }
diff --git a/desktop-environment.nix b/desktop-environment.nix
new file mode 100644
index 0000000..25222a3
--- /dev/null
+++ b/desktop-environment.nix
@@ -0,0 +1,16 @@
+{ config, ... }:
+
+{
+  # Enable the X11 windowing system.
+  services.xserver.enable = true;
+
+  # Enable the GNOME Desktop Environment.
+  services.xserver.displayManager.gdm.enable = true;
+  services.xserver.desktopManager.gnome.enable = true;
+
+  # Configure keymap in X11
+  services.xserver = {
+    layout = "us";
+    xkbVariant = "altgr-intl";
+  };
+}
\ No newline at end of file
diff --git a/hibernation.nix b/hibernation.nix
index 835b21f..b18d501 100644
--- a/hibernation.nix
+++ b/hibernation.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, ... }:
 
 {
   services.logind.lidSwitch = "suspend-then-hibernate";
diff --git a/system-packages.nix b/system-packages.nix
index 8bc8435..8e453bd 100644
--- a/system-packages.nix
+++ b/system-packages.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, pkgs, ... }:
 {  
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
diff --git a/user-packages.nix b/user-packages.nix
index 609d858..0d79fc4 100644
--- a/user-packages.nix
+++ b/user-packages.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, pkgs, ... }:
 
 {
   programs.steam.enable = true;
diff --git a/users.nix b/users.nix
index d0ee90b..3c4b00f 100644
--- a/users.nix
+++ b/users.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, ... }:
 
 {
   # Define a user account. Don't forget to set a password with ‘passwd’.