diff --git a/flake.nix b/flake.nix index 7d32d61..5aff38d 100644 --- a/flake.nix +++ b/flake.nix @@ -51,9 +51,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - hyprland = { - url = "github:hyprwm/Hyprland"; - }; + hyprland.url = "github:hyprwm/Hyprland"; }; outputs = diff --git a/hosts/nixos-desktop/default.nix b/hosts/nixos-desktop/default.nix index 0bbdc40..377c478 100644 --- a/hosts/nixos-desktop/default.nix +++ b/hosts/nixos-desktop/default.nix @@ -12,8 +12,9 @@ ./hardware-configuration.nix ]; + my.programs.hyprland.nvidiaSupport = true; + # KERNEL - # HACK to get nvidia driver to build boot.kernelPackages = pkgs.linuxPackages_latest; # BOOT @@ -59,14 +60,13 @@ nohook resolv.conf ''; }; - - # services.xserver.videoDrivers = [ "nvidia" ]; + hardware.nvidia.modesetting.enable = true; + services.xserver.videoDrivers = [ "nvidia" ]; hardware.opengl = { enable = true; driSupport32Bit = true; driSupport = true; }; - # hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.legacy_470; services.xserver.xrandrHeads = [ { output = "HDMI-1"; } { diff --git a/hosts/nixos-laptop/default.nix b/hosts/nixos-laptop/default.nix index 4c7130d..d89009d 100644 --- a/hosts/nixos-laptop/default.nix +++ b/hosts/nixos-laptop/default.nix @@ -16,12 +16,6 @@ # certainty = 3.0; # }; - - my.programs = { - bspwm.enable = false; - hyprland.enable = true; - }; - # BOOT boot = { supportedFilesystems = [ "btrfs" ]; diff --git a/modules/profiles/desktop.nix b/modules/profiles/desktop.nix index 92d25a9..eaec2b7 100644 --- a/modules/profiles/desktop.nix +++ b/modules/profiles/desktop.nix @@ -20,7 +20,7 @@ with lib; { programs = { adb.enable = true; - bspwm.enable = mkDefault true; + hyprland.enable = true; code.enable = true; emacs.enable = true; firefox = { @@ -101,11 +101,6 @@ with lib; { }; }; - programs.xss-lock = { - enable = true; - lockerCommand = "${pkgs.i3lock-fancy-rapid}/bin/i3lock-fancy-rapid 10 5"; - }; - environment.systemPackages = with pkgs; [ # nix nixpkgs-review diff --git a/modules/programs/bspwm/default.nix b/modules/programs/bspwm/default.nix index ffb5448..4ecf68c 100644 --- a/modules/programs/bspwm/default.nix +++ b/modules/programs/bspwm/default.nix @@ -75,6 +75,12 @@ in }; }; }; + + programs.xss-lock = { + enable = true; + lockerCommand = "${pkgs.i3lock-fancy-rapid}/bin/i3lock-fancy-rapid 10 5"; + }; + environment.systemPackages = with pkgs; [ bc # HACK to get bsp-layout to work brightnessctl diff --git a/modules/programs/hyprland/config.nix b/modules/programs/hyprland/config.nix new file mode 100644 index 0000000..51562a3 --- /dev/null +++ b/modules/programs/hyprland/config.nix @@ -0,0 +1,178 @@ +{ config +, lib +, pkgs +, ... +}: +'' + # + # Please note not all available settings / options are set here. + # For a full list, see the wiki + # + + # See https://wiki.hyprland.org/Configuring/Monitors/ + monitor=,preferred,auto,1 + + + # See https://wiki.hyprland.org/Configuring/Keywords/ for more + + # Execute your favorite apps at launch + # exec-once = waybar & hyprpaper & firefox + + # Source a file (multi-file configs) + # source = ~/.config/hypr/myColors.conf + + # For all categories, see https://wiki.hyprland.org/Configuring/Variables/ + input { + kb_layout = de,us + kb_variant = + kb_model = + kb_options = grp:alt_shift_toggle + kb_rules = + + follow_mouse = 1 + + touchpad { + natural_scroll = yes + } + + sensitivity = 0 # -1.0 - 1.0, 0 means no modification. + } + + general { + # See https://wiki.hyprland.org/Configuring/Variables/ for more + + gaps_in = 5 + gaps_out = 5 + border_size = 2 + col.active_border = rgba(1affffee) + col.inactive_border = rgba(595959aa) + + layout = dwindle + } + + decoration { + # See https://wiki.hyprland.org/Configuring/Variables/ for more + + rounding = 5 + inactive_opacity = 0.98 + blur = yes + blur_size = 8 + blur_passes = 1 + blur_new_optimizations = on + + drop_shadow = yes + shadow_range = 4 + shadow_render_power = 3 + col.shadow = rgba(1a1a1aee) + } + + animations { + enabled = yes + + # Some default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more + + bezier = myBezier, 0.45, 0, 0.55, 1 + + animation = windows, 1, 3, myBezier + animation = windowsOut, 1, 3, myBezier + animation = border, 1, 3, myBezier + animation = fade, 1, 3, myBezier + animation = workspaces, 1, 3, myBezier + } + + dwindle { + # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more + pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below + preserve_split = yes # you probably want this + no_gaps_when_only = true + } + + master { + # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more + no_gaps_when_only = true + } + + gestures { + # See https://wiki.hyprland.org/Configuring/Variables/ for more + workspace_swipe = on + } + + # Example per-device config + # See https://wiki.hyprland.org/Configuring/Keywords/#executing for more + device:epic mouse V1 { + sensitivity = -0.5 + } + + # Example windowrule v1 + # windowrule = float, ^(kitty)$ + # Example windowrule v2 + # windowrulev2 = float,class:^(kitty)$,title:^(kitty)$ + windowrulev2 = float,class:^([rR]ofi)$ + # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more + + + # See https://wiki.hyprland.org/Configuring/Keywords/ for more + $mainMod = SUPER + $windowMod = ALT + + # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more + bind = $mainMod, D, exec, hyprctl keyword general:layout dwindle + bind = $mainMod, E, exec, emacsclient -c -a emacs + bind = $mainMod, F, togglefloating, + bind = $mainMod, M, exec, hyprctl keyword general:layout master + bind = $mainMod, P, pseudo, # dwindle + bind = $mainMod, Q, killactive, + bind = $mainMod, R, exec, rofi -show combi + bind = $mainMod, C, exec, rofi -show calc -modi calc -no-show-match -no-sort | xclip -selection clipboard + bind = $mainMod, B, exec, rofi-bluetooth + bind = $mainMod, RETURN, exec, kitty + bind = $mainMod, T, togglesplit, # dwindle + bind = , XF86AudioLowerVolume, exec, pamixer -d 5 + bind = , XF86AudioMute, exec, pamixer -t + bind = , XF86AudioNext, exec, playerctl -p "spotifyd,firefox" next + bind = , XF86AudioPlay, exec, playerctl -p "spotifyd,firefox" play-pause + bind = , XF86AudioPrev, exec, playerctl -p "spotifyd,firefox" previous + bind = , XF86AudioRaiseVolume, exec, pamixer -i 5 + bind = , XF86MonBrightnessDown, exec, brightnessctl s 10%- + bind = , XF86MonBrightnessUp, exec, brightnessctl s 10%+ + + # Move focus with mainMod + hjkl + bind = $mainMod, H, movefocus, l + bind = $mainMod, L, movefocus, r + bind = $mainMod, K, movefocus, u + bind = $mainMod, J, movefocus, d + + # Switch workspaces with mainMod + [0-9] + bind = $mainMod, 1, workspace, 1 + bind = $mainMod, 2, workspace, 2 + bind = $mainMod, 3, workspace, 3 + bind = $mainMod, 4, workspace, 4 + bind = $mainMod, 5, workspace, 5 + bind = $mainMod, 6, workspace, 6 + bind = $mainMod, 7, workspace, 7 + bind = $mainMod, 8, workspace, 8 + bind = $mainMod, 9, workspace, 9 + bind = $mainMod, 0, workspace, 10 + + # Move active window to a workspace with mainMod + SHIFT + [0-9] + bind = $mainMod SHIFT, 1, movetoworkspace, 1 + bind = $mainMod SHIFT, 2, movetoworkspace, 2 + bind = $mainMod SHIFT, 3, movetoworkspace, 3 + bind = $mainMod SHIFT, 4, movetoworkspace, 4 + bind = $mainMod SHIFT, 5, movetoworkspace, 5 + bind = $mainMod SHIFT, 6, movetoworkspace, 6 + bind = $mainMod SHIFT, 7, movetoworkspace, 7 + bind = $mainMod SHIFT, 8, movetoworkspace, 8 + bind = $mainMod SHIFT, 9, movetoworkspace, 9 + bind = $mainMod SHIFT, 0, movetoworkspace, 10 + + # Scroll through existing workspaces with mainMod + scroll + bind = $mainMod, mouse_down, workspace, e+1 + bind = $mainMod, mouse_up, workspace, e-1 + + # Move/resize windows with mainMod + LMB/RMB and dragging + bindm = $mainMod, mouse:272, movewindow + bindm = $mainMod, mouse:273, resizewindow + + exec-once=synology-drive +'' diff --git a/modules/programs/hyprland/default.nix b/modules/programs/hyprland/default.nix index d05ad4c..42dec13 100644 --- a/modules/programs/hyprland/default.nix +++ b/modules/programs/hyprland/default.nix @@ -3,7 +3,7 @@ , pkgs , inputs , ... -}: +} @ args: with lib; let @@ -22,6 +22,7 @@ in config = mkIf cfg.enable { home-manager.users.moritz = { imports = [ inputs.hyprland.homeManagerModules.default ]; + programs.waybar = { enable = true; package = pkgs.waybar-hyprland; @@ -34,6 +35,7 @@ in output = [ "eDP-1" "HDMI-A-1" + "HDMI-A-2" ]; modules-left = [ "wlr/workspaces" ]; modules-center = [ "hyprland/window" ]; @@ -46,23 +48,91 @@ in }; }; }; + wayland.windowManager.hyprland = { enable = true; package = hyprland; - extraConfig = builtins.readFile ./hyprland.conf; + extraConfig = import ./config.nix args; }; + + services.swayidle = { + enable = true; + events = [ + { + event = "before-sleep"; + command = "${pkgs.swaylock-effects}/bin/swaylock -fF"; + } + { + event = "lock"; + command = "${pkgs.swaylock-effects}/bin/swaylock -fF"; + } + ]; + timeouts = [ + { + timeout = 300; + command = "${hyprland}/bin/hyprctl dispatch dpms off"; + resumeCommand = "${hyprland}/bin/hyprctl dispatch dpms on"; + } + { + timeout = 310; + command = "${pkgs.systemd}/bin/loginctl lock-session"; + } + ]; + }; + + # start swayidle as part of hyprland, not sway + systemd.user.services.swayidle.Install.WantedBy = lib.mkForce [ "hyprland-session.target" ]; }; + + users.users.moritz.packages = with pkgs; [ + swayidle + swaylock-effects + pamixer + playerctl + brightnessctl + ]; + + security.pam.services.swaylock = { }; + programs.hyprland = { enable = true; package = null; }; + + environment.sessionVariables = + { + XDG_CURRENT_DESKTOP = "Hyprland"; + XDG_SESSION_TYPE = "wayland"; + XDG_SESSION_DESKTOP = "Hyprland"; + QT_AUTO_SCREEN_SCALE_FACTOR = "1"; + QT_QPA_PLATFORM = "wayland;xcb"; + QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; + QT_QPA_PLATFORMTHEME = "qt5ct"; + _JAVA_AWT_WM_NONEREPARENTING = "1"; + } // + (if cfg.nvidiaSupport then + { + LIBVA_DRIVER_NAME = "nvidia"; + XDG_SESSION_TYPE = "wayland"; + GBM_BACKEND = "nvidia-drm"; + __GLX_VENDOR_LIBRARY_NAME = "nvidia"; + WLR_NO_HARDWARE_CURSORS = "1"; + __GL_VRR_ALLOWED = "0"; + } else { }); + services.xserver = { enable = true; displayManager = { gdm.enable = true; + autoLogin = { + enable = true; + user = "moritz"; + }; + defaultSession = "hyprland"; sessionPackages = [ hyprland ]; }; }; + xdg.portal = { enable = true; wlr.enable = true; diff --git a/modules/programs/hyprland/hyprland.conf b/modules/programs/hyprland/hyprland.conf deleted file mode 100644 index c8ac776..0000000 --- a/modules/programs/hyprland/hyprland.conf +++ /dev/null @@ -1,160 +0,0 @@ -# -# Please note not all available settings / options are set here. -# For a full list, see the wiki -# - -# See https://wiki.hyprland.org/Configuring/Monitors/ -monitor=,preferred,auto,1 - - -# See https://wiki.hyprland.org/Configuring/Keywords/ for more - -# Execute your favorite apps at launch -# exec-once = waybar & hyprpaper & firefox - -# Source a file (multi-file configs) -# source = ~/.config/hypr/myColors.conf - -# For all categories, see https://wiki.hyprland.org/Configuring/Variables/ -input { - kb_layout = de - kb_variant = - kb_model = - kb_options = - kb_rules = - - follow_mouse = 1 - - touchpad { - natural_scroll = yes - } - - sensitivity = 0 # -1.0 - 1.0, 0 means no modification. -} - -general { - # See https://wiki.hyprland.org/Configuring/Variables/ for more - - gaps_in = 5 - gaps_out = 5 - border_size = 2 - col.active_border = rgba(1affffee) - col.inactive_border = rgba(595959aa) - - layout = dwindle -} - -decoration { - # See https://wiki.hyprland.org/Configuring/Variables/ for more - - rounding = 5 - inactive_opacity = 0.98 - blur = yes - blur_size = 8 - blur_passes = 1 - blur_new_optimizations = on - - drop_shadow = yes - shadow_range = 4 - shadow_render_power = 3 - col.shadow = rgba(1a1a1aee) -} - -animations { - enabled = yes - - # Some default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more - - bezier = myBezier, 0.45, 0, 0.55, 1 - - animation = windows, 1, 3, myBezier - animation = windowsOut, 1, 3, myBezier - animation = border, 1, 3, myBezier - animation = fade, 1, 3, myBezier - animation = workspaces, 1, 3, myBezier -} - -dwindle { - # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more - pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below - preserve_split = yes # you probably want this -} - -master { - # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more - new_is_master = true -} - -gestures { - # See https://wiki.hyprland.org/Configuring/Variables/ for more - workspace_swipe = on -} - -# Example per-device config -# See https://wiki.hyprland.org/Configuring/Keywords/#executing for more -device:epic mouse V1 { - sensitivity = -0.5 -} - -# Example windowrule v1 -# windowrule = float, ^(kitty)$ -# Example windowrule v2 -# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$ -windowrulev2 = float,class:^(rofi)$ -# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more - - -# See https://wiki.hyprland.org/Configuring/Keywords/ for more -$mainMod = SUPER -$windowMod = ALT - -# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more -bind = $mainMod, RETURN, exec, kitty -bind = $mainMod, Q, killactive, -bind = $mainMod, M, exit, -bind = $mainMod, E, exec, emacsclient -c -a emacs -bind = $mainMod, F, togglefloating, -bind = $mainMod, D, exec, rofi -show combi -bind = $mainMod, P, pseudo, # dwindle -bind = $mainMod, T, togglesplit, # dwindle - -# Move focus with mainMod + arrow keys -bind = $mainMod, H, movefocus, l -bind = $mainMod, L, movefocus, r -bind = $mainMod, K, movefocus, u -bind = $mainMod, J, movefocus, d - -# Switch workspaces with mainMod + [0-9] -bind = $mainMod, 1, workspace, 1 -bind = $mainMod, 2, workspace, 2 -bind = $mainMod, 3, workspace, 3 -bind = $mainMod, 4, workspace, 4 -bind = $mainMod, 5, workspace, 5 -bind = $mainMod, 6, workspace, 6 -bind = $mainMod, 7, workspace, 7 -bind = $mainMod, 8, workspace, 8 -bind = $mainMod, 9, workspace, 9 -bind = $mainMod, 0, workspace, 10 - -# Move active window to a workspace with mainMod + SHIFT + [0-9] -bind = $mainMod SHIFT, 1, movetoworkspace, 1 -bind = $mainMod SHIFT, 2, movetoworkspace, 2 -bind = $mainMod SHIFT, 3, movetoworkspace, 3 -bind = $mainMod SHIFT, 4, movetoworkspace, 4 -bind = $mainMod SHIFT, 5, movetoworkspace, 5 -bind = $mainMod SHIFT, 6, movetoworkspace, 6 -bind = $mainMod SHIFT, 7, movetoworkspace, 7 -bind = $mainMod SHIFT, 8, movetoworkspace, 8 -bind = $mainMod SHIFT, 9, movetoworkspace, 9 -bind = $mainMod SHIFT, 0, movetoworkspace, 10 - -# Scroll through existing workspaces with mainMod + scroll -bind = $mainMod, mouse_down, workspace, e+1 -bind = $mainMod, mouse_up, workspace, e-1 - -# Move/resize windows with mainMod + LMB/RMB and dragging -bindm = $mainMod, mouse:272, movewindow -bindm = $mainMod, mouse:273, resizewindow - -exec-once=synology-drive -exec-once=waybar diff --git a/overlays/default.nix b/overlays/default.nix index 505736f..300887c 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -3,7 +3,7 @@ agenix = inputs.agenix.defaultPackage."${prev.system}"; waybar-hyprland = prev.waybar.overrideAttrs (old: { postPatch = old.postPatch or "" + '' - ${final.gnused}/bin/sed -i 's,zext_workspace_handle_v1_activate(workspace_handle_);,const std::string command = "${final.hyprland}/bin/hyprctl dispatch workspace " + name_;\n\tsystem(command.c_str());,g' src/modules/wlr/workspace_manager.cpp + sed -i 's,zext_workspace_handle_v1_activate(workspace_handle_);,const std::string command = "${final.hyprland}/bin/hyprctl dispatch workspace " + name_;\n\tsystem(command.c_str());,g' src/modules/wlr/workspace_manager.cpp ''; mesonFlags = old.mesonFlags or [ ] ++ [ "-Dexperimental=true" ]; });