emacs update
moved emacs from home-manager packages to system packages updated config to use tree-sitter and lsp-mode
This commit is contained in:
62
modules/emacs/default.nix
Normal file
62
modules/emacs/default.nix
Normal file
@@ -0,0 +1,62 @@
|
||||
{ pkgs, config, ... }:
|
||||
{
|
||||
environment.systemPackages = with pkgs; [
|
||||
(emacsWithPackagesFromUsePackage {
|
||||
config = ./init.el;
|
||||
alwaysEnsure = true;
|
||||
extraEmacsPackages = epkgs: with epkgs; [
|
||||
use-package
|
||||
tsc
|
||||
];
|
||||
override = epkgs : epkgs // {
|
||||
tsc = epkgs.melpaPackages.tsc.overrideAttrs(oa:
|
||||
let
|
||||
version = "0.15.1";
|
||||
tsc-dyn = fetchurl {
|
||||
url = "https://github.com/emacs-tree-sitter/elisp-tree-sitter/releases/download/${version}/tsc-dyn.so";
|
||||
sha256 = "sha256-TrwyQZEfARHfafT4IhxR+p7vpjSuw9lUcgOSwCvPxe4=";
|
||||
};
|
||||
version-file = writeText "DYN-VERSION" version;
|
||||
in {
|
||||
/* src = fetchFromGitHub {
|
||||
owner = "emacs-tree-sitter";
|
||||
repo = "elisp-tree-sitter";
|
||||
rev = version;
|
||||
sha256 = "sha256-dGWg4dj+85kxytvm+nNEJUN9UXdr9L6pSRz5OqDMFAM=";
|
||||
};*/
|
||||
postInstall = ''
|
||||
cp ${tsc-dyn} $out/share/emacs/site-lisp/elpa/tsc-${oa.version}/tsc-dyn.so
|
||||
cp ${version-file} $out/share/emacs/site-lisp/elpa/tsc-${oa.version}/DYN-VERSION
|
||||
'';
|
||||
});
|
||||
tree-sitter-langs = epkgs.melpaPackages.tree-sitter-langs.overrideAttrs (oa:
|
||||
let
|
||||
tree-sitter-grammars = super.stdenv.mkDerivation rec {
|
||||
name = "tree-sitter-grammars";
|
||||
version = "0.10.4";
|
||||
src = fetchzip {
|
||||
url = "https://github.com/emacs-tree-sitter/tree-sitter-langs/releases/download/${version}/tree-sitter-grammars-linux-${version}.tar.gz";
|
||||
sha256 = "sha256-Z+JtuGLTCVhCJBR60cbcDgWtdKcoYGWoeI5u9GcfvUQ=";
|
||||
stripRoot = false;
|
||||
};
|
||||
installPhase = ''
|
||||
install -d $out/langs/bin
|
||||
install -m444 * $out/langs/bin
|
||||
echo -n $version > $out/langs/bin/BUNDLE-VERSION
|
||||
'';
|
||||
};
|
||||
in {
|
||||
postPatch = oa.postPatch or "" + ''
|
||||
substituteInPlace ./tree-sitter-langs-build.el \
|
||||
--replace "tree-sitter-langs-grammar-dir tree-sitter-langs--dir" "tree-sitter-langs-grammar-dir \"${tree-sitter-grammars}/langs\""
|
||||
'';
|
||||
# postInstall = oa.postInstall or "" + ''
|
||||
# mkdir $out/share/emacs/site-lisp/elpa/tree-sitter-langs-${oa.version}/bin
|
||||
# cp ${binaries}/* $out/share/emacs/site-lisp/elpa/tree-sitter-langs-${oa.version}/bin/
|
||||
# '';
|
||||
});
|
||||
gruvbox-theme = epkgs.melpaPackages.gruvbox-theme.overrideAttrs(_: { patches = [ ./gruvbox-el.patch ]; } );
|
||||
};
|
||||
})
|
||||
];
|
||||
}
|
||||
19
modules/emacs/gruvbox-el.patch
Normal file
19
modules/emacs/gruvbox-el.patch
Normal file
@@ -0,0 +1,19 @@
|
||||
--- a/gruvbox.el 2021-05-17 21:19:07.731014155 +0530
|
||||
+++ b/gruvbox.el 2021-05-17 21:20:11.297990471 +0530
|
||||
@@ -162,11 +162,11 @@
|
||||
|
||||
|
||||
;; line numbers
|
||||
- (line-number (:foreground gruvbox-dark4 :background gruvbox-dark1))
|
||||
- (line-number-current-line (:foreground gruvbox-bright_orange :background gruvbox-dark2))
|
||||
- (linum (:foreground gruvbox-dark4 :background gruvbox-dark1))
|
||||
- (linum-highlight-face (:foreground gruvbox-bright_orange :background gruvbox-dark2))
|
||||
- (linum-relative-current-face (:foreground gruvbox-bright_orange :background gruvbox-dark2))
|
||||
+ (line-number (:foreground gruvbox-dark4 :background nil))
|
||||
+ (line-number-current-line (:foreground gruvbox-bright_orange :background gruvbox-dark1))
|
||||
+ (linum (:foreground gruvbox-dark4 :background nil))
|
||||
+ (linum-highlight-face (:foreground gruvbox-bright_orange :background gruvbox-dark1))
|
||||
+ (linum-relative-current-face (:foreground gruvbox-bright_orange :background gruvbox-dark1))
|
||||
|
||||
;; Highlight indentation mode
|
||||
(highlight-indentation-current-column-face (:background gruvbox-dark2))
|
||||
101
modules/emacs/init.el
Normal file
101
modules/emacs/init.el
Normal file
@@ -0,0 +1,101 @@
|
||||
;;settings
|
||||
(setq display-line-numbers-type 'relative)
|
||||
(setq inhibit-startup-screen t)
|
||||
(set-face-attribute 'default nil :font "Monoid" :height 120)
|
||||
(global-hl-line-mode 1)
|
||||
(scroll-bar-mode 0)
|
||||
(tool-bar-mode 0)
|
||||
(menu-bar-mode 0)
|
||||
(fringe-mode 0)
|
||||
(global-display-line-numbers-mode 1)
|
||||
(setq initial-major-mode 'emacs-lisp-mode)
|
||||
|
||||
;;add packages and shit
|
||||
(require 'package)
|
||||
(add-to-list 'package-archives '("melpa" . "http://melpa.org/packages/"))
|
||||
(package-initialize)
|
||||
(require 'use-package)
|
||||
|
||||
|
||||
;;package config and modes
|
||||
(use-package gruvbox-theme
|
||||
:init
|
||||
(load-theme 'gruvbox-dark-hard t))
|
||||
|
||||
(use-package ivy
|
||||
:config
|
||||
(ivy-mode 1))
|
||||
|
||||
(use-package elcord
|
||||
:config
|
||||
(elcord-mode 1))
|
||||
|
||||
(use-package evil
|
||||
:config
|
||||
(evil-mode 1))
|
||||
|
||||
(use-package evil-colemak-basics
|
||||
:init
|
||||
(setq evil-colemak-basics-layout-mod 'mod-dh)
|
||||
:config
|
||||
(global-evil-colemak-basics-mode 1))
|
||||
|
||||
(use-package treemacs
|
||||
:config
|
||||
(treemacs-filewatch-mode 1)
|
||||
(treemacs-git-mode 'deferred))
|
||||
|
||||
(use-package treemacs-evil
|
||||
:bind (:map evil-treemacs-state-map
|
||||
("n" . treemacs-next-line)
|
||||
("e" . treemacs-previous-line)
|
||||
("M-n" . treemacs-next-neighbour)
|
||||
("M-e" . treemacs-previous-neighbour)
|
||||
("M-N" . treemacs-next-line-other-window)
|
||||
("M-E" . treemacs-previous-line-other-window)
|
||||
("M" . treemacs-collapse-parent-node))
|
||||
:init
|
||||
|
||||
(use-package lsp-mode
|
||||
:config
|
||||
(lsp-mode 1))
|
||||
|
||||
(use-package lsp-treemacs
|
||||
:config
|
||||
(lsp-treemacs-sync-mode))
|
||||
|
||||
(use-package lsp-ui
|
||||
:config
|
||||
(lsp-ui-peek-enable 1)
|
||||
(lsp-ui-doc-enable 1))
|
||||
|
||||
(use-package tree-sitter-langs)
|
||||
|
||||
(use-package tree-sitter
|
||||
:config
|
||||
(global-tree-sitter-mode)
|
||||
:init
|
||||
(add-to-list 'tree-sitter-major-mode-language-alist '(fundamental-mode . bash))
|
||||
(add-hook 'tree-sitter-after-on-hook #'tree-sitter-hl-mode))
|
||||
|
||||
(use-package rainbow-delimiters
|
||||
:hook (prog-mode . rainbow-delimiters-mode))
|
||||
|
||||
;(use-package rustic)
|
||||
|
||||
;;keybinds
|
||||
;ivy
|
||||
(define-key ivy-minibuffer-map (kbd "C-n") 'ivy-next-line)
|
||||
(define-key ivy-minibuffer-map (kbd "C-e") 'ivy-previous-line)
|
||||
(define-key ivy-minibuffer-map (kbd "C-i") 'ivy-done)
|
||||
|
||||
;evil-treemacs
|
||||
(evil-define-key 'treemacs treemacs-mode-map (kbd "m") #'treemacs-COLLAPSE-action)
|
||||
(evil-define-key 'treemacs treemacs-mode-map (kbd "i") #'treemacs-RET-action))
|
||||
|
||||
;;hooks
|
||||
;exclude line numbers
|
||||
(setq exclude-ln '(term-mode-hook eshell-mode-hook shell-mode-hook))
|
||||
(while exclude-ln
|
||||
(add-hook (car exclude-ln) (lambda () (display-line-numbers-mode 0)))
|
||||
(setq exclude-ln (cdr exclude-ln)))
|
||||
Reference in New Issue
Block a user