diff options
| -rw-r--r-- | tag-emacs/emacs.d/init.org | 65 |
1 files changed, 28 insertions, 37 deletions
diff --git a/tag-emacs/emacs.d/init.org b/tag-emacs/emacs.d/init.org index 1a5ed53..68f2c7e 100644 --- a/tag-emacs/emacs.d/init.org +++ b/tag-emacs/emacs.d/init.org @@ -132,6 +132,12 @@ Let’s try a basic theme. (load-theme 'basic t) (set-face-background 'mode-line "#a1b56c") + (set-face-background 'border "#a1b56c") + (set-face-foreground 'border "#a1b56c") + (set-face-background 'vertical-border "#a1b56c") + (set-face-foreground 'vertical-border "#a1b56c") + (set-face-background 'window-divider "#a1b56c") + (set-face-foreground 'window-divider "#a1b56c") (defvar mode-line-default-format mode-line-format) (defcustom mode-line-default-hidden nil @@ -140,13 +146,13 @@ Let’s try a basic theme. (defun show-mode-line () (interactive) (setq mode-line-format mode-line-default-format) - (when (called-interactively-p) + (when (called-interactively-p 'interactive) (setq-default mode-line-format mode-line-default-format) (setq mode-line-default-hidden nil))) (defun hide-mode-line () (interactive) (setq mode-line-format nil) - (when (called-interactively-p) + (when (called-interactively-p 'interactive) (setq-default mode-line-format nil) (setq mode-line-default-hidden t))) @@ -172,6 +178,12 @@ Let’s try a basic theme. (hide-mode-line) (show-mode-line))) + (add-to-list 'default-frame-alist '(border-width . 0)) + (add-to-list 'default-frame-alist '(internal-border-width . 0)) + (setq window-divider-default-bottom-width 6 + window-divider-default-places t) + (window-divider-mode +1) + (add-hook 'after-change-major-mode-hook #'hide-mode-line-if-default-hidden) (add-hook 'minibuffer-setup-hook #'show-mode-line) @@ -218,7 +230,7 @@ because I manage those in my [[file:~/projects/dotfiles/tag-xresources/xresource ((eq window-system 'ns) (let ((displays (string-to-number (shell-command-to-string "system_profiler SPDisplaysDataType | grep \"Online: Yes\" | wc -l")))) (if (eq displays 1) - (ap/set-fonts "SF Mono" 12 "Lucida Grande" 12 t) + (ap/set-fonts "Roboto Mono" 13 "Lucida Grande" 13 t) (ap/set-fonts "Monaco" 10 "Lucida Grande" 12 nil)))) ((eq window-system 'x) (set-fontset-font "fontset-default" 'unicode (font-spec :name "Terminus" :size 10)) @@ -306,7 +318,7 @@ variables from whatever my shell configuration is. #+BEGIN_SRC emacs-lisp (use-package exec-path-from-shell :if (eq system-type 'darwin) - :init (exec-path-from-shell-initialize)) + :config (exec-path-from-shell-initialize)) #+END_SRC * Keybindings @@ -392,7 +404,7 @@ configuration with crux.el #+BEGIN_SRC emacs-lisp (defun switch-to-dotfiles () (interactive) - (projectile-persp-switch-project (expand-file-name "dotfiles" home-project-directory))) + (projectile-switch-project-by-name (expand-file-name "dotfiles" home-project-directory))) #+END_SRC ** The Silver Searcher @@ -424,7 +436,9 @@ based upon some folder conventions I use. #+BEGIN_SRC emacs-lisp (use-package projectile - :bind (("C-c C-f" . projectile-find-file) + :bind (("s-p" . projectile-switch-project) + ("C-x b" . projectile-switch-to-buffer) + ("C-c C-f" . projectile-find-file) ("s-x s-f" . projectile-find-file) ("C-x g" . projectile-vc) ("s-G" . projectile-vc)) @@ -473,24 +487,6 @@ based upon some folder conventions I use. projectile-completion-system 'ivy))) #+END_SRC -** perspective - -This package makes buffer-switching inside of projects make sense, by -filtering the candidates to those within the project. For it to work, -it needs hooking into projectile and a key bound to switch between projects. - -#+BEGIN_SRC emacs-lisp -(use-package perspective - :bind* ("s-p" . projectile-persp-switch-project) - :demand t - :config (progn - (setq persp-show-modestring t) - (persp-mode))) - -(use-package persp-projectile - :ensure t) -#+END_SRC - ** vc This is nice for some things that magit doesn’t do, and for those rare @@ -540,6 +536,11 @@ time. Make sure to set it up with a nice =completing-read-function= global-magit-file-mode nil) (add-to-list 'magit-no-confirm 'safe-with-wip)) :init (add-hook 'magit-mode-hook #'magit-load-config-extensions)) + +(use-package magithub + :after magit + :pin melpa + :config (magithub-feature-autoinject t)) #+END_SRC ** git-timemachine @@ -823,8 +824,7 @@ This is a frontend to the GPG-powered =pass= program. * Buffers ** Ibuffer -Ibuffer is quite nice for listing all buffers. I don’t use it very -often though, as it doesn’t really work with perspectives. +Ibuffer is quite nice for listing all buffers. #+BEGIN_SRC emacs-lisp (use-package ibuffer @@ -1328,7 +1328,6 @@ replacement for helm so far. (bind-key "<menu>" #'counsel-M-x) (bind-key "C-c M-x" #'execute-extended-command) (bind-key "C-x C-f" #'counsel-find-file) - (bind-key "C-x b" #'counsel-switch-to-persp-buffer) (bind-key "M-y" #'counsel-yank-pop) (bind-key "M-y" #'ivy-next-line ivy-minibuffer-map) (defadvice counsel-find-file (after find-file-sudo activate) @@ -1336,15 +1335,7 @@ replacement for helm so far. (when (and buffer-file-name (not (file-writable-p buffer-file-name))) (message "File not writable %s" buffer-file-name) - (find-alternate-file (concat "/sudo::" buffer-file-name)))) - (defun counsel-switch-to-persp-buffer (arg) - "Forward to `persp-switch-to-buffer'." - (interactive "P") - (ivy-read (format "Switch to buffer [%s]: " (persp-name persp-curr)) - (remq nil (mapcar #'buffer-name (persp-buffers persp-curr))) - :preselect (buffer-name (other-buffer (current-buffer))) - :action #'ivy--switch-buffer-action - :keymap ivy-switch-buffer-map)))) + (find-alternate-file (concat "/sudo::" buffer-file-name)))))) #+END_SRC @@ -1465,7 +1456,7 @@ works really nicely. :init (progn (defun open-budget () (interactive) - (projectile-persp-switch-project "~/Sync") + (projectile-switch-project-by-name "~/Sync/Default") (find-file (expand-file-name "ledger/my.ledger" (projectile-project-root))) (ledger-report "Budget (Cumulative)" nil))) :config (progn |