foglar/nixos-config
foglar/nixos-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hyprland cleanup and fixes

Browse Source
This commit is contained in:
foglar 2024-12-24 16:46:31 +01:00
parent 59413dd08f
commit a424a7d1a3
2 changed files with 38 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
nixos/home/desktop/hyprland/dependencies.nix
View File

@ -5,27 +5,20 @@
}: { }: {
home.packages = home.packages =
(with pkgs; [ (with pkgs; [
hyprlock
hyprpicker
hypridle hypridle
hyprpolkitagent hyprpolkitagent
dunst
libnotify libnotify
swayosd swayosd
#swww
playerctl playerctl
hyprshade
swappy
grimblast
udiskie
wl-clipboard wl-clipboard
cliphist cliphist
#dunst
#swww
#hyprshade
(writeShellScriptBin "dontkillsteam" '' (writeShellScriptBin "dontkillsteam" ''
if [[ $(hyprctl activewindow -j | ${pkgs.jq}/bin/jq -r ".class") == "Steam" ]]; then if [[ $(hyprctl activewindow -j | ${pkgs.jq}/bin/jq -r ".class") == "Steam" ]]; then
xdotool windowunmap $(xdotool getactivewindow) xdotool windowunmap $(xdotool getactivewindow)
@ -43,7 +36,7 @@
# Saves the current shader and turns it off # Saves the current shader and turns it off
save_shader() { save_shader() {
shader=$(hyprshade current) shader=$(${pkgs.hyprshade}/bin/hyprshade current)
${pkgs.hyprshade}/bin/hyprshade off ${pkgs.hyprshade}/bin/hyprshade off
trap restore_shader EXIT trap restore_shader EXIT
} }
@ -55,13 +48,13 @@
case $1 in case $1 in
p) # print all outputs p) # print all outputs
grimblast copysave screen $temp_screenshot && restore_shader && swappy -f $temp_screenshot ;; ${pkgs.grimblast}/bin/grimblast copysave screen $temp_screenshot && restore_shader && ${pkgs.swappy}/bin/swappy -f $temp_screenshot ;;
s) # drag to manually snip an area / click on a window to print it s) # drag to manually snip an area / click on a window to print it
grimblast copysave area $temp_screenshot && restore_shader && swappy -f $temp_screenshot ;; ${pkgs.grimblast}/bin/grimblast copysave area $temp_screenshot && restore_shader && ${pkgs.swappy}/bin/swappy -f $temp_screenshot ;;
sf) # frozen screen, drag to manually snip an area / click on a window to print it sf) # frozen screen, drag to manually snip an area / click on a window to print it
grimblast --freeze copysave area $temp_screenshot && restore_shader && swappy -f $temp_screenshot ;; ${pkgs.grimblast}/bin/grimblast --freeze copysave area $temp_screenshot && restore_shader && ${pkgs.swappy}/bin/swappy -f $temp_screenshot ;;
m) # print focused monitor m) # print focused monitor
grimblast copysave output $temp_screenshot && restore_shader && swappy -f $temp_screenshot ;; ${pkgs.grimblast}/bin/grimblast copysave output $temp_screenshot && restore_shader && ${pkgs.swappy}/bin/swappy -f $temp_screenshot ;;
*) # invalid option *) # invalid option
print_error ;; print_error ;;
esac esac

64
nixos/home/desktop/hyprland/hyprland.nix
View File

@ -19,6 +19,7 @@
config = lib.mkIf config.desktop.hyprland.enable { config = lib.mkIf config.desktop.hyprland.enable {
waybar.enable = lib.mkDefault true; waybar.enable = lib.mkDefault true;
rofi.enable = lib.mkDefault true; rofi.enable = lib.mkDefault true;
rofi.clipboard.enable = lib.mkDefault true;
wlogout.enable = lib.mkDefault true; wlogout.enable = lib.mkDefault true;
xdg.portal.enable = true; xdg.portal.enable = true;
@ -32,10 +33,6 @@
services.network-manager-applet.enable = true; services.network-manager-applet.enable = true;
services.dunst.enable = true; services.dunst.enable = true;
home.packages = [
pkgs.toybox
];
home.sessionVariables = { home.sessionVariables = {
WLR_NO_HARDWARE_CURSORS = "1"; WLR_NO_HARDWARE_CURSORS = "1";
NIXOS_OZONE_WL = "1"; NIXOS_OZONE_WL = "1";
@ -45,11 +42,6 @@
enable = true; enable = true;
package = pkgs.papirus-icon-theme; package = pkgs.papirus-icon-theme;
dark = "Papirus-Dark"; dark = "Papirus-Dark";
#package = pkgs.dracula-icon-theme;
#dark = "Dracula";
}; };
stylix.targets = { stylix.targets = {
@ -68,6 +60,10 @@
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
enable = true; enable = true;
plugins = [
pkgs.hyprlandPlugins.hyprspace
];
settings = { settings = {
monitor = [ monitor = [
"eDP-1,1920x1080,0x0,1" "eDP-1,1920x1080,0x0,1"
@ -87,7 +83,6 @@
"sensitivity" = "0"; "sensitivity" = "0";
"force_no_accel" = "1"; "force_no_accel" = "1";
#"numlock_by_default" = "true";
}; };
gestures = { gestures = {
@ -120,7 +115,7 @@
"XDG_SESSION_TYPE,wayland" "XDG_SESSION_TYPE,wayland"
"XDG_SESSION_DESKTOP,Hyprland" "XDG_SESSION_DESKTOP,Hyprland"
"QT_QPA_PLATFORM,wayland;xcb" "QT_QPA_PLATFORM,wayland;xcb"
#"QT_QPA_PLATFORMTHEME,qt6ct" "QT_QPA_PLATFORMTHEME,qt6ct"
"QT_WAYLAND_DISABLE_WINDOWDECORATION,1" "QT_WAYLAND_DISABLE_WINDOWDECORATION,1"
"QT_AUTO_SCREEN_SCALE_FACTOR,1" "QT_AUTO_SCREEN_SCALE_FACTOR,1"
"MOZ_ENABLE_WAYLAND,1" "MOZ_ENABLE_WAYLAND,1"
@ -132,30 +127,22 @@
]; ];
exec-once = [ exec-once = [
#"discord --start-minimized"
"${pkgs.vesktop}/bin/vesktop --start-minimized" "${pkgs.vesktop}/bin/vesktop --start-minimized"
"${pkgs.ferdium}/bin/ferdium --minimized" "${pkgs.ferdium}/bin/ferdium --minimized"
"${pkgs.kdePackages.kdeconnect-kde}/bin/kdeconnect-indicator" "${pkgs.kdePackages.kdeconnect-kde}/bin/kdeconnect-indicator"
"systemctl --user start hyprpolkitagent"
#"swww-daemon --format xrgb"
#"swww ../../aurora_borealis.png"
"${pkgs.hypridle}/bin/hypridle" "${pkgs.hypridle}/bin/hypridle"
"${pkgs.waybar}/bin/waybar" "${pkgs.waybar}/bin/waybar"
"${pkgs.udiskie}/bin/udiskie --no-automount --smart-tray"
"${pkgs.blueman}/bin/blueman-applet"
"${pkgs.wl-clipboard}/bin/wl-paste --type text --watch cliphist store # clipboard store text data"
"${pkgs.wl-clipboard}/bin/wl-paste --type image --watch cliphist store # clipboard store image data"
"systemctl --user start hyprpolkitagent"
"swayosd-server" "swayosd-server"
"blueman-applet" #"swww-daemon --format xrgb"
"udiskie --no-automount --smart-tray" #"swww ../../aurora_borealis.png"
"nm-applet --indicator"
"dunst"
"wl-paste --type text --watch cliphist store # clipboard store text data"
"wl-paste --type image --watch cliphist store # clipboard store image data"
#"$scrPath/batterynotify.sh # battery notification" #"$scrPath/batterynotify.sh # battery notification"
#"$scrPath/resetxdgportal.sh # reset XDPH for screenshare"
#"dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP # for XDPH"
#"dbus-update-activation-environment --systemd --all # for XDPH"
#"systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP # for XDPH"
]; ];
"$mod" = "SUPER"; "$mod" = "SUPER";
@ -193,7 +180,7 @@
#]; #];
bindd = [ bindd = [
"$mod SHIFT, P, Color Picker, exec, hyprpicker -a" "$mod SHIFT, P, Color Picker, exec, ${pkgs.hyprpicker}/bin/hyprpicker -a"
"$mod SHIFT, R, Random Background, exec, background-switch-random" "$mod SHIFT, R, Random Background, exec, background-switch-random"
]; ];
@ -203,9 +190,9 @@
",XF86AudioMicMute, exec, swayosd-client --input-volume mute-toggle" ",XF86AudioMicMute, exec, swayosd-client --input-volume mute-toggle"
# Media # Media
"Alt, P, exec, playerctl play-pause" "Alt, P, exec, ${pkgs.playerctl}/bin/playerctl play-pause"
"Alt, I, exec, playerctl next" "Alt, I, exec, ${pkgs.playerctl}/bin/playerctl next"
"Alt, O, exec, playerctl previous" "Alt, O, exec, ${pkgs.playerctl}/bin/playerctl previous"
]; ];
bindel = [ bindel = [
@ -241,18 +228,20 @@
"$mod, Escape, exec, ${pkgs.hyprlock}/bin/hyprlock" "$mod, Escape, exec, ${pkgs.hyprlock}/bin/hyprlock"
#"$mod+Shift,F, exec, windowpin.sh" #"$mod+Shift,F, exec, windowpin.sh"
"$mod, Backspace, exec, ${pkgs.wlogout}/bin/wlogout -b 2" "$mod, Backspace, exec, ${pkgs.wlogout}/bin/wlogout -b 2"
"$Ctrl+Alt, W, exec, killall waybar || ${pkgs.waybar}/bin/waybar" # toggle waybar "$Ctrl+Alt, W, exec, ${pkgs.toybox}/bin/killall waybar || ${pkgs.waybar}/bin/waybar" # toggle waybar
"$mod, T, exec, $term" "$mod, T, exec, $term"
"$mod, F, exec, $browser" "$mod, F, exec, $browser"
"$mod, E, exec, $file" "$mod, E, exec, $file"
"$mod, C, exec, $editor" "$mod, C, exec, $editor"
"Ctrl+Shift, Escape, exec, ${pkgs.btop}/bin/btop" "Ctrl+Shift, Escape, exec, ${pkgs.kitty}/bin/kitty -e ${pkgs.btop}/bin/btop"
# Rofi # Rofi
"$mod, A, exec, pkill -x rofi || ${pkgs.rofi-wayland}/bin/rofi -show drun" "$mod, A, exec, ${pkgs.toybox}/bin/pkill -x rofi || ${pkgs.rofi-wayland}/bin/rofi -show drun"
"$mod, Tab, exec, pkill -x rofi || ${pkgs.rofi-wayland}/bin/rofi -show window" "$mod, Tab, exec, ${pkgs.toybox}/bin/pkill -x rofi || ${pkgs.rofi-wayland}/bin/rofi -show window"
"$mod+Shift, E, exec, pkill -x rofi || ${pkgs.rofi-wayland}/bin/rofi -show emoji" "$mod+Shift, E, exec, ${pkgs.toybox}/bin/pkill -x rofi || ${pkgs.rofi-wayland}/bin/rofi -show emoji"
# Clipboard manager
"$mod, V, exec, ${pkgs.toybox}/bin/pkill -x rofi || clipboard"
# Grouped Windows # Grouped Windows
"$mod CTRL, H, changegroupactive, b" "$mod CTRL, H, changegroupactive, b"
@ -264,9 +253,6 @@
"$mod+Alt, P, exec, screenshot m" "$mod+Alt, P, exec, screenshot m"
", Print, exec, screenshot p" # All monitors screenshot capture ", Print, exec, screenshot p" # All monitors screenshot capture
# Custom scripts
"$mod, V, exec, pkill -x rofi || scliphist c"
# Move/Change window focus # Move/Change window focus
"$mod, H, movefocus, l" "$mod, H, movefocus, l"
"$mod, L, movefocus, r" "$mod, L, movefocus, r"