home: use input packages instead of overlays

and some other updates
This commit is contained in:
notohh 2025-03-17 05:36:48 -04:00
parent 362b9f044f
commit 9582abc5ce
Signed by: notohh
GPG key ID: BD47506D475EE86D
7 changed files with 22 additions and 11 deletions

View file

@ -29,6 +29,7 @@
gnupg
ripgrep
lazydocker
ffmpeg
yt-dlp
nfs-utils
dig
@ -39,6 +40,7 @@
p7zip
procs
navi
busybox
];
stateVersion = "23.05";
};

View file

@ -1,5 +1,3 @@
{
imports = [
./gpg.nix
];
imports = [./gpg.nix];
}

View file

@ -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"

View file

@ -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"
];

View file

@ -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";

View file

@ -7,6 +7,7 @@
}: {
services.hypridle = {
enable = true;
package = inputs.hypridle.packages.${pkgs.system}.default;
settings = {
general = {
ignore_dbus_inhibit = false;

View file

@ -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;