From 24589a4689ec7c4a3c722daeece04d76dd5b7f12 Mon Sep 17 00:00:00 2001
From: Akshay Nair <phenax5@gmail.com>
Date: Wed, 17 Feb 2021 23:30:14 +0530
Subject: Moves configuration around to modules

---
 home.nix | 49 +++++++++++--------------------------------------
 1 file changed, 11 insertions(+), 38 deletions(-)

(limited to 'home.nix')

diff --git a/home.nix b/home.nix
index 06edb7f..a70e8ca 100644
--- a/home.nix
+++ b/home.nix
@@ -1,55 +1,28 @@
-{ config, pkgs, ... }:
+{ config, pkgs, epkgs, ... }:
 let
   localPkgs = import ./packages/default.nix { pkgs = pkgs; };
 in {
   imports = [
-    ./modules/music.nix
     ./overlays-home.nix
+    ./modules/music.home.nix
+    ./modules/git.home.nix
   ];
 
   home.packages = with pkgs; [
     yarn
   ];
 
-  programs.lsd = {
+  programs.emacs = {
     enable = true;
-    enableAliases = true;
+  };
+  services.emacs = {
+    enable = true;
+    client.enable = true;
   };
 
-  programs.git = {
+  programs.lsd = {
     enable = true;
-    userEmail = "phenax5@gmail.com";
-    userName = "Akshay Nair";
-    ignores = [
-      "tags"
-      ".vim.session"
-      "tags.lock"
-      "tags.temp"
-    ];
-    aliases = {
-      ignore = "!gi() { curl -sL https://www.toptal.com/developers/gitignore/api/$@ ;}; gi";
-    };
-    extraConfig = {
-      "color" = {
-        "ui" = true;
-      };
-      "color \"diff-highlight\"" = {
-        oldNormal = "red bold";
-        oldHighlight = "red bold 52";
-        newNormal = "green bold";
-        newHighlight = "green bold 22";
-      };
-      "color \"diff\"" = {
-        meta = 11;
-        frag = "magenta bold";
-        commit = "yellow bold";
-        old = "red bold";
-        new = "green bold";
-        whitespace = "red reverse";
-      };
-    };
-    #signing.key = "GPG-KEY-ID";
-    #signing.signByDefault = true;
+    enableAliases = true;
   };
 
   services.syncthing = {
@@ -85,7 +58,7 @@ in {
     #'';
   };
 
-  services.network-manager-applet.enable = true;
+  # services.network-manager-applet.enable = true;
 
   xresources.properties = let
     bg = "#0f0c19";
-- 
cgit v1.3.1