From 9a54eef7e0cb983735b28c9241fc4a80a6bd2101 Mon Sep 17 00:00:00 2001 From: cnst Date: Tue, 16 Jul 2024 11:23:13 +0200 Subject: [PATCH] insanity, trying hyprpaper again --- flake.lock | 337 +--------------------- home/core/services/hypr/default.nix | 1 + home/core/services/hypr/idle/default.nix | 9 +- home/core/services/hypr/lock/default.nix | 28 +- home/core/services/hypr/paper/default.nix | 17 ++ 5 files changed, 49 insertions(+), 343 deletions(-) create mode 100644 home/core/services/hypr/paper/default.nix diff --git a/flake.lock b/flake.lock index 26d06752..2001ba53 100644 --- a/flake.lock +++ b/flake.lock @@ -210,7 +210,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1710146030, @@ -228,7 +228,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1701680307, @@ -374,258 +374,13 @@ "type": "github" } }, - "hyprcursor": { - "inputs": { - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1720108799, - "narHash": "sha256-AxRkTJlbB8r7aG6gvc7IaLhc2T9TO4/8uqanKRxukBQ=", - "owner": "hyprwm", - "repo": "hyprcursor", - "rev": "a5c0d57325c5f0814c39110a70ca19c070ae9486", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprcursor", - "type": "github" - } - }, - "hypridle": { - "inputs": { - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1719068457, - "narHash": "sha256-q2p1YzCg9Dq2jt+6+kjHec9lb6BjCbg5rnVP2Uc/840=", - "owner": "hyprwm", - "repo": "hypridle", - "rev": "7c5747b7855d06b4a63a4f515625ab3229278298", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hypridle", - "type": "github" - } - }, - "hyprland": { - "inputs": { - "hyprcursor": "hyprcursor", - "hyprlang": "hyprlang", - "hyprutils": "hyprutils", - "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs", - "systems": "systems_2", - "xdph": "xdph" - }, - "locked": { - "lastModified": 1721044084, - "narHash": "sha256-vO6wBIaInnyIQqmsKc28AsFSWeCFgnFilNhv2zoN/tU=", - "ref": "refs/heads/main", - "rev": "bd526822deb9ed47c0b51b534817aa8541fff07b", - "revCount": 4927, - "submodules": true, - "type": "git", - "url": "https://github.com/hyprwm/Hyprland" - }, - "original": { - "submodules": true, - "type": "git", - "url": "https://github.com/hyprwm/Hyprland" - } - }, - "hyprland-protocols": { - "inputs": { - "nixpkgs": [ - "hyprland", - "xdph", - "nixpkgs" - ], - "systems": [ - "hyprland", - "xdph", - "systems" - ] - }, - "locked": { - "lastModified": 1718746314, - "narHash": "sha256-HUklK5u86w2Yh9dOkk4FdsL8eehcOZ95jPhLixGDRQY=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "1b61f0093afff20ab44d88ad707aed8bf2215290", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, - "hyprlang": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1720381373, - "narHash": "sha256-lyC/EZdHULsaAKVryK11lgHY9u6pXr7qR4irnxNWC7k=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "5df0174fd09de4ac5475233d65ffc703e89b82eb", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprlock": { - "inputs": { - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "hyprutils": "hyprutils_2", - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1720969146, - "narHash": "sha256-uUsiOhgPTMDpM+D32kSc977wctMQEz763d5VcjPH4c0=", - "owner": "hyprwm", - "repo": "hyprlock", - "rev": "69d37d2663bdd69a4d7891baf68acf4f81a5610a", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlock", - "type": "github" - } - }, - "hyprutils": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1720545076, - "narHash": "sha256-Pxacc2uoxI00koXp5+CyNqHOTQlqNlK0rlRHDBHX4+g=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "6174a2a25f4e216c0f1d0c4278adc23c476b1d09", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprutils_2": { - "inputs": { - "nixpkgs": [ - "hyprlock", - "nixpkgs" - ], - "systems": [ - "hyprlock", - "systems" - ] - }, - "locked": { - "lastModified": 1717881334, - "narHash": "sha256-a0inRgJhPL6v9v7RPM/rx1kbXdfe3xJA1c9z0ZkYnh4=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "0693f9398ab693d89c9a0aa3b3d062dd61b7a60e", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprwayland-scanner": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1720215857, - "narHash": "sha256-JPdL+Qul+jEueAn8CARfcWP83eJgwkhMejQYfDvrgvU=", - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "d5fa094ca27e0039be5e94c0a80ae433145af8bb", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "type": "github" - } - }, "lanzaboote": { "inputs": { "crane": "crane", "flake-compat": "flake-compat_2", "flake-parts": "flake-parts", "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "rust-overlay": "rust-overlay" }, @@ -702,16 +457,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1720542800, - "narHash": "sha256-ZgnNHuKV6h2+fQ5LuqnUaqZey1Lqqt5dTUAiAnqH0QQ=", + "lastModified": 1717794163, + "narHash": "sha256-Ch6ZpFPVvi7Bb6gmmuufpTEFkXqa43pC94XMfU5FEt0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "feb2849fdeb70028c70d73b848214b00d324a497", + "rev": "121f68ed7c6c32de5a8ce91a08ef25713d1c4755", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-unstable-small", "repo": "nixpkgs", "type": "github" } @@ -764,22 +519,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1717794163, - "narHash": "sha256-Ch6ZpFPVvi7Bb6gmmuufpTEFkXqa43pC94XMfU5FEt0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "121f68ed7c6c32de5a8ce91a08ef25713d1c4755", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable-small", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1720957393, "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=", @@ -855,14 +594,11 @@ "flake-utils": "flake-utils_2", "hardware": "hardware", "home-manager": "home-manager", - "hypridle": "hypridle", - "hyprland": "hyprland", - "hyprlock": "hyprlock", "lanzaboote": "lanzaboote", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "nixpkgs-stable": "nixpkgs-stable_2", "nixvim": "nixvim", - "systems": "systems_5" + "systems": "systems_4" } }, "rust-overlay": { @@ -907,16 +643,16 @@ }, "systems_2": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -936,21 +672,6 @@ } }, "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_5": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -985,36 +706,6 @@ "repo": "treefmt-nix", "type": "github" } - }, - "xdph": { - "inputs": { - "hyprland-protocols": "hyprland-protocols", - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1720194466, - "narHash": "sha256-Rizg9efi6ue95zOp0MeIV2ZedNo+5U9G2l6yirgBUnA=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "b9b97e5ba23fe7bd5fa4df54696102e8aa863cf6", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } } }, "root": "root", diff --git a/home/core/services/hypr/default.nix b/home/core/services/hypr/default.nix index 67be45ff..fe50ebf8 100644 --- a/home/core/services/hypr/default.nix +++ b/home/core/services/hypr/default.nix @@ -2,5 +2,6 @@ imports = [ ./idle ./lock + ./paper ]; } diff --git a/home/core/services/hypr/idle/default.nix b/home/core/services/hypr/idle/default.nix index dd2e2d7e..331a190d 100644 --- a/home/core/services/hypr/idle/default.nix +++ b/home/core/services/hypr/idle/default.nix @@ -1,20 +1,17 @@ { services.hypridle = { enable = true; - importantPrefixes = [ - "$lock_cmd = pidof hyprlock || hyprlock" - "$suspend_cmd = pidof steam || systemctl suspend || loginctl suspend" - ]; settings = { general = { - lock_cmd = "$lock_cmd"; + lock_cmd = "hyprlock"; before_sleep_cmd = "$lock_cmd"; + after_sleep_cmd = "hyprctl dispatch dpms on"; }; listener = [ { timeout = 900; # 15mins - on-timeout = "$lock_cmd"; + on-timeout = "hyprlock"; } { timeout = 1200; # 20mins diff --git a/home/core/services/hypr/lock/default.nix b/home/core/services/hypr/lock/default.nix index 27f9501b..d8d262a0 100644 --- a/home/core/services/hypr/lock/default.nix +++ b/home/core/services/hypr/lock/default.nix @@ -51,20 +51,20 @@ halign = "center"; valign = "center"; } - # { - # # Date - # monitor = ""; - # text = "cmd[update:1000] echo '$(date -I)'"; - # shadow_passes = 1; - # shadow_boost = 0.5; - # color = "rgba(FFFFFFFF)"; - # font_size = 25; - # font_family = "Input Mono Compressed"; - # - # position = "0, 280"; - # halign = "center"; - # valign = "center"; - # } + { + # Date + monitor = ""; + text = "cmd[update:3600000] date +'%a %b %d'"; + shadow_passes = 1; + shadow_boost = 0.5; + color = "rgba(FFFFFFFF)"; + font_size = 25; + font_family = "Input Mono Compressed"; + + position = "0, 230"; + halign = "center"; + valign = "center"; + } ]; }; }; diff --git a/home/core/services/hypr/paper/default.nix b/home/core/services/hypr/paper/default.nix new file mode 100644 index 00000000..8e0a143c --- /dev/null +++ b/home/core/services/hypr/paper/default.nix @@ -0,0 +1,17 @@ +{ + services.hyprpaper = { + enable = true; + settings = { + ipc = "on"; + splash = false; + splash_offset = 2.0; + + preload = ["~/media/images/nix.png" "~/media/images/wallpaper.png"]; + + wallpaper = [ + "DP-3,~/media/images/wallpaper.png" + # "DP-1,/share/wallpapers/cat_pacman.png" + ]; + }; + }; +}