20205-10-04

hosts/arcadia/display.nix

@@ -2,8 +2,9 @@
   wayland.windowManager.hyprland = {
     settings = {
       monitor = [
-        "DP-2, 2560x1440@144, 0x0, 1"
-        "DP-1, 1920x1080@120, -1920x180, 1"
+        "DP-1, 5120x2880@60, 0x0, 2"
+        "DP-2, 1920x1080@144, 2560x-240, 1, transform, 1"
+        "HDMI-A-1, 2560x1440@144, -1440x-240, 1, transform, 1"
       ];
     };
   };

hosts/arcadia/hardware-configuration.nix

@@ -43,7 +43,16 @@
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 
-  hardware.opengl = {
-      enable = true;
+  hardware.graphics = {
+    enable = true;
+    extraPackages = with pkgs; [
+      mesa
+      libva
+      libvdpau-va-gl
+      vulkan-loader
+      vulkan-validation-layers
+      amdvlk # Optional: AMD's proprietary Vulkan driver
+      mesa.opencl # Enables Rusticl (OpenCL) support
+    ];
   };
 }

hosts/arcadia/home-manager.nix

@@ -1,17 +1,20 @@
-{ conifg, pkgs, ... }:
+{ pkgs, inputs, ... }:
 {
+  home.stateVersion = "25.05";
   imports = [
     ../../home-manager/hyprland.nix
     ./display.nix
 
+    ../../home-manager/vscode.nix
     ../../home-manager/tofi.nix
     ../../home-manager/direnv.nix
     ../../home-manager/firefox.nix
     ../../home-manager/obs-studio.nix
+    ../../home-manager/blender.nix
   ];
   home.packages = with pkgs; [
-    vscode
     vivaldi
+    google-chrome
     discord
     helvum
     superfile
@@ -21,13 +24,29 @@
     scrcpy
     tetrio-desktop
     kicad
-    blender-hip
     gimp
     inkscape
     obsidian
     zed-editor
-    easyeffects
+    davinci-resolve
+    kdePackages.filelight
+    inputs.zen-browser.packages."${system}".default
+    (deno.overrideAttrs (oldAttrs: {
+      doCheck = false;
+    }))
+    nodejs_24
+    pnpm
+    godot
+    nixd
+    rust-analyzer
+    beeper
+    aseprite
+    zrythm
   ];
+  services.easyeffects = {
+    enable = true;
+  };
+
   programs.git = {
     enable = true;
     userName = "Hare";

hosts/arcadia/nixos.nix

@@ -1,11 +1,13 @@
 {
-  config,
   pkgs,
   username,
   ...
 }:
+let
+  config.boot.kernelPackages = pkgs.linuxPackages_latest;
+in
 {
-  system.stateVersion = "24.11";
+  system.stateVersion = "25.05";
 
   imports = [
     ./hardware-configuration.nix
@@ -21,9 +23,16 @@
     ../../programs/steam.nix
   ];
   environment.systemPackages = with pkgs; [
-    deno
-    nodejs
-    pnpm
+    cargo
+    rustc
+    rustfmt
+    openssl
+    vulkan-tools
+    android-file-transfer
+
+    rocmPackages.rocm-runtime
+    rocmPackages.rocminfo
+    rocmPackages.clr
 
     qemu
     (pkgs.writeShellScriptBin "qemu-system-x86_64-uefi" ''
@@ -31,15 +40,16 @@
         -bios ${pkgs.OVMF.fd}/FV/OVMF.fd \
         "$@"
     '')
+
+    wineWowPackages.waylandFull
+    winetricks
+
+    bluez
+    bluez-tools
+    bluetuith
+    obexftp
   ];
-
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
-  boot.initrd.kernelModules = [ "amdgpu" ];
-
-  boot.kernelModules = [ "v4l2loopback" ];
-  boot.extraModulePackages = [ pkgs.linuxPackages.v4l2loopback ];
+  environment.sessionVariables.NIXOS_OZONE_WL = "1";
 
   users.users.${username} = {
     extraGroups = [
@@ -48,7 +58,9 @@
     ];
     shell = pkgs.fish;
     openssh.authorizedKeys.keys = [
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIfql/a6ZtxOPgBhFzOfgTO6HGcy0Se9mgMLmOa40vMF"
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIW2Yrqwi4YjIrdI8mygX5pTHDPmrUgbmpZ4WxoTqORi keihi@Vostro-LapTop"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICi8Cciepfs1ikPdfyHjc9qJX5z2QLFF9jBszsyEvCMA nix-on-droid@localhost"
     ];
   };
   programs.adb.enable = true;
@@ -56,12 +68,52 @@
 
   services.openssh.enable = true;
 
+  services.udisks2.enable = true;
+
   networking.firewall.allowedTCPPorts = [
     8080
     22
     5173
     8000
     9001
+    11434
   ];
   networking.firewall.allowedUDPPorts = [ ];
+
+  services.udev.extraRules = ''
+    ATTRS{idVendor}=="3151", ATTRS{idProduct}=="502d", MODE="0777"
+    KERNEL=="hidraw*", SUBSYSTEM=="hidraw", MODE="0660", GROUP="input"
+  '';
+
+  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"
+  ];
+
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
+  boot.initrd.kernelModules = [ "amdgpu" ];
 }

hosts/default.nix

@@ -43,7 +43,6 @@ let
             home = {
               inherit username;
               homeDirectory = "/home/${username}";
-              stateVersion = "24.11";
             };
             programs.home-manager.enable = true;
           }

hosts/fungus/hardware-configuration.nix

@@ -1,22 +1,34 @@
-# 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, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:
 
 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sr_mod" ];
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "ahci"
+    "usbhid"
+    "usb_storage"
+    "sd_mod"
+    "sr_mod"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/e4eb343c-d88f-4d63-99aa-c2c41d8580db";
-      fsType = "ext4";
-    };
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/e4eb343c-d88f-4d63-99aa-c2c41d8580db";
+    fsType = "ext4";
+  };
 
   swapDevices = [ ];
 

hosts/fungus/home-manager.nix

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

hosts/fungus/nixos.nix

@@ -5,7 +5,7 @@
   ...
 }:
 {
-  system.stateVersion = "24.11";
+  system.stateVersion = "25.05";
 
   imports = [
     ./hardware-configuration.nix