Merge hare/master into master

flake.lock

@@ -18,42 +18,6 @@
         "type": "github"
       }
     },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_3": {
-      "inputs": {
-        "systems": "systems_3"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -61,11 +25,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1784489491,
+        "lastModified": 1772218752,
-        "narHash": "sha256-j9maqjx1T8+ljAVntAdSI5hSGCm77QNZz64JF1rJNu0=",
+        "narHash": "sha256-G8nArvOTZXU8DRvrzAdz3Elcj6kA/vMtvY9mrGLATtA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "3139deb8cafbe73b39b24451255b2fdd3426077e",
+        "rev": "f3a30376bb9eb2f6f61816be7d6ed954b6d2a3b9",
         "type": "github"
       },
       "original": {
@@ -81,11 +45,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1784440659,
+        "lastModified": 1771734689,
-        "narHash": "sha256-Q5kNLlWngt7TaIIZoxDKWMHjiSaNRVqr70FqWCRRfr4=",
+        "narHash": "sha256-/phvMgr1yutyAMjKnZlxkVplzxHiz60i4rc+gKzpwhg=",
         "owner": "Mic92",
         "repo": "nix-index-database",
-        "rev": "4f8d52a3598b0dc7db7a5e7b419e3edd9d1ecfdb",
+        "rev": "8f590b832326ab9699444f3a48240595954a4b10",
         "type": "github"
       },
       "original": {
@@ -95,15 +59,12 @@
       }
     },
     "nixos-hardware": {
-      "inputs": {
-        "nixpkgs": "nixpkgs"
-      },
       "locked": {
-        "lastModified": 1784310968,
+        "lastModified": 1771969195,
-        "narHash": "sha256-rkSPTePrKqs4dg+i7ZFCq93+HrClac6oSwXX927SVjA=",
+        "narHash": "sha256-qwcDBtrRvJbrrnv1lf/pREQi8t2hWZxVAyeMo7/E9sw=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "779c32a00155994c86cde8213a8dd4df139d4355",
+        "rev": "41c6b421bdc301b2624486e11905c9af7b8ec68e",
         "type": "github"
       },
       "original": {
@@ -114,66 +75,21 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1767892417,
+        "lastModified": 1771848320,
-        "narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=",
+        "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=",
-        "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba",
+        "owner": "NixOS",
-        "type": "tarball",
+        "repo": "nixpkgs",
-        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre924538.3497aa5c9457/nixexprs.tar.xz"
+        "rev": "2fc6539b481e1d2569f25f8799236694180c0993",
+        "type": "github"
       },
       "original": {
-        "type": "tarball",
+        "owner": "NixOS",
-        "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
       }
     },
     "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1784356753,
-        "narHash": "sha256-12KrbMiWLcf8m7pCvAtZh1ZrgF85ZXDXvfR/fWTKy84=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "61b7c44c4073f0b827768aff0049561b5110ea5a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1781577229,
-        "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_4": {
-      "locked": {
-        "lastModified": 1779560665,
-        "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_5": {
       "locked": {
         "lastModified": 1727348695,
         "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
@@ -195,9 +111,7 @@
         "home-manager": "home-manager",
         "nix-index-database": "nix-index-database",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
-        "tourbox-linux": "tourbox-linux",
-        "yoi": "yoi",
         "zen-browser": "zen-browser"
       }
     },
@@ -216,78 +130,9 @@
         "type": "github"
       }
     },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_3": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "tourbox-linux": {
