From 51c1659b9816ed3875754786b31f0b80fe1e9d60 Mon Sep 17 00:00:00 2001
From: Erwin Boskma <erwin@datarift.nl>
Date: Sun, 30 Oct 2022 22:19:50 +0100
Subject: [PATCH] Hyprland fixes

---
 home-manager/modules/hyprland/default.nix | 29 +++++++++++++++--------
 home-manager/modules/waybar/default.nix   |  9 ++++---
 modules/greetd/default.nix                |  3 +++
 overlays/default.nix                      |  2 +-
 users/erwin/desktop.nix                   |  1 +
 5 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/home-manager/modules/hyprland/default.nix b/home-manager/modules/hyprland/default.nix
index a616546..c3e0e29 100644
--- a/home-manager/modules/hyprland/default.nix
+++ b/home-manager/modules/hyprland/default.nix
@@ -10,9 +10,9 @@ let
   powerMenu = "${rofiPower}/bin/rofi-power";
 
   wallpapers = {
-    hd = ./wallpapers/river-1920.png;
-    qhd = ./wallpapers/river-2560.png;
-    uhd = ./wallpapers/river-3840.png;
+    hd = ../sway/wallpapers/river-1920.png;
+    qhd = ../sway/wallpapers/river-2560.png;
+    uhd = ../sway/wallpapers/river-3840.png;
   };
   swaylockcmd = "${pkgs.swaylock-effects}/bin/swaylock --ignore-empty-password --daemonize --show-failed-attempts --indicator-caps-lock --clock --image ${wallpapers.qhd} --fade-in 0.5 --scaling fill";
 
@@ -38,6 +38,12 @@ in
           dim_strength = 0.5
         }
 
+        animations {
+          animation = workspaces,1,3,default
+          animation = windows,1,3,default
+          animation = windowsOut,1,3,default
+        }
+
         input {
           kb_layout = us
           kb_options = lv3:ralt_switch,eurosign:5
@@ -53,7 +59,7 @@ in
           workspace_back_and_forth = true
         }
 
-        $mod = Mod4
+        $mod = SUPER
 
         bind = $mod,Return,exec,${terminal}
         bind = $mod_SHIFT,Q,killactive
@@ -72,8 +78,8 @@ in
 
         bind = $mod_SHIFT,Space,togglefloating,active
 
-        bind = $mod,T,togglefullscreen,0
-        bind = $mod_SHIFT,T,togglefullscreen,1
+        bind = $mod,T,fullscreen,0
+        bind = $mod_SHIFT,T,fullscreen,1
 
         bind = $mod,1,workspace,1
         bind = $mod,2,workspace,2
@@ -116,18 +122,21 @@ in
         bind = $mod,D,exec,${pkgs.swaynotificationcenter}/bin/swaync-client -t -sw
 
         bind = $mod,W,togglegroup
+        bind = $mod,N,changegroupactive,b
+        bind = $mod,O,changegroupactive,f
 
         bindm = ALT,mouse:272,movewindow
         bindm = ALT,mouse:273,resizewindow
 
-        windowrulev2 = workspace 1,^(firefox)$
-        windowrulev2 = workspace 2,^(foot)$
-        windowrulev2 = workspace 3,^(emacs)$
+        windowrulev2 = workspace 1,class:^(firefox)$
+        windowrulev2 = workspace 2,class:^(foot)$
+        windowrulev2 = workspace 3,class:^(emacs)$
 
         exec = ${pkgs.networkmanagerapplet}/bin/nm-applet --indicator
 
         exec-once = ${pkgs.swaybg}/bin/swaybg -i ${wallpapers.qhd} -m fill
-        exec-once = ${cfg.package}/bin/hyprctl setcursor Nordzy-cursors 24
+        exec-once = ${config.wayland.windowManager.hyprland.package}/bin/hyprctl setcursor Nordzy-cursors 24
+        exec-once = ${pkgs.systemd}/bin/systemctl --user start swaync
       '' +
       (lib.optionalString config.eboskma.programs.emacs.enable "bind = $mod,C,exec,${config.eboskma.programs.emacs.package}/bin/emacsclient -c");
     };
diff --git a/home-manager/modules/waybar/default.nix b/home-manager/modules/waybar/default.nix
index 92ef0b4..3a8bce8 100644
--- a/home-manager/modules/waybar/default.nix
+++ b/home-manager/modules/waybar/default.nix
@@ -29,12 +29,14 @@ in
           height = 32;
 
           modules-left = [
-            "sway/workspaces"
+            # "sway/workspaces"
+            "wlr/workspaces"
             "sway/mode"
             "custom/now_playing"
           ];
           modules-center = [
             "sway/window"
+            "hyprland/window"
           ];
           modules-right = [
             "network"
@@ -119,10 +121,11 @@ in
             max-length = 120;
           };
 
-          "sway/workspaces" = {
+          "wlr/workspaces" = {
             all-outputs = false;
-            disable-scroll = true;
+            # disable-scroll = true;
             format = "{icon} {name}";
+            sort-by-number = true;
             format-icons = {
               "urgent" = "";
               "focused" = "";
diff --git a/modules/greetd/default.nix b/modules/greetd/default.nix
index b6402b6..78b63d6 100644
--- a/modules/greetd/default.nix
+++ b/modules/greetd/default.nix
@@ -1,12 +1,15 @@
 { pkgs
 , config
 , lib
+, inputs
 , ...
 }:
 with lib; let
   cfg = config.eboskma.greetd;
 
   style = builtins.replaceStrings [ "{WALLPAPER}" ] [ (builtins.toString ../../home-manager/modules/sway/wallpapers/river-2560.png) ] (builtins.readFile ./greetd.css);
+
+  hyprland = inputs.hyprland.packages.${pkgs.system}.hyprland;
 in
 {
   options.eboskma.greetd = {
diff --git a/overlays/default.nix b/overlays/default.nix
index ffca590..763e555 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -18,7 +18,7 @@ final: prev: rec {
 
   bl3auto = prev.pkgs.callPackage ../pkgs/bl3auto { inherit (prev.pkgs) lib buildGoModule fetchFromGitHub; };
 
-  waybar = prev.pkgs.waybar.overrideAttrs (prevAttrs: {
+  waybar = prev.waybar.overrideAttrs (prevAttrs: {
     src = prev.fetchFromGitHub {
       owner = "Alexays";
       repo = "Waybar";
diff --git a/users/erwin/desktop.nix b/users/erwin/desktop.nix
index 0d43be7..4da639e 100644
--- a/users/erwin/desktop.nix
+++ b/users/erwin/desktop.nix
@@ -68,6 +68,7 @@ in
               signingKeyFormat = "ssh";
             };
             gpg.enable = true;
+            hyprland.enable = true;
             neovim.enable = true;
             obs-studio.enable = true;
             rclone = {