diff --git a/home-manager/hosts/nixos-laptop/desktops/hyprland/hyprland-conf.nix b/home-manager/hosts/nixos-laptop/desktops/hyprland/hyprland-conf.nix index 90a637d3..04d0c4fa 100644 --- a/home-manager/hosts/nixos-laptop/desktops/hyprland/hyprland-conf.nix +++ b/home-manager/hosts/nixos-laptop/desktops/hyprland/hyprland-conf.nix @@ -7,8 +7,8 @@ # Laptop specific: monitor=,highrr,auto,1.25 + # https://wiki.hyprland.org/Configuring/Variables/ - # env = XCURSOR_SIZE,24 env = GDK_SCALE,2 env = XCURSOR_SIZE,48 @@ -103,7 +103,6 @@ bind = $mainMod, Q, exec, kitty bind = $mainMod, C, killactive, bind = $mainMod, M, exit, - bind = $mainMod, E, exec, dolphin bind = $mainMod, V, togglefloating, bind = $mainMod, R, exec, wofi --show drun bind = $mainMod, P, pseudo, # dwindle @@ -149,17 +148,20 @@ ############################################################################# # Custom keybinds - # Show Rofi on SUPER-S - bind = $mainMod, S, exec, rofi -show drun -show-icons # Show Rofi on SUPER-SPACE bind = $mainMod, space, exec, rofi -show drun -show-icons # Take a screenshot with the Print key - bind =,Print,exec,grim -g "$(slurp)" | wl-copy -t image/png + bind = , Print, exec, grim -g "$(slurp)" | wl-copy -t image/png + # Move to the previous / next workspace with SUPER-LEFT and SUPER-RIGHT - bind = $mainMod, right, workspace, e+1 - bind = $mainMod, left, workspace, e-1 + bind = $mainMod , right, workspace, e+1 + bind = $mainMod , left , workspace, e-1 bind = $mainMod SHIFT, right, movetoworkspace, e+1 - bind = $mainMod SHIFT, left, movetoworkspace, e-1 + bind = $mainMod SHIFT, left , movetoworkspace, e-1 + + # Launch various applications + bind = $mainMod, R, exec, ranger + bind = $mainMod, S, exec, steam # Lock the screen, send to swaylock bind = $mainMod, L, exec, swaylock @@ -168,7 +170,7 @@ # trigger when the switch is toggled # bindl=,switch:[switch name],exec,swaylock # trigger when the switch is turning on - #bindl=,switch:on:[switch name],exec,hyprctl keyword monitor "eDP-1, 2560x1600, 0x0, 1" + # bindl=,switch:on:[switch name],exec,hyprctl keyword monitor "eDP-1, 2560x1600, 0x0, 1" # trigger when the switch is turning off # bindl=,switch:off:[switch name],exec,hyprctl keyword monitor "eDP-1, disable" @@ -224,20 +226,18 @@ bind = $mainMod, R, exec, notify-send "Entered resize mode.\nPress ESC to quit." bind = $mainMod, R, submap, resize submap = resize - binde = , H, resizeactive,-50 0 - binde = , L, resizeactive,50 0 - binde = , K, resizeactive,0 -50 - binde = , J, resizeactive,0 50 - binde = , left, resizeactive,-50 0 - binde = , right, resizeactive,50 0 - binde = , up, resizeactive,0 -50 - binde = , down, resizeactive,0 50 - bind = , escape, submap, reset + binde = , H , resizeactive,-50 0 + binde = , L , resizeactive, 50 0 + binde = , K , resizeactive, 0 -50 + binde = , J , resizeactive, 0 50 + binde = , left , resizeactive,-50 0 + binde = , right , resizeactive, 50 0 + binde = , up , resizeactive, 0 -50 + binde = , down , resizeactive, 0 50 + bind = , escape, submap, reset submap = reset # Start the config: - # https://wiki.hyprland.org/FAQ/#some-of-my-apps-take-a-really-long-time-to-open - exec-once=dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP exec-once=bash ~/.config/hypr/start.sh ''; }; @@ -247,13 +247,13 @@ executable = true; text = '' #!/usr/bin/env bash + # https://wiki.hyprland.org/FAQ/#some-of-my-apps-take-a-really-long-time-to-open + dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP & swww init & - # Sets a random wallpaper WALLPAPER_DIR=/etc/nixos/git/wallpapers/gruvbox - swww img $WALLPAPER_DIR/wallpaper$((1 + $RANDOM % $(ls $WALLPAPER_DIR | wc -l))).jpg & - # nm-applet --indicator & - waybar & + swww img $WALLPAPER_DIR/wallpaper11.jpg & + waybar & # Set up the idle management daemon swayidle -w \ @@ -261,7 +261,8 @@ timeout 600 'hyprctl dispatch dpms off' \ resume 'hyprctl dispatch dpms on' \ before-sleep 'swaylock -f' - mako + + mako ''; }; }; diff --git a/nixos/common/desktops/hyprland/default.nix b/nixos/common/desktops/hyprland/default.nix index cd29208d..4295e1e5 100644 --- a/nixos/common/desktops/hyprland/default.nix +++ b/nixos/common/desktops/hyprland/default.nix @@ -74,7 +74,10 @@ greetd.tuigreet # Greeter swayidle # Idle management daemon - Automatic lock screen swayosd # used for on-screen notifications for things like adjusting backlight, volume, etc - sway # for swaymsg + nwg-bar + wlogout + ranger # TUI file manager + xdg-utils # Utilities for better X/Wayland integration ]; # Enable sound with pipewire. diff --git a/nixos/default.nix b/nixos/default.nix index a0af3085..f8942815 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -29,6 +29,7 @@ rsync git duf + ncdu du-dust home-manager btop