diff --git a/nixcfgs/flake.nix b/nixcfgs/flake.nix
index e8f12a1..2bf3302 100644
--- a/nixcfgs/flake.nix
+++ b/nixcfgs/flake.nix
@@ -27,91 +27,87 @@
     };
   };
 
-  outputs =
-    {
-      self,
-      nixpkgs,
-      nix-flatpak,
-      nix-darwin,
-      home-manager,
-      plasma-manager,
-      nur,
-      winboat,
-      caelestia-shell,
-      ...
-    }@inputs:
-    let
-      overlays = [
-        nur.overlays.default
-        (final: prev: {
-          winboat = winboat.packages.x86_64-linux.winboat;
-        })
-      ];
-      forSystem =
-        system:
-        import nixpkgs {
-          inherit system overlays;
-          config.allowUnfree = true;
-        };
-      specialArgs = { inherit inputs; };
-      nixosHosts = [
-        "zp"
-        "zephyrus"
-        "nixvirt"
-      ];
+  outputs = {
+    self,
+    nixpkgs,
+    nix-flatpak,
+    nix-darwin,
+    home-manager,
+    plasma-manager,
+    nur,
+    winboat,
+    caelestia-shell,
+    ...
+  } @ inputs: let
+    overlays = [
+      nur.overlays.default
+      (final: prev: {
+        winboat = winboat.packages.x86_64-linux.winboat;
+        caelestia-shell = caelestia-shell.packages.x86_64-linux.caelestia-shell;
+      })
+    ];
+    forSystem = system:
+      import nixpkgs {
+        inherit system overlays;
+        config.allowUnfree = true;
+      };
+    specialArgs = {inherit inputs overlays;};
+    nixosHosts = [
+      "zp"
+      "zephyrus"
+      "nixvirt"
+    ];
 
