configurations: update emacs conf

This commit is contained in:
Mateusz Słodkowicz 2023-10-25 19:28:25 +02:00
parent 614dea0e57
commit 1bbf628ea9
Signed by: materus
GPG Key ID: 28D140BCA60B4FD1
6 changed files with 25 additions and 3 deletions

View File

@ -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
{

View File

@ -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"}")
'';
};

View File

@ -0,0 +1 @@
(set-frame-font "FiraCode Nerd Font" nil t)