From 0edc2708a19744194ec2b336c8d21d4334d595e5 Mon Sep 17 00:00:00 2001
From: Tristan <tristan@tristans.cloud>
Date: Tue, 23 Jan 2024 10:09:02 +0000
Subject: [PATCH] upstream hyprland and change to tofi

tofi is way faster than wofi
---
 flake.lock                | 15 ++++++++-------
 flake.nix                 |  2 +-
 home/default.nix          |  6 ++++++
 home/modules/editor.nix   |  2 +-
 home/modules/menu.nix     |  2 +-
 home/programs/scripts.nix |  4 ++--
 lib/mkconf.nix            |  2 ++
 7 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/flake.lock b/flake.lock
index 917b8a1..6b6ce31 100644
--- a/flake.lock
+++ b/flake.lock
@@ -233,15 +233,16 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1704475363,
-        "narHash": "sha256-isiBkAsjXIvb/6McVK42/iBbC4h+UL3JRkkLqTSPE48=",
+        "lastModified": 1704110595,
+        "narHash": "sha256-WSrjBI3k2dM/kGF20At0E6NlrJSB4+pE+WGJ6dFzWEs=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "7e033e48ace5406a9bc442f7d403f9ce3af193f3",
+        "rev": "03ebbe18ed8517ee22591eac82cd54322f42cb7d",
         "type": "github"
       },
       "original": {
         "owner": "hyprwm",
+        "ref": "v0.34.0",
         "repo": "Hyprland",
         "type": "github"
       }
@@ -424,18 +425,18 @@
       "flake": false,
       "locked": {
         "host": "gitlab.freedesktop.org",
-        "lastModified": 1703963193,
-        "narHash": "sha256-ke8drv6PTrdQDruWbajrRJffP9A9PU6FRyjJGNZRTs4=",
+        "lastModified": 1701368958,
+        "narHash": "sha256-7kvyoA91etzVEl9mkA/EJfB6z/PltxX7Xc4gcr7/xlo=",
         "owner": "wlroots",
         "repo": "wlroots",
-        "rev": "f81c3d93cd6f61b20ae784297679283438def8df",
+        "rev": "5d639394f3e83b01596dcd166a44a9a1a2583350",
         "type": "gitlab"
       },
       "original": {
         "host": "gitlab.freedesktop.org",
         "owner": "wlroots",
         "repo": "wlroots",
-        "rev": "f81c3d93cd6f61b20ae784297679283438def8df",
+        "rev": "5d639394f3e83b01596dcd166a44a9a1a2583350",
         "type": "gitlab"
       }
     },
diff --git a/flake.nix b/flake.nix
index 4781991..085ee74 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,7 +9,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     stylix.url = "github:danth/stylix";
-    hyprland.url = "github:hyprwm/Hyprland";
+    hyprland.url = "github:hyprwm/Hyprland/v0.34.0";
     hycov = {
       url = "github:DreamMaoMao/hycov";
       inputs.hyprland.follows = "hyprland";
diff --git a/home/default.nix b/home/default.nix
index 5821a52..3622a94 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -27,6 +27,12 @@
     }
   ];
 
+  programs.menu = {
+    package = pkgs.tofi;
+    dmenuCommand = "${pkgs.tofi}/bin/tofi --fuzzy-match true";
+    drunCommand = "${pkgs.tofi}/bin/tofi-drun --drun-launch true";
+  };
+
   roles.mpd.enable = true;
 
   programs.home-manager.enable = true;
diff --git a/home/modules/editor.nix b/home/modules/editor.nix
index 2a8d01c..73edbdb 100644
--- a/home/modules/editor.nix
+++ b/home/modules/editor.nix
@@ -6,7 +6,7 @@
 }: let
   editor = config.programs.editor;
   pkg = editor.package;
-  menu = config.programs.menu.package + config.programs.menu.dmenuCommand;
+  menu = config.programs.menu.dmenuCommand;
   editorCmd = "NIXOS_OZONE_WL= ${pkg}/bin/${pkg.executableName}";
 in {
   options.programs = with lib; {
diff --git a/home/modules/menu.nix b/home/modules/menu.nix
index c244a1b..3e7943b 100644
--- a/home/modules/menu.nix
+++ b/home/modules/menu.nix
@@ -7,7 +7,7 @@
   cfg = config.programs.menu;
   terminal = config.programs.terminal;
   termcmd = "${terminal}/bin/${terminal.pname}";
-  menucmd = "${config.programs.menu.package}${config.programs.menu.drunCommand}";
+  menucmd = config.programs.menu.drunCommand;
 in {
   options.programs = with lib; {
     menu = {
diff --git a/home/programs/scripts.nix b/home/programs/scripts.nix
index 8da583b..dcd24fd 100644
--- a/home/programs/scripts.nix
+++ b/home/programs/scripts.nix
@@ -19,8 +19,8 @@
     jq = "${pkgs.jq}/bin/jq";
     hyprctl = "${pkgs.hyprland}/bin/hyprctl";
     xargs = "${pkgs.findutils}/bin/xargs";
-    menu = "${config.programs.menu.package}${config.programs.menu.dmenuCommand}";
-    runmenu = "${config.programs.menu.package}/bin/wofi --show drun";
+    menu = config.programs.menu.dmenuCommand;
+    runmenu = config.programs.menu.drunCommand;
     fileman = "${pkgs.pcmanfm}/bin/pcmanfm";
     gawk = "${pkgs.gawk}/bin/awk";
     hyprpicker = "${pkgs.hyprpicker}/bin/hyprpicker";
diff --git a/lib/mkconf.nix b/lib/mkconf.nix
index 7202ae8..c38df7a 100644
--- a/lib/mkconf.nix
+++ b/lib/mkconf.nix
@@ -30,7 +30,9 @@ with inputs;
                 }
               ];
           };
+          programs.hyprland.package = hyprland.packages."${system}".hyprland;
           nixpkgs.config.packageOverrides = pkgs: {
+            inherit (hyprland.packages.${system}) xdg-desktop-portal-hyprland hyprland hyprland-protocols;
             hycov = hycov.packages.${system}.hycov;
             brave = (import stable-nixpkgs {inherit system;}).brave;
           };