-      mkNixosSystem =
-        hostname:
-        nixpkgs.lib.nixosSystem {
-          system = "x86_64-linux";
-          inherit specialArgs;
-          modules = [ ./hosts/${hostname} ];
-        };
-    in
-    {
-      # This will automatically generate nixOS config for `nixosHosts'
-      # Include the module ./hosts/${hostname} by default.
-      nixosConfigurations = nixpkgs.lib.genAttrs nixosHosts mkNixosSystem;
-
-      darwinConfigurations."zen" = nix-darwin.lib.darwinSystem {
-        system = "aarch64-darwin";
+    mkNixosSystem = hostname:
+      nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
         inherit specialArgs;
+        modules = [./hosts/${hostname} {nixpkgs.overlays = overlays;}];
+      };
+  in {
+    # This will automatically generate nixOS config for `nixosHosts'
+    # Include the module ./hosts/${hostname} by default.
+    nixosConfigurations = nixpkgs.lib.genAttrs nixosHosts mkNixosSystem;
+
+    darwinConfigurations."zen" = nix-darwin.lib.darwinSystem {
+      system = "aarch64-darwin";
+      inherit specialArgs;
+      modules = [
+        ./hosts/zen
+      ];
+    };
+
+    homeConfigurations = {
+      js0ny = home-manager.lib.homeManagerConfiguration {
+        pkgs = forSystem "x86_64-linux";
+        extraSpecialArgs = specialArgs;
         modules = [
-          ./hosts/zen
+          ./users/js0ny
         ];
       };
-
-      homeConfigurations = {
-        js0ny = home-manager.lib.homeManagerConfiguration {
-          pkgs = forSystem "x86_64-linux";
-          extraSpecialArgs = specialArgs;
-          modules = [
-            ./users/js0ny
-          ];
-        };
-        "js0ny@zephyrus" = home-manager.lib.homeManagerConfiguration {
-          pkgs = forSystem "x86_64-linux";
-          extraSpecialArgs = specialArgs;
-          modules = [
-            ./users/js0ny/zephyrus.nix
-            plasma-manager.homeModules.plasma-manager
-            nix-flatpak.homeManagerModules.nix-flatpak
-          ];
-        };
-        "js0ny@nixvirt" = home-manager.lib.homeManagerConfiguration {
-          pkgs = forSystem "x86_64-linux";
-          extraSpecialArgs = specialArgs;
-          modules = [
-            ./users/js0ny/nixvirt.nix
-          ];
-        };
-        "js0ny@zen" = home-manager.lib.homeManagerConfiguration {
-          pkgs = forSystem "aarch64-darwin";
-          extraSpecialArgs = specialArgs;
-          modules = [
-            ./users/js0ny/zen.nix
-          ];
-        };
+      "js0ny@zephyrus" = home-manager.lib.homeManagerConfiguration {
+        pkgs = forSystem "x86_64-linux";
+        extraSpecialArgs = specialArgs;
+        modules = [
+          ./users/js0ny/zephyrus.nix
+          plasma-manager.homeModules.plasma-manager
+          nix-flatpak.homeManagerModules.nix-flatpak
+        ];
+      };
+      "js0ny@nixvirt" = home-manager.lib.homeManagerConfiguration {
+        pkgs = forSystem "x86_64-linux";
+        extraSpecialArgs = specialArgs;
+        modules = [
+          ./users/js0ny/nixvirt.nix
+        ];
+      };
+      "js0ny@zen" = home-manager.lib.homeManagerConfiguration {
+        pkgs = forSystem "aarch64-darwin";
+        extraSpecialArgs = specialArgs;
+        modules = [
+          ./users/js0ny/zen.nix
+        ];
       };
     };
+  };
 }
diff --git a/nixcfgs/hosts/zephyrus/default.nix b/nixcfgs/hosts/zephyrus/default.nix
index 98b750b..1b5a302 100644
--- a/nixcfgs/hosts/zephyrus/default.nix
+++ b/nixcfgs/hosts/zephyrus/default.nix
@@ -14,6 +14,7 @@
     ../../modules/nixos/chromium.nix
     ../../modules/nixos/obs-studio.nix
     ../../modules/nixos/wine.nix
+    ../../modules/nixos/gnome-keyring.nix
     ../../modules/nixos/desktop/kde.nix
     ../../modules/nixos/desktop/hyprland.nix
     ../../modules/nixos/display-manager/sddm.nix
diff --git a/nixcfgs/modules/home/gnome-keyrings.nix b/nixcfgs/modules/home/gnome-keyrings.nix
index 4b27102..c842ee5 100644
--- a/nixcfgs/modules/home/gnome-keyrings.nix
+++ b/nixcfgs/modules/home/gnome-keyrings.nix
@@ -1,6 +1,4 @@
-{ pkgs, ... }:
-
-{
+{pkgs, ...}: {
   home.packages = with pkgs; [
     gcr
   ];
diff --git a/nixcfgs/modules/nixos/desktop/hyprland.nix b/nixcfgs/modules/nixos/desktop/hyprland.nix
index 85c0f9e..7202283 100644
--- a/nixcfgs/modules/nixos/desktop/hyprland.nix
+++ b/nixcfgs/modules/nixos/desktop/hyprland.nix
@@ -1,22 +1,18 @@
-{
-  pkgs,
-  inputs,
-  ...
-}: {
+{pkgs, ...}: {
   programs.hyprland = {
     enable = true;
     withUWSM = false;
     xwayland.enable = true;
   };
 
-  environment.systemPackages = [
-    inputs.caelestia-shell.packages.x86_64-linux.default
-    pkgs.mako
-    pkgs.rofi-wayland
-    pkgs.xdg-desktop-portal-wlr
-    pkgs.xdg-desktop-portal-hyprland
-    pkgs.hyprpolkitagent
-    pkgs.cliphist
-    pkgs.grimblast
+  environment.systemPackages = with pkgs; [
+    caelestia-shell
+    mako
+    rofi
+    xdg-desktop-portal-wlr
+    xdg-desktop-portal-hyprland
+    hyprpolkitagent
+    cliphist
+    grimblast
   ];
 }
diff --git a/nixcfgs/modules/nixos/fonts.nix b/nixcfgs/modules/nixos/fonts.nix
index c272d0b..39d59a1 100644
--- a/nixcfgs/modules/nixos/fonts.nix
+++ b/nixcfgs/modules/nixos/fonts.nix
@@ -1,8 +1,4 @@
-{
-  pkgs,
-  config,
-  ...
-}: let
+{pkgs, ...}: let
   fontPkgs = [
     pkgs.maple-mono.NF
     pkgs.sarasa-gothic
@@ -51,7 +47,7 @@ in {
         fontPkgs
         ++ [
           # Add cursor supports
-          pkgs.libsForQt5.breeze-qt5
+          pkgs.kdePackages.breeze
         ]; # with pkgs; [
       #   libsForQt5.breeze-qt5
 
diff --git a/nixcfgs/modules/nixos/gnome-keyring.nix b/nixcfgs/modules/nixos/gnome-keyring.nix
new file mode 100644
index 0000000..45e1cbd
--- /dev/null
+++ b/nixcfgs/modules/nixos/gnome-keyring.nix
@@ -0,0 +1,7 @@
+{pkgs, ...}: {
+  services.gnome.gnome-keyring.enable = true;
+  services.gnome.gcr-ssh-agent.enable = true;
+  programs.ssh = {
+    enableAskPassword = true;
+  };
+}
diff --git a/nixcfgs/modules/nixos/libvirt.nix b/nixcfgs/modules/nixos/libvirt.nix
index a2bd438..cf177f8 100644
--- a/nixcfgs/modules/nixos/libvirt.nix
+++ b/nixcfgs/modules/nixos/libvirt.nix
@@ -11,15 +11,15 @@
       package = pkgs.qemu_kvm;
       runAsRoot = true;
       swtpm.enable = true;
-      ovmf = {
-        enable = true;
-        packages = [
-          (pkgs.OVMF.override {
-            secureBoot = true;
-            tpmSupport = true;
-          }).fd
-        ];
-      };
+      # ovmf = {
+      #   enable = true;
+      #   packages = [
+      #     (pkgs.OVMF.override {
+      #       secureBoot = true;
+      #       tpmSupport = true;
+      #     }).fd
+      #   ];
+      # };
     };
   };
   users.users.js0ny = {
diff --git a/nixcfgs/modules/nixos/rime.nix b/nixcfgs/modules/nixos/rime.nix
index 2576f55..9a37c6b 100644
--- a/nixcfgs/modules/nixos/rime.nix
+++ b/nixcfgs/modules/nixos/rime.nix
@@ -13,7 +13,7 @@
     type = "fcitx5";
     fcitx5 = {
       waylandFrontend = true;
-      plasma6Support = true;
+      # plasma6Support = true;
       addons = with pkgs; [
         fcitx5-rime
         kdePackages.fcitx5-configtool