diff --git a/flake.lock b/flake.lock index 613d1f9..801dfce 100644 --- a/flake.lock +++ b/flake.lock @@ -25,11 +25,11 @@ ] }, "locked": { - "lastModified": 1767437240, - "narHash": "sha256-OA0dBHhccdupFXp+/eaFfb8K1dQxk61in4aF5ITGVX8=", + "lastModified": 1767606757, + "narHash": "sha256-lCl9QyHHHG/lKkpZu9nhJ5ri30FUD66VWNMJp167wPY=", "owner": "nix-community", "repo": "home-manager", - "rev": "1cfa305fba94468f665de1bd1b62dddf2e0cb012", + "rev": "c4eabb884b01366f25c3f80823b12dd595ed603a", "type": "github" }, "original": { @@ -55,11 +55,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1767116409, - "narHash": "sha256-5vKw92l1GyTnjoLzEagJy5V5mDFck72LiQWZSOnSicw=", + "lastModified": 1767379071, + "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cad22e7d996aea55ecab064e84834289143e44a0", + "rev": "fb7944c166a3b630f177938e478f0378e64ce108", "type": "github" }, "original": { diff --git a/home-manager/hyprland/default.nix b/home-manager/hyprland/default.nix index 92a5355..84dfb2d 100644 --- a/home-manager/hyprland/default.nix +++ b/home-manager/hyprland/default.nix @@ -50,6 +50,11 @@ let "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" + ]; ecosystem.no_update_news = true; @@ -246,9 +251,6 @@ in GTK_BACKEND = "wayland"; QT_QPA_PLATFORM = "wayland;xcb"; QT_QPA_PLATFORMTHEME = "qt5ct"; - XDG_SESSION_TYPE = "wayland"; - XDG_CURRENT_DESKTOP = "Hyprland"; - XDG_SESSION_DESKTOP = "Hyprland"; }; }; } diff --git a/home-manager/obs-studio.nix b/home-manager/obs-studio.nix index edd2865..a8c2ffa 100644 --- a/home-manager/obs-studio.nix +++ b/home-manager/obs-studio.nix @@ -6,6 +6,7 @@ wlrobs obs-backgroundremoval obs-pipewire-audio-capture + obs-shaderfilter ]; }; } diff --git a/programs/shell.nix b/programs/shell.nix index 36e480a..c080300 100644 --- a/programs/shell.nix +++ b/programs/shell.nix @@ -15,6 +15,7 @@ fishPlugins.z bc jq + tree socat acpi btrfs-progs diff --git a/programs/v4l2.nix b/programs/v4l2.nix index 6bdbd21..793dbf7 100644 --- a/programs/v4l2.nix +++ b/programs/v4l2.nix @@ -1,10 +1,11 @@ -{ pkgs, ... }: +{ config, pkgs, ... }: { environment.systemPackages = with pkgs; [ + config.boot.kernelPackages.v4l2loopback v4l-utils ffmpeg ]; boot.extraModprobeConfig = '' - options v4l2loopback devices=2 video_nr=0,1 card_label="Scrcpy Source,OBS VirtualCamera" exclusive_caps=1 + options v4l2loopback devices=2 video_nr=0,1 card_label="OBS Virtual Camera,Scrcpy Source" exclusive_caps=1 ''; } diff --git a/system/core/greeter.nix b/system/core/greeter.nix index a67df49..ccb27bc 100644 --- a/system/core/greeter.nix +++ b/system/core/greeter.nix @@ -1,11 +1,34 @@ { config, pkgs, ... }: let + rosePineHyprcursor = pkgs.callPackage ../../home-manager/hyprland/rose-pine-hyprcursor.nix { }; hyprGreetConf = pkgs.writeText "hyprland-greetd.conf" '' monitor = DP-1, 5120x2880@60, 0x0, 2 monitor = DP-2, disable monitor = DP-3, disable + env = HYPRCURSOR_THEME,rose-pine-hyprcursor + env = HYPRCURSOR_SIZE,24 + env = XCURSOR_SIZE,24 + + env = XDG_CURRENT_DESKTOP,Hyprland + env = XDG_SESSION_TYPE,wayland + env = XDG_SESSION_DESKTOP,Hyprland" + + general { + border_size = 0 + } + + animations { + enabled = false + } + + 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 @@ -16,6 +39,10 @@ in user = "greeter"; }; + environment.systemPackages = [ + rosePineHyprcursor + ]; + programs.regreet = { # greetd を Hyprland で動かす enable = true;