update packages; niri stuff

This commit is contained in:
Reid 2025-06-02 01:46:47 -07:00
parent cb4b22b4e5
commit dd8ff25c31
Signed by: reidlab
GPG key ID: DAF5EAF6665839FD
7 changed files with 65 additions and 61 deletions

View file

@ -27,13 +27,6 @@ in {
package = cfg.package;
};
# home-manager recently did a huge upgrade and made it so wayland stuff doesn't break anymore
# however... they forgot to include cliphist
# https://github.com/nix-community/home-manager/pull/5785
# EDIT: i initially did this with `graphical-session-pre.target`, but that didn't work, pray this does
hm.systemd.user.services.cliphist.Unit.After = "graphical-session.target";
hm.systemd.user.services.cliphist-images.Unit.After = "graphical-session.target";
modules.desktop.rofi.enable = true;
};
}

View file

@ -26,6 +26,7 @@ in {
name = monitor.name;
value = {
scale = monitor.scale;
background-color = config.modules.desktop.themes.niri.background;
};
}) cfg.monitors);
};

View file

@ -94,6 +94,10 @@ in {
};
};
overview = {
backdrop-color = config.modules.desktop.themes.niri.background;
};
hotkey-overlay.skip-at-startup = true;
screenshot-path = null;
@ -324,16 +328,17 @@ in {
"Mod+8".action = focus-workspace 8;
"Mod+9".action = focus-workspace 9;
"Mod+0".action = focus-workspace 10;
"Mod+Shift+1".action = move-column-to-workspace 1;
"Mod+Shift+2".action = move-column-to-workspace 2;
"Mod+Shift+3".action = move-column-to-workspace 3;
"Mod+Shift+4".action = move-column-to-workspace 4;
"Mod+Shift+5".action = move-column-to-workspace 5;
"Mod+Shift+6".action = move-column-to-workspace 6;
"Mod+Shift+7".action = move-column-to-workspace 7;
"Mod+Shift+8".action = move-column-to-workspace 8;
"Mod+Shift+9".action = move-column-to-workspace 9;
"Mod+Shift+0".action = move-column-to-workspace 10;
# no clue why, this got removed!! TODO: find an alternative
# "Mod+Shift+1".action = move-column-to-workspace 1;
# "Mod+Shift+2".action = move-column-to-workspace 2;
# "Mod+Shift+3".action = move-column-to-workspace 3;
# "Mod+Shift+4".action = move-column-to-workspace 4;
# "Mod+Shift+5".action = move-column-to-workspace 5;
# "Mod+Shift+6".action = move-column-to-workspace 6;
# "Mod+Shift+7".action = move-column-to-workspace 7;
# "Mod+Shift+8".action = move-column-to-workspace 8;
# "Mod+Shift+9".action = move-column-to-workspace 9;
# "Mod+Shift+0".action = move-column-to-workspace 10;
"Mod+Comma".action = consume-window-into-column;
"Mod+Period".action = expel-window-from-column;
@ -356,6 +361,8 @@ in {
"Print".action = screenshot;
"Mod+Grave".action = toggle-overview;
"Mod+Shift+E".action = quit;
"XF86AudioMicMute".action = spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SOURCE@" "toggle";

View file

@ -73,6 +73,8 @@ in {
inactive = "#${base02}";
# catppuccin crust
shadow = "#11111b";
# catppuccin crust
background = "#11111b";
};
waybar = builtins.concatStringsSep "\n" [

View file

@ -49,6 +49,7 @@ in {
accent = mkOpt str "";
inactive = mkOpt str "";
shadow = mkOpt str "";
background = mkOpt str "";
};
waybar = mkOpt str "";

View file

@ -15,7 +15,7 @@ in {
enableExtraSocket = true;
enableSshSupport = true;
pinentryPackage = pkgs.pinentry-qt;
pinentry.package = pkgs.pinentry-qt;
};
};
}