diff options
| -rw-r--r-- | .config/emacs/init.el | 2 | ||||
| -rw-r--r-- | .config/emacs/org/config.org | 144 | ||||
| -rw-r--r-- | .config/x11/xresources | 9 |
3 files changed, 88 insertions, 67 deletions
diff --git a/.config/emacs/init.el b/.config/emacs/init.el index cc7906e..c3a6e93 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -37,7 +37,7 @@ '(jdee-db-spec-breakpoint-face-colors (cons "#1c1f2b" "#676E95")) '(objed-cursor-color "#ff5370") '(package-selected-packages - '(eyebrowse diff-hl difflib fzf helm-fuzzy helm-fuzzy-find helm-ag evil-numbers ccls org-superstar company-lsp lsp-ui lsp-mode evil-mc evil-surround cl-format company-irony neotree irony xr font-utils org-evil evil-vimish-fold crontab-mode symon toc-org yaml-mode helm-w3m helm-mu htmlize babel org-pdftools shell-pop which-key dmenu lua-mode dionysos helm-c-yasnippet helm-emms emms font-lock-cl restart-emacs w3m string-utils go-mode major-mode-icons dired-icon mode-icons evil-collection sed-mode zones kaolin-themes gruvbox-theme helm-themes yasnippet-classic-snippets yasnippet-snippets auto-yasnippet php-auto-yasnippets el-autoyas yasnippet cargo evil-ediff windresize helm-make spacemacs-theme centaur-tabs evil-magit dashboard ssh sudo-ext dockerfile-mode docker frame-local ov dash-functional helm-addressbook org-mime flyspell-correct pdf-tools websocket request emojify-logos emojify oauth2 circe web-mode doom-themes doom-modeline all-the-icons-dired all-the-icons-gnus all-the-icons html5-schema phps-mode org-babel-eval-in-repl rust-mode smart-mode-line-powerline-theme eshell-prompt-extras eshell-fixed-prompt pyenv-mode s realgud-lldb ranger ## color-theme-modern auto-complete-c-headers command-log-mode auto-complete magit smart-tabs-mode airline-themes paredit autopair tabbar-ruler tabbar use-package-el-get color-theme-approximate diminish rainbow-delimiters color-identifiers-mode use-package helm evil-visual-mark-mode)) + '(ibuffer-vc ibuffer-projectile eyebrowse diff-hl difflib fzf helm-fuzzy helm-fuzzy-find helm-ag evil-numbers ccls org-superstar company-lsp lsp-ui lsp-mode evil-mc evil-surround cl-format company-irony neotree irony xr font-utils org-evil evil-vimish-fold crontab-mode symon toc-org yaml-mode helm-w3m helm-mu htmlize babel org-pdftools shell-pop which-key dmenu lua-mode dionysos helm-c-yasnippet helm-emms emms font-lock-cl restart-emacs w3m string-utils go-mode major-mode-icons dired-icon mode-icons evil-collection sed-mode zones kaolin-themes gruvbox-theme helm-themes yasnippet-classic-snippets yasnippet-snippets auto-yasnippet php-auto-yasnippets el-autoyas yasnippet cargo evil-ediff windresize helm-make spacemacs-theme centaur-tabs evil-magit dashboard ssh sudo-ext dockerfile-mode docker frame-local ov dash-functional helm-addressbook org-mime flyspell-correct pdf-tools websocket request emojify-logos emojify oauth2 circe web-mode doom-themes doom-modeline all-the-icons-dired all-the-icons-gnus all-the-icons html5-schema phps-mode org-babel-eval-in-repl rust-mode smart-mode-line-powerline-theme eshell-prompt-extras eshell-fixed-prompt pyenv-mode s realgud-lldb ranger ## color-theme-modern auto-complete-c-headers command-log-mode auto-complete magit smart-tabs-mode airline-themes paredit autopair tabbar-ruler tabbar use-package-el-get color-theme-approximate diminish rainbow-delimiters color-identifiers-mode use-package helm evil-visual-mark-mode)) '(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 f95b7c7..18c8a7f 100644 --- a/.config/emacs/org/config.org +++ b/.config/emacs/org/config.org @@ -141,9 +141,9 @@ (setq evil-want-C-u-scroll t) (require 'evil) (require 'evil-magit) - ;; (require 'evil-collection) + (require 'evil-collection) (evil-mode t) - ;; (evil-collection-init) + (evil-collection-init 'ibuffer) (setq evil-emacs-state-cursor '("#b16286" box)) @@ -213,56 +213,56 @@ *** Centaur tabs #+BEGIN_SRC emacs-lisp - (require 'centaur-tabs) - (centaur-tabs-mode t) - (centaur-tabs-group-by-projectile-project) - - (evil-define-key 'insert global-map (kbd "M-k") 'centaur-tabs-backward) - (evil-define-key 'insert global-map (kbd "M-j") 'centaur-tabs-forward) - (evil-define-key 'replace global-map (kbd "M-k") 'centaur-tabs-backward) - (evil-define-key 'replace global-map (kbd "M-j") 'centaur-tabs-forward) - (evil-define-key 'normal global-map (kbd "M-k") 'centaur-tabs-backward) - (evil-define-key 'normal global-map (kbd "M-j") 'centaur-tabs-forward) - (global-set-key (kbd "M-k") 'centaur-tabs-backward) - (global-set-key (kbd "M-j") 'centaur-tabs-forward) - - (setq centaur-tabs-set-icons t - centaur-tabs-gray-out-icons 'buffer - centaur-tabs-set-close-button nil - centaur-tabs-set-modified-marker t - centaur-tabs-modified-marker "[+]" - centaur-tabs-height 32 - centaur-tabs-style "bar" - centaur-tabs-set-bar 'left - centaur-tabs-change-fonts "mononoki Nerd Font:pixelsize=15") - - (defun centaur-tabs-hide-tab (x) - (let ((name (format "%s" x))) - (or - (string-prefix-p "*epc" name) - (string-prefix-p "*helm" name) - (string-prefix-p "*Helm" name) - (string-prefix-p "*Compile-Log*" name) - (string-prefix-p "*compilation*" name) - (string-prefix-p "*Flymake diagnostics" name) - (string-prefix-p "*lsp" name) - (string-prefix-p "*scratch*" name) - (string-prefix-p "*Messages*" name) - (string-prefix-p "todo.org" name) - (string-prefix-p "*Mingus Help*" name) - (string-prefix-p "*Mingus*" name) - (string-prefix-p "*Mingus Browser*" name) - (string-prefix-p "TAGS" name) - (string-prefix-p "*lsp-ui-doc" name) - (and (string-prefix-p "magit" name) - (not (file-name-extension name)))))) - - (add-hook 'dashboard-mode-hook #'centaur-tabs-local-mode) - (add-hook 'neotree-mode-hook #'centaur-tabs-local-mode) - (add-hook 'calendar-mode-hook #'centaur-tabs-local-mode) - (add-hook 'org-agenda-mode-hook #'centaur-tabs-local-mode) - (add-hook 'helpful-mode-hook #'centaur-tabs-local-mode) - (add-hook 'term-mode-hook #'centaur-tabs-local-mode) + ;; (require 'centaur-tabs) + ;; (centaur-tabs-mode t) + ;; (centaur-tabs-group-by-projectile-project) + + ;; (evil-define-key 'insert global-map (kbd "M-k") 'centaur-tabs-backward) + ;; (evil-define-key 'insert global-map (kbd "M-j") 'centaur-tabs-forward) + ;; (evil-define-key 'replace global-map (kbd "M-k") 'centaur-tabs-backward) + ;; (evil-define-key 'replace global-map (kbd "M-j") 'centaur-tabs-forward) + ;; (evil-define-key 'normal global-map (kbd "M-k") 'centaur-tabs-backward) + ;; (evil-define-key 'normal global-map (kbd "M-j") 'centaur-tabs-forward) + ;; (global-set-key (kbd "M-k") 'centaur-tabs-backward) + ;; (global-set-key (kbd "M-j") 'centaur-tabs-forward) + + ;; (setq centaur-tabs-set-icons t + ;; centaur-tabs-gray-out-icons 'buffer + ;; centaur-tabs-set-close-button nil + ;; centaur-tabs-set-modified-marker t + ;; centaur-tabs-modified-marker "[+]" + ;; centaur-tabs-height 32 + ;; centaur-tabs-style "bar" + ;; centaur-tabs-set-bar 'left + ;; centaur-tabs-change-fonts "mononoki Nerd Font:pixelsize=15") + + ;; (defun centaur-tabs-hide-tab (x) + ;; (let ((name (format "%s" x))) + ;; (or + ;; (string-prefix-p "*epc" name) + ;; (string-prefix-p "*helm" name) + ;; (string-prefix-p "*Helm" name) + ;; (string-prefix-p "*Compile-Log*" name) + ;; (string-prefix-p "*compilation*" name) + ;; (string-prefix-p "*Flymake diagnostics" name) + ;; (string-prefix-p "*lsp" name) + ;; (string-prefix-p "*scratch*" name) + ;; (string-prefix-p "*Messages*" name) + ;; (string-prefix-p "todo.org" name) + ;; (string-prefix-p "*Mingus Help*" name) + ;; (string-prefix-p "*Mingus*" name) + ;; (string-prefix-p "*Mingus Browser*" name) + ;; (string-prefix-p "TAGS" name) + ;; (string-prefix-p "*lsp-ui-doc" name) + ;; (and (string-prefix-p "magit" name) + ;; (not (file-name-extension name)))))) + + ;; (add-hook 'dashboard-mode-hook #'centaur-tabs-local-mode) + ;; (add-hook 'neotree-mode-hook #'centaur-tabs-local-mode) + ;; (add-hook 'calendar-mode-hook #'centaur-tabs-local-mode) + ;; (add-hook 'org-agenda-mode-hook #'centaur-tabs-local-mode) + ;; (add-hook 'helpful-mode-hook #'centaur-tabs-local-mode) + ;; (add-hook 'term-mode-hook #'centaur-tabs-local-mode) #+END_SRC *** Dashboard @@ -282,7 +282,8 @@ show-week-agenda-p t) (setq dashboard-items '((projects . 10) - (recents . 10))) + (recents . 10) + (bookmarks . 10))) (add-to-list 'evil-emacs-state-modes 'dashboard-mode) #+END_SRC @@ -724,6 +725,17 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer." (setq eyebrowse-new-workspace t) #+END_SRC +*** ibuffer + #+BEGIN_SRC emacs-lisp + (require 'ibuffer) + (require 'ibuffer-vc) + (require 'ibuffer-projectile) + (add-hook 'ibuffer-hook + (lambda () + (ibuffer-projectile-set-filter-groups) + (unless (eq ibuffer-sorting-mode 'alphabetic) + (ibuffer-do-sort-by-alphabetic)))) + #+END_SRC ** Compilation *** Close window after errorless compilation #+BEGIN_SRC emacs-lisp @@ -747,15 +759,17 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer." #+END_SRC ** Other key bindings -#+BEGIN_SRC emacs-lisp -(global-set-key [f1] 'shell-pop) -(global-set-key [f2] 'neotree-toggle) -(global-set-key [f3] 'flymake-show-diagnostics-buffer) -(global-set-key [f4] 'helm-make-projectile) -(global-set-key [f5] 'undo-tree-visualize) -(global-set-key (kbd "C-x d") 'dired) -(global-set-key (kbd "M-9") 'shell-command) -(global-set-key (kbd "M-0") 'async-shell-command) - -(shell-pop--set-shell-type 'my/shell-pop-shell-type my/shell-pop-shell-type) -#+END_SRC + #+BEGIN_SRC emacs-lisp + (global-set-key [f1] 'shell-pop) + (global-set-key [f2] 'neotree-toggle) + (global-set-key [f3] 'flymake-show-diagnostics-buffer) + (global-set-key [f4] 'helm-make-projectile) + (global-set-key [f5] 'undo-tree-visualize) + (global-set-key (kbd "C-x d") 'dired) + (global-set-key (kbd "C-x b") 'helm-buffers-list) + (global-set-key (kbd "C-x C-b") 'ibuffer) + (global-set-key (kbd "M-9") 'shell-command) + (global-set-key (kbd "M-0") 'async-shell-command) + + (shell-pop--set-shell-type 'my/shell-pop-shell-type my/shell-pop-shell-type) + #+END_SRC diff --git a/.config/x11/xresources b/.config/x11/xresources index 3475eb8..424818a 100644 --- a/.config/x11/xresources +++ b/.config/x11/xresources @@ -1,3 +1,10 @@ +Xft.dpi: 96 +Xft.antialias: true +Xft.hinting: true +Xft.rgba: rgb +Xft.autohint: false +Xft.hintstyle: hintslight +Xft.lcdfilter: lcddefault Xcursor.theme: redglass Xcursor.size: 18 -Sxiv.background: #1d2021 +xiv.background: #1d2021 |