mirror of
https://codeberg.org/andyscott/dotfiles.git
synced 2024-12-22 01:43:10 -05:00
Import changes from laptop-hidpi branch
This commit is contained in:
parent
1b902820f4
commit
2539f6ac96
GPG key ID:
3EB62D0BBB8DB381
1 changed files with 72 additions and 58 deletions
130
emacs.d/init.el
130
emacs.d/init.el
|
|
@ -6,9 +6,10 @@
|
|||
(scroll-bar-mode -1) ; Disable visible scrollbar
|
||||
(tool-bar-mode -1) ; Disable the toolbar
|
||||
(tooltip-mode -1) ; Disable tooltips
|
||||
(set-fringe-mode 10) ; Give some breathing room
|
||||
(set-fringe-mode 10) ; Add come extra space to the left/right sides
|
||||
(menu-bar-mode -1) ; Disable the menu bar
|
||||
(setq-default custom-file null-device) ; Write customizations not in this file to the null device (AKA stop littering in my init.el)
|
||||
(setq confirm-kill-processes nil) ; Stop asking about running processes on exit
|
||||
|
||||
;; Visible bell
|
||||
(setq visible-bell t)
|
||||
|
|
@ -67,11 +68,11 @@
|
|||
conf-mode-hook))
|
||||
(add-hook mode (lambda () (display-line-numbers-mode 1))))
|
||||
|
||||
;; Show vertical line at column 80 to keep code clean in prog-mode
|
||||
;; Show vertical line at column 80 in prog-mode
|
||||
(setq-default fill-column 80)
|
||||
(add-hook 'prog-mode-hook #'display-fill-column-indicator-mode)
|
||||
|
||||
; Override some modes which derive from the above
|
||||
; No line numbers in org-mode
|
||||
(dolist (mode '(org-mode-hook))
|
||||
(add-hook mode (lambda () (display-line-numbers-mode 0))))
|
||||
|
||||
|
|
@ -121,9 +122,7 @@
|
|||
(setq custom-safe-themes t)
|
||||
|
||||
;; (use-package everforest
|
||||
;; :straight (:type git :repo "https://git.sr.ht/~theorytoe/everforest-theme")
|
||||
;; :config
|
||||
;; (load-theme 'everforest-hard-dark t))
|
||||
;; :straight (:type git :repo "https://git.sr.ht/~theorytoe/everforest-theme"))
|
||||
|
||||
;; (use-package gruvbox-theme
|
||||
;; :config
|
||||
|
|
@ -292,7 +291,8 @@
|
|||
(eval-when-compile
|
||||
(require 'cl-lib))
|
||||
(require 'dap-python)
|
||||
(require 'dap-node)
|
||||
;(require 'dap-node)
|
||||
(require 'dap-lldb)
|
||||
:bind
|
||||
(:map dap-mode-map
|
||||
("<f5>" . dap-debug)
|
||||
|
|
@ -335,8 +335,9 @@
|
|||
|
||||
;; C/C++
|
||||
|
||||
;(setq-default c-default-style "k&r")
|
||||
;(setq-default c-basic-offset 2)
|
||||
(setq dap-lldb-debug-program '("/usr/bin/lldb-vscode"))
|
||||
(setq-default c-default-style "k&r")
|
||||
(setq-default c-basic-offset 2)
|
||||
|
||||
;(use-package ccls
|
||||
; :hook ((c-mode c++-mode objc-mode cuda-mode) .
|
||||
|
|
@ -348,9 +349,9 @@
|
|||
|
||||
;; Golang
|
||||
|
||||
(use-package go-mode
|
||||
:config
|
||||
(add-hook 'before-save-hook #'lsp-organize-imports))
|
||||
;; (use-package go-mode
|
||||
;; :config
|
||||
;; (add-hook 'before-save-hook #'lsp-organize-imports))
|
||||
|
||||
;; Java
|
||||
|
||||
|
|
@ -358,35 +359,35 @@
|
|||
|
||||
;; JavaScript/TypeScript, HTML, CSS
|
||||
|
||||
(setq css-indent-level 2)
|
||||
(setq css-indent-offset 2)
|
||||
(setq js-indent-level 2)
|
||||
;; (setq css-indent-level 2)
|
||||
;; (setq css-indent-offset 2)
|
||||
;; (setq js-indent-level 2)
|
||||
|
||||
(add-to-list 'auto-mode-alist '("\\.mjs\\'" . js-mode))
|
||||
;; (add-to-list 'auto-mode-alist '("\\.mjs\\'" . js-mode))
|
||||
|
||||
(use-package js2-mode
|
||||
:config
|
||||
(add-to-list 'interpreter-mode-alist '("#!/usr/bin/env node" . js2-mode))
|
||||
;(setq js2-strict-missing-semi-warning t)
|
||||
(setq js2-mode-show-strict-warnings t)
|
||||
:hook (js-mode . js2-minor-mode))
|
||||
;; (use-package js2-mode
|
||||
;; :config
|
||||
;; (add-to-list 'interpreter-mode-alist '("#!/usr/bin/env node" . js2-mode))
|
||||
;; ;(setq js2-strict-missing-semi-warning t)
|
||||
;; (setq js2-mode-show-strict-warnings t)
|
||||
;; :hook (js-mode . js2-minor-mode))
|
||||
|
||||
(use-package typescript-mode
|
||||
:config
|
||||
(setq typescript-indent-level 2)
|
||||
:mode ("\\.ts\\'" . typescript-mode)
|
||||
("\\.tsx\\'" . typescript-mode))
|
||||
;; (use-package typescript-mode
|
||||
;; :config
|
||||
;; (setq typescript-indent-level 2)
|
||||
;; :mode ("\\.ts\\'" . typescript-mode)
|
||||
;; ("\\.tsx\\'" . typescript-mode))
|
||||
|
||||
(use-package restclient
|
||||
:init
|
||||
(use-package company-restclient)
|
||||
:mode ("\\.http\\'" . restclient-mode))
|
||||
;; (use-package restclient
|
||||
;; :init
|
||||
;; (use-package company-restclient)
|
||||
;; :mode ("\\.http\\'" . restclient-mode))
|
||||
|
||||
(use-package rainbow-mode
|
||||
:hook
|
||||
((js-mode . rainbow-mode)
|
||||
(typescript-mode . rainbow-mode)
|
||||
(web-mode . rainbow-mode)))
|
||||
;; (use-package rainbow-mode
|
||||
;; :hook
|
||||
;; ((js-mode . rainbow-mode)
|
||||
;; (typescript-mode . rainbow-mode)
|
||||
;; (web-mode . rainbow-mode)))
|
||||
|
||||
;; (use-package skewer-mode
|
||||
;; :init
|
||||
|
|
@ -403,36 +404,36 @@
|
|||
|
||||
;; (use-package simple-httpd)
|
||||
|
||||
(use-package web-mode
|
||||
:config
|
||||
(setq web-mode-code-indent-offset 2)
|
||||
(setq web-mode-markup-indent-offset 2)
|
||||
(setq web-mode-attribute-indent-offset 2)
|
||||
:mode
|
||||
(("\\.phtml\\'" . web-mode)
|
||||
("\\.tpl\\.php\\'" . web-mode)
|
||||
("\\.jsp\\'" . web-mode)
|
||||
("\\.as[cp]x\\'" . web-mode)
|
||||
("\\.erb\\'" . web-mode)
|
||||
("\\.mustache\\'" . web-mode)
|
||||
("\\.djhtml\\'" . web-mode)
|
||||
("\\.jst.ejs\\'" . web-mode)
|
||||
("\\.html?\\'" . web-mode)))
|
||||
;; (use-package web-mode
|
||||
;; :config
|
||||
;; (setq web-mode-code-indent-offset 2)
|
||||
;; (setq web-mode-markup-indent-offset 2)
|
||||
;; (setq web-mode-attribute-indent-offset 2)
|
||||
;; :mode
|
||||
;; (("\\.phtml\\'" . web-mode)
|
||||
;; ("\\.tpl\\.php\\'" . web-mode)
|
||||
;; ("\\.jsp\\'" . web-mode)
|
||||
;; ("\\.as[cp]x\\'" . web-mode)
|
||||
;; ("\\.erb\\'" . web-mode)
|
||||
;; ("\\.mustache\\'" . web-mode)
|
||||
;; ("\\.djhtml\\'" . web-mode)
|
||||
;; ("\\.jst.ejs\\'" . web-mode)
|
||||
;; ("\\.html?\\'" . web-mode)))
|
||||
|
||||
(use-package jsdoc
|
||||
:straight (jsdoc :type git :host github :repo "isamert/jsdoc.el")
|
||||
:bind ("C-c C-n" . jsdoc))
|
||||
;; (use-package jsdoc
|
||||
;; :straight (jsdoc :type git :host github :repo "isamert/jsdoc.el")
|
||||
;; :bind ("C-c C-n" . jsdoc))
|
||||
|
||||
;; LaTeX
|
||||
|
||||
(use-package lsp-latex)
|
||||
;; (use-package lsp-latex)
|
||||
|
||||
(setq lsp-tex-server 'digestif)
|
||||
;; (setq lsp-tex-server 'digestif)
|
||||
|
||||
|
||||
;; Protocol Buffers
|
||||
|
||||
(use-package protobuf-mode)
|
||||
;; (use-package protobuf-mode)
|
||||
|
||||
;; Python
|
||||
|
||||
|
|
@ -450,6 +451,17 @@
|
|||
:config
|
||||
(setq numpydoc-insert-examples-block nil))
|
||||
|
||||
(use-package conda
|
||||
:init
|
||||
(setq conda-anaconda-home (expand-file-name "/opt/miniconda3"))
|
||||
(setq conda-env-home-directory (expand-file-name "~/.conda/envs"))
|
||||
(conda-env-initialize-interactive-shells)
|
||||
;(conda-env-autoactivate-mode)
|
||||
:hook
|
||||
('find-file-hook . (lambda ()
|
||||
(when (bound-and-true-p conda-project-env-path)
|
||||
(conda-env-activate-for-buffer)))))
|
||||
|
||||
;; Rust
|
||||
|
||||
;(use-package rust-mode)
|
||||
|
|
@ -467,7 +479,9 @@
|
|||
|
||||
;; Syntax checking
|
||||
(use-package flycheck
|
||||
:hook (lsp-mode . flycheck-mode))
|
||||
:hook (lsp-mode . flycheck-mode)
|
||||
:config
|
||||
(setq flycheck-python-flake8-executable "flake8"))
|
||||
|
||||
;; Templating
|
||||
(use-package yasnippet
|
||||
|
|
|
|||
Loading…
Reference in a new issue