cleanup, fmt, work on emacs, start hydrus booru integration

1 files changed, 34 insertions, 25 deletions

diff --git a/mixins/emacs/default.nix b/mixins/emacs/default.nix
index 0290d20..7303ebb 100644
--- a/mixins/emacs/default.nix
+++ b/mixins/emacs/default.nix
@@ -5,29 +5,38 @@
   inputs,
   ...
 }: {
-  #   imports = [
-  #     inputs.home-manager.nixosModules."home-manager"
-  #   ];
-  #   config = {
-  #     home-manager.users.tzlil = {
-  #       pkgs,
-  #       config,
-  #       nixosConfig,
-  #       ...
-  #     } @ hm: {
-  #       home = {
-  #         packages = with pkgs; [
-
-  #         ];
-  #       };
-  #       services.emacs = {
-  #         enable = true;
-  #         defaultEditor = true;
-  #       };
-  #       programs.emacs = {
-  #         enable = true;
-  #         extraConfig = builtins.readFile ./init.el
-  #       };
-  #     };
-  #   }
+  imports = [
+    inputs.home-manager.nixosModules."home-manager"
+  ];
+  config = {
+    home-manager.users.tzlil = {
+      pkgs,
+      config,
+      nixosConfig,
+      ...
+    } @ hm: {
+      home = {
+        packages = with pkgs; [
+        ];
+      };
+      services.emacs = {
+        enable = true;
+        defaultEditor = true;
+        startWithUserSession = true;
+        client.enable = true;
+        package = with pkgs; (emacsWithPackages (with emacsPackagesNg; [
+          evil
+          nix-mode
+          org
+          python-mode
+        ]));
+      };
+      # xdg.configFile."emacs/init.el".text = builtins.readFile ./init.el;
+      # non client
+      programs.emacs = {
+        enable = true;
+        extraConfig = builtins.readFile ./init.el;
+      };
+    };
+  };
 }