From 1bbf628ea91ec3e7beb9457f6e28ae803d23df6c Mon Sep 17 00:00:00 2001
From: materus <materus@podkos.pl>
Date: Wed, 25 Oct 2023 19:28:25 +0200
Subject: [PATCH] configurations: update emacs conf

---
 .../profile/common/packages/fonts.nix         |  3 ++-
 configurations/profile/home/editor/emacs.nix  | 24 +++++++++++++++++--
 extraFiles/config/{ => emacs}/doom/config.el  |  0
 extraFiles/config/{ => emacs}/doom/init.el    |  0
 .../config/{ => emacs}/doom/packages.el       |  0
 extraFiles/config/emacs/materus/config.el     |  1 +
 6 files changed, 25 insertions(+), 3 deletions(-)
 rename extraFiles/config/{ => emacs}/doom/config.el (100%)
 rename extraFiles/config/{ => emacs}/doom/init.el (100%)
 rename extraFiles/config/{ => emacs}/doom/packages.el (100%)
 create mode 100644 extraFiles/config/emacs/materus/config.el

diff --git a/configurations/profile/common/packages/fonts.nix b/configurations/profile/common/packages/fonts.nix
index 6a9006f..2afc3b5 100644
--- a/configurations/profile/common/packages/fonts.nix
+++ b/configurations/profile/common/packages/fonts.nix
@@ -16,6 +16,7 @@ let
     pkgs.noto-fonts-cjk-serif
     pkgs.wqy_zenhei
     pkgs.corefonts
+    (pkgs.nerdfonts.override { fonts = [ "FiraCode"]; })
     
   ] ++ defaultFonts;
 
@@ -23,7 +24,7 @@ let
     pkgs.ubuntu_font_family
     pkgs.monocraft
     pkgs.hack-font
-    (pkgs.nerdfonts.override { fonts = [ "FiraCode" "DroidSansMono" "Meslo" "ProFont" ]; })
+    (pkgs.nerdfonts.override { fonts = [ "DroidSansMono" "Meslo" "ProFont" ]; })
   ];
 in
 {
diff --git a/configurations/profile/home/editor/emacs.nix b/configurations/profile/home/editor/emacs.nix
index 22791cd..5b1a7f6 100644
--- a/configurations/profile/home/editor/emacs.nix
+++ b/configurations/profile/home/editor/emacs.nix
@@ -1,6 +1,7 @@
-{ config, lib, pkgs, materusPkgs, ... }:
+{ config, lib, pkgs, materusPkgs, materusFlake, ... }:
 let
   cfg = config.materus.profile.editor.emacs;
+  configPath = "${materusFlake.selfPath}" + "/extraFiles/config/emacs/materus/"; 
   emacsPkgs = with pkgs;[
     python3
     lua
@@ -26,14 +27,27 @@ in
       enable = true;
       package = with pkgs; lib.mkDefault (if pkgs ? emacs-pgtk then emacs-pgtk else emacs-gtk);
       extraPackages = epkgs: with epkgs; [
-        magit
         evil
+        evil-numbers
+        evil-mc
+        evil-tex
+        evil-nerd-commenter
+
+        magit
         helm
         avy
         corfu
+        ivy
         vterm
         centaur-tabs
         treemacs
+        treemacs-evil
+        treemacs-nerd-icons
+        tree-edit
+        doom-modeline
+        nerd-icons
+        nerd-icons-completion
+        load-relative
 
         lsp-mode
         d-mode
@@ -41,6 +55,9 @@ in
         org
         markdown-mode
         json-mode
+
+        vscode-dark-plus-theme
+        kaolin-themes
       ];
       extraConfig = ''
         ;;;; Set emacs PATH
@@ -49,6 +66,9 @@ in
         ${builtins.concatStringsSep "\n" (builtins.map (x: "(setq exec-path (append exec-path '(\""+x+"/bin\")))" ) emacsPkgs)}
       
         ;;;; Done setting PATH
+
+        ; Load Config file
+         (load-file "${configPath + "config.el"}")
       '';
     };
 
diff --git a/extraFiles/config/doom/config.el b/extraFiles/config/emacs/doom/config.el
similarity index 100%
rename from extraFiles/config/doom/config.el
rename to extraFiles/config/emacs/doom/config.el
diff --git a/extraFiles/config/doom/init.el b/extraFiles/config/emacs/doom/init.el
similarity index 100%
rename from extraFiles/config/doom/init.el
rename to extraFiles/config/emacs/doom/init.el
diff --git a/extraFiles/config/doom/packages.el b/extraFiles/config/emacs/doom/packages.el
similarity index 100%
rename from extraFiles/config/doom/packages.el
rename to extraFiles/config/emacs/doom/packages.el
diff --git a/extraFiles/config/emacs/materus/config.el b/extraFiles/config/emacs/materus/config.el
new file mode 100644
index 0000000..33dfb1e
--- /dev/null
+++ b/extraFiles/config/emacs/materus/config.el
@@ -0,0 +1 @@
+(set-frame-font "FiraCode Nerd Font" nil t)
\ No newline at end of file