Compare commits
No commits in common. "8235d8d0ae82087a3601813dae17126c2aa62b31" and "1353cfd91d8b033e0ec4fb476af44c920f22875c" have entirely different histories.
8235d8d0ae
...
1353cfd91d
@ -56,10 +56,4 @@
|
|||||||
:config
|
:config
|
||||||
(evil-collection-occur-setup))
|
(evil-collection-occur-setup))
|
||||||
|
|
||||||
(use-package hideshow
|
|
||||||
:straight (:type built-in)
|
|
||||||
:hook (prog-mode . hs-minor-mode)
|
|
||||||
:init
|
|
||||||
(general-def 'normal "zM" #'hs-hide-level))
|
|
||||||
|
|
||||||
(provide 'init-built-ins)
|
(provide 'init-built-ins)
|
||||||
|
@ -38,7 +38,6 @@
|
|||||||
(cider-known-endpoints
|
(cider-known-endpoints
|
||||||
'(("local" "localhost" "4005")))
|
'(("local" "localhost" "4005")))
|
||||||
(cider-prompt-for-symbol nil)
|
(cider-prompt-for-symbol nil)
|
||||||
(cider-comment-prefix ";; => ")
|
|
||||||
:hook ((clojure-mode . cider-mode)
|
:hook ((clojure-mode . cider-mode)
|
||||||
(clojurescript-mode . cider-mode)
|
(clojurescript-mode . cider-mode)
|
||||||
(clojurec-mode . cider-mode))
|
(clojurec-mode . cider-mode))
|
||||||
@ -50,7 +49,6 @@
|
|||||||
(cider-stacktrace-mode-map "SPC" leader-map)
|
(cider-stacktrace-mode-map "SPC" leader-map)
|
||||||
(normal cider-mode-map "M-." #'cider-find-var)
|
(normal cider-mode-map "M-." #'cider-find-var)
|
||||||
(cider-mode-map "C-c M-b" #'cider-debug-defun-at-point)
|
(cider-mode-map "C-c M-b" #'cider-debug-defun-at-point)
|
||||||
(cider-mode-map "C-c M-;" #'cider-pprint-eval-defun-to-comment)
|
|
||||||
(cider-repl-mode-map "C-c C-l" #'cider-repl-clear-buffer))
|
(cider-repl-mode-map "C-c C-l" #'cider-repl-clear-buffer))
|
||||||
|
|
||||||
(provide 'init-clojure)
|
(provide 'init-clojure)
|
||||||
|
@ -4,7 +4,6 @@
|
|||||||
:defer 2
|
:defer 2
|
||||||
:init
|
:init
|
||||||
(add-to-list 'auto-mode-alist '("\\.env\\'" . shell-script-mode))
|
(add-to-list 'auto-mode-alist '("\\.env\\'" . shell-script-mode))
|
||||||
(add-to-list 'auto-mode-alist '("\\.env.local\\'" . shell-script-mode))
|
|
||||||
:config
|
:config
|
||||||
(direnv-mode)
|
(direnv-mode)
|
||||||
(add-hook 'eshell-mode-hook #'direnv-update-directory-environment)
|
(add-hook 'eshell-mode-hook #'direnv-update-directory-environment)
|
||||||
|
@ -1,5 +0,0 @@
|
|||||||
(use-package elisp-mode
|
|
||||||
:straight (:type built-in)
|
|
||||||
:general
|
|
||||||
(emacs-lisp-mode-map "C-c C-c" #'eval-defun
|
|
||||||
"C-c C-k" #'eval-buffer))
|
|
@ -4,41 +4,6 @@
|
|||||||
(use-package nvm
|
(use-package nvm
|
||||||
:commands (nvm-use
|
:commands (nvm-use
|
||||||
nvm-use-for
|
nvm-use-for
|
||||||
nvm-use-for-buffer
|
nvm-use-for-buffer))
|
||||||
nvm--installed-versions)
|
|
||||||
:init
|
|
||||||
(defun nvm (version)
|
|
||||||
(interactive (list
|
|
||||||
(completing-read "Node version: "
|
|
||||||
(mapcar #'car
|
|
||||||
(nvm--installed-versions)))))
|
|
||||||
(nvm-use version)))
|
|
||||||
|
|
||||||
(use-package js
|
|
||||||
:straight (:type built-in)
|
|
||||||
:defer t
|
|
||||||
:config
|
|
||||||
(add-hook 'js-mode-hook #'lsp-deferred))
|
|
||||||
|
|
||||||
;; Make sure we load LSP in React files
|
|
||||||
(with-eval-after-load 'lsp-clients
|
|
||||||
(defun lsp-typescript-javascript-tsx-jsx-activate-p (filename major-mode)
|
|
||||||
"Checks if the javascript-typescript language server should be enabled
|
|
||||||
based on FILE-NAME and MAJOR-MODE"
|
|
||||||
(or (member major-mode '(typescript-mode typescript-tsx-mode js-mode js2-mode rjsx-mode))
|
|
||||||
(and (eq major-mode 'web-mode)
|
|
||||||
(or (string-suffix-p ".tsx" filename t)
|
|
||||||
(string-suffix-p ".jsx" filename t)
|
|
||||||
(string-suffix-p ".js" filename t))))))
|
|
||||||
|
|
||||||
(use-package js-comint
|
|
||||||
:commands (run-js)
|
|
||||||
:config
|
|
||||||
(js-do-use-nvm)
|
|
||||||
:general
|
|
||||||
(js-mode-map "C-c M-j" #'run-js
|
|
||||||
"C-x C-e" #'js-send-last-sexp
|
|
||||||
"C-c C-k" #'js-send-buffer
|
|
||||||
"C-c M-z" #'js-send-buffer-and-go))
|
|
||||||
|
|
||||||
(provide 'init-js)
|
(provide 'init-js)
|
||||||
|
@ -50,12 +50,4 @@
|
|||||||
kubectl-deployments
|
kubectl-deployments
|
||||||
kubectl-statefulsets))
|
kubectl-statefulsets))
|
||||||
|
|
||||||
(when (executable-find "k9s")
|
|
||||||
(defun k9s ()
|
|
||||||
(interactive)
|
|
||||||
(let ((k9s-buf (vterm "*k9s*")))
|
|
||||||
(switch-to-buffer k9s-buf)
|
|
||||||
(vterm-send-string (executable-find "k9s"))
|
|
||||||
(vterm-send-return))))
|
|
||||||
|
|
||||||
(provide 'init-kubernetes)
|
(provide 'init-kubernetes)
|
||||||
|
@ -360,7 +360,7 @@
|
|||||||
:name "spend-service"
|
:name "spend-service"
|
||||||
:tags '(lola backend)
|
:tags '(lola backend)
|
||||||
:command "~/lola/python_services/spend/bin/start.sh"
|
:command "~/lola/python_services/spend/bin/start.sh"
|
||||||
:args '("web-dev")
|
:args '("web")
|
||||||
:cwd "~/lola/python_services"
|
:cwd "~/lola/python_services"
|
||||||
:stop-signal 'int
|
:stop-signal 'int
|
||||||
:init-async (python-service-setup "~/lola/python_services/.venv"
|
:init-async (python-service-setup "~/lola/python_services/.venv"
|
||||||
|
@ -7,4 +7,5 @@
|
|||||||
(global-undo-tree-mode)
|
(global-undo-tree-mode)
|
||||||
:bind ("C-c C-r" . undo-tree-visualize))
|
:bind ("C-c C-r" . undo-tree-visualize))
|
||||||
|
|
||||||
|
|
||||||
(provide 'init-undo)
|
(provide 'init-undo)
|
||||||
|
@ -1,5 +1,3 @@
|
|||||||
;; -*- lexical-binding: t; -*-
|
|
||||||
|
|
||||||
(use-package vterm
|
(use-package vterm
|
||||||
:commands vterm
|
:commands vterm
|
||||||
:init
|
:init
|
||||||
|
@ -1,29 +0,0 @@
|
|||||||
;; -*- lexical-binding: t; -*-
|
|
||||||
|
|
||||||
(use-package web-mode
|
|
||||||
:mode (("\\.phtml\\'" . web-mode)
|
|
||||||
("\\.tpl\\.php\\'" . web-mode)
|
|
||||||
("\\.[agj]sp\\'" . web-mode)
|
|
||||||
("\\.as[cp]x\\'" . web-mode)
|
|
||||||
("\\.erb\\'" . web-mode)
|
|
||||||
("\\.mustache\\'" . web-mode)
|
|
||||||
("\\.djhtml\\'" . web-mode)
|
|
||||||
("\\.hbs\\'" . web-mode)
|
|
||||||
("\\.html?\\'" . web-mode)
|
|
||||||
("\\.jsx?\\'" . web-mode)
|
|
||||||
("\\.mako\\'" . web-mode)
|
|
||||||
("\\.jinja2\\'" . web-mode))
|
|
||||||
:config
|
|
||||||
(setq web-mode-engines-alist
|
|
||||||
'(("django" . "\\.jinja2\\'")))
|
|
||||||
(add-hook 'web-mode-hook
|
|
||||||
(lambda ()
|
|
||||||
(when (equal web-mode-content-type "javascript")
|
|
||||||
(web-mode-set-content-type "jsx"))
|
|
||||||
(when (or (equal web-mode-content-type "javascript")
|
|
||||||
(equal web-mode-content-type "jsx"))
|
|
||||||
(lsp-deferred))))
|
|
||||||
:custom
|
|
||||||
(web-mode-enable-auto-pairing nil))
|
|
||||||
|
|
||||||
(provide 'init-web)
|
|
@ -1,15 +0,0 @@
|
|||||||
;; -*- lexical-binding: t; -*-
|
|
||||||
|
|
||||||
(use-package nxml-mode
|
|
||||||
:straight (:type built-in)
|
|
||||||
:defer t
|
|
||||||
:config
|
|
||||||
(add-to-list 'hs-special-modes-alist
|
|
||||||
'(nxml-mode
|
|
||||||
"<!--\\|<[^/>]*[^/]>" ;; regexp for start block
|
|
||||||
"-->\\|</[^/>]*[^/]>" ;; regexp for end block
|
|
||||||
"<!--"
|
|
||||||
nxml-forward-element
|
|
||||||
nil)))
|
|
||||||
|
|
||||||
(provide 'init-xml)
|
|
@ -1,7 +1,5 @@
|
|||||||
;; -*- lexical-binding: t; -*-
|
;; -*- lexical-binding: t; -*-
|
||||||
|
|
||||||
(setq load-prefer-newer t)
|
|
||||||
|
|
||||||
;; Some startup time optimizations stolen from Doom emacs
|
;; Some startup time optimizations stolen from Doom emacs
|
||||||
(setq gc-cons-threshold most-positive-fixnum ; 2^61 bytes
|
(setq gc-cons-threshold most-positive-fixnum ; 2^61 bytes
|
||||||
gc-cons-percentage 0.6)
|
gc-cons-percentage 0.6)
|
||||||
|
@ -66,7 +66,6 @@
|
|||||||
(require 'init-keybindings)
|
(require 'init-keybindings)
|
||||||
(require 'init-auth)
|
(require 'init-auth)
|
||||||
(require 'init-lib)
|
(require 'init-lib)
|
||||||
(require 'init-elisp)
|
|
||||||
(require 'init-org)
|
(require 'init-org)
|
||||||
(require 'init-profiler)
|
(require 'init-profiler)
|
||||||
(require 'init-built-ins)
|
(require 'init-built-ins)
|
||||||
@ -89,8 +88,6 @@
|
|||||||
(require 'init-clojure)
|
(require 'init-clojure)
|
||||||
(require 'init-lisp)
|
(require 'init-lisp)
|
||||||
(require 'init-js)
|
(require 'init-js)
|
||||||
(require 'init-web)
|
|
||||||
(require 'init-xml)
|
|
||||||
(require 'init-yaml)
|
(require 'init-yaml)
|
||||||
(require 'init-groovy)
|
(require 'init-groovy)
|
||||||
(require 'init-terraform)
|
(require 'init-terraform)
|
||||||
|
Loading…
Reference in New Issue
Block a user