From 9875eaf3096a6e464af74d707d0336fe859c64c8 Mon Sep 17 00:00:00 2001 From: Hare Date: Thu, 25 Dec 2025 18:37:54 +0900 Subject: [PATCH] 2025-12-25 --- flake.lock | 24 ++++++------- hosts/arcadia/display.nix | 4 +-- hosts/arcadia/hardware-configuration.nix | 2 +- hosts/arcadia/home-manager.nix | 20 +++++++---- hosts/arcadia/nixos.nix | 7 +++- system/core/default.nix | 2 +- system/core/fonts.nix | 2 +- system/core/greeter.nix | 45 ++++++++++++++++++++++++ system/core/regreet.nix | 24 ------------- 9 files changed, 82 insertions(+), 48 deletions(-) create mode 100644 system/core/greeter.nix delete mode 100644 system/core/regreet.nix diff --git a/flake.lock b/flake.lock index a5167e5..4f03dc7 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1759261733, - "narHash": "sha256-G104PUPKBgJmcu4NWs0LUaPpSOTD4jiq4mamLWu3Oc0=", + "lastModified": 1766387499, + "narHash": "sha256-AjK3/UKDzeXFeYNLVBaJ3+HLE9he1g5UrlNd4/BM3eA=", "owner": "nix-community", "repo": "home-manager", - "rev": "5a21f4819ee1be645f46d6b255d49f4271ef6723", + "rev": "527ad07e6625302b648ed3b28c34b62a79bd103e", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1759261527, - "narHash": "sha256-wPd5oGvBBpUEzMF0kWnXge0WITNsITx/aGI9qLHgJ4g=", + "lastModified": 1764440730, + "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e087756cf4abbe1a34f3544c480fc1034d68742f", + "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3", "type": "github" }, "original": { @@ -37,11 +37,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1759036355, - "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", + "lastModified": 1766309749, + "narHash": "sha256-3xY8CZ4rSnQ0NqGhMKAy5vgC+2IVK0NoVEzDoOh4DA4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", + "rev": "a6531044f6d0bef691ea18d4d4ce44d0daa6e816", "type": "github" }, "original": { @@ -80,11 +80,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1754251351, - "narHash": "sha256-k9ZxAmwu7DfLGW6Z6910XsSyi5V9LEIdaYxe86PeEKE=", + "lastModified": 1761859251, + "narHash": "sha256-+Kxwwlis5m8b69DBQ42wxM0f7sKCa7RRy5ADCMEI1Ss=", "owner": "xaragon", "repo": "zen-browser-flake", - "rev": "0db16223c3dc3e9337051e440c305a85b4bc3437", + "rev": "20dbd219c8238f297d53603b5f0001167a35ce51", "type": "github" }, "original": { diff --git a/hosts/arcadia/display.nix b/hosts/arcadia/display.nix index 39d4dd7..3b8ae77 100644 --- a/hosts/arcadia/display.nix +++ b/hosts/arcadia/display.nix @@ -3,8 +3,8 @@ settings = { monitor = [ "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" + "DP-2, 2560x1440@144, 2560x0, 1, transform, 0" + "DP-3, 1920x1080@144, -1080x-240, 1, transform, 1" ]; }; }; diff --git a/hosts/arcadia/hardware-configuration.nix b/hosts/arcadia/hardware-configuration.nix index 2835087..43af020 100644 --- a/hosts/arcadia/hardware-configuration.nix +++ b/hosts/arcadia/hardware-configuration.nix @@ -51,8 +51,8 @@ libvdpau-va-gl vulkan-loader vulkan-validation-layers - amdvlk # Optional: AMD's proprietary Vulkan driver mesa.opencl # Enables Rusticl (OpenCL) support + rocmPackages.clr.icd ]; }; } diff --git a/hosts/arcadia/home-manager.nix b/hosts/arcadia/home-manager.nix index 68b9ccc..4fcb38b 100644 --- a/hosts/arcadia/home-manager.nix +++ b/hosts/arcadia/home-manager.nix @@ -17,7 +17,6 @@ google-chrome discord helvum - superfile plemoljp plemoljp-nf prismlauncher @@ -28,20 +27,29 @@ inkscape obsidian zed-editor - davinci-resolve + # davinci-resolve kdePackages.filelight inputs.zen-browser.packages."${system}".default (deno.overrideAttrs (oldAttrs: { doCheck = false; })) nodejs_24 - pnpm godot + unityhub nixd rust-analyzer beeper aseprite - zrythm + bambu-studio + orca-slicer + + # voicevox-core + # voicevox-engine + # voicevox + + vinegar + + antigravity ]; services.easyeffects = { enable = true; @@ -49,8 +57,8 @@ programs.git = { enable = true; - userName = "Hare"; - userEmail = "kei.hiracchi.0928@gmail.com"; + settings.user.name = "Hare"; + settings.user.email = "kei.hiracchi.0928@gmail.com"; }; fonts = { diff --git a/hosts/arcadia/nixos.nix b/hosts/arcadia/nixos.nix index f049787..ab8e91c 100644 --- a/hosts/arcadia/nixos.nix +++ b/hosts/arcadia/nixos.nix @@ -7,7 +7,7 @@ let config.boot.kernelPackages = pkgs.linuxPackages_latest; in { - system.stateVersion = "25.05"; + system.stateVersion = "25.11"; imports = [ ./hardware-configuration.nix @@ -48,6 +48,8 @@ in bluez-tools bluetuith obexftp + fzf + ghq ]; environment.sessionVariables.NIXOS_OZONE_WL = "1"; @@ -76,12 +78,14 @@ in 5173 8000 9001 + 2222 # crtb server 11434 ]; networking.firewall.allowedUDPPorts = [ ]; services.udev.extraRules = '' ATTRS{idVendor}=="3151", ATTRS{idProduct}=="502d", MODE="0777" + ATTRS{idVendor}=="414", ATTRS{idProduct}=="211a", MODE="0777" KERNEL=="hidraw*", SUBSYSTEM=="hidraw", MODE="0660", GROUP="input" ''; @@ -116,4 +120,5 @@ in boot.loader.efi.canTouchEfiVariables = true; boot.initrd.kernelModules = [ "amdgpu" ]; + } diff --git a/system/core/default.nix b/system/core/default.nix index 738833e..2fb0acc 100644 --- a/system/core/default.nix +++ b/system/core/default.nix @@ -8,6 +8,6 @@ ./sound.nix ./uwsm.nix - ./regreet.nix + ./greeter.nix ]; } diff --git a/system/core/fonts.nix b/system/core/fonts.nix index 5fc22be..b5dc10b 100644 --- a/system/core/fonts.nix +++ b/system/core/fonts.nix @@ -4,7 +4,7 @@ packages = with pkgs; [ noto-fonts noto-fonts-cjk-sans - noto-fonts-emoji + noto-fonts-color-emoji ibm-plex ]; fontconfig = { diff --git a/system/core/greeter.nix b/system/core/greeter.nix new file mode 100644 index 0000000..a67df49 --- /dev/null +++ b/system/core/greeter.nix @@ -0,0 +1,45 @@ +{ config, pkgs, ... }: +let + hyprGreetConf = pkgs.writeText "hyprland-greetd.conf" '' + monitor = DP-1, 5120x2880@60, 0x0, 2 + + monitor = DP-2, disable + monitor = DP-3, disable + + exec-once = ${config.programs.regreet.package or pkgs.regreet}/bin/regreet; hyprctl dispatch exit + ''; +in +{ + services.greetd.enable = true; + services.greetd.settings.default_session = { + command = "${pkgs.hyprland}/bin/Hyprland --config ${hyprGreetConf}"; + user = "greeter"; + }; + + programs.regreet = { + # greetd を Hyprland で動かす + enable = true; + theme.name = "Adwaita-dark"; + iconTheme.name = "Papirus-Dark"; + cursorTheme.name = "Bibata-Modern-Ice"; + settings = { + appearance = { + greeting_msg = "Welcome back!"; + }; + widget = { + clock = { + format = "%H:%M"; + resolution = "100ms"; + timezone = "Asia/Tokyo"; + label_width = 150; + }; + }; + GTK = { + application_prefer_dark_theme = true; + }; + background = { + path = "/usr/share/wallpaper/arknights-image-01.png"; + }; + }; + }; +} diff --git a/system/core/regreet.nix b/system/core/regreet.nix deleted file mode 100644 index 9e9d86c..0000000 --- a/system/core/regreet.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ - programs.regreet = { - enable = true; - settings = { - appearance = { - greeting_msg = "Welcome back!"; - }; - widget = { - clock = { - format = "%H:%M"; - resolution = "100ms"; - timezone = "Asia/Tokyo"; - label_width = 150; - }; - }; - GTK = { - application_prefer_dark_theme = true; - }; - background = { - path = "/usr/share/wallpaper/arknights-image-01.png"; - }; - }; - }; -}