diff options
| -rw-r--r-- | .config/emacs/init.el | 2 | ||||
| -rw-r--r-- | .config/emacs/org/config.org | 8 | ||||
| -rw-r--r-- | .config/zsh/alias.zsh | 3 |
3 files changed, 6 insertions, 7 deletions
diff --git a/.config/emacs/init.el b/.config/emacs/init.el index a07e428..9017c5a 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -41,7 +41,7 @@ '(jdee-db-spec-breakpoint-face-colors (cons "#1c1f2b" "#676E95")) '(objed-cursor-color "#ff5370") '(package-selected-packages - '(edit-indirect yaml-mode lua-mode company-nginx company-fuzzy company-go company-shell helm-ag rainbow-identifiers nginx-mode evil-quickscope vc-fossil crontab-mode go-mode mutt-mode pacmacs gemini-mode org-evil glsl-mode vimrc-mode windresize evil evil-collection evil-leader evil-search-highlight-persist evil-mc evil-surround evil-ediff evil-visual-mark-mode evil-nerd-commenter evil-vimish-fold evil-numbers yasnippet yasnippet-classic-snippets yasnippet-snippets auto-yasnippet el-autoyas helm helm-xref helm-etags-plus helm-fuzzy helm-themes helm-make helm-projectile projectile company company-box which-key magit undo-tree shell-pop autopair paredit rainbow-delimiters color-identifiers-mode ibuffer-vc ibuffer-projectile eyebrowse diff-hl fzf font-utils restart-emacs string-utils dired-icon kaolin-themes doom-themes spacemacs-theme doom-modeline dashboard org-superstar toc-org pdf-tools dockerfile-mode web-mode ssh sudo-ext vimish-fold bind-key all-the-icons all-the-icons-dired all-the-icons-ibuffer)) + '(treemacs edit-indirect yaml-mode lua-mode company-nginx company-fuzzy company-go company-shell helm-ag rainbow-identifiers nginx-mode evil-quickscope vc-fossil crontab-mode go-mode mutt-mode pacmacs gemini-mode org-evil glsl-mode vimrc-mode windresize evil evil-collection evil-leader evil-search-highlight-persist evil-mc evil-surround evil-ediff evil-visual-mark-mode evil-nerd-commenter evil-vimish-fold evil-numbers yasnippet yasnippet-classic-snippets yasnippet-snippets auto-yasnippet el-autoyas helm helm-xref helm-etags-plus helm-fuzzy helm-themes helm-make helm-projectile projectile company company-box which-key magit undo-tree shell-pop autopair paredit rainbow-delimiters color-identifiers-mode ibuffer-vc ibuffer-projectile eyebrowse diff-hl fzf font-utils restart-emacs string-utils dired-icon kaolin-themes doom-themes spacemacs-theme doom-modeline dashboard org-superstar toc-org pdf-tools dockerfile-mode web-mode ssh sudo-ext vimish-fold bind-key all-the-icons all-the-icons-dired all-the-icons-ibuffer)) '(pdf-view-midnight-colors (cons "#EEFFFF" "#292D3E")) '(pos-tip-background-color "#2E2A29") '(pos-tip-foreground-color "#d4d4d6") diff --git a/.config/emacs/org/config.org b/.config/emacs/org/config.org index 43135ec..f7dd039 100644 --- a/.config/emacs/org/config.org +++ b/.config/emacs/org/config.org @@ -76,7 +76,7 @@ evil-visual-mark-mode evil-nerd-commenter evil-vimish-fold evil-numbers evil-quickscope lsp-mode lsp-ui - ccls + ;; ccls yasnippet yasnippet-classic-snippets yasnippet-snippets auto-yasnippet el-autoyas helm helm-xref helm-lsp helm-etags-plus helm-fuzzy helm-themes helm-make helm-projectile projectile @@ -247,7 +247,7 @@ (evil-mode t) (evil-collection-init 'ibuffer) (evil-collection-init 'magit) - ;; (evil-collection-init 'flymake) + (evil-collection-init 'flymake) (setq evil-emacs-state-cursor '("#b16286" box)) @@ -610,7 +610,7 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer." #+BEGIN_SRC emacs-lisp (require 'lsp-mode) (require 'lsp-ui) - (require 'ccls) + ;; (require 'ccls) (require 'company) (require 'company-box) (require 'yasnippet) @@ -655,8 +655,6 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer." (require 'lsp-clangd) (setq lsp-clangd-executable "/usr/local/llvm13/bin/clangd") - (add-hook 'c-mode-hook 'lsp-clangd-c-enable) - (add-hook 'c++-mode-hook 'lsp-clangd-c++-enable) ;; (setq ccls-executable "ccls") diff --git a/.config/zsh/alias.zsh b/.config/zsh/alias.zsh index cf49267..7608b7a 100644 --- a/.config/zsh/alias.zsh +++ b/.config/zsh/alias.zsh @@ -188,5 +188,6 @@ alias watch='cmdwatch' \ calcurse='calcurse -C $XDG_CONFIG_HOME/calcurse -D $XDG_DATA_HOME/calcurse' \ abook='abook -C $XDG_CONFIG_HOME/abook/abookrc --datafile $XDG_DATA_HOME/abook/addressbook' \ dosbox='dosbox -conf $XDG_CONFIG_HOME/dosbox/dosbox.conf' \ - gpg='gpg2' + gpg='gpg2' \ + mysql='mycli -u root -h' \ wget='wget --hsts-file="$XDG_CACHE_HOME/wget-hsts"' |