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 -H <host>
+
+nh home switch -c <username>@<host>
+```

flake.lock

@@ -61,11 +61,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1784489491,
+        "lastModified": 1791642191,
-        "narHash": "sha256-j9maqjx1T8+ljAVntAdSI5hSGCm77QNZz64JF1rJNu0=",
+        "narHash": "sha256-0bK0A59rVUn1SRZzo4cNi4VSqAe7vR1gL2/MZl53Frw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "3139deb8cafbe73b39b24451255b2fdd3426077e",
+        "rev": "c58f54c733a7894d84fa2fdff26cc12088c4b78c",
         "type": "github"
       },
       "original": {
@@ -81,11 +81,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1784440659,
+        "lastModified": 1791711434,
-        "narHash": "sha256-Q5kNLlWngt7TaIIZoxDKWMHjiSaNRVqr70FqWCRRfr4=",
+        "narHash": "sha256-LpIhxnuO0tYeZ4k7BbNMxsPs2zJpB4hWXO1jdhUuE7Q=",
         "owner": "Mic92",
         "repo": "nix-index-database",
-        "rev": "4f8d52a3598b0dc7db7a5e7b419e3edd9d1ecfdb",
+        "rev": "9a2dd40780eeab8543aa97c59c26f11267025616",
         "type": "github"
       },
       "original": {
@@ -99,11 +99,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1784310968,
+        "lastModified": 1791721963,
-        "narHash": "sha256-rkSPTePrKqs4dg+i7ZFCq93+HrClac6oSwXX927SVjA=",
+        "narHash": "sha256-BYhx89XJltnRyQeuDKHVL5eSqbbfAcOKuDts7QRsrxQ=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "779c32a00155994c86cde8213a8dd4df139d4355",
+        "rev": "60a624466c08787ee8303393b7d4752d1826f14f",
         "type": "github"
       },
       "original": {
@@ -114,11 +114,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1767892417,
+        "lastModified": 1789546076,
-        "narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=",
+        "narHash": "sha256-vWkSk5bbfTqdtMoSgD9FshACO8JCvXTFi+3cqEp0mH0=",
-        "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba",
+        "rev": "b1b875982b17dabde9b4a37f3e229e74913e6db3",
         "type": "tarball",
-        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre924538.3497aa5c9457/nixexprs.tar.xz"
+        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1074753.b1b875982b17/nixexprs.tar.xz"
       },
       "original": {
         "type": "tarball",
@@ -127,11 +127,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1784356753,
+        "lastModified": 1791594108,
-        "narHash": "sha256-12KrbMiWLcf8m7pCvAtZh1ZrgF85ZXDXvfR/fWTKy84=",
+        "narHash": "sha256-XK4KceonkwD8LuMAt/vNrz982mXJM5jeHAxMwsUXXAQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "61b7c44c4073f0b827768aff0049561b5110ea5a",
+        "rev": "6510408d147d8c5e6d76043e899e9251756f6a75",
         "type": "github"
       },
       "original": {
@@ -196,11 +196,32 @@
         "nix-index-database": "nix-index-database",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs_2",
+        "shojiwm": "shojiwm",
         "tourbox-linux": "tourbox-linux",
         "yoi": "yoi",
         "zen-browser": "zen-browser"
       }
     },
+    "shojiwm": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1791702924,
+        "narHash": "sha256-uPQU1+EH1rXqHqJfh986bbU0MS6uJlwQrSC8FHbl9iA=",
+        "owner": "bea4dev",
+        "repo": "ShojiWM",
+        "rev": "13c8eca5753b027e118ab051d941ff4208e65507",
+        "type": "github"
+      },
+      "original": {
+        "owner": "bea4dev",
+        "repo": "ShojiWM",
+        "type": "github"
+      }
+    },
     "systems": {
       "locked": {
         "lastModified": 1681028828,
@@ -271,11 +292,11 @@
         "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-        "lastModified": 1784328575,
+        "lastModified": 1791538767,
-        "narHash": "sha256-4LdSQBnOPZ82otj2go33qAtDUcVtWFRmMvfgKdQO9Ys=",
+        "narHash": "sha256-XZhtXUzgbGXCvHYg+Y8tBujI7L5+PSyjfJR4KUz244M=",
         "ref": "develop",
-        "rev": "37c44a7942776ce43d21f0aa55e55006de1aa6a4",
+        "rev": "e8828cd1b58ebdf7485aab8a60087ad712bcc08a",
-        "revCount": 3343,
+        "revCount": 4835,
         "type": "git",
         "url": "ssh://git@gitea.hareworks.net/Hare/yoi.git"
       },

flake.nix

@@ -13,6 +13,9 @@
     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/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

@@ -14,6 +14,7 @@ mkHost {
   ];
   systemModules = [
     inputs.tourbox-linux.nixosModules.default
+    # inputs.shojiwm.nixosModules.default
     ./nixos.nix
   ];
 }

hosts/arcadia/hare/home-manager.nix

@@ -1,4 +1,5 @@
 {
+  config,
   pkgs,
   inputs,
   lib,
@@ -13,12 +14,13 @@
     ../../../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/java.nix
     # ../../../home-manager/voicevox.nix
   ];
 
@@ -36,21 +38,20 @@
       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";
+      mode = "1920x1080@300";
-      position = "-1080x-240";
+      position = "-1920x180";
       scale = 1;
-      transform = 1;
+      transform = 0;
     }
+    # {
+    #   output = "DP-3";
+    #   mode = "1920x1080@144";
+    #   position = "-1080x-240";
+    #   scale = 1;
+    #   transform = 1;
+    # }
   ];
   hare.hyprland = {
     input.sensitivity = -1.0;
@@ -59,7 +60,28 @@
 
   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
@@ -69,7 +91,7 @@
     nodejs
     scrcpy
     tetrio-desktop
-    kicad
+    # kicad
     gimp
     inkscape
     obsidian
@@ -82,9 +104,9 @@
     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
   ];

hosts/arcadia/nixos.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ lib, pkgs, ... }:
 let
   config.boot.kernelPackages = pkgs.linuxPackages_latest;
 in
@@ -36,9 +36,6 @@ in
     ../../programs/steam.nix
   ];
   environment.systemPackages = with pkgs; [
-    cargo
-    rustc
-    rustfmt
     openssl
     vulkan-tools
     android-tools
@@ -49,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
 
@@ -69,6 +59,14 @@ in
   ];
   environment.sessionVariables.NIXOS_OZONE_WL = "1";
 
+  # programs.shojiwm = {
+  #   enable = true;
+  #   initConfig = {
+  #     enable = true;
+  #     users = [ "hare" ];
+  #   };
+  # };
+
   programs.nix-ld.enable = true;
 
   services.openssh.enable = true;
@@ -91,6 +89,7 @@ in
     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;
@@ -113,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 = [

system/core/greeter.nix

@@ -38,9 +38,7 @@ let
     })
 
     hl.on("hyprland.start", function()
-      hl.exec_cmd("${
+      hl.exec_cmd("${config.services.displayManager.regreet.package}/bin/regreet; ${pkgs.hyprland}/bin/hyprctl dispatch 'hl.dsp.exit()'")
-        config.programs.regreet.package or pkgs.regreet
-      }/bin/regreet; ${pkgs.hyprland}/bin/hyprctl dispatch 'hl.dsp.exit()'")
     end)
   '';
 in
@@ -62,7 +60,7 @@ in
       rosePineHyprcursor
     ];
 
-    programs.regreet = {
+    services.displayManager.regreet = {
       # greetd を Hyprland で動かす
       enable = true;
       theme.name = "Adwaita-dark";

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
+    '';
+  };
 }