-      "inputs": {
-        "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs_3"
-      },
-      "locked": {
-        "lastModified": 1782109395,
-        "narHash": "sha256-5b11NT4jgnTrZj8O94MbqiWjslgeKoiqnlfmZ4eJu3s=",
-        "owner": "HareK02",
-        "repo": "TourBox-Linux",
-        "rev": "d5d5055514576701c05d177186bba2ed2f65cc91",
-        "type": "github"
-      },
-      "original": {
-        "owner": "HareK02",
-        "repo": "TourBox-Linux",
-        "type": "github"
-      }
-    },
-    "yoi": {
-      "inputs": {
-        "flake-utils": "flake-utils_3",
-        "nixpkgs": "nixpkgs_4"
-      },
-      "locked": {
-        "lastModified": 1784328575,
-        "narHash": "sha256-4LdSQBnOPZ82otj2go33qAtDUcVtWFRmMvfgKdQO9Ys=",
-        "ref": "develop",
-        "rev": "37c44a7942776ce43d21f0aa55e55006de1aa6a4",
-        "revCount": 3343,
-        "type": "git",
-        "url": "ssh://git@gitea.hareworks.net/Hare/yoi.git"
-      },
-      "original": {
-        "ref": "develop",
-        "type": "git",
-        "url": "ssh://git@gitea.hareworks.net/Hare/yoi.git"
-      }
-    },
     "zen-browser": {
       "inputs": {
-        "nixpkgs": "nixpkgs_5"
+        "nixpkgs": "nixpkgs_2"
       },
       "locked": {
         "lastModified": 1761859251,

flake.nix

@@ -10,8 +10,6 @@
     flake-utils.url = "github:numtide/flake-utils";
     nixos-hardware.url = "github:NixOS/nixos-hardware";
     zen-browser.url = "github:xaragon/zen-browser-flake";
-    yoi.url = "git+ssh://git@gitea.hareworks.net/Hare/yoi.git?ref=develop";
-    tourbox-linux.url = "github:HareK02/TourBox-Linux";
 
     nix-index-database.url = "github:Mic92/nix-index-database";
     nix-index-database.inputs.nixpkgs.follows = "nixpkgs";

home-manager/firefox.nix

@@ -1,6 +1,5 @@
 {
-  programs.firefox = {
+programs.firefox = {
-    enable = true;
+  enable = true;
-    configPath = ".mozilla/firefox";
+};
-  };
 }

home-manager/hyprland/default.nix

@@ -12,39 +12,6 @@ let
     optionals
     ;
   rosePineHyprcursor = pkgs.callPackage ./rose-pine-hyprcursor.nix { };
-  mkLua = lib.generators.mkLuaInline;
-
-  mkEnv = name: value: {
-    _args = [
-      name
-      value
-    ];
-  };
-
-  mkBind = keys: dispatcher: {
-    _args = [
-      keys
-      (mkLua dispatcher)
-    ];
-  };
-
-  mkMouseBind = keys: dispatcher: {
-    _args = [
-      keys
-      (mkLua dispatcher)
-      { mouse = true; }
-    ];
-  };
-
-  mkStartHook = commands: {
-    _args = [
-      "hyprland.start"
-      (mkLua ''
-        function()
-        ${lib.concatMapStrings (command: "  hl.exec_cmd(${builtins.toJSON command})\n") commands}end
-      '')
-    ];
-  };
 
   defaultInput = {
     kb_layout = "us";
@@ -56,40 +23,44 @@ let
     follow_mouse = true;
 
     touchpad = {
-      natural_scroll = true;
+      natural_scroll = false;
     };
 
-    natural_scroll = true;
+    natural_scroll = false;
     sensitivity = 0.0;
   };
 
   wallpaperCommand = config.hare.hyprland.wallpaperCommand;
 
-  startupCommands = [
+  baseSettings = {
-    # "/usr/lib/polkit-kde-authentication-agent-1"
+    exec-once = [
-    # "dunst"
+      # "/usr/lib/polkit-kde-authentication-agent-1"
-    "awww-daemon"
+      # "dunst"
-    # "copyq --start-server"
+      "swww-daemon"
-    # "wl-paste --type text --watch cliphist store"
+      # "copyq --start-server"
-    # "wl-paste --type image --watch cliphist store"
+      # "wl-paste --type text --watch cliphist store"
-    "eww daemon"
+      # "wl-paste --type image --watch cliphist store"
-    "eww open bar"
+      "eww daemon"
-    "eww open roundedEdge"
+      "eww open bar"
-  ];
+      "eww open roundedEdge"
-
+    ];
-  reloadCommands =
+    exec =
-    optionals (wallpaperCommand != null) [
+      optionals (wallpaperCommand != null) [
-      wallpaperCommand
+        wallpaperCommand
-    ]
+      ]
-    ++ [
+      ++ [
-      "dconf write /org/gnome/desktop/interface/gtk-theme 'Adwaita Dark'"
+        "dconf write /org/gnome/desktop/interface/gtk-theme 'Adwaita Dark'"
-      "dconf write /org/gnome/desktop/interface/icon-theme 'Adwaita Dark'"
+        "dconf write /org/gnome/desktop/interface/icon-theme 'Adwaita Dark'"
-      "dconf write /org/gnome/desktop/interface/document-font-name 'Noto Sans Medium 11'"
+        "dconf write /org/gnome/desktop/interface/document-font-name 'Noto Sans Medium 11'"
-      "dconf write /org/gnome/desktop/interface/font-name 'Noto Sans Medium 11'"
+        "dconf write /org/gnome/desktop/interface/font-name 'Noto Sans Medium 11'"
-      "dconf write /org/gnome/desktop/interface/monospace-font-name 'Noto Sans Mono Medium 11'"
+        "dconf write /org/gnome/desktop/interface/monospace-font-name 'Noto Sans Mono Medium 11'"
+      ];
+    env = [
+      "XDG_CURRENT_DESKTOP,Hyprland"
+      "XDG_SESSION_TYPE,wayland"
+      "XDG_SESSION_DESKTOP,Hyprland"
     ];
 
-  baseConfig = {
     ecosystem.no_update_news = true;
 
     input = defaultInput;
@@ -100,6 +71,7 @@ let
     };
 
     dwindle = {
+      pseudotile = true;
       preserve_split = true;
     };
 
@@ -108,124 +80,78 @@ let
       disable_hyprland_logo = true;
       disable_splash_rendering = true;
     };
-    xwayland = {
-      force_zero_scaling = true;
-    };
-  };
 
-  baseSettings = {
+    windowrule = [
-    menu = {
+      "animation windowsIn 0, match:title ^(.*wofi.*)$"
-      _var = "uwsm app -- $(tofi-drun)";
+      "float on, match:title ^(.*feh.*)$"
-    };
+      "center on, match:title ^(.*feh.*)$"
-    terminal = {
+      "float on, match:title ^(Picture.*)$"
-      _var = "wezterm";
+      "pin on, match:title ^(Picture.*)$"
-    };
+      "immediate on, match:class ^(Terraria)$"
-    lock = {
-      _var = "hyprlock";
-    };
-
-    env = [
-      (mkEnv "XDG_CURRENT_DESKTOP" "Hyprland")
-      (mkEnv "XDG_SESSION_TYPE" "wayland")
-      (mkEnv "XDG_SESSION_DESKTOP" "Hyprland")
-      # "GDK_SCALE,2"
-      # "XCURSOR_SIZE,32"
     ];
 
-    exec_cmd = reloadCommands;
+    workspace = [
-
+      "1, monitor:DP-2, default:true"
-    on = mkStartHook startupCommands;
+      "r[2-9], monitor:DP-2"
-
+      "name:sub, monitor:DP-1, default:true"
-    window_rule = [
-      {
-        match.title = "^(.*wofi.*)$";
-        animation = "windowsIn 0";
-      }
-      {
-        match.title = "^(.*feh.*)$";
-        float = true;
-      }
-      {
-        match.title = "^(.*feh.*)$";
-        center = true;
-      }
-      {
-        match.title = "^(Picture.*)$";
-        float = true;
-      }
-      {
-        match.title = "^(Picture.*)$";
-        pin = true;
-      }
     ];
 
-    workspace_rule = [
+    "$menu" = "uwsm app -- $(tofi-drun)";
-      {
+    "$terminal" = "wezterm";
-        workspace = "r[1-9]";
+    "$lock" = "hyprlock";
-        monitor = "DP-1";
+    bindm = [
-      }
-      {
-        workspace = "101";
-        monitor = "DP-2";
-        default = true;
-      }
-      {
-        workspace = "102";
-        monitor = "DP-3";
-        default = true;
-      }
-    ];
-
-    bind = [
       # Window Movement & Resizing
-      (mkMouseBind "SUPER + mouse:272" "hl.dsp.window.drag()")
+      "SUPER, mouse:272, movewindow"
-      (mkMouseBind "SUPER + mouse:273" "hl.dsp.window.resize()")
+      "SUPER, mouse:273, resizewindow"
-
+    ];
+    bind = [
       # basic
-      (mkBind "SUPER + RETURN" "hl.dsp.exec_cmd(menu)")
+      "SUPER, return, exec, $menu"
-      (mkBind "SUPER + E" "hl.dsp.exec_cmd(terminal)")
+      "SUPER, E, exec, $terminal"
-      (mkBind "SUPER + Q" "hl.dsp.window.close()")
+      "SUPER, Q, killactive,"
-      (mkBind "SUPER + L" "hl.dsp.exec_cmd(lock)")
+      "SUPER, L, exec, $lock"
-      (mkBind "SUPER + SHIFT + L" ''hl.dsp.dpms({ action = "off" })'')
+      "SUPER_SHIFT, M, exec, loginctl terminate-user $USER"
-      (mkBind "SUPER + SHIFT + M" ''hl.dsp.exec_cmd("loginctl terminate-user $USER")'')
 
       # prsc
-      (mkBind "Print" ''hl.dsp.exec_cmd("hyprshot -m window -m active --clipboard-only")'')
+      ", Print, exec, hyprshot -m window -m active --clipboard-only"
 
       # Clipboard
-      (mkBind "SUPER + C" ''hl.dsp.exec_cmd("copyq show")'')
+      "SUPER, C, exec, copyq show"
-      (mkBind "SUPER + V" ''hl.dsp.exec_cmd("clipman pick -t dmenu")'')
+      "SUPER, V, exec, clipman pick -t dmenu"
 
       # Window navigation
-      (mkBind "SUPER + F" "hl.dsp.window.fullscreen()")
+      "SUPER, F, fullscreen,"
-      (mkBind "SUPER + Y" "hl.dsp.window.pin()")
+      "SUPER, Y, pin"
-      (mkBind "SUPER + I" ''hl.dsp.window.float({ action = "toggle" })'')
+      "SUPER, I, togglefloating,"
-      (mkBind "SUPER + O" ''hl.dsp.layout("togglesplit")'') # dwindle
+      "SUPER, O, togglesplit," # dwindle
-      (mkBind "SUPER + P" "hl.dsp.window.pseudo()") # dwindle
+      "SUPER, P, pseudo," # dwindle
 
       # Window focus
-      (mkBind "SUPER + mouse_down" "hl.dsp.window.cycle_next()")
+      "SUPER, mouse_down, cyclenext, next"
-      (mkBind "SUPER + mouse_up" "hl.dsp.window.cycle_next({ next = false })")
+      "SUPER, mouse_up, cyclenext, prev"
 
-      (mkBind "SUPER + left" ''hl.dsp.focus({ direction = "left" })'')
+      "SUPER, left, movefocus, l"
-      (mkBind "SUPER + right" ''hl.dsp.focus({ direction = "right" })'')
+      "SUPER, right, movefocus, r"
-      (mkBind "SUPER + up" ''hl.dsp.focus({ direction = "up" })'')
+      "SUPER, up, movefocus, u"
-      (mkBind "SUPER + down" ''hl.dsp.focus({ direction = "down" })'')
+      "SUPER, down, movefocus, d"
 
-      (mkBind "SUPER + SHIFT + left" ''hl.dsp.window.move({ direction = "left" })'')
+      "SUPER_SHIFT, left, movewindow, l"
-      (mkBind "SUPER + SHIFT + right" ''hl.dsp.window.move({ direction = "right" })'')
+      "SUPER_SHIFT, right, movewindow, r"
-      (mkBind "SUPER + SHIFT + up" ''hl.dsp.window.move({ direction = "up" })'')
+      "SUPER_SHIFT, up, movewindow, u"
-      (mkBind "SUPER + SHIFT + down" ''hl.dsp.window.move({ direction = "down" })'')
+      "SUPER_SHIFT, down, movewindow, d"
 
       # workspaces
-      (mkBind "SUPER + 1" "hl.dsp.focus({ workspace = 1 })")
+      "SUPER, 1, workspace, 1"
-      (mkBind "SUPER + 2" "hl.dsp.focus({ workspace = 2 })")
+      "SUPER, 2, workspace, 2"
-      (mkBind "SUPER + 3" "hl.dsp.focus({ workspace = 3 })")
+      "SUPER, 3, workspace, 3"
 
-      (mkBind "SUPER + CTRL + left" ''hl.dsp.focus({ workspace = "m-1" })'')
+      "SUPER_CTRL, left, workspace, m-1"
-      (mkBind "SUPER + CTRL + right" ''hl.dsp.focus({ workspace = "m+1" })'')
+      "SUPER_CTRL, right, workspace, m+1"
-      (mkBind "SUPER + CTRL + SHIFT + left" ''hl.dsp.focus({ workspace = "r-1" })'')
+      "SUPER_CTRL_SHIFT, left, workspace, r-1"
-      (mkBind "SUPER + CTRL + SHIFT + right" ''hl.dsp.focus({ workspace = "r+1" })'')
+      "SUPER_CTRL_SHIFT, right, workspace, r+1"
+
+      # screenshot
+      "SUPER_SHIFT, S, exec, hyprshot -m region --clipboard-only"
     ]
     ++ (
       # workspaces
@@ -237,8 +163,8 @@ let
             ws = i + 1;
           in
           [
-            (mkBind "SUPER + code:1${toString i}" "hl.dsp.focus({ workspace = ${toString ws} })")
+            "SUPER, code:1${toString i}, workspace, ${toString ws}"
-            (mkBind "SUPER + SHIFT + code:1${toString i}" "hl.dsp.window.move({ workspace = ${toString ws} })")
+            "SUPER SHIFT, code:1${toString i}, movetoworkspace, ${toString ws}"
           ]
         ) 9
       )
@@ -250,16 +176,8 @@ let
       gaps_in = 4;
       gaps_out = 7;
       border_size = 3;
-      col = {
+      "col.active_border" = "rgba(6e848cee) rgba(eeeeffee) 90deg";
-        active_border = {
+      "col.inactive_border" = "rgba(595959aa)";
-          colors = [
-            "rgba(6e848cee)"
-            "rgba(eeeeffee)"
-          ];
-          angle = 90;
-        };
-        inactive_border = "rgba(595959aa)";
-      };
     };
     decoration = {
       rounding = 10;
@@ -284,59 +202,18 @@ let
     animations = {
       enabled = true;
       animation = [
-        {
+        "windowsIn, 1, 1, default, popin 90%"
-          leaf = "windowsIn";
+        "windowsOut, 1, 100, default, popin 80%"
-          enabled = true;
+        "windowsMove, 1, 3, default"
-          speed = 1;
+        "border, 1, 10, default"
-          bezier = "default";
+        "borderangle, 1, 8, default"
-          style = "popin 90%";
+        "fade, 1, 7, default"
-        }
+        "workspaces, 1, 5, default, slidefade 10%"
-        {
-          leaf = "windowsOut";
-          enabled = true;
-          speed = 100;
-          bezier = "default";
-          style = "popin 80%";
-        }
-        {
-          leaf = "windowsMove";
-          enabled = true;
-          speed = 3;
-          bezier = "default";
-        }
-        {
-          leaf = "border";
-          enabled = true;
-          speed = 10;
-          bezier = "default";
-        }
-        {
-          leaf = "borderangle";
-          enabled = true;
-          speed = 8;
-          bezier = "default";
-        }
-        {
-          leaf = "fade";
-          enabled = true;
-          speed = 7;
-          bezier = "default";
-        }
-        {
-          leaf = "workspaces";
-          enabled = true;
-          speed = 5;
-          bezier = "default";
-          style = "slidefade 10%";
-        }
       ];
     };
   };
 
   styleSettings = recursiveUpdate defaultStyle config.hare.hyprland.style;
-  styleConfig = recursiveUpdate (builtins.removeAttrs styleSettings [ "animations" ]) {
-    animations = builtins.removeAttrs styleSettings.animations [ "animation" ];
-  };
   inputSettings = recursiveUpdate defaultInput config.hare.hyprland.input;
 in
 {
@@ -354,19 +231,15 @@ in
   options.hare.hyprland.wallpaperCommand = mkOption {
     type = types.nullOr types.str;
     default = null;
-    description = "Command to set the wallpaper (e.g., \"awww img <path>\"); appended to Hyprland's exec list when provided.";
+    description = "Command to set the wallpaper (e.g., \"swww img <path>\"); appended to Hyprland's exec list when provided.";
   };
 
   config = {
     wayland.windowManager.hyprland = {
       enable = true;
-      configType = "lua";
       systemd.enable = false;
-      settings = recursiveUpdate baseSettings {
+      settings = recursiveUpdate (recursiveUpdate baseSettings styleSettings) {
-        config = recursiveUpdate (recursiveUpdate baseConfig styleConfig) {
+        input = inputSettings;
-          input = inputSettings;
-        };
-        animation = styleSettings.animations.animation;
       };
       plugins = [
       ];
@@ -375,7 +248,7 @@ in
       rosePineHyprcursor
     ]
     ++ (with pkgs; [
-      awww
+      swww
       eww
       hyprshot
     ]);

home-manager/hyprland/styles/thin.nix

@@ -4,16 +4,8 @@
     gaps_in = 0;
     gaps_out = 0;
     border_size = 2;
-    col = {
+    "col.active_border" = "rgba(6e848cee) rgba(eeeeffee) 90deg";
-      active_border = {
+    "col.inactive_border" = "rgba(595959aa)";
-        colors = [
-          "rgba(6e848cee)"
-          "rgba(eeeeffee)"
-        ];
-        angle = 90;
-      };
-      inactive_border = "rgba(595959aa)";
-    };
     layout = "dwindle";
     allow_tearing = true;
   };
@@ -39,51 +31,13 @@
   animations = lib.mkForce {
     enabled = true;
     animation = [
-      {
+      "windowsIn, 1, 1, default, popin 90%"
-        leaf = "windowsIn";
+      "windowsOut, 1, 100, default, popin 80%"
-        enabled = true;
+      "windowsMove, 1, 3, default"
-        speed = 1;
+      "border, 1, 10, default"
-        bezier = "default";
+      "borderangle, 1, 8, default"
-        style = "popin 90%";
+      "fade, 1, 7, default"
-      }
+      "workspaces, 1, 5, default, slidefade 10%"
-      {
-        leaf = "windowsOut";
-        enabled = true;
-        speed = 100;
-        bezier = "default";
-        style = "popin 80%";
-      }
-      {
-        leaf = "windowsMove";
-        enabled = true;
-        speed = 3;
-        bezier = "default";
-      }
-      {
-        leaf = "border";
-        enabled = true;
-        speed = 10;
-        bezier = "default";
-      }
-      {
-        leaf = "borderangle";
-        enabled = true;
-        speed = 8;
-        bezier = "default";
-      }
-      {
-        leaf = "fade";
-        enabled = true;
-        speed = 7;
-        bezier = "default";
-      }
-      {
-        leaf = "workspaces";
-        enabled = true;
-        speed = 5;
-        bezier = "default";
-        style = "slidefade 10%";
-      }
     ];
   };
 }

home-manager/zeditor.nix

@@ -3,7 +3,11 @@
 {
   programs.zed-editor = {
     enable = true;
-    extensions = [ "nix" "toml" "rust" ];
+    extensions = [
+      "nix"
+      "toml"
+      "rust"
+    ];
 
     userSettings = {
       theme = {
@@ -12,11 +16,12 @@
         light = "Kanagawa Lotus";
       };
       hour_format = "hour24";
-      vim_mode = true;
+      vim_mode = false;
       buffer_font_size = 12.0;
       buffer_font_family = "PlemolJP Console NF";
     };
   };
   fonts.fontconfig.enable = true;
-  home.file.".local/share/fonts/plemoljp".source = "${pkgs.plemoljp-nf}/share/fonts/truetype/plemoljp-nf-console";
+  home.file.".local/share/fonts/plemoljp".source =
+    "${pkgs.plemoljp-nf}/share/fonts/truetype/plemoljp-nf-console";
 }

hosts/aqua/default.nix

@@ -0,0 +1,16 @@
+inputs:
+let
+  mkHost = import ../mkHost.nix inputs;
+in
+mkHost {
+  system = "x86_64-linux";
+  hostname = "AQUA";
+  users = [
+    {
+      username = "umi";
+      homeModule = [ ./umi/home-manager.nix ];
+      userNixos = ./umi/nixos.nix;
+    }
+  ];
+  systemModules = [ ./nixos.nix ];
+}

hosts/aqua/hardware-configuration.nix

@@ -0,0 +1,54 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:
+
+{
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
+
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "ahci"
+    "nvme"
+    "usb_storage"
+    "usbhid"
+    "sd_mod"
+  ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-amd" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/e8956bf9-0123-4caf-8a5d-abe77a33e83a";
+    fsType = "ext4";
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/6949-1506";
+    fsType = "vfat";
+    options = [
+      "fmask=0077"
+      "dmask=0077"
+    ];
+  };
+
+  swapDevices = [ ];
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+
+  services.xserver.videoDrivers = [ "nvidia" ];
+  hardware.nvidia = {
+    modesetting.enable = true;
+    open = true;
+    nvidiaSettings = true;
+  };
+}

hosts/aqua/nixos.nix

@@ -0,0 +1,118 @@
+{
+  pkgs,
+  username,
+  ...
+}:
+let
+  config.boot.kernelPackages = pkgs.linuxPackages_latest;
+in
+{
+  system.stateVersion = "25.11";
+
+  imports = [
+    ./hardware-configuration.nix
+
+    ../../system/core
+    ../../programs/ssh.nix
+    ../../programs/utility.nix
+    ../../programs/shell.nix
+    ../../programs/docker.nix
+    ../../programs/v4l2.nix
+    ../../programs/desktop/hyprland.nix
+    ../../programs/fcitx.nix
+    ../../programs/steam.nix
+  ];
+  environment.systemPackages = with pkgs; [
+    cargo
+    rustc
+    rustfmt
+    openssl
+    vulkan-tools
+    android-tools
+    android-file-transfer
+    ddcutil
+    bluez
+    bluez-tools
+    bluetuith
+    obexftp
+    fzf
+    ghq
+  ];
+  environment.sessionVariables.NIXOS_OZONE_WL = "1";
+
+  programs.nix-ld.enable = true;
+
+  services.openssh.enable = true;
+
+  services.udisks2.enable = true;
+
+  services.keyd.enable = true;
+
+  hardware.i2c.enable = true;
+
+  services.keyd.keyboards.default = {
+    ids = [ "*" ];
+    settings = {
+      main = {
+        capslock = "C-space";
+      };
+    };
+  };
+
+  networking.firewall.allowedTCPPorts = [
+    22
+    19132
+    25565
+  ];
+  networking.firewall.allowedUDPPorts = [ ];
+
+  services.udev.extraRules = "";
+
+  hardware.bluetooth = {
+    enable = true;
+    package = pkgs.bluez;
+    powerOnBoot = true;
+    settings = {
+      General = {
+        ControllerMode = "dual";
+        Experimental = true;
+        KernelExperimental = true;
+        FastConnectable = true;
+        # セキュリティレベルを調整
+        Class = "0x000100";
+        # ペアリングタイムアウトを延長
+        PairableTimeout = 0;
+      };
+      Policy = {
+        AutoEnable = true;
+      };
+    };
+  };
+
+  boot.kernelPackages = config.boot.kernelPackages;
+  boot.extraModulePackages = [ config.boot.kernelPackages.v4l2loopback ];
+  boot.kernelModules = [
+    "v4l2loopback"
+  ];
+
+  # Bootloader.
+  boot.loader.systemd-boot.enable = false;
+  boot.loader.efi.canTouchEfiVariables = true;
+  boot.loader.efi.efiSysMountPoint = "/boot";
+
+  boot.loader.grub = {
+    enable = true;
+    efiSupport = true;
+    devices = [ "nodev" ];
+    useOSProber = true;
+
+    copyKernels = true;
+    configurationLimit = 10;
+  };
+
+  cornflake.greeter.monitors = [
+    "DP-1, disable"
+    "DP-2, disable"
+    "DP-3, 1920x1080@240, 0x0"
+  ];
+}

hosts/aqua/umi/home-manager.nix

@@ -0,0 +1,95 @@
+{
+  pkgs,
+  inputs,
+  lib,
+  ...
+}:
+{
+  home.stateVersion = "25.05";
+  imports = [
+    inputs.nix-index-database.homeModules.nix-index
+    ../../../home-manager/tofi.nix
+    ../../../home-manager/hyprland
+    ../../../home-manager/fnott.nix
+    ../../../home-manager/wezterm
+    ../../../home-manager/fish
+    ../../../home-manager/vscode.nix
+    ../../../home-manager/direnv.nix
+    ../../../home-manager/firefox.nix
+    ../../../home-manager/obs-studio.nix
+    ../../../home-manager/zeditor.nix
+    ../../../home-manager/voicevox.nix
+  ];
+  hare.hyprland = {
+    input.sensitivity = -0.85;
+    wallpaperCommand = "swww img /usr/share/wallpaper/arknights-02.jpg";
+  };
+
+  programs.nix-index-database.comma.enable = true;
+
+  home.packages = with pkgs; [
+    google-chrome
+    discord
+    discord-canary
+    discord-ptb
+    helvum
+    plemoljp
+    plemoljp-nf
+    prismlauncher
+    scrcpy
+    tetrio-desktop
+    gimp
+    inkscape
+    obsidian
+    kdePackages.filelight
+    (deno.overrideAttrs (oldAttrs: {
+      doCheck = false;
+    }))
+    bun
+    nodejs_24
+    nixd
+    rar
+    rust-analyzer
+    ytmdesktop
+    opencode
+    pnpm_9
+    notion-app
+  ];
+  services.easyeffects = {
+    enable = true;
+  };
+
+  programs.git = {
+    enable = true;
+    settings.user.name = "Kariya";
+    settings.user.email = "kariya2298@gmail.com";
+  };
+
+  fonts = {
+    fontconfig = {
+      defaultFonts = {
+        serif = [ "Noto Serif" ];
+        sansSerif = [ "Noto Sans" ];
+        monospace = [ "PlemolJP NF Console" ];
+      };
+    };
+  };
+
+  xdg.mimeApps = {
+    enable = true;
+
+    defaultApplications = {
+      "text/html" = "google-chrome.desktop";
+      "x-scheme-handler/http" = "google-chrome.desktop";
+      "x-scheme-handler/https" = "google-chrome.desktop";
+      "x-scheme-handler/about" = "google-chrome.desktop";
+      "x-scheme-handler/unknown" = "google-chrome.desktop";
+    };
+  };
+
+  wayland.windowManager.hyprland.settings.monitor = [
+    "DP-1, 1920x1080@60, -1920x0, 1"
+    "DP-2, 1600x900@60, -3520x90, 1"
+    "DP-3, 1920x1080@240, 0x0, 1"
+  ];
+}

hosts/aqua/umi/nixos.nix

@@ -0,0 +1,10 @@
+{ pkgs, ... }:
+{
+   extraGroups = [
+     "docker"
+     "i2c"
+   ];
+   shell = pkgs.fish;
+   # openssh.authroizedKeys.keys = [
+   # ];
+}

hosts/arcadia/default.nix

@@ -12,8 +12,5 @@ mkHost {
       nixos = ./hare/nixos.nix;
     }
   ];
-  systemModules = [
+  systemModules = [ ./nixos.nix ];
-    inputs.tourbox-linux.nixosModules.default
-    ./nixos.nix
-  ];
 }

hosts/arcadia/display.nix

@@ -0,0 +1,11 @@
+{
+  wayland.windowManager.hyprland = {
+    settings = {
+      monitor = [
+        "DP-1, 5120x2880@60, 0x0, 2"
+        "DP-2, 2560x1440@144, 2560x0, 1, transform, 0"
+        "DP-3, 1920x1080@144, -1080x-240, 1, transform, 1"
+      ];
+    };
+  };
+}

hosts/arcadia/hare/home-manager.nix

@@ -5,9 +5,10 @@
   ...
 }:
 {
-  home.stateVersion = "26.05";
+  home.stateVersion = "25.05";
   imports = [
     inputs.nix-index-database.homeModules.nix-index
+    ../display.nix
     ../../../home-manager/tofi.nix
     ../../../home-manager/hyprland
     ../../../home-manager/fnott.nix
@@ -19,42 +20,11 @@
     ../../../home-manager/obs-studio.nix
     ../../../home-manager/zeditor.nix
     ../../../home-manager/blender.nix
-    # ../../../home-manager/voicevox.nix
+    ../../../home-manager/voicevox.nix
-  ];
-
-  wayland.windowManager.hyprland.settings.monitor = [
-    {
-      output = "DP-1";
-      mode = "5120x2880@60";
-      position = "0x0";
-      scale = 2;
-    }
-    {
-      output = "DP-2";
-      mode = "2560x1440@144";
-      position = "2560x0";
-      scale = 1;
-      transform = 0;
-    }
-    # {
-    #   output = "DP-3";
-    #   mode = "1920x1080@60";
-    #   position = "0x0";
-    #   scale = 0.75;
-    #   transform = 0;
-    #   mirror = "DP-1";
-    # }
-    {
-      output = "DP-3";
-      mode = "1920x1080@144";
-      position = "-1080x-240";
-      scale = 1;
-      transform = 1;
-    }
   ];
   hare.hyprland = {
     input.sensitivity = -1.0;
-    wallpaperCommand = "awww img /usr/share/wallpaper/arknights-02.jpg";
+    wallpaperCommand = "swww img /usr/share/wallpaper/arknights-02.jpg";
   };
 
   programs.nix-index-database.comma.enable = true;
@@ -63,10 +33,10 @@
     vivaldi
     google-chrome
     discord
+    helvum
     plemoljp
     plemoljp-nf
     prismlauncher
-    nodejs
     scrcpy
     tetrio-desktop
     kicad
@@ -74,9 +44,11 @@
     inkscape
     obsidian
     kdePackages.filelight
+    inputs.zen-browser.packages."${stdenv.hostPlatform.system}".default
     (deno.overrideAttrs (oldAttrs: {
       doCheck = false;
     }))
+    nodejs_24
     godot
     unityhub
     nixd
@@ -85,8 +57,6 @@
     bambu-studio
     orca-slicer
     davinci-resolve
-    inputs.zen-browser.packages."${stdenv.hostPlatform.system}".default
-    # inputs.yoi.packages.${stdenv.hostPlatform.system}.default
   ];
   services.easyeffects = {
     enable = true;
@@ -96,11 +66,6 @@
     enable = true;
     settings.user.name = "Hare";
     settings.user.email = "kei.hiracchi.0928@gmail.com";
-    signing = {
-      format = "ssh";
-      key = "~/.ssh/git-sign.pub";
-      signByDefault = true;
-    };
   };
 
   fonts = {
@@ -122,7 +87,6 @@
       "x-scheme-handler/https" = "vivaldi-stable.desktop";
       "x-scheme-handler/about" = "vivaldi-stable.desktop";
       "x-scheme-handler/unknown" = "vivaldi-stable.desktop";
-      "x-scheme-handler/vivaldi" = "vivaldi-stable.desktop";
     };
   };
 }

