From bb3e35e9b6183f51247a57927cdfa275477c7f1d Mon Sep 17 00:00:00 2001 From: Adithya Nair Date: Sun, 2 Jun 2024 23:35:58 +0530 Subject: [PATCH] some housekeeping --- extra-packages/scripts/getpaper/default.nix | 3 ++- extra-packages/scripts/misc/default.nix | 5 +++-- extra-packages/scripts/youtube/default.nix | 4 +++- home/wm/hyprland/default.nix | 3 ++- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/extra-packages/scripts/getpaper/default.nix b/extra-packages/scripts/getpaper/default.nix index e9153d4..f38ce9d 100644 --- a/extra-packages/scripts/getpaper/default.nix +++ b/extra-packages/scripts/getpaper/default.nix @@ -13,6 +13,7 @@ stdenvNoCC.mkDerivation { src = ./.; nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ curl envsubst jq libsecret ]; installPhase = '' runHook preInstall @@ -25,6 +26,6 @@ stdenvNoCC.mkDerivation { ''; postInstall = '' - wrapProgram $out/bin/getpaper --prefix PATH : ${lib.makeBinPath [envsubst jq curl libsecret]} + wrapProgram $out/bin/getpaper --prefix PATH : ${lib.makeBinPath [curl envsubst jq libsecret]} ''; } diff --git a/extra-packages/scripts/misc/default.nix b/extra-packages/scripts/misc/default.nix index a752110..5e4497b 100644 --- a/extra-packages/scripts/misc/default.nix +++ b/extra-packages/scripts/misc/default.nix @@ -14,6 +14,7 @@ stdenvNoCC.mkDerivation { src = ./.; nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ hyprland kitty libnotify rofi-wayland tmux ]; installPhase = '' runHook preInstall @@ -30,7 +31,7 @@ stdenvNoCC.mkDerivation { ''; postInstall = '' - wrapProgram $out/bin/power-menu --prefix PATH : ${lib.makeBinPath [libnotify rofi-wayland hyprland]} - wrapProgram $out/bin/tmux-sessions --prefix PATH : ${lib.makeBinPath [tmux kitty rofi-wayland]} + wrapProgram $out/bin/power-menu --prefix PATH : ${lib.makeBinPath [hyprland libnotify rofi-wayland]} + wrapProgram $out/bin/tmux-sessions --prefix PATH : ${lib.makeBinPath [kitty rofi-wayland tmux]} ''; } diff --git a/extra-packages/scripts/youtube/default.nix b/extra-packages/scripts/youtube/default.nix index 0db9d3c..4f1cce3 100644 --- a/extra-packages/scripts/youtube/default.nix +++ b/extra-packages/scripts/youtube/default.nix @@ -1,6 +1,7 @@ { lib , stdenvNoCC , makeWrapper +, mpv , kitty , rofi-wayland , ueberzugpp @@ -13,6 +14,7 @@ stdenvNoCC.mkDerivation { src = ./.; nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ kitty mpv rofi-wayland ueberzugpp ytfzf ]; installPhase = '' runHook preInstall @@ -26,6 +28,6 @@ stdenvNoCC.mkDerivation { ''; postInstall = '' - wrapProgram $out/bin/youtube --prefix PATH : ${lib.makeBinPath [kitty ytfzf rofi-wayland ueberzugpp]} + wrapProgram $out/bin/youtube --prefix PATH : ${lib.makeBinPath [kitty mpv rofi-wayland ueberzugpp ytfzf]} ''; } diff --git a/home/wm/hyprland/default.nix b/home/wm/hyprland/default.nix index ad9a1ab..b8d1ffb 100644 --- a/home/wm/hyprland/default.nix +++ b/home/wm/hyprland/default.nix @@ -18,6 +18,7 @@ let wpaperctl = "${config.programs.wpaperd.package}/bin/wpaperctl"; wpctl = "${pkgs.wireplumber}/bin/wpctl"; yazi = "${pkgs.yazi}/bin/yazi"; + youtube = "${extra-packages.youtube}/bin/youtube"; pictures = "${config.xdg.userDirs.pictures}"; in @@ -174,7 +175,7 @@ in "SUPER_SHIFT,escape, exec, ${extra-packages.misc-scripts}/bin/power-menu" "SUPER,f11, exec, ${extra-packages.misc-scripts}/bin/tmux-sessions" - "SUPER_SHIFT,y, exec, ${extra-packages.youtube}/bin/youtube" + "SUPER_SHIFT,y, exec, ${youtube}" "SUPER_SHIFT,b, exec, ${extra-packages.rofi-bluetooth}/bin/rofi-bluetooth" "SUPER,escape, exec, ${loginctl} lock-session"