From da05270443b97ba49c97ca33eef9768fbad82d94 Mon Sep 17 00:00:00 2001
From: Ivan Dimitrov <ivan@idimitrov.dev>
Date: Mon, 7 Aug 2023 18:37:18 +0300
Subject: [PATCH] enabling emacs service

---
 flake.lock      | 72 +++++++++++++++++++++++++++++++++++++++++++++++++
 flake.nix       |  8 ++++--
 home/emacs.nix  |  3 +++
 home/laptop.nix | 26 ++++++++++++------
 4 files changed, 99 insertions(+), 10 deletions(-)
 create mode 100644 home/emacs.nix

diff --git a/flake.lock b/flake.lock
index a3f2ee7..5b7af9e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,45 @@
 {
   "nodes": {
+    "emacs-overlay": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nixpkgs-stable": "nixpkgs-stable"
+      },
+      "locked": {
+        "lastModified": 1691405775,
+        "narHash": "sha256-csVe2tfnr+Gs+L0iPHgV5XhVrX57zAqqXabVx42fAz0=",
+        "owner": "nix-community",
+        "repo": "emacs-overlay",
+        "rev": "47fd556725bcc96a831ef13fc1bb0eccbfd4a895",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "emacs-overlay",
+        "type": "github"
+      }
+    },
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1689068808,
+        "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -35,11 +75,43 @@
         "type": "indirect"
       }
     },
+    "nixpkgs-stable": {
+      "locked": {
+        "lastModified": 1691328192,
+        "narHash": "sha256-w59N1zyDQ7SupfMJLFvtms/SIVbdryqlw5AS4+DiH+Y=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "61676e4dcfeeb058f255294bcb08ea7f3bc3ce56",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-23.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
+        "emacs-overlay": "emacs-overlay",
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs"
       }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index d8347e6..630b1a5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,9 +5,13 @@
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    emacs-overlay = {
+      url = "github:nix-community/emacs-overlay";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
-  outputs = { self, nixpkgs, home-manager, ... }: {
+  outputs = { self, nixpkgs, home-manager, emacs-overlay, ... }: {
     nixosConfigurations = {
       laptop = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
@@ -19,7 +23,7 @@
     homeConfigurations = {
       ivand = home-manager.lib.homeManagerConfiguration {
         modules = [ ./home/laptop.nix ];
-	pkgs = import nixpkgs { system = "x86_64-linux"; };
+        pkgs = import nixpkgs { system = "x86_64-linux"; overlays = [ emacs-overlay.overlay ]; };
       };
     };
   };
diff --git a/home/emacs.nix b/home/emacs.nix
new file mode 100644
index 0000000..5752221
--- /dev/null
+++ b/home/emacs.nix
@@ -0,0 +1,3 @@
+{pkgs, emacs, ...}: {
+	
+}
diff --git a/home/laptop.nix b/home/laptop.nix
index 8665e6f..d0b95c1 100644
--- a/home/laptop.nix
+++ b/home/laptop.nix
@@ -48,10 +48,10 @@
         catppuccin
       ];
       extraConfig = ''
-                        set -g default-command "''${SHELL}"
-                	set -g default-terminal "tmux-256color"
-        		set -g base-index 1
-			set -s escape-time 0
+                                set -g default-command "''${SHELL}"
+                        	set -g default-terminal "tmux-256color"
+                		set -g base-index 1
+        			set -s escape-time 0
       '';
     };
     swaylock = {
@@ -85,9 +85,9 @@
         stylua
       ];
       plugins = with pkgs.vimPlugins; [
-	nvim-surround
-	nvim-ts-autotag
-	vim-prisma
+        nvim-surround
+        nvim-ts-autotag
+        vim-prisma
         autoclose-nvim
         barbar-nvim
         cmp-nvim-lsp
@@ -107,6 +107,10 @@
       ];
       extraLuaConfig = lib.fileContents ./cfg/nvim/init.lua;
     };
+    emacs = {
+      enable = true;
+      package = pkgs.emacsGit;
+    };
     zsh = {
       enable = true;
       syntaxHighlighting.enable = true;
@@ -119,7 +123,7 @@
         gac = "ga && gc";
         ga = "git add .";
         gc = "git commit";
-	dev = "nix develop --command $SHELL";
+        dev = "nix develop --command $SHELL";
       };
       history = {
         size = 1000;
@@ -176,4 +180,10 @@
       '';
     };
   };
+  services = {
+    emacs = {
+      enable = true;
+      package = pkgs.emacsGit;
+    };
+  };
 }