From 9c2d060f278d560723d334c69a9b267c09e1ca5a Mon Sep 17 00:00:00 2001 From: cnst Date: Mon, 15 Jul 2024 21:13:42 +0200 Subject: [PATCH] hyprpaper be gone --- flake.lock | 364 ++++++++++++++++++++-- flake.nix | 22 +- home/core/services/hypr/default.nix | 1 - home/core/services/hypr/paper/default.nix | 17 - home/users/cnst/imports.nix | 3 +- nixos/core/hyprland.nix | 6 +- 6 files changed, 361 insertions(+), 52 deletions(-) delete mode 100644 home/core/services/hypr/paper/default.nix diff --git a/flake.lock b/flake.lock index 266ebd51..ec8ac868 100644 --- a/flake.lock +++ b/flake.lock @@ -1,23 +1,5 @@ { "nodes": { - "ags": { - "inputs": { - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1718921313, - "narHash": "sha256-TFJah1RW5qnYW7kajjAFPAS5j/0q0R3vz9zPjrRA0Mc=", - "owner": "Aylur", - "repo": "ags", - "rev": "646d5ad073ff7f8b1d50cfbd40f5b8a250fcd59d", - "type": "github" - }, - "original": { - "owner": "Aylur", - "repo": "ags", - "type": "github" - } - }, "cachix": { "locked": { "lastModified": 1635350005, @@ -228,7 +210,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1710146030, @@ -246,7 +228,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1701680307, @@ -392,6 +374,280 @@ "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" + } + }, + "hyprpaper": { + "inputs": { + "hyprlang": [ + "hyprland", + "hyprlang" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1719939251, + "narHash": "sha256-N58i+BSqmz9n7WKFY0Q8c27NWetyzbJf/1NtJuNEQLg=", + "owner": "hyprwm", + "repo": "hyprpaper", + "rev": "13fcdd79efe439a81d807572cc4b4737abbad918", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprpaper", + "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", @@ -475,11 +731,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1718714799, - "narHash": "sha256-FUZpz9rg3gL8NVPKbqU8ei1VkPLsTIfAJ2fdAf5qjak=", + "lastModified": 1720542800, + "narHash": "sha256-ZgnNHuKV6h2+fQ5LuqnUaqZey1Lqqt5dTUAiAnqH0QQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c00d587b1a1afbf200b1d8f0b0e4ba9deb1c7f0e", + "rev": "feb2849fdeb70028c70d73b848214b00d324a497", "type": "github" }, "original": { @@ -624,16 +880,19 @@ }, "root": { "inputs": { - "ags": "ags", "firefox-nightly": "firefox-nightly", "flake-utils": "flake-utils_2", "hardware": "hardware", "home-manager": "home-manager", + "hypridle": "hypridle", + "hyprland": "hyprland", + "hyprlock": "hyprlock", + "hyprpaper": "hyprpaper", "lanzaboote": "lanzaboote", "nixpkgs": "nixpkgs_3", "nixpkgs-stable": "nixpkgs-stable_2", "nixvim": "nixvim", - "systems": "systems_4" + "systems": "systems_5" } }, "rust-overlay": { @@ -678,16 +937,16 @@ }, "systems_2": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, @@ -707,6 +966,21 @@ } }, "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=", @@ -741,6 +1015,36 @@ "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/flake.nix b/flake.nix index ef53408f..e7575c81 100644 --- a/flake.nix +++ b/flake.nix @@ -39,7 +39,27 @@ # url = "github:nix-community/fenix"; # inputs.nixpkgs.follows = "nixpkgs"; #}; - ags.url = "github:Aylur/ags"; + # ags.url = "github:Aylur/ags"; + + # HYPRLAND ECOSYSTEM + hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; + + hypridle = { + url = "github:hyprwm/hypridle"; + inputs = { + hyprlang.follows = "hyprland/hyprlang"; + nixpkgs.follows = "hyprland/nixpkgs"; + systems.follows = "hyprland/systems"; + }; + }; + hyprlock = { + url = "github:hyprwm/hyprlock"; + inputs = { + hyprlang.follows = "hyprland/hyprlang"; + nixpkgs.follows = "hyprland/nixpkgs"; + systems.follows = "hyprland/systems"; + }; + }; }; outputs = { self, diff --git a/home/core/services/hypr/default.nix b/home/core/services/hypr/default.nix index fe50ebf8..67be45ff 100644 --- a/home/core/services/hypr/default.nix +++ b/home/core/services/hypr/default.nix @@ -2,6 +2,5 @@ imports = [ ./idle ./lock - ./paper ]; } diff --git a/home/core/services/hypr/paper/default.nix b/home/core/services/hypr/paper/default.nix deleted file mode 100644 index 57e9f868..00000000 --- a/home/core/services/hypr/paper/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ - services.hyprpaper = { - enable = true; - settings = { - ipc = "off"; - splash = false; - splash_offset = 2.0; - - preload = ["/src/nix.png" "/src/wallpaper.png"]; - - wallpaper = [ - "DP-3,/src/wallpaper.png" - # "DP-1,/share/wallpapers/cat_pacman.png" - ]; - }; - }; -} diff --git a/home/users/cnst/imports.nix b/home/users/cnst/imports.nix index 88d55685..320fe6fc 100644 --- a/home/users/cnst/imports.nix +++ b/home/users/cnst/imports.nix @@ -14,7 +14,7 @@ # core.services ../../core/services/mako ../../core/services/polkit - ../../core/services/hypr/paper + ../../core/services/hypr ]; home = { packages = with pkgs; [ @@ -28,6 +28,7 @@ qbittorrent virt-manager xfce.thunar + swaybg # misc.tui alacritty diff --git a/nixos/core/hyprland.nix b/nixos/core/hyprland.nix index ea7dc2e8..0774f03b 100644 --- a/nixos/core/hyprland.nix +++ b/nixos/core/hyprland.nix @@ -1,7 +1,9 @@ -{pkgs, ...}: { +{inputs, ...}: { + imports = [ + inputs.hyprland.nixosModules.default + ]; programs.hyprland = { enable = true; - package = pkgs.hyprland; xwayland.enable = true; }; environment.sessionVariables = {