home: hyprland

5 files changed, 113 insertions, 75 deletions

diff --git a/flake.lock b/flake.lock
index c6f7237..c67fbff 100644
--- a/flake.lock
+++ b/flake.lock
@@ -423,6 +423,27 @@
         "type": "github"
       }
     },
+    "hyprfocus": {
+      "inputs": {
+        "hyprland": [
+          "hyprland"
+        ],
+        "nix-filter": "nix-filter"
+      },
+      "locked": {
+        "lastModified": 1717066948,
+        "narHash": "sha256-R1ZgNhQkoS6ZHRRKB+j5vYgRANfYO//sHbrD7moUTx0=",
+        "owner": "pyt0xic",
+        "repo": "hyprfocus",
+        "rev": "aa7262d3a4564062f97b9cfdad47fd914cfb80f2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "pyt0xic",
+        "repo": "hyprfocus",
+        "type": "github"
+      }
+    },
     "hyprland": {
       "inputs": {
         "aquamarine": "aquamarine",
@@ -659,7 +680,7 @@
       "inputs": {
         "flake-compat": "flake-compat",
         "flake-utils": "flake-utils",
-        "nix-filter": "nix-filter",
+        "nix-filter": "nix-filter_2",
         "nix-index-database": "nix-index-database",
         "nixpkgs": [
           "nixpkgs"
@@ -681,6 +702,21 @@
     },
     "nix-filter": {
       "locked": {
+        "lastModified": 1694857738,
+        "narHash": "sha256-bxxNyLHjhu0N8T3REINXQ2ZkJco0ABFPn6PIe2QUfqo=",
+        "owner": "numtide",
+        "repo": "nix-filter",
+        "rev": "41fd48e00c22b4ced525af521ead8792402de0ea",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "nix-filter",
+        "type": "github"
+      }
+    },
+    "nix-filter_2": {
+      "locked": {
         "lastModified": 1710156097,
         "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=",
         "owner": "numtide",
@@ -1054,6 +1090,7 @@
         "chaotic": "chaotic",
         "flake-parts": "flake-parts",
         "home-manager": "home-manager_2",
+        "hyprfocus": "hyprfocus",
         "hyprland": "hyprland",
         "hyprland-plugins": "hyprland-plugins",
         "nix-alien": "nix-alien",
diff --git a/flake.nix b/flake.nix
index 9844a2c..0d84492 100644
--- a/flake.nix
+++ b/flake.nix
@@ -121,10 +121,9 @@
       inputs.systems.follows = "systems";
     };
 
-    # Hyprspace = {
-    #   url = "github:KZDKM/Hyprspace";
-    #   inputs.hyprland.follows = "hyprland";
-    #   inputs.systems.follows = "systems";
-    # };
+    hyprfocus = {
+      url = "github:pyt0xic/hyprfocus";
+      inputs.hyprland.follows = "hyprland";
+    };
   };
 }
diff --git a/home/ebisu/fortune/desktop/hyprland/default.nix b/home/ebisu/fortune/desktop/hyprland/default.nix
index 424c6e9..89165a9 100644
--- a/home/ebisu/fortune/desktop/hyprland/default.nix
+++ b/home/ebisu/fortune/desktop/hyprland/default.nix
@@ -17,11 +17,6 @@
 
       variables = [ "--all" ];
     };
-
-    plugins = [
-      # Hyprspace.packages.${pkgs.system}.Hyprspace
-      hyprland-plugins.packages.${pkgs.system}.hyprtrails
-    ];
   };
 
   xdg.configFile."hypr/xdph.conf".text = ''
diff --git a/home/ebisu/fortune/desktop/hyprland/hyprland/binds.nix b/home/ebisu/fortune/desktop/hyprland/hyprland/binds.nix
index f31b1c4..692b17c 100644
--- a/home/ebisu/fortune/desktop/hyprland/hyprland/binds.nix
+++ b/home/ebisu/fortune/desktop/hyprland/hyprland/binds.nix
@@ -43,12 +43,7 @@
           "$mod, j, movefocus, d"
           "$mod, l, movefocus, r"
           "$mod, h, movefocus, l"
-
-          # "$mod, j, layoutmsg, cyclenext"
-          # "$mod, j, layoutmsg, cycleprev"
-
-          # "$mod, tab, hycov:toggleoverview"
-          # "$mod SHIFT, tab, overview:toggle"
+          "$mod, tab, hyprexpo:expo"
 
           # Rofi
           "$mod, grave, exec, rofi -modi emoji -show emoji"
