diff --git a/flake.nix b/flake.nix
index fe38acf..9eb5241 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,6 +8,7 @@
     zen-browser.url = "github:0xc000022070/zen-browser-flake";
     oceanix.url = "github:LEXUGE/oceanix";
     copetch.url = "github:elwrcl/copetch";
+
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -37,32 +38,11 @@
     }:
     let
       system = "x86_64-linux";
-
-      chaoticOverlay = chaotic.overlays.default;
-      cachyosKernelOverlay = nix-cachyos-kernel.overlays.default;
-
-      copetchOverlay = final: prev: {
-        copetch = inputs.copetch.packages.${system}.default;
-      };
-
-      gtkPortalOverlay = final: prev: {
-        xdg-desktop-portal-gtk = prev.xdg-desktop-portal-gtk.overrideAttrs (old: {
-          postInstall = (old.postInstall or "") + ''
-            substituteInPlace $out/share/xdg-desktop-portal/portals/gtk.portal \
-              --replace "UseIn=gnome" "UseIn=gnome;Hyprland"
-          '';
-        });
-      };
     in
     {
       nixosConfigurations = {
         copland = nixpkgs.lib.nixosSystem {
-          specialArgs = {
-            inherit inputs system;
-            oceanix = inputs.oceanix;
-            zen-browser = inputs.zen-browser;
-            nix-cachyos-kernel = nix-cachyos-kernel;
-          };
+          specialArgs = { inherit inputs system; };
 
           modules = [
             { nixpkgs.hostPlatform = system; }
@@ -70,14 +50,14 @@
             home-manager.nixosModules.home-manager
             {
               nixpkgs.overlays = [
-                chaoticOverlay
-                cachyosKernelOverlay
-                copetchOverlay
-                gtkPortalOverlay
+                chaotic.overlays.default
+                nix-cachyos-kernel.overlays.default
+                (final: prev: {
+                  copetch = inputs.copetch.packages.${system}.default;
+                })
               ];
               nixpkgs.config.allowUnfree = true;
-            }
-            {
+
               home-manager = {
                 useGlobalPkgs = true;
                 useUserPackages = true;
diff --git a/home/default.nix b/home/default.nix
index ab3c489..7a08032 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -19,6 +19,7 @@
     x11.enable = true;
   };
 
+  # Alternatifsiz tek shell.
   programs.zsh = {
     enable = true;
     enableCompletion = true;
@@ -37,25 +38,19 @@
       window-padding-y = 10;
     };
   };
-
   xdg.configFile = {
     "fastfetch".source = ./dots/fastfetch;
-    "fish/conf.d".source = ./dots/fish/conf.d;
   };
-
   home.packages = with pkgs; [
     eza
     bat
-    fzf
     fd
     fastfetch
-    starship
     vulkan-tools
     libva-utils
     mesa-demos
     intel-gpu-tools
     clinfo
-    zoxide
     trash-cli
     rsync
   ];
@@ -64,6 +59,7 @@
   programs.fzf.enable = true;
   programs.zoxide.enable = true;
   programs.home-manager.enable = true;
+
   fonts.fontconfig.enable = true;
   services.kdeconnect.enable = true;
 
@@ -78,8 +74,6 @@
     "org/gnome/desktop/interface" = {
       color-scheme = "prefer-dark";
       gtk-application-prefer-dark-theme = true;
-      cursor-theme = "Bibata-Modern-Classic";
-      cursor-size = 24;
     };
     "org/gnome/nautilus/preferences" = {
       default-folder-viewer = "icon-view";
@@ -89,6 +83,7 @@
       sort-directories-first = true;
     };
   };
+
   gtk = {
     enable = true;
     theme = {
@@ -99,11 +94,6 @@
       name = "Papirus-Dark";
       package = pkgs.papirus-icon-theme;
     };
-    cursorTheme = {
-      name = "Bibata-Modern-Classic";
-      package = pkgs.bibata-cursors;
-      size = 24;
-    };
     gtk3.extraConfig = {
       gtk-application-prefer-dark-theme = 1;
     };
diff --git a/nixos/boot/default.nix b/nixos/boot/default.nix
index 16e237f..5fa2d82 100644
--- a/nixos/boot/default.nix
+++ b/nixos/boot/default.nix
@@ -5,7 +5,7 @@
     ./opencore.nix
   ];
 
-  environment.systemPackages = [ pkgs.limine pkgs.efibootmgr ];
+  environment.systemPackages = [ pkgs.efibootmgr ];
 
   boot.kernelPackages = pkgs.cachyosKernels.linuxPackages-cachyos-latest-lto-x86_64-v2;
 
diff --git a/nixos/boot/opencore.nix b/nixos/boot/opencore.nix
index aa5d7be..8726833 100644
--- a/nixos/boot/opencore.nix
+++ b/nixos/boot/opencore.nix
@@ -131,6 +131,7 @@ in
         fi
       else
         echo "Error: Could not find mount point for /boot!"
+        exit 1
       fi
     '';
   };
diff --git a/nixos/desktop/audio/pipewire.nix b/nixos/desktop/audio/pipewire.nix
index f77a079..8de3502 100644
--- a/nixos/desktop/audio/pipewire.nix
+++ b/nixos/desktop/audio/pipewire.nix
@@ -3,34 +3,36 @@
 {
   services.pulseaudio.enable = false;
   security.rtkit.enable = true;
+
   services.pipewire = {
     enable = true;
     alsa.enable = true;
     alsa.support32Bit = true;
     pulse.enable = true;
-    wireplumber.enable = true;
 
+    wireplumber = {
+      enable = true;
+      extraConfig."51-no-mic-monitor" = {
+        "monitor.alsa.rules" = [
+          {
+            matches = [ { "node.name" = "~alsa_input.*"; } ];
+            actions = {
+              "update-props" = {
+                "stream.dont-remix" = true;
+              };
+            };
+          }
+        ];
+      };
+    };
     extraConfig.pipewire."92-quantum" = {
       "context.properties" = {
         "default.clock.rate" = 48000;
         "default.clock.allowed-rates" = [ 48000 ];
-        "default.clock.quantum" = 1024;
-        "default.clock.min-quantum" = 1024;
-        "default.clock.max-quantum" = 1024;
+        "default.clock.quantum" = 512;
+        "default.clock.min-quantum" = 512;
+        "default.clock.max-quantum" = 512;
       };
     };
   };
-
-  services.pipewire.wireplumber.extraConfig."51-no-mic-monitor" = {
-    "monitor.alsa.rules" = [
-      {
-        matches = [{ "node.name" = "~alsa_input.*"; }];
-        actions = {
-          "update-props" = {
-            "stream.dont-remix" = true;
-          };
-        };
-      }
-    ];
-  };
 }
diff --git a/nixos/desktop/window-managers/hyprland.nix b/nixos/desktop/window-managers/hyprland.nix
index 56872aa..a072504 100644
--- a/nixos/desktop/window-managers/hyprland.nix
+++ b/nixos/desktop/window-managers/hyprland.nix
@@ -5,30 +5,31 @@
     enable = true;
     xwayland.enable = true;
   };
+
   xdg.portal = {
     enable = true;
     xdgOpenUsePortal = true;
-    extraPortals = [
-      pkgs.xdg-desktop-portal-gtk
+    extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
+    config.hyprland.default = lib.mkForce [
+      "hyprland"
+      "gtk"
     ];
-    config = {
-      common = {
-        default = [
-          "hyprland"
-          "gtk"
-        ];
-      };
+  };
+
+  services = {
+    dbus.enable = true;
+    pipewire = {
+      enable = true;
+      pulse.enable = true;
+      wireplumber.enable = true;
+    };
+    gnome = {
+      gnome-keyring.enable = true;
+      gnome-settings-daemon.enable = lib.mkDefault false;
     };
   };
-  services.dbus.enable = true;
-  services.pipewire = {
-    enable = true;
-    pulse.enable = true;
-    wireplumber.enable = true;
-  };
+
   security.polkit.enable = true;
-  services.gnome.gnome-keyring.enable = true;
-  services.gnome.gnome-settings-daemon.enable = lib.mkDefault false;
 
   environment.systemPackages = with pkgs; [
     glib