diff options
| -rw-r--r-- | flake.lock | 445 | ||||
| -rw-r--r-- | flake.nix | 6 | ||||
| -rw-r--r-- | modules/programs/hypr/hypridle.nix | 8 | ||||
| -rw-r--r-- | modules/programs/hypr/hyprlock.nix | 10 | ||||
| -rw-r--r-- | modules/programs/hypr/hyprpaper.nix | 8 |
5 files changed, 10 insertions, 467 deletions
@@ -170,85 +170,6 @@ "type": "github" } }, - "hyprgraphics_2": { - "inputs": { - "hyprutils": [ - "hyprlock", - "hyprutils" - ], - "nixpkgs": [ - "hyprlock", - "nixpkgs" - ], - "systems": [ - "hyprlock", - "systems" - ] - }, - "locked": { - "lastModified": 1736115290, - "narHash": "sha256-Jcn6yAzfUMcxy3tN/iZRbi/QgrYm7XLyVRl9g/nbUl4=", - "owner": "hyprwm", - "repo": "hyprgraphics", - "rev": "52202272d89da32a9f866c0d10305a5e3d954c50", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprgraphics", - "type": "github" - } - }, - "hyprgraphics_3": { - "inputs": { - "hyprutils": [ - "hyprpaper", - "hyprutils" - ], - "nixpkgs": [ - "hyprpaper", - "nixpkgs" - ], - "systems": [ - "hyprpaper", - "systems" - ] - }, - "locked": { - "lastModified": 1734906236, - "narHash": "sha256-vH/ysV2ONGQgYZPtcJKwc8jJivzyVxru2aaOxC20ZOE=", - "owner": "hyprwm", - "repo": "hyprgraphics", - "rev": "6dea3fba08fd704dd624b6d4b261638fb4003c9c", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprgraphics", - "type": "github" - } - }, - "hypridle": { - "inputs": { - "hyprlang": "hyprlang", - "hyprutils": "hyprutils", - "nixpkgs": "nixpkgs", - "systems": "systems" - }, - "locked": { - "lastModified": 1734384160, - "narHash": "sha256-zy2uzmlIORQV6VjIqSPhaoUKPLqfzpUQ5UTjmRfrkdg=", - "owner": "hyprwm", - "repo": "hypridle", - "rev": "413564cb986cfc67aeb7c4e750b42dc93ff9810f", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hypridle", - "type": "github" - } - }, "hyprland": { "inputs": { "aquamarine": "aquamarine", @@ -256,12 +177,12 @@ "hyprgraphics": "hyprgraphics", "hyprland-protocols": "hyprland-protocols", "hyprland-qtutils": "hyprland-qtutils", - "hyprlang": "hyprlang_2", - "hyprutils": "hyprutils_2", + "hyprlang": "hyprlang", + "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems_2", + "systems": "systems", "xdph": "xdph" }, "locked": { @@ -365,35 +286,6 @@ "hyprlang": { "inputs": { "hyprutils": [ - "hypridle", - "hyprutils" - ], - "nixpkgs": [ - "hypridle", - "nixpkgs" - ], - "systems": [ - "hypridle", - "systems" - ] - }, - "locked": { - "lastModified": 1734364628, - "narHash": "sha256-ii8fzJfI953n/EmIxVvq64ZAwhvwuuPHWfGd61/mJG8=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "16e59c1eb13d9fb6de066f54e7555eb5e8a4aba5", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprlang_2": { - "inputs": { - "hyprutils": [ "hyprland", "hyprutils" ], @@ -420,138 +312,9 @@ "type": "github" } }, - "hyprlang_3": { - "inputs": { - "hyprutils": [ - "hyprlock", - "hyprutils" - ], - "nixpkgs": [ - "hyprlock", - "nixpkgs" - ], - "systems": [ - "hyprlock", - "systems" - ] - }, - "locked": { - "lastModified": 1735393019, - "narHash": "sha256-NPpqA8rtmDLsEmZOmz+qR67zsB6Y503Jnv+nSFLKJZ8=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "55608efdaa387af7bfdc0eddb404c409958efa43", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprlang_4": { - "inputs": { - "hyprutils": [ - "hyprpaper", - "hyprutils" - ], - "nixpkgs": [ - "hyprpaper", - "nixpkgs" - ], - "systems": [ - "hyprpaper", - "systems" - ] - }, - "locked": { - "lastModified": 1734906259, - "narHash": "sha256-P79t/7HbACO4/PuJBroGpTptvCWJtXTv+gWsF+sM6MI=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "0404833ea18d543df44df935ebf1b497310eb046", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprlock": { - "inputs": { - "hyprgraphics": "hyprgraphics_2", - "hyprlang": "hyprlang_3", - "hyprutils": "hyprutils_3", - "hyprwayland-scanner": "hyprwayland-scanner_2", - "nixpkgs": "nixpkgs_3", - "systems": "systems_3" - }, - "locked": { - "lastModified": 1736953751, - "narHash": "sha256-hoc21ZMxcabYWGz4nB/jd6TdFqDY4KZoPLs/qNn0g0Q=", - "owner": "hyprwm", - "repo": "hyprlock", - "rev": "02639c27599b03c81dc1d0e031628224f5ad8d50", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlock", - "type": "github" - } - }, - "hyprpaper": { - "inputs": { - "hyprgraphics": "hyprgraphics_3", - "hyprlang": "hyprlang_4", - "hyprutils": "hyprutils_4", - "hyprwayland-scanner": "hyprwayland-scanner_3", - "nixpkgs": "nixpkgs_4", - "systems": "systems_4" - }, - "locked": { - "lastModified": 1736181224, - "narHash": "sha256-mOV9EZia1EKjGtoqwASZNo9gWVJt0GNwBdC5/iqkXws=", - "owner": "hyprwm", - "repo": "hyprpaper", - "rev": "251e8e2593cdd2ef0a015f4f6e211a7bab3a63ed", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprpaper", - "type": "github" - } - }, "hyprutils": { "inputs": { "nixpkgs": [ - "hypridle", - "nixpkgs" - ], - "systems": [ - "hypridle", - "systems" - ] - }, - "locked": { - "lastModified": 1733502241, - "narHash": "sha256-KAUNC4Dgq8WQjYov5auBw/usaHixhacvb7cRDd0AG/k=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "104117aed6dd68561be38b50f218190aa47f2cd8", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprutils_2": { - "inputs": { - "nixpkgs": [ "hyprland", "nixpkgs" ], @@ -574,56 +337,6 @@ "type": "github" } }, - "hyprutils_3": { - "inputs": { - "nixpkgs": [ - "hyprlock", - "nixpkgs" - ], - "systems": [ - "hyprlock", - "systems" - ] - }, - "locked": { - "lastModified": 1736164519, - "narHash": "sha256-1LimBKvDpBbeX+qW7T240WEyw+DBVpDotZB4JYm8Aps=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "3c895da64b0eb19870142196fa48c07090b441c4", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprutils_4": { - "inputs": { - "nixpkgs": [ - "hyprpaper", - "nixpkgs" - ], - "systems": [ - "hyprpaper", - "systems" - ] - }, - "locked": { - "lastModified": 1734796073, - "narHash": "sha256-TnuKsa8OHrSJEmHm3TLGOWbPNA1gRjmZLsRzKrCqOsg=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "c3331116ebd0b71df5ae8c6efe9a7f94148b03bf", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, "hyprwayland-scanner": { "inputs": { "nixpkgs": [ @@ -649,90 +362,8 @@ "type": "github" } }, - "hyprwayland-scanner_2": { - "inputs": { - "nixpkgs": [ - "hyprlock", - "nixpkgs" - ], - "systems": [ - "hyprlock", - "systems" - ] - }, - "locked": { - "lastModified": 1735493474, - "narHash": "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4=", - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "de913476b59ee88685fdc018e77b8f6637a2ae0b", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "type": "github" - } - }, - "hyprwayland-scanner_3": { - "inputs": { - "nixpkgs": [ - "hyprpaper", - "nixpkgs" - ], - "systems": [ - "hyprpaper", - "systems" - ] - }, - "locked": { - "lastModified": 1734793513, - "narHash": "sha256-rrrHcXapXJvGFqX+L/Bb0182L25jofAZ0fm1FInvrTQ=", - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "4d7367b6eee87397e2dbca2e78078dd0a4ef4c61", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1734119587, - "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1736012469, - "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { "lastModified": 1736012469, "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", "owner": "NixOS", @@ -747,23 +378,7 @@ "type": "github" } }, - "nixpkgs_4": { - "locked": { - "lastModified": 1734649271, - "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { + "nixpkgs_2": { "locked": { "lastModified": 1737062831, "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", @@ -806,12 +421,9 @@ "inputs": { "home-manager": "home-manager", "hy3": "hy3", - "hypridle": "hypridle", "hyprland": "hyprland", "hyprland-plugins": "hyprland-plugins", - "hyprlock": "hyprlock", - "hyprpaper": "hyprpaper", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_2" } }, "systems": { @@ -829,51 +441,6 @@ "type": "github" } }, - "systems_2": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "systems_3": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "systems_4": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, "xdph": { "inputs": { "hyprland-protocols": [ @@ -9,12 +9,6 @@ home-manager.inputs.nixpkgs.follows = "nixpkgs"; # hyprland hyprland.url = "github:hyprwm/Hyprland"; - # hyprlock - hyprlock.url = "github:hyprwm/hyprlock"; - # hyprpaper - hyprpaper.url = "github:hyprwm/hyprpaper"; - # hypridle - hypridle.url = "github:hyprwm/hypridle"; # hyprland plugins hyprland-plugins.url = "github:hyprwm/hyprland-plugins"; hyprland-plugins.inputs.hyprland.follows = "hyprland"; diff --git a/modules/programs/hypr/hypridle.nix b/modules/programs/hypr/hypridle.nix index f69db63..b7417f5 100644 --- a/modules/programs/hypr/hypridle.nix +++ b/modules/programs/hypr/hypridle.nix @@ -1,10 +1,5 @@ -{ config, pkgs, lib, inputs, ... }: +{ config, lib, ... }: -let - # inputs - system = pkgs.stdenv.hostPlatform.system; - hypridle = inputs.hypridle.packages.${system}; -in { config = lib.mkIf config.desktop.enable { @@ -12,7 +7,6 @@ in services.hypridle = { enable = true; - package = hypridle.hypridle; settings = { general = { diff --git a/modules/programs/hypr/hyprlock.nix b/modules/programs/hypr/hyprlock.nix index e80b020..d2fa3fe 100644 --- a/modules/programs/hypr/hyprlock.nix +++ b/modules/programs/hypr/hyprlock.nix @@ -1,10 +1,5 @@ -{ config, pkgs, lib, inputs, ... }: +{ config, lib, ... }: -let - # inputs - system = pkgs.stdenv.hostPlatform.system; - hyprlock = inputs.hyprlock.packages.${system}; -in { config = lib.mkIf config.desktop.enable { @@ -12,7 +7,6 @@ in programs.hyprlock = { enable = true; - package = hyprlock.hyprlock; settings = { @@ -44,7 +38,7 @@ in font_color = "rgb(${config.theme.colors.base05})"; font_family = config.theme.font; fade_on_empty = false; - placeholder_text = "<i><span foreground=\"#${config.theme.colors.base05}\">Input Password...</span></i>"; + placeholder_text = "<i><span foreground=\"##${config.theme.colors.base05}\">Input Password...</span></i>"; hide_input = false; position = "0, -120"; halign = "center"; diff --git a/modules/programs/hypr/hyprpaper.nix b/modules/programs/hypr/hyprpaper.nix index 1d6b0cd..5f61cc1 100644 --- a/modules/programs/hypr/hyprpaper.nix +++ b/modules/programs/hypr/hyprpaper.nix @@ -1,10 +1,5 @@ -{ config, pkgs, lib, inputs, ... }: +{ config, lib, ... }: -let - # inputs - system = pkgs.stdenv.hostPlatform.system; - hyprpaper = inputs.hyprpaper.packages.${system}; -in { config = lib.mkIf config.desktop.enable { @@ -12,7 +7,6 @@ in services.hyprpaper = { enable = true; - package = hyprpaper.hyprpaper; settings = { preload = config.wallpaper; |