natto1784/dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

misc changes

Browse Source 
new services, random config updates
This commit is contained in:
Amneesh Singh
2021-11-30 06:31:53 +05:30
parent 21212a5cf4
commit 6130b448e0
23 changed files with 507 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
modules/emacs/default.nix
View File

@@ -1,63 +1,56 @@
{ pkgs, config, ... }:
{pkgs, ... }:
{
environment.systemPackages = with pkgs; [
(emacsWithPackagesFromUsePackage {
config = ./init.el;
package = emacsGcc;
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;
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 {
/* 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
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.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;
};
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
echo -n $version > $out/langs/bin/BUNDLE-VERSION
'';
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\""
'';
# 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/
# '';
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 ]; } );
};
})
];
gruvbox-theme = epkgs.melpaPackages.gruvbox-theme.overrideAttrs(_: { patches = [ ./gruvbox-el.patch ]; } );
};
};};
}

46
modules/emacs/init.el
View File

@@ -19,20 +19,19 @@ c-blue-2 "#83a598"
c-magenta-2 "#d3869b"
c-cyan-2 "#8ec07c"
c-white-2 "#ebdbb2")
;(setq vc-handled-backends nil) ; vc is slow as fuck with git
;;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)
(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)
(setq frame-resize-pixelwise t)
(setq auto-window-vscroll nil)
(setq scroll-step 1)
;;add packages and shit
(require 'package)
@@ -56,9 +55,13 @@ c-white-2 "#ebdbb2")
:config
(elcord-mode 1))
(use-package undo-tree
:config
(global-undo-tree-mode 1))
(use-package evil
:config
(setq evil-undo-system 'undo-redo)
(evil-set-undo-system 'undo-tree)
(evil-mode 1))
(use-package evil-colemak-basics
@@ -82,7 +85,8 @@ c-white-2 "#ebdbb2")
(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))
(evil-define-key 'treemacs treemacs-mode-map (kbd "i") #'treemacs-RET-action)
)
(use-package lsp-mode
:config
@@ -121,12 +125,22 @@ c-white-2 "#ebdbb2")
(use-package magit)
(use-package nix-mode
:mode "\\.nix\\'")
(defface bufname
`((t :foreground ,c-fg
:background ,c-bg
:weight bold
))
"Custom faces for buffer name"
"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
@@ -134,13 +148,23 @@ c-white-2 "#ebdbb2")
:background ,c-red-2
:weight bold
))
"Custom face for git branch"
"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))))
(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