From c8acfe1f7b51c4435f0dc478d15e95c57dfd4f74 Mon Sep 17 00:00:00 2001
From: Miran Bastaja <miran.bastaja04@gmail.com>
Date: Thu, 12 Sep 2024 01:53:19 +0200
Subject: Move emacs installation into hyprdesktop

---
 share/cfg/default.nix            |  1 +
 share/cfg/emacs.nix              |  8 ++++++++
 share/hm-modules/hyprdesktop.nix |  1 +
 share/system/client-common.nix   |  1 -
 share/system/emacs.nix           | 10 ----------
 5 files changed, 10 insertions(+), 11 deletions(-)
 create mode 100644 share/cfg/emacs.nix
 delete mode 100644 share/system/emacs.nix

(limited to 'share')

diff --git a/share/cfg/default.nix b/share/cfg/default.nix
index dfee598..88e2e89 100644
--- a/share/cfg/default.nix
+++ b/share/cfg/default.nix
@@ -17,5 +17,6 @@
     ./hyprland.nix
     ./jujutsu.nix
     ./senpai.nix
+    ./emacs.nix
   ];
 }
diff --git a/share/cfg/emacs.nix b/share/cfg/emacs.nix
new file mode 100644
index 0000000..27c28e6
--- /dev/null
+++ b/share/cfg/emacs.nix
@@ -0,0 +1,8 @@
+{ pkgs, ... }:
+{
+  services.emacs = {
+    package = pkgs.sorremacs;
+    client.enable = true;
+    socketActivation.enable = true;
+  };
+}
diff --git a/share/hm-modules/hyprdesktop.nix b/share/hm-modules/hyprdesktop.nix
index 135a457..19e1e64 100644
--- a/share/hm-modules/hyprdesktop.nix
+++ b/share/hm-modules/hyprdesktop.nix
@@ -143,6 +143,7 @@ in
     services.dunst.enable = true;
     services.wpaperd.enable = true;
     services.poweralertd.enable = cfg.hasBattery;
+    services.emacs.enable = true;
 
     programs.mpv.enable = true;
     programs.git.enable = true;
diff --git a/share/system/client-common.nix b/share/system/client-common.nix
index f55040d..2a49d42 100644
--- a/share/system/client-common.nix
+++ b/share/system/client-common.nix
@@ -8,7 +8,6 @@
 {
   imports = [
     ./steam.nix
-    ./emacs.nix
   ];
   nixpkgs = {
     overlays = [
diff --git a/share/system/emacs.nix b/share/system/emacs.nix
deleted file mode 100644
index c846ad7..0000000
--- a/share/system/emacs.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ pkgs, ... }:
-{
-  services.emacs = {
-    enable = true;
-    install = true;
-    package = pkgs.sorremacs;
-  };
-
-  environment.systemPackages = [ pkgs.sorremacs ];
-}
-- 
cgit v1.3.1