chore: update flake inputs

README.md

@@ -1,7 +1,17 @@
 # 🌽❄
 
+初回（`nh` 導入前）:
+
 ```
 sudo nixos-rebuild switch --flake .#<host>
 
 nix run .#home-manager -- switch --flake .#<username>@<host>
 ```
+
+`nh` 導入後:
+
+```
+nh os switch
+
+nh home switch
+```

flake.lock

@@ -4,6 +4,42 @@
       "inputs": {
         "systems": "systems"
       },
+      "locked": {
+        "lastModified": 1791914995,
+        "narHash": "sha256-Zf/xfQEAasnwnmEfHqW/4hjDE/s44yn2hD4RuVIZRjA=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "b7a79d3fea1e214f6d668d521cecec0c01e26544",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "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=",
@@ -25,11 +61,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772218752,
+        "lastModified": 1792098797,
-        "narHash": "sha256-G8nArvOTZXU8DRvrzAdz3Elcj6kA/vMtvY9mrGLATtA=",
+        "narHash": "sha256-u4DIIZgznEGzByxXrxWCXK19VcMtTBmi/M9gZ7Jk9bM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "f3a30376bb9eb2f6f61816be7d6ed954b6d2a3b9",
+        "rev": "640725978b99076e18e069f6e7d2959124584f8f",
         "type": "github"
       },
       "original": {
@@ -45,11 +81,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1771734689,
+        "lastModified": 1791711434,
-        "narHash": "sha256-/phvMgr1yutyAMjKnZlxkVplzxHiz60i4rc+gKzpwhg=",
+        "narHash": "sha256-LpIhxnuO0tYeZ4k7BbNMxsPs2zJpB4hWXO1jdhUuE7Q=",
         "owner": "Mic92",
         "repo": "nix-index-database",
-        "rev": "8f590b832326ab9699444f3a48240595954a4b10",
+        "rev": "9a2dd40780eeab8543aa97c59c26f11267025616",
         "type": "github"
       },
       "original": {
@@ -59,12 +95,15 @@
       }
     },
     "nixos-hardware": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      },
       "locked": {
-        "lastModified": 1771969195,
+        "lastModified": 1791721963,
-        "narHash": "sha256-qwcDBtrRvJbrrnv1lf/pREQi8t2hWZxVAyeMo7/E9sw=",
+        "narHash": "sha256-BYhx89XJltnRyQeuDKHVL5eSqbbfAcOKuDts7QRsrxQ=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "41c6b421bdc301b2624486e11905c9af7b8ec68e",
+        "rev": "60a624466c08787ee8303393b7d4752d1826f14f",
         "type": "github"
       },
       "original": {
@@ -75,11 +114,24 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1771848320,
+        "lastModified": 1789546076,
-        "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=",
+        "narHash": "sha256-vWkSk5bbfTqdtMoSgD9FshACO8JCvXTFi+3cqEp0mH0=",
+        "rev": "b1b875982b17dabde9b4a37f3e229e74913e6db3",
+        "type": "tarball",
+        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1074753.b1b875982b17/nixexprs.tar.xz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1791956154,
+        "narHash": "sha256-jBYGPi4udQ9uo4KQp9m2J0546nJVQitG15gvZSaVVAs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2fc6539b481e1d2569f25f8799236694180c0993",
+        "rev": "55bfb4d7437bd4e09ab7cba58a43bd68eb310044",
         "type": "github"
       },
       "original": {
@@ -89,7 +141,39 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
+    "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=",
@@ -111,10 +195,33 @@
         "home-manager": "home-manager",
         "nix-index-database": "nix-index-database",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
+        "shojiwm": "shojiwm",
+        "tourbox-linux": "tourbox-linux",
+        "yoi": "yoi",
         "zen-browser": "zen-browser"
       }
     },
