commit 0803b1fa4e664c670424192245e8d586908b365d
parent d85668dfd69675e7aeb9c51d8a2c49df134e7331
Author: Ryan Jeffrey <ryan@ryanmj.xyz>
Date: Sat, 15 Jan 2022 03:51:54 -0800
Evil names and truncate names
Diffstat:
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/.config/emacs/config.org b/.config/emacs/config.org
@@ -119,6 +119,7 @@
(setq vc-follow-symlinks t) ; Otherwise emacs asks
(setq tramp-terminal-type "tramp") ; See zshrc
(add-hook 'after-save-hook #'executable-make-buffer-file-executable-if-script-p)
+(toggle-truncate-lines)
;; scroll one line at a time (less "jumpy" than defaults)
(setq mouse-wheel-scroll-amount '(1 ((shift) . 1))) ;; one line at a time
@@ -208,13 +209,16 @@
:init
(evil-collection-init))
(setq-default evil-cross-lines t)
- (setq evil-normal-state-tag (propertize " COMMAND " 'face '((:background "red" :foreground "black")))
- evil-emacs-state-tag (propertize " EMACS " 'face '((:background "turquoise" :foreground "black")))
- evil-insert-state-tag (propertize " ------- " 'face '((:background "green" :foreground "black")))
- evil-replace-state-tag (propertize " REPLACE " 'face '((:background "orange" :foreground "black")))
- evil-motion-state-tag (propertize " MOTION " 'face '((:background "cyan" :foreground "black")))
- evil-visual-state-tag (propertize " VISUAL " 'face '((:background "salmon" :foreground "black")))
- evil-operator-state-tag (propertize " OPERATE " 'face '((:background "magenta" :foreground "black"))))
+
+ ;; Code snippet for color
+ ;;evil-emacs-state-tag (propertize " EMACS " 'face '((:background "turquoise" :foreground "black")))
+ (setq evil-normal-state-tag (propertize "-COMMAND-" 'face '((:foreground "turquoise")))
+ evil-emacs-state-tag (propertize "--EMACS--" 'face '((:foreground "blue")))
+ evil-insert-state-tag (propertize "--INSRT--" 'face '((:foreground "gold")))
+ evil-replace-state-tag (propertize "-REPLACE-" 'face '((:foreground "cyan")))
+ evil-motion-state-tag (propertize "--MOTION-" 'face '((:foreground "grey")))
+ evil-visual-state-tag (propertize "--VISUAL-" 'face '((:foreground "magenta")))
+ evil-operator-state-tag (propertize " OPERATE-" 'face '((:foreground "grey"))))
(setq evil-insert-state-cursor '(bar "green")
evil-normal-state-cursor '(box "magenta"))
@@ -230,6 +234,7 @@
(evil-define-key 'normal 'global (kbd "<leader>ss") #'split-window-horizontally)
(evil-define-key 'normal 'global (kbd "<leader>so") #'split-window-vertically)
(evil-define-key 'normal 'global (kbd "<leader>x") #'execute-extended-command)
+ (evil-define-key 'normal 'global (kbd "<leader>x") #'execute-extended-command)
;; set leader key in all states
(evil-set-leader 'visual (kbd "C-SPC"))
(evil-set-leader 'insert (kbd "C-SPC"))
@@ -493,11 +498,8 @@
(use-package magit
:ensure t
:init
-; (add-hook 'after-init-hook '(lambda ()
-; (global-magit-file-mode -1)))
-
- (add-hook 'diff-mode-hook 'whitespace-mode)
- (add-hook 'git-commit-setup-hook 'git-commit-turn-on-flyspell))
+ (add-hook 'diff-mode-hook #'whitespace-mode)
+ (add-hook 'git-commit-setup-hook #'git-commit-turn-on-flyspell))
#+end_src
** Misc
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
@@ -70,7 +70,6 @@ function check_last_exit_code() {
fi
}
-# TODO make this better
function git_prompt_string() {
stat .git &>/dev/null && git status | head -n1 | awk '{print $3}'
}
@@ -96,7 +95,7 @@ bindkey '^[[3~' delete-char
HISTSIZE=10000
SAVEHIST=10000
# Make sure to create this dir and touch history when installing on new system
-HISTFILE=~/.cache/zsh/history
+HISTFILE="$HOME/.cache/zsh/history"
# Write to history immediately
setopt inc_append_history
@@ -159,7 +158,7 @@ export EDITOR="emacsclient -t -a emacs"
export VISUAL="emacsclient -c -a emacs"
alias cfk="$EDITOR $HOME/.config/kitty/kitty.conf "
-alias magit="emacsclient -t -e '(magit)'"
+alias magit="emacsclient -t -e '(progn (magit) (delete-other-windows))'"
alias srz='source ~/.zshrc'
alias jrc='joe $HOME/.config/joestar/joestarrc'
alias vim='nvim'
@@ -246,6 +245,5 @@ zinit snippet "OMZL::theme-and-appearance.zsh"
zinit snippet "OMZL::git.zsh"
zinit snippet "OMZP::mercurial"
# oh-my-zsh theme
-
zinit snippet "OMZT::/af-magic"
