Browse Source

update

master
Brett Langdon 2 years ago
parent
commit
1a2108643d
No known key found for this signature in database GPG Key ID: C2BEA329670CD664
6 changed files with 36 additions and 10 deletions
  1. +13
    -7
      emacs.d/init.el
  2. +14
    -0
      emacs.d/layers/go/init.el
  3. +1
    -1
      emacs.d/layers/python/init.el
  4. +3
    -1
      emacs.d/layers/rust/init.el
  5. +1
    -1
      setup.sh
  6. +4
    -0
      zshrc.d/.env.zsh

+ 13
- 7
emacs.d/init.el View File

@ -320,7 +320,7 @@
(setq lsp-eldoc-enable-hover t)
(setq lsp-modeline-code-actions-enable nil)
(setq lsp-modeline-diagnostics-enable nil)
(setq lsp-headerline-breadcrumb-enable nil)
(setq lsp-headerline-breadcrumb-enable t)
(setq lsp-semantic-tokens-enable nil)
(setq lsp-enable-folding nil)
(setq lsp-enable-imenu nil)
@ -343,13 +343,19 @@
:defer t
:commands helm-lsp-workspace-symbol)
(use-package copilot
:quelpa (copilot :fetcher github
:repo "zerolfx/copilot.el"
:branch "main"
:files ("dist" "*.el")))
;; dap-mode
(use-package dap-mode
:defer t
:ensure t :after lsp-mode
:config
(dap-mode t)
(dap-ui-mode t))
;; (use-package dap-mode
;; :defer t
;; :ensure t :after lsp-mode
;; :config
;; (dap-mode t)
;; (dap-ui-mode t))
;; ;; Turn `C-]' into a sticky "super" modifier.
(define-key local-function-key-map [?\C-\]] 'event-apply-super-modifier)


+ 14
- 0
emacs.d/layers/go/init.el View File

@ -0,0 +1,14 @@
(defun lsp-go-install-save-hooks ()
(add-hook 'before-save-hook #'lsp-format-buffer t t)
(add-hook 'before-save-hook #'lsp-organize-imports t t))
(use-package go-mode
:defer t
:diminish go-mode
:ensure t
:mode (("\\.go\\'" . go-mode))
:init
(setq rust-format-on-save t)
:hook (go-mode . (lambda ()
(lsp)))
:hook (go-mode . lsp-go-install-save-hooks))

+ 1
- 1
emacs.d/layers/python/init.el View File

@ -44,4 +44,4 @@
;; Enable Flycheck for python
;; (enable-flycheck 'python-mode-hook)
(require 'dap-python)
;; (require 'dap-python)

+ 3
- 1
emacs.d/layers/rust/init.el View File

@ -4,4 +4,6 @@
:ensure t
:mode (("\\.rs\\'" . rust-mode))
:init
(setq rust-format-on-save t))
(setq rust-format-on-save t)
:hook (rust-mode . (lambda ()
(lsp)))) ; or lsp-deferred

+ 1
- 1
setup.sh View File

@ -8,7 +8,7 @@
dir=~/dotfiles # dotfiles directory
olddir=~/dotfiles_old # old dotfiles backup directory
files="emacs.d gitconfig gitignore_global psqlrc sqliterc zshrc.d zshrc" # list of files/folders to symlink in homedir
config_dir="~/.config/"
config_dir=~/.config/
config_files="starship.toml" # list of files for ~/config/
##########


+ 4
- 0
zshrc.d/.env.zsh View File

@ -8,6 +8,9 @@ setopt INC_APPEND_HISTORY_TIME
export HISTSIZE=1000000
export SAVEHIST=1000000
# Omit `/` from the list of word characters so delete work on a path only deletes sub-path and not the whole thing
export WORDCHARS=${WORDCHARS/\/}
export LC_ALL=en_US.UTF-8
export LANG=en_US.UTF-8
export TERM="xterm-256color"
@ -49,6 +52,7 @@ PATH="$HOME/.cargo/bin:$PATH"
PATH="~/.local/bin:/usr/local/bin:/usr/local/sbin:/sbin:$PATH"
PATH="$PATH:/usr/local/go/bin:$GOPATH/bin"
PATH="$HOME/.poetry/bin:$PATH"
PATH="/opt/homebrew/bin:$PATH"
command -v pyenv 2>&1 > /dev/null && PATH="$(pyenv root)/shims:${PATH}"
export PATH="$HOME/.rvm/bin:$PATH"
export MANPATH="/usr/local/opt/coreutils/libexec/gnuman:$MANPATH"


Loading…
Cancel
Save