+    "shojiwm": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1792040296,
+        "narHash": "sha256-ZneGdoGW0iheFj8G8snUHqfhOt0DfdtjpmJCI/Bfg5U=",
+        "owner": "bea4dev",
+        "repo": "ShojiWM",
+        "rev": "98f84845ebbaabf0cd847d7dc5ac628e5adfccce",
+        "type": "github"
+      },
+      "original": {
+        "owner": "bea4dev",
+        "repo": "ShojiWM",
+        "type": "github"
+      }
+    },
     "systems": {
       "locked": {
         "lastModified": 1681028828,
@@ -130,9 +237,78 @@
         "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": 1792060900,
+        "narHash": "sha256-ymqMufudzSv63RXiAvcaeWGPZeKzkHljLzh7dMiDyOU=",
+        "ref": "develop",
+        "rev": "885e8045feaf236ac447652cf247e2d5d40f07c6",
+        "revCount": 4940,
+        "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_2"
+        "nixpkgs": "nixpkgs_5"
       },
       "locked": {
         "lastModified": 1761859251,

flake.nix

@@ -10,6 +10,11 @@
     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";
+
+    shojiwm.url = "github:bea4dev/ShojiWM";
+    shojiwm.inputs.nixpkgs.follows = "nixpkgs";
 
     nix-index-database.url = "github:Mic92/nix-index-database";
     nix-index-database.inputs.nixpkgs.follows = "nixpkgs";

home-manager/firefox.nix

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

home-manager/hyprland/default.nix

@@ -5,8 +5,46 @@
   ...
 }:
 let
-  inherit (lib) mkOption recursiveUpdate types optionals;
+  inherit (lib)
+    mkOption
+    recursiveUpdate
+    types
+    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";
@@ -27,35 +65,31 @@ let
 
   wallpaperCommand = config.hare.hyprland.wallpaperCommand;
 
-  baseSettings = {
+  startupCommands = [
-    exec-once = [
+    # "/usr/lib/polkit-kde-authentication-agent-1"
-      # "/usr/lib/polkit-kde-authentication-agent-1"
+    # "dunst"
-      # "dunst"
+    "awww-daemon"
-      "swww-daemon"
+    # "copyq --start-server"
-      # "copyq --start-server"
+    # "wl-paste --type text --watch cliphist store"
-      # "wl-paste --type text --watch cliphist store"
+    # "wl-paste --type image --watch cliphist store"
-      # "wl-paste --type image --watch cliphist store"
+    "eww daemon"
-      "eww daemon"
+    "eww open bar"
-      "eww open bar"
+    "eww open roundedEdge"
-      "eww open roundedEdge"
+  ];
-    ];
+
-    exec =
+  reloadCommands =
-      optionals (wallpaperCommand != null) [
+    optionals (wallpaperCommand != null) [
-        wallpaperCommand
+      wallpaperCommand
-      ]
+    ]
-      ++ [
+    ++ [
       "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/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/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;
@@ -66,7 +100,6 @@ let
     };
 
     dwindle = {
-      pseudotile = true;
       preserve_split = true;
     };
 
@@ -75,75 +108,124 @@ let
       disable_hyprland_logo = true;
       disable_splash_rendering = true;
     };
+    xwayland = {
+      force_zero_scaling = true;
+    };
+  };
 
-    windowrule = [
+  baseSettings = {
-      "animation windowsIn 0, match:title ^(.*wofi.*)$"
+    menu = {
-      "float on, match:title ^(.*feh.*)$"
+      _var = "uwsm app -- $(tofi-drun)";
-      "center on, match:title ^(.*feh.*)$"
+    };
-      "float on, match:title ^(Picture.*)$"
+    terminal = {
-      "pin on, match:title ^(Picture.*)$"
+      _var = "wezterm";
-      "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"
     ];
 
-    workspace = [
+    exec_cmd = reloadCommands;
-      "1, monitor:DP-2, default:true"
+
-      "r[2-9], monitor:DP-2"
+    on = mkStartHook startupCommands;
-      "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;
+      }
     ];
 
-    "$menu" = "uwsm app -- $(tofi-drun)";
+    workspace_rule = [
-    "$terminal" = "wezterm";
+      {
-    "$lock" = "hyprlock";
+        workspace = "r[1-9]";
-    bindm = [
+        monitor = "DP-1";
-      # Window Movement & Resizing
+      }
-      "SUPER, mouse:272, movewindow"
+      {
-      "SUPER, mouse:273, resizewindow"
+        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()")
+      (mkMouseBind "SUPER + mouse:273" "hl.dsp.window.resize()")
+
       # basic
-      "SUPER, return, exec, $menu"
+      (mkBind "SUPER + RETURN" "hl.dsp.exec_cmd(menu)")
-      "SUPER, E, exec, $terminal"
+      (mkBind "SUPER + E" "hl.dsp.exec_cmd(terminal)")
-      "SUPER, Q, killactive,"
+      (mkBind "SUPER + Q" "hl.dsp.window.close()")
-      "SUPER, L, exec, $lock"
+      (mkBind "SUPER + L" "hl.dsp.exec_cmd(lock)")
-      "SUPER_SHIFT, M, exec, loginctl terminate-user $USER"
+      (mkBind "SUPER + SHIFT + L" ''hl.dsp.dpms({ action = "off" })'')
+      (mkBind "SUPER + SHIFT + M" ''hl.dsp.exec_cmd("loginctl terminate-user $USER")'')
 
       # prsc
-      ", Print, exec, hyprshot -m window -m active --clipboard-only"
+      (mkBind "Print" ''hl.dsp.exec_cmd("hyprshot -m window -m active --clipboard-only")'')
 
       # Clipboard
-      "SUPER, C, exec, copyq show"
+      (mkBind "SUPER + C" ''hl.dsp.exec_cmd("copyq show")'')
-      "SUPER, V, exec, clipman pick -t dmenu"
+      (mkBind "SUPER + V" ''hl.dsp.exec_cmd("clipman pick -t dmenu")'')
 
       # Window navigation
-      "SUPER, F, fullscreen,"
+      (mkBind "SUPER + F" "hl.dsp.window.fullscreen()")
-      "SUPER, Y, pin"
+      (mkBind "SUPER + Y" "hl.dsp.window.pin()")
-      "SUPER, I, togglefloating,"
+      (mkBind "SUPER + I" ''hl.dsp.window.float({ action = "toggle" })'')
-      "SUPER, O, togglesplit," # dwindle
+      (mkBind "SUPER + O" ''hl.dsp.layout("togglesplit")'') # dwindle
-      "SUPER, P, pseudo," # dwindle
+      (mkBind "SUPER + P" "hl.dsp.window.pseudo()") # dwindle
 
       # Window focus
-      "SUPER, mouse_down, cyclenext, next"
+      (mkBind "SUPER + mouse_down" "hl.dsp.window.cycle_next()")
-      "SUPER, mouse_up, cyclenext, prev"
+      (mkBind "SUPER + mouse_up" "hl.dsp.window.cycle_next({ next = false })")
 
-      "SUPER, left, movefocus, l"
+      (mkBind "SUPER + left" ''hl.dsp.focus({ direction = "left" })'')
-      "SUPER, right, movefocus, r"
+      (mkBind "SUPER + right" ''hl.dsp.focus({ direction = "right" })'')
-      "SUPER, up, movefocus, u"
+      (mkBind "SUPER + up" ''hl.dsp.focus({ direction = "up" })'')
-      "SUPER, down, movefocus, d"
+      (mkBind "SUPER + down" ''hl.dsp.focus({ direction = "down" })'')
 
-      "SUPER_SHIFT, left, movewindow, l"
+      (mkBind "SUPER + SHIFT + left" ''hl.dsp.window.move({ direction = "left" })'')
-      "SUPER_SHIFT, right, movewindow, r"
+      (mkBind "SUPER + SHIFT + right" ''hl.dsp.window.move({ direction = "right" })'')
-      "SUPER_SHIFT, up, movewindow, u"
+      (mkBind "SUPER + SHIFT + up" ''hl.dsp.window.move({ direction = "up" })'')
-      "SUPER_SHIFT, down, movewindow, d"
+      (mkBind "SUPER + SHIFT + down" ''hl.dsp.window.move({ direction = "down" })'')
 
       # workspaces
-      "SUPER, 1, workspace, 1"
+      (mkBind "SUPER + 1" "hl.dsp.focus({ workspace = 1 })")
-      "SUPER, 2, workspace, 2"
+      (mkBind "SUPER + 2" "hl.dsp.focus({ workspace = 2 })")
-      "SUPER, 3, workspace, 3"
+      (mkBind "SUPER + 3" "hl.dsp.focus({ workspace = 3 })")
 
-      "SUPER_CTRL, left, workspace, m-1"
+      (mkBind "SUPER + CTRL + left" ''hl.dsp.focus({ workspace = "m-1" })'')
-      "SUPER_CTRL, right, workspace, m+1"
+      (mkBind "SUPER + CTRL + right" ''hl.dsp.focus({ workspace = "m+1" })'')
-      "SUPER_CTRL_SHIFT, left, workspace, r-1"
+      (mkBind "SUPER + CTRL + SHIFT + left" ''hl.dsp.focus({ workspace = "r-1" })'')
-      "SUPER_CTRL_SHIFT, right, workspace, r+1"
+      (mkBind "SUPER + CTRL + SHIFT + right" ''hl.dsp.focus({ workspace = "r+1" })'')
     ]
     ++ (
       # workspaces
@@ -155,8 +237,8 @@ let
             ws = i + 1;
           in
           [
-            "SUPER, code:1${toString i}, workspace, ${toString ws}"
+            (mkBind "SUPER + code:1${toString i}" "hl.dsp.focus({ workspace = ${toString ws} })")
-            "SUPER SHIFT, code:1${toString i}, movetoworkspace, ${toString ws}"
+            (mkBind "SUPER + SHIFT + code:1${toString i}" "hl.dsp.window.move({ workspace = ${toString ws} })")
           ]
         ) 9
       )
@@ -168,8 +250,16 @@ let
       gaps_in = 4;
       gaps_out = 7;
       border_size = 3;
-      "col.active_border" = "rgba(6e848cee) rgba(eeeeffee) 90deg";
+      col = {
-      "col.inactive_border" = "rgba(595959aa)";
+        active_border = {
+          colors = [
+            "rgba(6e848cee)"
+            "rgba(eeeeffee)"
+          ];
+          angle = 90;
+        };
+        inactive_border = "rgba(595959aa)";
+      };
     };
     decoration = {
       rounding = 10;
@@ -194,18 +284,59 @@ let
     animations = {
       enabled = true;
       animation = [
-        "windowsIn, 1, 1, default, popin 90%"
+        {
-        "windowsOut, 1, 100, default, popin 80%"
+          leaf = "windowsIn";
-        "windowsMove, 1, 3, default"
+          enabled = true;
-        "border, 1, 10, default"
+          speed = 1;
-        "borderangle, 1, 8, default"
+          bezier = "default";
-        "fade, 1, 7, default"
+          style = "popin 90%";
-        "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
 {
@@ -223,15 +354,19 @@ in
   options.hare.hyprland.wallpaperCommand = mkOption {
     type = types.nullOr types.str;
     default = null;
-    description = "Command to set the wallpaper (e.g., \"swww img <path>\"); appended to Hyprland's exec list when provided.";
+    description = "Command to set the wallpaper (e.g., \"awww img <path>\"); appended to Hyprland's exec list when provided.";
   };
 
   config = {
     wayland.windowManager.hyprland = {
       enable = true;
+      configType = "lua";
       systemd.enable = false;
-      settings = recursiveUpdate (recursiveUpdate baseSettings styleSettings) {
+      settings = recursiveUpdate baseSettings {
-        input = inputSettings;
+        config = recursiveUpdate (recursiveUpdate baseConfig styleConfig) {
+          input = inputSettings;
+        };
+        animation = styleSettings.animations.animation;
       };
       plugins = [
       ];
@@ -240,7 +375,7 @@ in
       rosePineHyprcursor
     ]
     ++ (with pkgs; [
-      swww
+      awww
       eww
       hyprshot
     ]);

home-manager/hyprland/styles/thin.nix

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

@@ -0,0 +1,20 @@
+{ pkgs, ... }:
+{
+  home.packages = [ pkgs.jre ];
+
+  xdg.desktopEntries.java = {
+    name = "Java";
+    genericName = "JAR Launcher";
+    exec = "${pkgs.jre}/bin/java -jar %f";
+    terminal = false;
+    mimeType = [
+      "application/java-archive"
+      "application/x-java-archive"
+    ];
+  };
+
+  xdg.mimeApps.defaultApplications = {
+    "application/java-archive" = "java.desktop";
+    "application/x-java-archive" = "java.desktop";
+  };
+}

home-manager/obs-studio.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
 {
   programs.obs-studio = {
     enable = true;
@@ -6,7 +6,6 @@
       wlrobs
       obs-backgroundremoval
       obs-pipewire-audio-capture
-      obs-shaderfilter
     ];
   };
 }

home-manager/pipewire.nix

@@ -0,0 +1,32 @@
+{ pkgs, ... }:
+{
+  xdg.configFile."pipewire/pipewire.conf.d/virtual-pipe.conf".text = ''
+    context.objects = [
+        {   factory = adapter
+            args = {
+                factory.name     = support.null-audio-sink
+                node.name        = "vpipe_sink"
+                node.description = "Virtual Pipe Input"
+                media.class      = Audio/Sink
+                object.linger    = true
+                audio.position   = [ FL FR ]
+            }
+        }
+        {   factory = adapter
+            args = {
+                factory.name     = support.null-audio-sink
+                node.name        = "vpipe_source"
+                node.description = "Virtual Pipe Output"
+                media.class      = Audio/Source/Virtual
+                object.linger    = true
+                audio.position   = [ FL FR ]
+            }
+        }
+    ]
+
+    context.exec = [
+        { path = "${pkgs.pipewire}/bin/pw-link" args = "vpipe_sink:monitor_FL vpipe_source:input_FL" }
+        { path = "${pkgs.pipewire}/bin/pw-link" args = "vpipe_sink:monitor_FR vpipe_source:input_FR" }
+    ]
+  '';
+}

home-manager/vscode.nix

@@ -1,11 +0,0 @@
-{ pkgs, ... }:
-{
-  programs.vscode = {
-    enable = true;
-    package = pkgs.vscode.fhs;
-    profiles.default = {
-      extensions = with pkgs.vscode-extensions; [
-      ];
-    };
-  };
-}

home-manager/wezterm/wezterm.lua

@@ -41,6 +41,7 @@ local config = {
 
   keys = {
     { key = 'V', mods = 'CTRL', action = wezterm.action.PasteFrom 'Clipboard' },
+    { key = 'Enter', mods = 'ALT', action = wezterm.action.DisableDefaultAssignment },
   }
 }
 

hosts/arcadia/default.nix

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

hosts/arcadia/display.nix

@@ -1,11 +0,0 @@
-{
-  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

@@ -1,62 +1,114 @@
 {
+  config,
   pkgs,
   inputs,
   lib,
   ...
 }:
 {
-  home.stateVersion = "25.05";
+  home.stateVersion = "26.05";
   imports = [
     inputs.nix-index-database.homeModules.nix-index
-    ../display.nix
     ../../../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/pipewire.nix
     ../../../home-manager/zeditor.nix
     ../../../home-manager/blender.nix
-    ../../../home-manager/voicevox.nix
+    ../../../home-manager/java.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@300";
+      position = "-1920x180";
+      scale = 1;
+      transform = 0;
+    }
+    # {
+    #   output = "DP-3";
+    #   mode = "1920x1080@144";
+    #   position = "-1080x-240";
+    #   scale = 1;
+    #   transform = 1;
+    # }
   ];
   hare.hyprland = {
     input.sensitivity = -1.0;
-    wallpaperCommand = "swww img /usr/share/wallpaper/arknights-02.jpg";
+    wallpaperCommand = "awww img /usr/share/wallpaper/arknights-02.jpg";
   };
 
   programs.nix-index-database.comma.enable = true;
 
+  xdg.configFile."sccache/config" = {
+    force = true;
+    text = ''
+      [cache.disk]
+      dir = "${config.xdg.cacheHome}/sccache"
+      size = 42949672960
+    '';
+  };
+
+  systemd.user.services.sccache = {
+    Unit.Description = "sccache compilation cache server";
+    Service = {
+      Type = "oneshot";
+      RemainAfterExit = true;
+      ExecStart = "${pkgs.sccache}/bin/sccache --start-server";
+      ExecStop = "${pkgs.sccache}/bin/sccache --stop-server";
+    };
+    Install.WantedBy = [ "default.target" ];
+  };
+
   home.packages = with pkgs; [
+    sccache
     vivaldi
     google-chrome
     discord
-    helvum
     plemoljp
     plemoljp-nf
     prismlauncher
+    nodejs
     scrcpy
     tetrio-desktop
-    kicad
+    # kicad
     gimp
     inkscape
     obsidian
     kdePackages.filelight
-    inputs.zen-browser.packages."${stdenv.hostPlatform.system}".default
     (deno.overrideAttrs (oldAttrs: {
       doCheck = false;
     }))
-    nodejs_24
     godot
     unityhub
     nixd
     rust-analyzer
     aseprite
-    bambu-studio
+    # bambu-studio
-    orca-slicer
+    # orca-slicer
-    davinci-resolve
+    # davinci-resolve
+    inputs.zen-browser.packages."${stdenv.hostPlatform.system}".default
+    # inputs.yoi.packages.${stdenv.hostPlatform.system}.default
   ];
   services.easyeffects = {
     enable = true;
@@ -66,6 +118,11 @@
     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 = {
@@ -87,6 +144,7 @@
       "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

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ lib, pkgs, ... }:
 let
   config.boot.kernelPackages = pkgs.linuxPackages_latest;
 in
@@ -6,9 +6,20 @@ in
   system.stateVersion = "25.11";
 
   cornflake.greeter.monitors = [
-    "DP-1, 5120x2880@60, 0x0, 2"
+    {
-    "DP-2, disable"
+      output = "DP-1";
-    "DP-3, disable"
+      mode = "5120x2880@60";
+      position = "0x0";
+      scale = 2;
+    }
+    {
+      output = "DP-2";
+      disabled = true;
+    }
+    {
+      output = "DP-3";
+      disabled = true;
+    }
   ];
 
   imports = [
@@ -25,9 +36,6 @@ in
     ../../programs/steam.nix
   ];
   environment.systemPackages = with pkgs; [
-    cargo
-    rustc
-    rustfmt
     openssl
     vulkan-tools
     android-tools
@@ -38,13 +46,6 @@ in
     rocmPackages.clr
     rocmPackages.rocm-smi
 
-    qemu
-    (pkgs.writeShellScriptBin "qemu-system-x86_64-uefi" ''
-      qemu-system-x86_64 \
-        -bios ${pkgs.OVMF.fd}/FV/OVMF.fd \
-        "$@"
-    '')
-
     wineWow64Packages.waylandFull
     winetricks
 
@@ -54,9 +55,18 @@ in
     obexftp
     fzf
     ghq
+    gh
   ];
   environment.sessionVariables.NIXOS_OZONE_WL = "1";
 
+  # programs.shojiwm = {
+  #   enable = true;
+  #   initConfig = {
+  #     enable = true;
+  #     users = [ "hare" ];
+  #   };
+  # };
+
   programs.nix-ld.enable = true;
 
   services.openssh.enable = true;
@@ -69,8 +79,7 @@ in
     5173
     8000
     9001
-    2222 # crtb server
+    25565
-    11434
   ];
   networking.firewall.allowedUDPPorts = [ ];
 
@@ -79,6 +88,8 @@ in
     ATTRS{idVendor}=="414", ATTRS{idProduct}=="211a", MODE="0777"
     KERNEL=="hidraw*", SUBSYSTEM=="hidraw", MODE="0660", GROUP="input"
   '';
+  services.tourbox-linux.enable = true;
+  systemd.services.tourbox-linux.reloadIfChanged = lib.mkForce false;
 
   hardware.bluetooth = {
     enable = true;
@@ -101,6 +112,11 @@ in
     };
   };
 
+  systemd.coredump.settings.Coredump = {
+    Storage = "none";
+    ProcessSizeMax = "0";
+  };
+
   boot.kernelPackages = config.boot.kernelPackages;
   boot.extraModulePackages = [ config.boot.kernelPackages.v4l2loopback ];
   boot.kernelModules = [

hosts/default.nix

@@ -5,6 +5,11 @@ rec {
     x1carbon = import ./x1carbon inputs;
     fungus = import ./fungus inputs;
   };
-  nixos = builtins.mapAttrs (_: host: host.nixos) hosts;
+  nixos = builtins.listToAttrs (
+    map (host: {
+      name = host.hostname;
+      value = host.nixos;
+    }) (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 = "25.05";
+  home.stateVersion = "26.05";
   imports = [
     ../../../home-manager/direnv.nix
     ../../../home-manager/wezterm

hosts/mkHost.nix

@@ -12,6 +12,8 @@ let
   };
 in
 {
+  inherit hostname;
+
   nixos = inputs.nixpkgs.lib.nixosSystem {
     modules =
       systemModules

hosts/x1carbon/hare/home-manager.nix

@@ -5,34 +5,26 @@
   ...
 }:
 {
-  home.stateVersion = "25.05";
+  home.stateVersion = "26.05";
   imports = [
     ../../../home-manager/hyprland
     ../../../home-manager/tofi.nix
     ../../../home-manager/fnott.nix
     ../../../home-manager/direnv.nix
-    ../../../home-manager/obs-studio.nix
     ../../../home-manager/wezterm
     ../../../home-manager/fish
   ];
   hare.hyprland = {
     style = import ../../../home-manager/hyprland/styles/thin.nix { inherit lib; };
     input.sensitivity = -0.6;
-    wallpaperCommand = "swww img /usr/share/wallpaper/";
+    wallpaperCommand = "awww img /usr/share/wallpaper/";
   };
   home.packages = with pkgs; [
     vivaldi
     discord
-    helvum
     plemoljp
     plemoljp-nf
-    prismlauncher
-    scrcpy
-    gimp
     zed-editor
-    deno
-    nodejs_latest
-    # aseprite
   ];
   services.easyeffects = {
     enable = true;

hosts/x1carbon/hare/nixos.nix

@@ -1,11 +1,9 @@
 { pkgs, ... }:
 {
-  extraGroups = [
-    "docker"
-  ];
   shell = pkgs.fish;
   openssh.authorizedKeys.keys = [
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIfql/a6ZtxOPgBhFzOfgTO6HGcy0Se9mgMLmOa40vMF"
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIW2Yrqwi4YjIrdI8mygX5pTHDPmrUgbmpZ4WxoTqORi keihi@Vostro-LapTop"
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBd45JtvgM44KUqhp3Xl2Wtt6rmxU13c/84YLyGKigkG hare@nixos"
   ];
 }

hosts/x1carbon/nixos.nix

@@ -12,7 +12,6 @@ in
     ../../programs/ssh.nix
     ../../programs/utility.nix
     ../../programs/shell.nix
-    ../../programs/docker.nix
     ../../programs/v4l2.nix
     ../../programs/desktop/hyprland.nix
     ../../programs/fcitx.nix
@@ -33,7 +32,6 @@ 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; [
-    swww
+    awww
     eww
   ];
 }

programs/steam.nix

@@ -5,4 +5,8 @@
     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

@@ -11,5 +11,6 @@
     wezterm
     libsixel
     nixfmt
+    nil
   ];
 }

system/core/greeter.nix

@@ -1,45 +1,58 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 let
   rosePineHyprcursor = pkgs.callPackage ../../home-manager/hyprland/rose-pine-hyprcursor.nix { };
-  monitorConf = lib.concatMapStrings (m: "monitor = ${m}\n") config.cornflake.greeter.monitors;
+  toLua = lib.generators.toLua { };
-  hyprGreetConf = pkgs.writeText "hyprland-greetd.conf" ''
+  monitorConf = lib.concatMapStrings (
+    m: "hl.monitor(${toLua m})\n"
+  ) config.cornflake.greeter.monitors;
+  hyprGreetConf = pkgs.writeText "hyprland-greetd.lua" ''
     ${monitorConf}
-    env = HYPRCURSOR_THEME,rose-pine-hyprcursor
+    hl.env("HYPRCURSOR_THEME", "rose-pine-hyprcursor")
-    env = HYPRCURSOR_SIZE,24
+    hl.env("HYPRCURSOR_SIZE", "24")
-    env = XCURSOR_SIZE,24
+    hl.env("XCURSOR_SIZE", "24")
+    hl.env("GTK_USE_PORTAL", "0")
+    hl.env("GDK_DEBUG", "no-portals")
 
-    env = XDG_CURRENT_DESKTOP,Hyprland
+    hl.env("XDG_CURRENT_DESKTOP", "Hyprland")
-    env = XDG_SESSION_TYPE,wayland
+    hl.env("XDG_SESSION_TYPE", "wayland")
-    env = XDG_SESSION_DESKTOP,Hyprland
+    hl.env("XDG_SESSION_DESKTOP", "Hyprland")
 
-    general {
+    hl.config({
-      border_size = 0
+      general = {
-    }
+        border_size = 0,
+      },
+      animations = {
+        enabled = false,
+      },
+      misc = {
+        force_default_wallpaper = false,
+        disable_hyprland_logo = true,
+        disable_splash_rendering = true,
+        disable_hyprland_guiutils_check = true,
+      },
+    })
 
-    animations {
+    hl.on("hyprland.start", function()
-      enabled = false
+      hl.exec_cmd("${config.services.displayManager.regreet.package}/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.str;
+    type = lib.types.listOf lib.types.attrs;
     default = [ ];
-    description = "greetd セッション用 Hyprland の monitor 設定";
+    description = "greetd セッション用 Hyprland の Lua monitor 設定";
   };
 
   config = {
     services.greetd.enable = true;
     services.greetd.settings.default_session = {
-      command = "${pkgs.hyprland}/bin/start-hyprland -- -c ${hyprGreetConf}";
+      command = "${pkgs.dbus}/bin/dbus-run-session ${pkgs.hyprland}/bin/start-hyprland -- -c ${hyprGreetConf}";
       user = "greeter";
     };
 
@@ -47,7 +60,7 @@ in
       rosePineHyprcursor
     ];
 
-    programs.regreet = {
+    services.displayManager.regreet = {
       # greetd を Hyprland で動かす
       enable = true;
       theme.name = "Adwaita-dark";
@@ -68,9 +81,6 @@ in
         GTK = {
           application_prefer_dark_theme = true;
         };
-        background = {
-          path = "/usr/share/wallpaper/arknights-image-01.png";
-        };
       };
     };
   };

system/core/nix.nix

@@ -13,5 +13,10 @@
     };
   };
 
+  programs.nh = {
+    enable = true;
+    flake = "/home/hare/cornflake";
+  };
+
   nixpkgs.config.allowUnfree = true;
 }

system/core/sound.nix

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

system/home-manager/default.nix

@@ -1,11 +1,17 @@
+{ config, ... }:
 {
   imports = [
     ./theme-switcher.nix
   ];
 
-    home.activation = {
+  programs.nh = {
-        makedir = ''
+    enable = true;
-            mkdir -p ~/.config/cornflake
+    flake = "${config.home.homeDirectory}/cornflake";
-        '';
+  };
-      };
+
+  home.activation = {
+    makedir = ''
+      mkdir -p ~/.config/cornflake
+    '';
+  };
 }