From 9582abc5ce7a3ca07852435904ecbb90c7669f6f Mon Sep 17 00:00:00 2001
From: notohh <github@notohh.dev>
Date: Mon, 17 Mar 2025 05:36:48 -0400
Subject: [PATCH] home: use input packages instead of overlays
and some other updates
---
home/default.nix | 2 ++
home/services/default.nix | 4 +---
home/wayland/hyprland/config/binds.nix | 10 +++++-----
home/wayland/hyprland/config/general.nix | 2 +-
home/wayland/programs/hyprlock.nix | 7 ++++++-
home/wayland/services/hypridle.nix | 1 +
home/wayland/services/hyprpaper.nix | 7 ++++++-
7 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/home/default.nix b/home/default.nix
index 46fedf6..174beab 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -29,6 +29,7 @@
gnupg
ripgrep
lazydocker
+ ffmpeg
yt-dlp
nfs-utils
dig
@@ -39,6 +40,7 @@
p7zip
procs
navi
+ busybox
];
stateVersion = "23.05";
};
diff --git a/home/services/default.nix b/home/services/default.nix
index 5607062..c08b659 100644
--- a/home/services/default.nix
+++ b/home/services/default.nix
@@ -1,5 +1,3 @@
{
- imports = [
- ./gpg.nix
- ];
+ imports = [./gpg.nix];
}
diff --git a/home/wayland/hyprland/config/binds.nix b/home/wayland/hyprland/config/binds.nix
index 25a4715..124c24d 100644
--- a/home/wayland/hyprland/config/binds.nix
+++ b/home/wayland/hyprland/config/binds.nix
@@ -1,9 +1,10 @@
{
- lib,
+ inputs,
pkgs,
+ lib,
...
}: {
- wayland.windowManager.hyprland.settings = {
+ wayland.windowManager.hyprland.settings = with pkgs; {
"$mainMod" = "SUPER";
bind = [
"$mainMod, Return, exec, wezterm"
@@ -13,13 +14,12 @@
"$mainMod, R, exec, anyrun"
"$mainMod, P, pseudo,"
"$mainMod, J, togglesplit,"
- "$mainMod, C, exec, hyprpicker | wl-copy"
+ "$mainMod, C, exec, ${lib.getExe inputs.hyprpicker.packages.${system}.default} | wl-copy"
"$mainMod, left, movefocus, l"
"$mainMod, right, movefocus, r"
"$mainMod, up, movefocus, u"
"$mainMod, down, movefocus, d"
- '', Print, exec, ${lib.getExe pkgs.grim} -g "$(${lib.getExe pkgs.slurp})" - | ${lib.getExe pkgs.satty} -f - --fullscreen --output-filename ~/Pictures/screenshots/$(date '+%Y%m%d-%H:%M:%S').png''
-
+ '', Print, exec, ${lib.getExe grim} -g "$(${lib.getExe slurp})" - | ${lib.getExe satty} -f - --fullscreen --output-filename ~/Pictures/screenshots/$(date '+%Y%m%d-%H:%M:%S').png''
"$mainMod, 1, workspace, 1"
"$mainMod, 2, workspace, 2"
"$mainMod, 3, workspace, 3"
diff --git a/home/wayland/hyprland/config/general.nix b/home/wayland/hyprland/config/general.nix
index c61d911..b9bdc3e 100644
--- a/home/wayland/hyprland/config/general.nix
+++ b/home/wayland/hyprland/config/general.nix
@@ -11,7 +11,7 @@
"hyprpanel"
"hyprpaper"
"chatterino"
- "DiscordCanary"
+ "vesktop"
"dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
"${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1"
];
diff --git a/home/wayland/programs/hyprlock.nix b/home/wayland/programs/hyprlock.nix
index bba9f9a..2398e44 100644
--- a/home/wayland/programs/hyprlock.nix
+++ b/home/wayland/programs/hyprlock.nix
@@ -1,6 +1,11 @@
-_: {
+{
+ inputs,
+ pkgs,
+ ...
+}: {
programs.hyprlock = {
enable = true;
+ package = inputs.hyprlock.packages.${pkgs.system}.default;
settings = {
background = let
verticalWallpaper = "/home/notoh/dev/assets/wallpapers/miku/miku2.png";
diff --git a/home/wayland/services/hypridle.nix b/home/wayland/services/hypridle.nix
index 6809526..1580828 100644
--- a/home/wayland/services/hypridle.nix
+++ b/home/wayland/services/hypridle.nix
@@ -7,6 +7,7 @@
}: {
services.hypridle = {
enable = true;
+ package = inputs.hypridle.packages.${pkgs.system}.default;
settings = {
general = {
ignore_dbus_inhibit = false;
diff --git a/home/wayland/services/hyprpaper.nix b/home/wayland/services/hyprpaper.nix
index 81ffc02..81ace58 100644
--- a/home/wayland/services/hyprpaper.nix
+++ b/home/wayland/services/hyprpaper.nix
@@ -1,4 +1,8 @@
-{pkgs, ...}: {
+{
+ inputs,
+ pkgs,
+ ...
+}: {
home.packages = [pkgs.hyprpaper];
services.hyprpaper = let
@@ -6,6 +10,7 @@
horizontalWallpaper = "~/dev/assets/wallpapers/miku/miku.png";
in {
enable = true;
+ package = inputs.hyprpaper.packages.${pkgs.system}.default;
settings = {
ipc = true;
splash = false;