From: Andrew Date: Thu, 21 Aug 2025 19:53:29 +0000 (-0400) Subject: switch to hyprpaper X-Git-Url: http://git.skullheadx.com/nixos/static/gitweb.js?a=commitdiff_plain;h=574d3681522ce5c21b153cfb3e8f1a923d14aa46;p=nixos.git switch to hyprpaper --- diff --git a/configuration.nix b/configuration.nix index 846788a..a171c5e 100644 --- a/configuration.nix +++ b/configuration.nix @@ -58,7 +58,11 @@ # Allow unfree packages nixpkgs.config.allowUnfree = true; - programs.hyprland.enable = true; + programs.hyprland = { + enable = true; + withUWSM = true; + }; + # List packages installed in system profile. To search, run: # $ nix search wget environment.systemPackages = with pkgs; [ @@ -68,6 +72,8 @@ hyprland kitty libnotify + gnome-keyring + ]; programs.steam = { enable = true; diff --git a/home.nix b/home.nix index 612b2fc..ecc9de9 100644 --- a/home.nix +++ b/home.nix @@ -4,10 +4,13 @@ pkgs, ... }: + + { imports = [ ./sh.nix ./hyprland/hyprland.nix + ./hyprpaper.nix ./ghostty.nix ./obsidian.nix ./fastfetch.nix @@ -137,6 +140,7 @@ enable = true; extraPortals = [ pkgs.xdg-desktop-portal-hyprland ]; }; + # Let Home Manager install and manage itself. programs.home-manager.enable = true; diff --git a/hyprland/hyprland.nix b/hyprland/hyprland.nix index a28953c..269b484 100644 --- a/hyprland/hyprland.nix +++ b/hyprland/hyprland.nix @@ -7,6 +7,7 @@ ]; wayland.windowManager.hyprland = { enable = true; + systemd.enable = false; settings = { monitor = [ "DP-3,2560x1440@180.00,0x0,1" @@ -36,13 +37,14 @@ ]; exec-once = [ "xrandr --output DP-3 --primary" - "waybar" - "[workspace 1 silent] ghostty" - "[workspace 2 silent] ghostty -e rmpc" - "[workspace 3 silent] obsidian" - "[workspace 6 silent] brave" - "[workspace 7 silent] discord" - "[workspace 8 silent] steam" + "uwsm app -- waybar" +# "systemctl --user enable --now ./../hyprpaper.service" + "[workspace 1 silent] uwsm app -- ghostty" + "[workspace 2 silent] uwsm app -- ghostty -e rmpc" + "[workspace 3 silent] uwsm app -- obsidian" + "[workspace 6 silent] uwsm app -- brave" + "[workspace 7 silent] uwsm app -- discord" + "[workspace 8 silent] uwsm app -- steam" ]; windowrule = [ "workspace 7 silent, class:(discord)" diff --git a/hyprpaper.nix b/hyprpaper.nix new file mode 100644 index 0000000..013eae9 --- /dev/null +++ b/hyprpaper.nix @@ -0,0 +1,33 @@ +{ config, pkgs, ... }: +let + hk_1440 = pkgs.fetchurl { + url = "https://raw.githubusercontent.com/Skullheadx/dotfiles/16c0b7ce0cf0a6286554a3bbe60c636871fb75c9/backgrounds/hollowknightbackground_2560x1440.png"; + hash = "sha256-NyfvBFeEkXe3Z6ZpciJlOEBOMvKQjZKoH9ji2jiqmj8="; + }; + hk_1080 = pkgs.fetchurl { + url = "https://raw.githubusercontent.com/Skullheadx/dotfiles/16c0b7ce0cf0a6286554a3bbe60c636871fb75c9/backgrounds/hollowknightbackground_1920x1080.png"; + hash = "sha256-mCqYc4w+S8aVALo6wMyXrWtCmfw78kIEcFAhxlFNbHQ="; + }; + testImage = pkgs.fetchurl { + url = "https://i.redd.it/mvev8aelh7zc1.png"; + hash = "sha256-lJjIq+3140a5OkNy/FAEOCoCcvQqOi73GWJGwR2zT9w"; + }; +in +{ + + services.hyprpaper = { + enable = true; + settings = { + ipc = "on"; + splash = false; + preload = [ + (builtins.toString hk_1440) + (builtins.toString hk_1080) + ]; + + wallpaper = [ + "DP-3,${builtins.toString hk_1440}" + "DP-2,${builtins.toString hk_1080}" + ]; + }; +};} diff --git a/hyprpaper.service b/hyprpaper.service new file mode 100644 index 0000000..2d85a72 --- /dev/null +++ b/hyprpaper.service @@ -0,0 +1,19 @@ +[Unit] +Description=Hyprpaper wallpaper utility for Hyprland +Documentation=man:hyprpaper(1) +# order startup after WM +After=graphical-session.target + +[Service] +Type=exec +# Repurpose XDG Autostart filtering +ExecCondition=/lib/systemd/systemd-xdg-autostart-condition "Hyprland" "" +ExecStart=hyprpaper +Restart=on-failure +Slice=background-graphical.slice + +[Install] +WantedBy=graphical-session.target +# Alternatively can be wanted by specific WMs' targets +# Should also be duplicated in 'After=' to avoid ordering loop +#WantedBy=wayland-session@hyprland.desktop.target diff --git a/stylix.nix b/stylix.nix index fe5ae7b..e9b0194 100644 --- a/stylix.nix +++ b/stylix.nix @@ -5,7 +5,7 @@ enable = true; base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-macchiato.yaml"; polarity = "dark"; - image = ./backgrounds/hollowknightbackground_2560x1440.png; + #image = ./backgrounds/hollowknightbackground_2560x1440.png; fonts = { monospace = { package = pkgs.nerd-fonts.jetbrains-mono;