Merge branch 'hyprland' into nixos

modules/programs/default.nix

@@ -32,5 +32,6 @@
     ./xmonad
     ./zathura.nix
     ./zsh.nix
+    ./hyprland
   ];
 }

modules/programs/hyprland/default.nix

@@ -0,0 +1,71 @@
+{ config
+, lib
+, pkgs
+, inputs
+, ...
+}:
+
+with lib;
+let
+  cfg = config.my.programs.hyprland;
+
+  hyprland-default = inputs.hyprland.packages.${pkgs.system}.default;
+  hyprland-nvidia = hyprland-default.override { nvidiaPatches = true; };
+  hyprland = if cfg.nvidiaSupport then hyprland-nvidia else hyprland-default;
+in
+{
+  options.my.programs.hyprland = {
+    enable = mkEnableOption "hyprland";
+    nvidiaSupport = mkEnableOption "enable nvidia Support";
+  };
+
+  config = mkIf cfg.enable {
+    home-manager.users.moritz = {
+      imports = [ inputs.hyprland.homeManagerModules.default ];
+      programs.waybar = {
+        enable = true;
+        package = pkgs.waybar-hyprland;
+        systemd.enable = true;
+        settings = {
+          mainBar = {
+            layer = "top";
+            position = "top";
+            height = 30;
+            output = [
+              "eDP-1"
+              "HDMI-A-1"
+            ];
+            modules-left = [ "wlr/workspaces" ];
+            modules-center = [ "hyprland/window" ];
+            modules-right = [ "network" "memory" "cpu" "battery" "clock" ];
+            modules = {
+              "wlr/workspaces" = {
+                on-click = "activate";
+              };
+            };
+          };
+        };
+      };
+      wayland.windowManager.hyprland = {
+        enable = true;
+        package = hyprland;
+        extraConfig = builtins.readFile ./hyprland.conf;
+      };
+    };
+    programs.hyprland = {
+      enable = true;
+      package = null;
+    };
+    services.xserver = {
+      enable = true;
+      displayManager = {
+        gdm.enable = true;
+        sessionPackages = [ hyprland ];
+      };
+    };
+    xdg.portal = {
+      enable = true;
+      wlr.enable = true;
+    };
+  };
+}

modules/programs/hyprland/hyprland.conf

@@ -0,0 +1,160 @@
+#
+# 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

modules/programs/rofi/default.nix

@@ -21,7 +21,7 @@ in
       programs.rofi = {
         enable = true;
         package =
-          pkgs.rofi.override { plugins = with pkgs; [ rofi-calc rofi-emoji ]; };
+          pkgs.rofi-wayland.override { plugins = with pkgs; [ rofi-calc rofi-emoji ]; };
         extraConfig = { combi-modi = "drun,window,emoji"; };
       };
       xdg = {