diff --git a/flake.nix b/flake.nix
index 7848d8d..e2da495 100644
--- a/flake.nix
+++ b/flake.nix
@@ -24,18 +24,13 @@
         url = "github:nix-community/NUR";                                   # NUR Packages
       };
 
-      hyprland = {                                                          # Official Hyprland flake
-        url = "github:vaxerski/Hyprland";
-        inputs.nixpkgs.follows = "nixpkgs";
-      };
-
       agenix = {
         url = "github:ryantm/agenix";
         inputs.nixpkgs.follows = "nixpkgs";
       };
     };
 
-  outputs = inputs @ { self, nixpkgs, nixpkgs-stable, nixos-hardware, home-manager, nur, hyprland, agenix, ... }:   # Function that tells my flake which to use and what do what to do with the dependencies.
+  outputs = inputs @ { self, nixpkgs, nixpkgs-stable, nixos-hardware, home-manager, nur, agenix, ... }:   # Function that tells my flake which to use and what do what to do with the dependencies.
     let                                                                     # Variables that can be used in the config files
       user = "kabbone";
       location = "$HOME/.setup";
@@ -44,7 +39,7 @@
       nixosConfigurations = (                                               # NixOS configurations
         import ./hosts {                                                    # Imports ./hosts/default.nix
           inherit (nixpkgs) lib;
-          inherit inputs nixpkgs nixpkgs-stable nixos-hardware home-manager nur user location hyprland agenix;   # Also inherit home-manager so it does not need to be defined here.
+          inherit inputs nixpkgs nixpkgs-stable nixos-hardware home-manager nur user location agenix;   # Also inherit home-manager so it does not need to be defined here.
         }
       );
     };
diff --git a/hosts/configuration_desktop.nix b/hosts/configuration_desktop.nix
index 7cfcd00..5a52c44 100644
--- a/hosts/configuration_desktop.nix
+++ b/hosts/configuration_desktop.nix
@@ -166,8 +166,6 @@
   nix = {                                   # Nix Package Manager settings
     settings ={
       auto-optimise-store = true;           # Optimise syslinks
-      substituters = ["https://hyprland.cachix.org"];
-      trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="];
     };
     gc = {                                  # Automatic garbage collection
       automatic = true;
diff --git a/hosts/default.nix b/hosts/default.nix
index 09e8ac0..5054bd5 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -11,7 +11,7 @@
 #            └─ ./home.nix 
 #
 
-{ lib, inputs, nixpkgs, nixos-hardware, home-manager, nur, user, location, hyprland, agenix, ... }:
+{ lib, inputs, nixpkgs, nixos-hardware, home-manager, nur, user, location, agenix, ... }:
 
 let
   system = "x86_64-linux";                                  # System architecture
@@ -27,11 +27,10 @@ in
 {
   desktop = lib.nixosSystem {                                # Desktop profile
     inherit system;
-    specialArgs = { inherit inputs user location hyprland nixos-hardware nur agenix; };
+    specialArgs = { inherit inputs user location nixos-hardware nur agenix; };
     modules = [
       agenix.nixosModules.default
       nur.nixosModules.nur
-      #hyprland.nixosModules.default
       ./desktop
       ./configuration_desktop.nix
       nixos-hardware.nixosModules.common-cpu-amd
@@ -55,11 +54,10 @@ in
 
   laptop = lib.nixosSystem {                                # Laptop profile
     inherit system;
-    specialArgs = { inherit inputs user location hyprland nixos-hardware nur agenix; };
+    specialArgs = { inherit inputs user location nixos-hardware nur agenix; };
     modules = [
       agenix.nixosModules.default
       nur.nixosModules.nur
-      #hyprland.nixosModules.default
       ./laptop
       ./configuration_desktop.nix
       nixos-hardware.nixosModules.common-cpu-intel
@@ -135,9 +133,8 @@ in
 
   q920 = lib.nixosSystem {                                # Laptop profile
     inherit system;
-    specialArgs = { inherit inputs user location hyprland; };
+    specialArgs = { inherit inputs user location ; };
     modules = [
-      hyprland.nixosModules.default
       ./q920
       ./configuration.nix