From e6178207be4a360d9b837828fb202539597c6cc7 Mon Sep 17 00:00:00 2001
From: Frantisek Bohacek <rutherther@proton.me>
Date: Sat, 27 Jul 2024 12:15:40 +0200
Subject: [PATCH] feat: add emacs-anywhere, some changes

---
 home/modules/profiles/desktop/dwl/default.nix      | 14 +++++++-------
 home/modules/profiles/desktop/dwl/mako-hm-impl.nix |  6 +++---
 pkgs/dwl/default.nix                               |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/home/modules/profiles/desktop/dwl/default.nix b/home/modules/profiles/desktop/dwl/default.nix
index 57a8536..c272185 100644
--- a/home/modules/profiles/desktop/dwl/default.nix
+++ b/home/modules/profiles/desktop/dwl/default.nix
@@ -18,6 +18,10 @@ let
 
   wlopmDisableScreens = wlopmScreens "off";
   wlopmEnableScreens = wlopmScreens "on";
+
+  emacs-anywhere = pkgs.writeShellScriptBin "emacs-anywhere" ''
+    emacs --batch --script "${./emacs-anywhere.el}" | wl-copy
+  '';
 in {
   imports = [
     ./mako.nix
@@ -85,7 +89,6 @@ in {
 
     home.packages = [
       # Clipboard
-      pkgs.cliphist
       pkgs.wl-clipboard
       # PrintScreening
       pkgs.grim
@@ -100,6 +103,8 @@ in {
       pkgs.wlopm
       pkgs.kanshi
 
+      emacs-anywhere
+
       inputs.self.packages.${pkgs.system}.dwl
     ];
 
@@ -156,11 +161,6 @@ in {
       };
     };
 
-    services.cliphist = {
-      enable = true;
-      systemdTarget = "wlr-session.target";
-    };
-
     services.swayidle = {
       enable = true;
       events = [
@@ -170,7 +170,7 @@ in {
       timeouts = [
         { timeout = 300; command = lib.getExe wlopmDisableScreens; resumeCommand = lib.getExe wlopmEnableScreens; }
         { timeout = 1800; command = "${lib.getExe' pkgs.systemd "systemctl"} suspend"; }
-        { timeout = 10; command = "${lib.getExe' pkgs.mako "makoctl"} mode -a idle"; resumeCommand = "${lib.getExe' pkgs.mako "makoctl"} mode -r idle"; }
+        { timeout = 30; command = "${lib.getExe' pkgs.mako "makoctl"} mode -a idle"; resumeCommand = "${lib.getExe' pkgs.mako "makoctl"} mode -r idle"; }
       ];
     };
 
diff --git a/home/modules/profiles/desktop/dwl/mako-hm-impl.nix b/home/modules/profiles/desktop/dwl/mako-hm-impl.nix
index a0579a3..6cd9701 100644
--- a/home/modules/profiles/desktop/dwl/mako-hm-impl.nix
+++ b/home/modules/profiles/desktop/dwl/mako-hm-impl.nix
@@ -5,11 +5,11 @@ let
 in {
   config = lib.mkIf cfg.enable {
     home.packages = [
-      cfg.package
+      cfg.package # Adds dbus-1/services as well, to the XDG_DATA_DIRS.
     ];
 
-    xdg.dataFile."dbus-1/services/${builtins.baseNameOf (builtins.unsafeDiscardStringContext
- cfg.dbusFile)}".source = cfg.dbusFile;
+    # xdg.dataFile."dbus-1/services/${builtins.baseNameOf (builtins.unsafeDiscardStringContext cfg.dbusFile)}".source = cfg.dbusFile;
+
     xdg.configFile."mako/config".source = cfg.configFile;
   };
 }
diff --git a/pkgs/dwl/default.nix b/pkgs/dwl/default.nix
index 6950171..b8d6a48 100644
--- a/pkgs/dwl/default.nix
+++ b/pkgs/dwl/default.nix
@@ -101,7 +101,7 @@ in ((dwl.override {
   src = fetchFromGitHub {
     owner = "Rutherther";
     repo = "dwl";
-    rev = "16bebf0e6eb6a012b12c4e0ffe7d12b29c379b28";
-    hash = "sha256-EiTONatB8BynKQVrWG9b0zAw+NKX79gMxro+kLZuMQk=";
+    rev = "a8e46f319f574876ce697a7097eb47a2080b1a87";
+    hash = "sha256-AdQW9zqPn9+X6fIQHlZEgWK+k1EwWM8kW4h0wyzHfso=";
   };
 }))
-- 
2.48.1