Generic commit
modules/sound: added jack and other stuff satori: kernel and pkg changes home/xmonad: some keybind changes emacs: some more configuration updates, this took me quite some time to configure but i dont see myself using it at all since neovim is still much much more efficient for me
This commit is contained in:
221
modules/emacs/#init.el#
Normal file
221
modules/emacs/#init.el#
Normal file
@@ -0,0 +1,221 @@
|
||||
;; -*- lexical-binding:t -*-
|
||||
|
||||
;;colors
|
||||
(setq
|
||||
c-bg "#1d2021"
|
||||
c-fg "#d5c4a1"
|
||||
c-red "#cc241d"
|
||||
c-green "#98971a"
|
||||
c-yellow "#d79921"
|
||||
c-blue "#458588"
|
||||
c-magenta "#b16286"
|
||||
c-cyan "#689d6a"
|
||||
c-white "#a89984"
|
||||
c-black "#928374"
|
||||
c-red-2 "#fb4934"
|
||||
c-green-2 "#b8bb26"
|
||||
c-yellow-2 "#fabd2f"
|
||||
c-blue-2 "#83a598"
|
||||
c-magenta-2 "#d3869b"
|
||||
c-cyan-2 "#8ec07c"
|
||||
c-white-2 "#ebdbb2")
|
||||
;;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)
|
||||
(tab-bar-mode t)
|
||||
(fringe-mode 0)
|
||||
(global-display-line-numbers-mode 1)
|
||||
(setq initial-major-mode 'emacs-lisp-mode)
|
||||
(setq frame-resize-pixelwise t)
|
||||
(setq auto-window-vscroll nil)
|
||||
(setq scroll-step 1)
|
||||
|
||||
;;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
|
||||
(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)
|
||||
(ivy-mode 1))
|
||||
|
||||
(use-package elcord
|
||||
:config
|
||||
(elcord-mode 1))
|
||||
|
||||
(use-package undo-tree
|
||||
:config
|
||||
(global-undo-tree-mode 1))
|
||||
|
||||
(use-package evil
|
||||
:config
|
||||
(evil-set-undo-system 'undo-tree)
|
||||
(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-display-current-project-exclusively)
|
||||
(treemacs-git-mode 'deferred))
|
||||
|
||||
(use-package treemacs-evil
|
||||
:config
|
||||
(define-key evil-treemacs-state-map (kbd "n") #'treemacs-next-line)
|
||||
(define-key evil-treemacs-state-map (kbd "e") #'treemacs-previous-line)
|
||||
(define-key evil-treemacs-state-map (kbd "M-n") #'treemacs-next-neighbour)
|
||||
(define-key evil-treemacs-state-map (kbd "M-e") #'treemacs-previous-neighbour)
|
||||
(define-key evil-treemacs-state-map (kbd "M-N") #'treemacs-next-line-other-window)
|
||||
(define-key evil-treemacs-state-map (kbd "M-E") #'treemacs-previous-line-other-window)
|
||||
(define-key evil-treemacs-state-map (kbd "M") #'treemacs-collapse-parent-node)
|
||||
(evil-define-key 'treemacs treemacs-mode-map (kbd "m") #'treemacs-COLLAPSE-action)
|
||||
(evil-define-key 'treemacs treemacs-mode-map (kbd "i") #'treemacs-RET-action)
|
||||
)
|
||||
|
||||
(use-package lsp-mode
|
||||
:init
|
||||
(setq )
|
||||
:config
|
||||
(lsp-mode 1))
|
||||
|
||||
(use-package lsp-treemacs
|
||||
:config
|
||||
(lsp-treemacs-sync-mode 1))
|
||||
|
||||
(use-package lsp-ui
|
||||
:init
|
||||
(setq lsp-ui-doc-show-with-cursor t)
|
||||
:config
|
||||
(lsp-ui-peek-enable 1)
|
||||
(lsp-ui-doc-enable 1))
|
||||
|
||||
(use-package company
|
||||
:after lsp-mode
|
||||
:config
|
||||
(define-key company-active-map (kbd "C-n") 'company-select-next)
|
||||
(define-key company-active-map (kbd "C-e") 'company-select-previous)
|
||||
(define-key company-search-map (kbd "C-n") 'company-select-next)
|
||||
(define-key company-search-map (kbd "C-e") 'company-select-previous))
|
||||
|
||||
(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 flex-autopair
|
||||
:config
|
||||
(flex-autopair-mode 1))
|
||||
|
||||
(use-package rainbow-mode
|
||||
:config
|
||||
(rainbow-mode 1))
|
||||
|
||||
(use-package rustic)
|
||||
|
||||
(use-package magit)
|
||||
|
||||
(use-package nix-mode
|
||||
:mode "\\.nix\\'")
|
||||
|
||||
(defface bufname
|
||||
`((t :foreground ,c-fg
|
||||
:background ,c-bg
|
||||
:weight bold
|
||||
))
|
||||
"Custom face for buffer name"
|
||||
:group 'mode-line-faces )
|
||||
|
||||
(defface majmode
|
||||
`((t :foreground ,c-fg
|
||||
:background ,c-bg
|
||||
))
|
||||
"Custom face for major mode"
|
||||
:group 'mode-line-faces )
|
||||
|
||||
(defface gitmode
|
||||
`((t :foreground ,c-fg
|
||||
:background ,c-red-2
|
||||
:weight bold
|
||||
))
|
||||
"Custom face for VC"
|
||||
:group 'mode-line-faces )
|
||||
(defface infomode
|
||||
`((t :foreground ,c-bg
|
||||
:background ,c-green
|
||||
:weight bold
|
||||
))
|
||||
"For showing line and column number"
|
||||
:group 'mode-line-faces )
|
||||
|
||||
|
||||
(setq-default mode-line-format
|
||||
'((:propertize " %b " face bufname)
|
||||
(vc-mode (:propertize (" " vc-mode " " ) face gitmode))
|
||||
(:propertize (" " mode-name " ") face majmode)
|
||||
(:propertize ("[[ %l | %c || %p . %+%@ ]]") face infomode)
|
||||
("%-")))
|
||||
|
||||
(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)))
|
||||
(let ((default-color (cons (face-background 'mode-line)
|
||||
(face-foreground 'mode-line))))
|
||||
(add-hook 'post-command-hook
|
||||
(lambda ()
|
||||
(let ((color (cond ((minibufferp) default-color)
|
||||
((evil-insert-state-p) (cons c-magenta c-fg))
|
||||
((evil-visual-state-p) (cons c-cyan c-fg))
|
||||
((evil-normal-state-p) (cons c-fg c-bg))
|
||||
((buffer-modified-p) (cons c-blue c-fg))
|
||||
(t default-color))))
|
||||
(set-face-background 'bufname (car color))
|
||||
(set-face-foreground 'bufname (cdr color))
|
||||
))))
|
||||
|
||||
;;keybinds
|
||||
|
||||
(add-hook 'emacs-startup-hook (lambda ()
|
||||
(when (get-buffer "*scratch*")
|
||||
(kill-buffer "*scratch*"))))
|
||||
|
||||
(global-set-key (kbd "M-o") 'treemacs)
|
||||
(global-set-key (kbd "M-v") 'split-window-vertically)
|
||||
(global-set-key (kbd "M-h") 'split-window-horizontally)
|
||||
(global-set-key (kbd "M-C-m") 'shrink-window-horizontally)
|
||||
(global-set-key (kbd "M-C-i") 'enlarge-window-horizontally)
|
||||
(global-set-key (kbd "M-C-e") 'shrink-window)
|
||||
(global-set-key (kbd "M-C-n") 'enlarge-window)
|
||||
(global-set-key (kbd "C-S-m") 'windmove-left)
|
||||
(global-set-key (kbd "C-S-i") 'windmove-right)
|
||||
(global-set-key (kbd "C-S-e") 'windmove-up)
|
||||
(global-set-key (kbd "C-S-n") 'windmove-down)
|
||||
(global-set-key (kbd "M-S-,") 'previous-buffer)
|
||||
(global-set-key (kbd "M-S-.") 'next-buffer)
|
||||
(global-set-key (kbd "M-C-S-q") '(kill-buffer))
|
||||
@@ -1,56 +1,66 @@
|
||||
{pkgs, ... }:
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
services.emacs = {
|
||||
enable = true;
|
||||
package = with pkgs; emacsWithPackagesFromUsePackage {
|
||||
config = ./init.el;
|
||||
package = emacsGcc;
|
||||
alwaysEnsure = true;
|
||||
extraEmacsPackages = epkgs: with epkgs; [
|
||||
use-package
|
||||
tsc
|
||||
];
|
||||
services.emacs = {
|
||||
enable = true;
|
||||
package = with pkgs; emacsWithPackagesFromUsePackage {
|
||||
config = ./init.el;
|
||||
package = emacsGcc;
|
||||
alwaysEnsure = true;
|
||||
extraEmacsPackages = epkgs: with epkgs; [
|
||||
use-package
|
||||
tsc
|
||||
];
|
||||
|
||||
#https://github.com/NixOS/nixpkgs/issues/108089
|
||||
override = epkgs : epkgs // {
|
||||
tsc = epkgs.melpaPackages.tsc.overrideAttrs(oa:
|
||||
let
|
||||
version = "0.15.2";
|
||||
tsc-dyn = fetchurl {
|
||||
url = "https://github.com/emacs-tree-sitter/elisp-tree-sitter/releases/download/${version}/tsc-dyn.so";
|
||||
sha256 = "sha256-oOq/TAooHRUo7JypCblrB/ztABowAHv2LRhFL/ZmVrg=";
|
||||
};
|
||||
in {
|
||||
postInstall = ''
|
||||
cp ${tsc-dyn} $out/share/emacs/site-lisp/elpa/tsc-${oa.version}/tsc-dyn.so
|
||||
echo -n ${version} > $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.7";
|
||||
src = fetchzip {
|
||||
url = "https://github.com/emacs-tree-sitter/tree-sitter-langs/releases/download/${version}/tree-sitter-grammars-linux-${version}.tar.gz";
|
||||
sha256 = "sha256-pdSMyTUUAj4JsRLbJMUMbQSOaSEYlsaqVdmaXtXtSJw=";
|
||||
stripRoot = false;
|
||||
};
|
||||
installPhase = ''
|
||||
install -d $out/langs/bin
|
||||
install -m444 * $out/langs/bin
|
||||
'';
|
||||
postInstall = ''
|
||||
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\""
|
||||
'';
|
||||
});
|
||||
gruvbox-theme = epkgs.melpaPackages.gruvbox-theme.overrideAttrs(_: { patches = [ ./gruvbox-el.patch ]; } );
|
||||
#https://github.com/NixOS/nixpkgs/issues/108089
|
||||
override = epkgs: epkgs // {
|
||||
tsc = epkgs.melpaPackages.tsc.overrideAttrs (oa:
|
||||
let
|
||||
version = "0.16.1";
|
||||
tsc-dyn = fetchurl {
|
||||
url = "https://github.com/emacs-tree-sitter/elisp-tree-sitter/releases/download/${version}/tsc-dyn.so";
|
||||
sha256 = "sha256-l2mVxnnO43rzLWbOAnX5UZ0a7uk0EPE2x0Jl9rd2D1A=";
|
||||
};
|
||||
in
|
||||
{
|
||||
postInstall = ''
|
||||
cp ${tsc-dyn} $out/share/emacs/site-lisp/elpa/tsc-${oa.version}/tsc-dyn.so
|
||||
echo -n ${version} > $out/share/emacs/site-lisp/elpa/tsc-${oa.version}/DYN-VERSION
|
||||
'';
|
||||
});
|
||||
tree-sitter-langs = epkgs.melpaPackages.tree-sitter-langs.overrideAttrs (oa:
|
||||
let
|
||||
version = "0.10.14";
|
||||
tree-sitter-grammars = super.stdenv.mkDerivation rec {
|
||||
inherit version;
|
||||
name = "tree-sitter-grammars";
|
||||
src = fetchzip {
|
||||
url = "https://github.com/emacs-tree-sitter/tree-sitter-langs/releases/download/${version}/tree-sitter-grammars-linux-${version}.tar.gz";
|
||||
sha256 = "sha256-J8VplZWhyWN8ur74Ep0CTl4nPtESzfs2Gh6MxfY5Zqc=";
|
||||
stripRoot = false;
|
||||
};
|
||||
installPhase = ''
|
||||
install -d $out/langs/bin
|
||||
echo -n "${version}" > $out/langs/bin/BUNDLE-VERSION
|
||||
install -m444 * $out/langs/bin
|
||||
'';
|
||||
};
|
||||
in
|
||||
{
|
||||
src = fetchFromGitHub {
|
||||
owner = "emacs-tree-sitter";
|
||||
repo = "tree-sitter-langs";
|
||||
rev = version;
|
||||
sha256 = "sha256-uKfkhcm1k2Ov4fSr7ALVnpQoX/l9ssEWMn761pa7Y/c=";
|
||||
};
|
||||
postPatch = ''
|
||||
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\""
|
||||
'';
|
||||
});
|
||||
gruvbox-theme = epkgs.melpaPackages.gruvbox-theme.overrideAttrs (_: { patches = [ ./gruvbox-el.patch ]; });
|
||||
};
|
||||
};
|
||||
};};
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
;; -*- lexical-binding:t -*-
|
||||
|
||||
;;colors
|
||||
(setq
|
||||
c-bg "#1d2021"
|
||||
@@ -24,7 +23,8 @@ c-white-2 "#ebdbb2")
|
||||
(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)
|
||||
(scroll-bar-mode 0)
|
||||
(tool-bar-mode 0)
|
||||
(menu-bar-mode 0)
|
||||
(fringe-mode 0)
|
||||
(global-display-line-numbers-mode 1)
|
||||
@@ -73,10 +73,10 @@ c-white-2 "#ebdbb2")
|
||||
(use-package treemacs
|
||||
:config
|
||||
(treemacs-filewatch-mode 1)
|
||||
; (treemacs-display-current-project-exclusively)
|
||||
(treemacs-git-mode 'deferred))
|
||||
|
||||
(use-package treemacs-evil
|
||||
:config
|
||||
(use-package treemacs-evil :config
|
||||
(define-key evil-treemacs-state-map (kbd "n") #'treemacs-next-line)
|
||||
(define-key evil-treemacs-state-map (kbd "e") #'treemacs-previous-line)
|
||||
(define-key evil-treemacs-state-map (kbd "M-n") #'treemacs-next-neighbour)
|
||||
@@ -89,18 +89,30 @@ c-white-2 "#ebdbb2")
|
||||
)
|
||||
|
||||
(use-package lsp-mode
|
||||
:init
|
||||
(setq )
|
||||
:config
|
||||
(lsp-mode 1))
|
||||
|
||||
(use-package lsp-treemacs
|
||||
:config
|
||||
(lsp-treemacs-sync-mode))
|
||||
(lsp-treemacs-sync-mode 1))
|
||||
|
||||
(use-package lsp-ui
|
||||
:init
|
||||
(setq lsp-ui-doc-show-with-cursor t)
|
||||
:config
|
||||
(lsp-ui-peek-enable 1)
|
||||
(lsp-ui-doc-enable 1))
|
||||
|
||||
(use-package company
|
||||
:after lsp-mode
|
||||
:config
|
||||
(define-key company-active-map (kbd "C-n") 'company-select-next)
|
||||
(define-key company-active-map (kbd "C-e") 'company-select-previous)
|
||||
(define-key company-search-map (kbd "C-n") 'company-select-next)
|
||||
(define-key company-search-map (kbd "C-e") 'company-select-previous))
|
||||
|
||||
(use-package tree-sitter-langs)
|
||||
|
||||
(use-package tree-sitter
|
||||
@@ -128,6 +140,23 @@ c-white-2 "#ebdbb2")
|
||||
(use-package nix-mode
|
||||
:mode "\\.nix\\'")
|
||||
|
||||
(use-package projectile)
|
||||
|
||||
(use-package vterm)
|
||||
|
||||
(use-package vterm-toggle
|
||||
:config
|
||||
(setq vterm-toggle-fullscreen-p nil)
|
||||
(add-to-list 'display-buffer-alist
|
||||
'((lambda(bufname _) (with-current-buffer bufname (equal major-mode 'vterm-mode)))
|
||||
(display-buffer-reuse-window display-buffer-at-bottom)
|
||||
(reusable-frames . visible)
|
||||
(window-height . 0.4)))
|
||||
(global-set-key [f1] 'vterm-toggle)
|
||||
(global-set-key [C-f1] 'vterm-toggle-cd)
|
||||
(define-key vterm-mode-map (kbd "C-N") 'vterm-toggle-forward)
|
||||
(define-key vterm-mode-map (kbd "C-E") 'vterm-toggle-backward))
|
||||
|
||||
(defface bufname
|
||||
`((t :foreground ,c-fg
|
||||
:background ,c-bg
|
||||
@@ -135,7 +164,6 @@ c-white-2 "#ebdbb2")
|
||||
))
|
||||
"Custom face for buffer name"
|
||||
:group 'mode-line-faces )
|
||||
|
||||
(defface majmode
|
||||
`((t :foreground ,c-fg
|
||||
:background ,c-bg
|
||||
@@ -183,3 +211,19 @@ c-white-2 "#ebdbb2")
|
||||
(set-face-background 'bufname (car color))
|
||||
(set-face-foreground 'bufname (cdr color))
|
||||
))))
|
||||
|
||||
;;keybinds
|
||||
(global-set-key (kbd "M-o") 'treemacs)
|
||||
(global-set-key (kbd "M-v") 'split-window-vertically)
|
||||
(global-set-key (kbd "M-h") 'split-window-horizontally)
|
||||
(global-set-key (kbd "M-C-m") 'shrink-window-horizontally)
|
||||
(global-set-key (kbd "M-C-i") 'enlarge-window-horizontally)
|
||||
(global-set-key (kbd "M-C-e") 'shrink-window)
|
||||
(global-set-key (kbd "M-C-n") 'enlarge-window)
|
||||
(global-set-key (kbd "C-S-m") 'windmove-left)
|
||||
(global-set-key (kbd "C-S-i") 'windmove-right)
|
||||
(global-set-key (kbd "C-S-e") 'windmove-up)
|
||||
(global-set-key (kbd "C-S-n") 'windmove-down)
|
||||
(global-set-key (kbd "M->") 'previous-buffer)
|
||||
(global-set-key (kbd "M-<") 'next-buffer)
|
||||
(global-set-key (kbd "M-C-S-q") 'kill-buffer)
|
||||
|
||||
Reference in New Issue
Block a user