aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiran Bastaja <miran.bastaja04@gmail.com>2024-09-12 01:53:19 +0200
committerMiran Bastaja <miran.bastaja04@gmail.com>2024-09-12 01:53:48 +0200
commitc8acfe1f7b51c4435f0dc478d15e95c57dfd4f74 (patch)
tree7e9e31ac646f6bb0e51bb43864cc4daa3de1831f
parent2404053bf23647c782fd8c9488e975e175f5d6ec (diff)
Move emacs installation into hyprdesktop
-rw-r--r--share/cfg/default.nix1
-rw-r--r--share/cfg/emacs.nix8
-rw-r--r--share/hm-modules/hyprdesktop.nix1
-rw-r--r--share/system/client-common.nix1
-rw-r--r--share/system/emacs.nix10
5 files changed, 10 insertions, 11 deletions
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 ];
-}