hosts/arcadia/nixos.nix

@@ -6,20 +6,9 @@ in
   system.stateVersion = "25.11";
 
   cornflake.greeter.monitors = [
-    {
+    "DP-1, 5120x2880@60, 0x0, 2"
-      output = "DP-1";
+    "DP-2, disable"
-      mode = "5120x2880@60";
+    "DP-3, disable"
-      position = "0x0";
-      scale = 2;
-    }
-    {
-      output = "DP-2";
-      disabled = true;
-    }
-    {
-      output = "DP-3";
-      disabled = true;
-    }
   ];
 
   imports = [
@@ -65,7 +54,6 @@ in
     obexftp
     fzf
     ghq
-    gh
   ];
   environment.sessionVariables.NIXOS_OZONE_WL = "1";
 
@@ -81,7 +69,8 @@ in
     5173
     8000
     9001
-    25565
+    2222 # crtb server
+    11434
   ];
   networking.firewall.allowedUDPPorts = [ ];
 
@@ -90,7 +79,6 @@ in
     ATTRS{idVendor}=="414", ATTRS{idProduct}=="211a", MODE="0777"
     KERNEL=="hidraw*", SUBSYSTEM=="hidraw", MODE="0660", GROUP="input"
   '';
-  services.tourbox-linux.enable = true;
 
   hardware.bluetooth = {
     enable = true;

hosts/default.nix

@@ -1,10 +1,12 @@
-inputs:
+inputs: rec {
-rec {
   hosts = {
+    aqua = import ./aqua inputs;
     arcadia = import ./arcadia inputs;
     x1carbon = import ./x1carbon inputs;
     fungus = import ./fungus inputs;
   };
   nixos = builtins.mapAttrs (_: host: host.nixos) hosts;
-  home-manager = builtins.foldl' (a: b: a // b) { } (map (h: h.home-manager) (builtins.attrValues hosts));
+  home-manager = builtins.foldl' (a: b: a // b) { } (
+    map (h: h.home-manager) (builtins.attrValues hosts)
+  );
 }

hosts/fungus/hare/home-manager.nix

@@ -1,6 +1,6 @@
 { pkgs, ... }:
 {
-  home.stateVersion = "26.05";
+  home.stateVersion = "25.05";
   imports = [
     ../../../home-manager/direnv.nix
     ../../../home-manager/wezterm

hosts/mkHost.nix

@@ -15,22 +15,30 @@ in
   nixos = inputs.nixpkgs.lib.nixosSystem {
     modules =
       systemModules
-      ++ (map (u: { pkgs, ... }: {
+      ++ (map (
-        users.users.${u.username} = import u.nixos { inherit pkgs; };
+        u:
-      }) (builtins.filter (u: u ? nixos) users))
+        { pkgs, ... }:
+        {
+          users.users.${u.username} = import (if u ? userNixos then u.userNixos else u.nixos) {
+            inherit pkgs;
+          };
+        }
+      ) (builtins.filter (u: u ? userNixos || u ? nixos) users))
       ++ [
         {
-          users.users = builtins.listToAttrs (map (u: {
+          users.users = builtins.listToAttrs (
-            name = u.username;
+            map (u: {
-            value = {
+              name = u.username;
-              isNormalUser = true;
+              value = {
-              description = "";
+                isNormalUser = true;
-              extraGroups = [
+                description = "";
-                "networkmanager"
+                extraGroups = [
-                "wheel"
+                  "networkmanager"
-              ];
+                  "wheel"
-            };
+                ];
-          }) users);
+              };
+            }) users
+          );
         }
       ];
     inherit system;
@@ -39,25 +47,27 @@ in
       users = map (u: u.username) users;
     };
   };
-  home-manager = builtins.listToAttrs (map (u: {
+  home-manager = builtins.listToAttrs (
-    name = "${u.username}@${hostname}";
+    map (u: {
-    value = inputs.home-manager.lib.homeManagerConfiguration {
+      name = "${u.username}@${hostname}";
-      inherit pkgs;
+      value = inputs.home-manager.lib.homeManagerConfiguration {
-      extraSpecialArgs = {
+        inherit pkgs;
-        inherit inputs hostname;
+        extraSpecialArgs = {
-        username = u.username;
+          inherit inputs hostname;
+          username = u.username;
+        };
+        modules = [
+          {
+            home = {
+              username = u.username;
+              homeDirectory = "/home/${u.username}";
+            };
+            programs.home-manager.enable = true;
+          }
+          (import ../system/home-manager)
+        ]
+        ++ (if u ? homeModule then u.homeModule else [ u.home ]);
       };
-      modules = [
+    }) users
-        {
+  );
-          home = {
-            username = u.username;
-            homeDirectory = "/home/${u.username}";
-          };
-          programs.home-manager.enable = true;
-        }
-        (import ../system/home-manager)
-        u.home
-      ];
-    };
-  }) users);
 }

hosts/x1carbon/hare/home-manager.nix

@@ -5,7 +5,7 @@
   ...
 }:
 {
-  home.stateVersion = "26.05";
+  home.stateVersion = "25.05";
   imports = [
     ../../../home-manager/hyprland
     ../../../home-manager/tofi.nix
@@ -18,11 +18,12 @@
   hare.hyprland = {
     style = import ../../../home-manager/hyprland/styles/thin.nix { inherit lib; };
     input.sensitivity = -0.6;
-    wallpaperCommand = "awww img /usr/share/wallpaper/";
+    wallpaperCommand = "swww img /usr/share/wallpaper/";
   };
   home.packages = with pkgs; [
     vivaldi
     discord
+    helvum
     plemoljp
     plemoljp-nf
     prismlauncher

hosts/x1carbon/nixos.nix

@@ -33,6 +33,7 @@ in
   environment.sessionVariables.NIXOS_OZONE_WL = "1";
 
   programs.nix-ld.enable = true;
+  programs.light.enable = true;
 
   services.openssh.enable = true;
 

programs/desktop/hyprland.nix

@@ -11,7 +11,7 @@
   services.hypridle.enable = true;
 
   environment.systemPackages = with pkgs; [
-    awww
+    swww
     eww
   ];
 }

programs/steam.nix

@@ -5,8 +5,4 @@
     dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
     localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers
   };
-
-  programs.gamescope = {
-    enable = true;
-  };
 }

programs/utility.nix

@@ -10,7 +10,6 @@
     bat
     wezterm
     libsixel
-    nixfmt
+    nixfmt-rfc-style
-    nil
   ];
 }

