diff options
| -rw-r--r-- | emacs | 6 | ||||
| -rw-r--r-- | emacs.d/custom.el | 2 | ||||
| -rw-r--r-- | kshrc | 1 | ||||
| -rw-r--r-- | profile | 4 |
4 files changed, 12 insertions, 1 deletions
@@ -268,10 +268,15 @@ ;; LSP (unless (package-installed-p 'tuareg) (package-install 'tuareg)) +(unless (package-installed-p 'nix-ts-mode) + (package-install 'nix-ts-mode)) +(require 'nix-ts-mode) +(add-to-list 'auto-mode-alist '("\\.nix\\'" . nix-ts-mode)) (use-package tree-sitter-langs :ensure t :defer t) +(global-tree-sitter-mode) (setq treesit-language-source-alist '((bash "https://github.com/tree-sitter/tree-sitter-bash") (cmake "https://github.com/uyha/tree-sitter-cmake") @@ -285,6 +290,7 @@ (ocaml "https://github.com/alemuller/tree-sitter-ocaml") (markdown "https://github.com/ikatyang/tree-sitter-markdown") (python "https://github.com/tree-sitter/tree-sitter-python") + (nix "https://github.com/tree-sitter/tree-sitter-nix") (toml "https://github.com/tree-sitter/tree-sitter-toml") (tsx "https://github.com/tree-sitter/tree-sitter-typescript" "master" "tsx/src") (typescript "https://github.com/tree-sitter/tree-sitter-typescript" "master" "typescript/src") diff --git a/emacs.d/custom.el b/emacs.d/custom.el index 35d8dd2..5524964 100644 --- a/emacs.d/custom.el +++ b/emacs.d/custom.el @@ -72,7 +72,7 @@ '(org-babel-load-languages '((emacs-lisp . t) (lisp . t) (shell . t))) '(org-fold-core-style 'overlays) '(package-selected-packages - '(slime eat avy monotropic-theme tempel vundo add-node-modules-path prettier password-store vc-fossil eldoc-box mu4e direnv elpher w3m elfeed-protocol elfeed ligature copilot f editorconfig s quelpa-use-package quelpa org-mime org-journal which-key consult orderless vertico markdown-mode smartparens tree-sitter-langs diff-hl magit corfu rg almost-mono-themes git-ps1-mode meow)) + '(nix-mode nix-ts-mode slime eat avy monotropic-theme tempel vundo add-node-modules-path prettier password-store vc-fossil eldoc-box mu4e direnv elpher w3m elfeed-protocol elfeed ligature copilot f editorconfig s quelpa-use-package quelpa org-mime org-journal which-key consult orderless vertico markdown-mode smartparens tree-sitter-langs diff-hl magit corfu rg almost-mono-themes git-ps1-mode meow)) '(project-switch-commands '((project-find-file "Find file" nil) (project-find-regexp "Find regexp" nil) @@ -9,6 +9,7 @@ alias lsrc="lsrc -d ~/rcm" alias rcdn="rcdn -d ~/rcm" alias mkrc="mkrc -d ~/rcm" alias infols="inxi -S -c 0" +alias de='eval "$(direnv export bash)"' alias f-commit="fossil commit && fossil git export" PS1='$(git branch 2> /dev/null | grep "^\*" | colrm 1 2 | sed -e "s/$/./")${PWD##*/} ' eval "$(direnv export bash)" @@ -16,6 +16,10 @@ export PF_ALIGN="7" export PF_COLOR="0" export PATH=${PATH}:~/.local/bin export ENV=$HOME/.kshrc +export HISTFILE=$HOME/.history +export HISTSIZE=65535 eval "$(direnv export bash)" emacs --daemon + if [ "$(tty)" == "/dev/tty1" ]; then exec dbus-run-session hikari; fi + |