diff --git a/home/ebisu/fortune/desktop/hyprland/hyprland/plugins.nix b/home/ebisu/fortune/desktop/hyprland/hyprland/plugins.nix
index 5507491..649b698 100644
--- a/home/ebisu/fortune/desktop/hyprland/hyprland/plugins.nix
+++ b/home/ebisu/fortune/desktop/hyprland/hyprland/plugins.nix
@@ -1,69 +1,81 @@
+{ inputs, pkgs, ... }:
 {
-  wayland.windowManager.hyprland.settings.plugin = {
-    # split-monitor-workspaces = {
-    #   count = 10;
-    #   keep_focused = 0;
-    #   enable_notifications = 0;
-    # };
+  wayland.windowManager.hyprland = {
+    plugins =
+      with inputs;
+      with pkgs;
+      [
+        hyprland-plugins.packages.${system}.hyprtrails
+        hyprfocus.packages.${system}.hyprfocus
+        hyprland-plugins.packages.${system}.hyprexpo
+      ];
 
-    hyprtrails = {
-      color = "rgba(cfddf619)";
-    };
+    settings.plugin = {
+      # split-monitor-workspaces = {
+      #   count = 10;
+      #   keep_focused = 0;
+      #   enable_notifications = 0;
+      # };
 
-    hyprfocus = {
-      enabled = true;
-      animate_floating = true;
-      animate_workspacechange = true;
-      focus_animation = "flash";
+      hyprtrails = {
+        color = "rgba(cfddf619)";
+      };
 
-      bezier = [
-        "bezIn, 0.5, 0.0, 1.0, 0.5"
-        "bezOut, 0.0, 0.5, 0.5, 1.0"
-        "overshot, 0.05, 0.9, 0.1, 1.05"
-        "smoothOut, 0.36, 0, 0.66, -0.56"
-        "smoothIn, 0.25, 1, 0.5, 1"
-        "realsmooth, 0.28, 0.29, .69, 1.08"
-      ];
+      hyprfocus = {
+        enabled = true;
+        animate_floating = true;
+        animate_workspacechange = true;
+        focus_animation = "flash";
 
-      flash = {
-        flash_opacity = 0.85;
-        in_bezier = "realsmooth";
-        in_speed = 0.5;
-        out_bezier = "realsmooth";
-        out_speed = 3;
-      };
+        bezier = [
+          "bezIn, 0.5, 0.0, 1.0, 0.5"
+          "bezOut, 0.0, 0.5, 0.5, 1.0"
+          "overshot, 0.05, 0.9, 0.1, 1.05"
+          "smoothOut, 0.36, 0, 0.66, -0.56"
+          "smoothIn, 0.25, 1, 0.5, 1"
+          "realsmooth, 0.28, 0.29, .69, 1.08"
+        ];
+
+        flash = {
+          flash_opacity = 0.85;
+          in_bezier = "realsmooth";
+          in_speed = 1;
+          out_bezier = "realsmooth";
+          out_speed = 3;
+        };
 
-      shrink = {
-        shrink_percentage = 0.99;
-        in_bezier = "realsmooth";
-        in_speed = 1;
-        out_bezier = "realsmooth";
-        out_speed = 2;
+        shrink = {
+          shrink_percentage = 0.99;
+          in_bezier = "realsmooth";
+          in_speed = 1;
+          out_bezier = "realsmooth";
+          out_speed = 2;
+        };
       };
-    };
 
-    hycov = {
-      overview_gappo = 10; # gaps width from screen edge
-      overview_gappi = 10; # gaps width from clients
-      enable_hotarea = 0; # enable mouse cursor hotarea, when cursor enter hotarea, it will toggle overview
-      enable_click_action = 1; # enable mouse left button jump and right button kill in overview mode
-      hotarea_monitor = "all"; # monitor name which hotarea is in, default is all
-      hotarea_pos = 1; # position of hotarea (1: bottom left, 2: bottom right, 3: top left, 4: top right)
-      hotarea_size = 10; # hotarea size, 10x10
-      swipe_fingers = 4; # finger number of gesture,move any directory
-      move_focus_distance = 100; # distance for movefocus,only can use 3 finger to move
-      enable_gesture = 0; # enable gesture
-      auto_exit = 1; # enable auto exit when no client in overview
-      auto_fullscreen = 0; # auto make active window maximize after exit overview
-      only_active_workspace = 0; # only overview the active workspace
-      only_active_monitor = 0; # only overview the active monitor
-      enable_alt_release_exit = 1; # alt swith mode arg,see readme for detail
-      alt_replace_key = "Super_L"; # alt swith mode arg,see readme for detail
-      alt_toggle_auto_next = 0; # auto focus next window when toggle overview in alt swith mode
-      click_in_cursor = 1; # when click to jump,the target windwo is find by cursor, not the current foucus window.
-      height_of_titlebar = 0; # height deviation of title bar height
-      show_special = 0; # show windwos in special workspace in overview.
-      raise_float_to_top = 1; # raise the window that is floating before to top after leave overview mode
+      hycov = {
+        overview_gappo = 10; # gaps width from screen edge
+        overview_gappi = 10; # gaps width from clients
+        enable_hotarea = 0; # enable mouse cursor hotarea, when cursor enter hotarea, it will toggle overview
+        enable_click_action = 1; # enable mouse left button jump and right button kill in overview mode
+        hotarea_monitor = "all"; # monitor name which hotarea is in, default is all
+        hotarea_pos = 1; # position of hotarea (1: bottom left, 2: bottom right, 3: top left, 4: top right)
+        hotarea_size = 10; # hotarea size, 10x10
+        swipe_fingers = 4; # finger number of gesture,move any directory
+        move_focus_distance = 100; # distance for movefocus,only can use 3 finger to move
+        enable_gesture = 0; # enable gesture
+        auto_exit = 1; # enable auto exit when no client in overview
+        auto_fullscreen = 0; # auto make active window maximize after exit overview
+        only_active_workspace = 0; # only overview the active workspace
+        only_active_monitor = 0; # only overview the active monitor
+        enable_alt_release_exit = 1; # alt swith mode arg,see readme for detail
+        alt_replace_key = "Super_L"; # alt swith mode arg,see readme for detail
+        alt_toggle_auto_next = 0; # auto focus next window when toggle overview in alt swith mode
+        click_in_cursor = 1; # when click to jump,the target windwo is find by cursor, not the current foucus window.
+        height_of_titlebar = 0; # height deviation of title bar height
+        show_special = 0; # show windwos in special workspace in overview.
+        raise_float_to_top = 1; # raise the window that is floating before to top after leave overview mode
+      };
     };
   };
 }