system/core/greeter.nix

@@ -1,60 +1,45 @@
-{
+{ config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 let
   rosePineHyprcursor = pkgs.callPackage ../../home-manager/hyprland/rose-pine-hyprcursor.nix { };
-  toLua = lib.generators.toLua { };
+  monitorConf = lib.concatMapStrings (m: "monitor = ${m}\n") config.cornflake.greeter.monitors;
-  monitorConf = lib.concatMapStrings (
+  hyprGreetConf = pkgs.writeText "hyprland-greetd.conf" ''
-    m: "hl.monitor(${toLua m})\n"
-  ) config.cornflake.greeter.monitors;
-  hyprGreetConf = pkgs.writeText "hyprland-greetd.lua" ''
     ${monitorConf}
-    hl.env("HYPRCURSOR_THEME", "rose-pine-hyprcursor")
+    env = HYPRCURSOR_THEME,rose-pine-hyprcursor
-    hl.env("HYPRCURSOR_SIZE", "24")
+    env = HYPRCURSOR_SIZE,24
-    hl.env("XCURSOR_SIZE", "24")
+    env = XCURSOR_SIZE,24
-    hl.env("GTK_USE_PORTAL", "0")
-    hl.env("GDK_DEBUG", "no-portals")
 
-    hl.env("XDG_CURRENT_DESKTOP", "Hyprland")
+    env = XDG_CURRENT_DESKTOP,Hyprland
-    hl.env("XDG_SESSION_TYPE", "wayland")
+    env = XDG_SESSION_TYPE,wayland
-    hl.env("XDG_SESSION_DESKTOP", "Hyprland")
+    env = XDG_SESSION_DESKTOP,Hyprland
 
-    hl.config({
+    general {
-      general = {
+      border_size = 0
-        border_size = 0,
+    }
-      },
-      animations = {
-        enabled = false,
-      },
-      misc = {
-        force_default_wallpaper = false,
-        disable_hyprland_logo = true,
-        disable_splash_rendering = true,
-        disable_hyprland_guiutils_check = true,
-      },
-    })
 
-    hl.on("hyprland.start", function()
+    animations {
-      hl.exec_cmd("${
+      enabled = false
-        config.programs.regreet.package or pkgs.regreet
+    }
-      }/bin/regreet; ${pkgs.hyprland}/bin/hyprctl dispatch 'hl.dsp.exit()'")
+
-    end)
+    misc {
+      force_default_wallpaper = false
+      disable_hyprland_logo = true
+      disable_splash_rendering = true
+    }
+
+    exec-once = ${config.programs.regreet.package or pkgs.regreet}/bin/regreet; hyprctl dispatch exit
   '';
 in
 {
   options.cornflake.greeter.monitors = lib.mkOption {
-    type = lib.types.listOf lib.types.attrs;
+    type = lib.types.listOf lib.types.str;
     default = [ ];
-    description = "greetd セッション用 Hyprland の Lua monitor 設定";
+    description = "greetd セッション用 Hyprland の monitor 設定";
   };
 
   config = {
     services.greetd.enable = true;
     services.greetd.settings.default_session = {
-      command = "${pkgs.dbus}/bin/dbus-run-session ${pkgs.hyprland}/bin/start-hyprland -- -c ${hyprGreetConf}";
+      command = "${pkgs.hyprland}/bin/start-hyprland -- -c ${hyprGreetConf}";
       user = "greeter";
     };
 
@@ -83,6 +68,9 @@ in
         GTK = {
           application_prefer_dark_theme = true;
         };
+        background = {
+          path = "/usr/share/wallpaper/arknights-image-01.png";
+        };
       };
     };
   };

system/core/sound.nix

@@ -5,7 +5,6 @@
     alsa.enable = true;
     alsa.support32Bit = true;
     pulse.enable = true;
-    jack.enable = true;
     extraConfig.pipewire."92-low-latency" = {
       context.properties = {
         default.clock.rate = 48000;