diff --git a/home-manager/firefox.nix b/home-manager/firefox.nix new file mode 100644 index 0000000..902f34f --- /dev/null +++ b/home-manager/firefox.nix @@ -0,0 +1,5 @@ +{ +programs.firefox = { + enable = true; +}; +} diff --git a/home-manager/hyprland.nix b/home-manager/hyprland.nix index 1afee27..d36878b 100644 --- a/home-manager/hyprland.nix +++ b/home-manager/hyprland.nix @@ -7,14 +7,15 @@ # "/usr/lib/polkit-kde-authentication-agent-1" # "dunst" "swww-daemon" - "swww img ./backgrounds/arknights-02.jpg" - # "hypridle" # "copyq --start-server" # "wl-paste --type text --watch cliphist store" # "wl-paste --type image --watch cliphist store" "eww daemon" "eww open bar" "eww open roundedEdge" + ]; + exec = [ + "swww img /usr/share/wallpaper/arknights-02.jpg" "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'" @@ -123,7 +124,7 @@ "SUPER, E, exec, $terminal" "SUPER, Q, killactive," "SUPER, L, exec, $lock" - "SUPER_SHIFT, M, exec, uwsm stop" + "SUPER_SHIFT, M, exec, loginctl terminate-user $USER" # prsc ", Print, exec, hyprshot -m window -m active --clipboard-only" @@ -184,8 +185,8 @@ ]; }; home.sessionVariables = { - HYPRCURSOR_THEME = "rose-pine-cursor-hyprcursor"; - HYPRCURSOR_SIZE = "24"; + HYPRCURSOR_THEME = ""; + HYPRCURSOR_SIZE = "12"; XCURSOR_SIZE = "24"; GTK_BACKEND = "wayland"; QT_QPA_PLATFORM = "wayland;xcb"; diff --git a/home-manager/obs-studio.nix b/home-manager/obs-studio.nix new file mode 100644 index 0000000..edd2865 --- /dev/null +++ b/home-manager/obs-studio.nix @@ -0,0 +1,11 @@ +{ config, pkgs, ... }: +{ + programs.obs-studio = { + enable = true; + plugins = with pkgs.obs-studio-plugins; [ + wlrobs + obs-backgroundremoval + obs-pipewire-audio-capture + ]; + }; +} diff --git a/hosts/arcadia/display.nix b/hosts/arcadia/display.nix new file mode 100644 index 0000000..6211044 --- /dev/null +++ b/hosts/arcadia/display.nix @@ -0,0 +1,10 @@ +{ + wayland.windowManager.hyprland = { + settings = { + monitor = [ + "DP-2, 2560x1440@144, 0x0, 1" + "DP-1, 1920x1080@120, -1920x180, 1" + ]; + }; + }; +} diff --git a/hosts/arcadia/hardware-configuration.nix b/hosts/arcadia/hardware-configuration.nix index 8bf8788..9810a82 100644 --- a/hosts/arcadia/hardware-configuration.nix +++ b/hosts/arcadia/hardware-configuration.nix @@ -42,4 +42,8 @@ nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + + hardware.opengl = { + enable = true; + }; } diff --git a/hosts/arcadia/home-manager.nix b/hosts/arcadia/home-manager.nix index 2f414d2..fbe5636 100644 --- a/hosts/arcadia/home-manager.nix +++ b/hosts/arcadia/home-manager.nix @@ -2,15 +2,18 @@ { imports = [ ../../home-manager/hyprland.nix + ./display.nix + ../../home-manager/tofi.nix ../../home-manager/direnv.nix + ../../home-manager/firefox.nix + ../../home-manager/obs-studio.nix ]; home.packages = with pkgs; [ vscode vivaldi discord helvum - obs-studio superfile plemoljp plemoljp-nf @@ -40,4 +43,16 @@ }; }; }; + + xdg.mimeApps = { + enable = true; + + defaultApplications = { + "text/html" = "vivaldi-stable.desktop"; + "x-scheme-handler/http" = "vivaldi-stable.desktop"; + "x-scheme-handler/https" = "vivaldi-stable.desktop"; + "x-scheme-handler/about" = "vivaldi-stable.desktop"; + "x-scheme-handler/unknown" = "vivaldi-stable.desktop"; + }; + }; } diff --git a/programs/desktop/hyprland.nix b/programs/desktop/hyprland.nix index 0e8eb57..27b2e86 100644 --- a/programs/desktop/hyprland.nix +++ b/programs/desktop/hyprland.nix @@ -7,11 +7,9 @@ withUWSM = true; }; hyprlock.enable = true; - - regreet.enable = true; }; services.hypridle.enable = true; - + environment.systemPackages = with pkgs; [ swww eww diff --git a/programs/shell.nix b/programs/shell.nix index 699a587..36e480a 100644 --- a/programs/shell.nix +++ b/programs/shell.nix @@ -12,6 +12,7 @@ }; environment.systemPackages = with pkgs; [ + fishPlugins.z bc jq socat @@ -21,4 +22,4 @@ lsof pciutils ]; -} \ No newline at end of file +} diff --git a/programs/utility.nix b/programs/utility.nix index 3f2467e..b2199fb 100644 --- a/programs/utility.nix +++ b/programs/utility.nix @@ -8,6 +8,5 @@ bat wezterm - kitty nixfmt-rfc-style - ];} \ No newline at end of file + ];} diff --git a/programs/v4l2.nix b/programs/v4l2.nix index 735d139..87e7864 100644 --- a/programs/v4l2.nix +++ b/programs/v4l2.nix @@ -4,4 +4,7 @@ v4l-utils ffmpeg ]; + boot.extraModprobeConfig = '' + options v4l2loopback devices=2 video_nr=0,1 card_label="Scrcpy Source","OBS VirtualCamera" exclusive_caps=1 + ''; } diff --git a/system/core/default.nix b/system/core/default.nix index e7a517a..738833e 100644 --- a/system/core/default.nix +++ b/system/core/default.nix @@ -2,10 +2,12 @@ imports = [ ./nix.nix ./boot.nix - ./uwsm.nix ./locale.nix ./network.nix ./fonts.nix ./sound.nix + + ./uwsm.nix + ./regreet.nix ]; -} \ No newline at end of file +} diff --git a/system/core/regreet.nix b/system/core/regreet.nix new file mode 100644 index 0000000..9e9d86c --- /dev/null +++ b/system/core/regreet.nix @@ -0,0 +1,24 @@ +{ + 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"; + }; + }; + }; +}