diff --git a/home-manager/fish/default.nix b/home-manager/fish/default.nix
index 6aeaa80..29bef19 100644
--- a/home-manager/fish/default.nix
+++ b/home-manager/fish/default.nix
@@ -1,6 +1,11 @@
 { ... }:
 {
-  programs.fish.enable = true;
+  programs.fish = {
+    enable = true;
+    interactiveShellInit = ''
+      set -g fish_greeting ""
+    '';
+  };
 
   xdg.configFile."fish/functions/fish_prompt.fish".source = ./functions/fish_prompt.fish;
 }
diff --git a/home-manager/fnott.nix b/home-manager/fnott.nix
index 04e37df..007fe38 100644
--- a/home-manager/fnott.nix
+++ b/home-manager/fnott.nix
@@ -53,21 +53,21 @@
         max-icon-size = 64; # デフォルト32 -> 強調
         icon = "dialog-information"; # フォールバック（任意）
 
-        dpi-aware = "auto";
+        dpi-aware = false;
       };
 
       low = {
-        timeout = 4;
+        default-timeout = 4;
         border-color = "232327ff";
       };
 
       normal = {
-        timeout = 7;
+        default-timeout = 7;
         border-color = "2a2a2fff";
       };
 
       critical = {
-        timeout = 0;
+        default-timeout = 0;
         border-color = "6a6a6fff";
         border-size = 2;
         background = "101012f2";
diff --git a/home-manager/hyprland/default.nix b/home-manager/hyprland/default.nix
index 730ed5c..d19c028 100644
--- a/home-manager/hyprland/default.nix
+++ b/home-manager/hyprland/default.nix
@@ -6,6 +6,7 @@
 }:
 let
   inherit (lib) mkOption recursiveUpdate types;
+  rosePineHyprcursor = pkgs.callPackage ./rose-pine-hyprcursor.nix { };
 
   defaultInput = {
     kb_layout = "us";
@@ -220,10 +221,14 @@ in
       plugins = [
       ];
     };
-    home.packages = with pkgs; [
-      swww
-      eww
-    ];
+    home.packages =
+      [
+        rosePineHyprcursor
+      ]
+      ++ (with pkgs; [
+        swww
+        eww
+      ]);
     home.sessionVariables = {
       HYPRCURSOR_THEME = "rose-pine-hyprcursor";
       HYPRCURSOR_SIZE = "24";
diff --git a/home-manager/hyprland/rose-pine-hyprcursor.nix b/home-manager/hyprland/rose-pine-hyprcursor.nix
new file mode 100644
index 0000000..7691537
--- /dev/null
+++ b/home-manager/hyprland/rose-pine-hyprcursor.nix
@@ -0,0 +1,33 @@
+{
+  stdenvNoCC,
+  lib,
+  fetchzip,
+}:
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "rose-pine-hyprcursor";
+  version = "0.3.2";
+
+  src = fetchzip {
+    url = "https://github.com/ndom91/rose-pine-hyprcursor/archive/refs/tags/v${finalAttrs.version}.tar.gz";
+    hash = "sha256-ArUX5qlqAXUqcRqHz4QxXy3KgkfasTPA/Qwf6D2kV0U=";
+  };
+
+  dontBuild = true;
+
+  installPhase = ''
+    runHook preInstall
+    target=$out/share/icons/${finalAttrs.pname}
+    mkdir -p "$target"
+    cp -r hyprcursors hyprcursors_uncompressed manifest.hl "$target"
+    # include docs for reference
+    cp README.md LICENSE "$target"/
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "Rose Pine themed Hyprcursor set";
+    homepage = "https://github.com/ndom91/rose-pine-hyprcursor";
+    license = licenses.mit;
+    platforms = platforms.linux;
+  };
+})
diff --git a/hosts/default.nix b/hosts/default.nix
index 98e0980..9308830 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -10,21 +10,18 @@ let
     }:
     {
       nixos = inputs.nixpkgs.lib.nixosSystem {
-        modules =
-          with inputs;
-          systemModules
-          ++ [
-            {
-              users.users.${username} = {
-                isNormalUser = true;
-                description = "";
-                extraGroups = [
-                  "networkmanager"
-                  "wheel"
-                ];
-              };
-            }
-          ];
+        modules = systemModules ++ [
+          {
+            users.users.${username} = {
+              isNormalUser = true;
+              description = "";
+              extraGroups = [
+                "networkmanager"
+                "wheel"
+              ];
+            };
+          }
+        ];
         inherit system;
         specialArgs = {
           inherit inputs hostname username;
@@ -88,14 +85,6 @@ rec {
       ];
     };
   };
-  nixos = {
-    arcadia = hosts.arcadia.nixos;
-    fungus = hosts.fungus.nixos;
-    x1carbon = hosts.x1carbon.nixos;
-  };
-  home-manager = {
-    arcadia = hosts.arcadia.home-manager;
-    fungus = hosts.fungus.home-manager;
-    x1carbon = hosts.x1carbon.home-manager;
-  };
+  nixos = builtins.mapAttrs (_: host: host.nixos) hosts;
+  home-manager = builtins.mapAttrs (_: host: host.home-manager) hosts;
 }
diff --git a/hosts/x1carbon/nixos.nix b/hosts/x1carbon/nixos.nix
index 5223ae0..86a8f21 100644
--- a/hosts/x1carbon/nixos.nix
+++ b/hosts/x1carbon/nixos.nix
@@ -25,10 +25,8 @@ in
   environment.systemPackages = with pkgs; [
     openssl
 
-    bluez
-    bluez-tools
     bluetuith
-    
+
     brightnessctl
 
     fzf
@@ -61,7 +59,9 @@ in
   networking.firewall.allowedUDPPorts = [ ];
 
   services.openvpn.servers = {
-    homeVPN = { config = '' config /root/nixos/openvpn/homeVPN.conf ''; };
+    homeVPN = {
+      config = ''config /root/nixos/openvpn/homeVPN.conf '';
+    };
   };
 
   services.udev.extraRules = ''
diff --git a/system/core/uwsm.nix b/system/core/uwsm.nix
index be70bc7..46cb00e 100644
--- a/system/core/uwsm.nix
+++ b/system/core/uwsm.nix
@@ -1,3 +1,4 @@
+{ pkgs, lib, ... }:
 {
   programs.uwsm = {
     enable = true;
@@ -5,6 +6,7 @@
       hyprland = {
         prettyName = "Hyprland";
         comment = "Hyprland compositor managed by UWSM";
+        binPath = lib.mkDefault "${pkgs.hyprland}/bin/Hyprland";
       };
     };
   };