From ea7f456334e6b2ba9673f16c90545dd7a40d056c Mon Sep 17 00:00:00 2001 From: Joseph Ferano Date: Thu, 18 Nov 2021 06:44:42 +0700 Subject: [PATCH] All the icons, simplify some buffer commands --- .config/fish/functions/fish_prompt.fish | 3 --- .emacs.d/init.el | 13 ++++++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.config/fish/functions/fish_prompt.fish b/.config/fish/functions/fish_prompt.fish index eab8fbe..a11d80c 100644 --- a/.config/fish/functions/fish_prompt.fish +++ b/.config/fish/functions/fish_prompt.fish @@ -23,9 +23,6 @@ function fish_prompt set -l retc red test $status = 0; and set retc green - set -q __fish_git_prompt_showupstream - or set -g __fish_git_prompt_showupstream auto - function _nim_prompt_wrapper set retc $argv[1] set -l field_name $argv[2] diff --git a/.emacs.d/init.el b/.emacs.d/init.el index e0f2379..1684ab7 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -17,6 +17,8 @@ (set-terminal-coding-system 'utf-8) (set-keyboard-coding-system 'utf-8) (define-key key-translation-map (kbd "ESC") (kbd "C-g")) +(auto-fill-mode) +(setq fill-column 80) ;; Visuals (scroll-bar-mode -1) @@ -43,7 +45,7 @@ (global-hl-line-mode +1) (column-number-mode +1) -(set-face-attribute 'default nil :height 120) +(set-face-attribute 'default nil :font "FiraCode Nerd Font" :height 120) ;; Text Settings (setq tab-width 4) @@ -117,7 +119,7 @@ all of the evil keybindings in buffers like magit, without compromises." '(flycheck-color-mode-line-face-to-color 'mode-line-buffer-id) '(frame-background-mode 'dark) '(package-selected-packages - '(treemacs-icons-dired magit ranger multi-vterm evil-collection smartparens vterm all-the-icons-dired all-the-icons org-bullets sudoku select-themes fsharp-mode eglot-fsharp fish-mode find-file-in-project helpful ahk-mode rainbow-delimiters csharp-mode doom-themes marginalia eglot selectrum-prescient prescient selectrum avy evil-commentary evil-embrace evil-snipe evil-surround undo-tree which-key dashboard)) + '(magit ranger multi-vterm evil-collection smartparens vterm all-the-icons-dired all-the-icons org-bullets sudoku select-themes fsharp-mode eglot-fsharp fish-mode find-file-in-project helpful ahk-mode rainbow-delimiters csharp-mode doom-themes marginalia eglot selectrum-prescient prescient selectrum avy evil-commentary evil-embrace evil-snipe evil-surround undo-tree which-key dashboard)) '(window-divider-mode nil)) (custom-set-faces ;; custom-set-faces was added by Custom. @@ -166,6 +168,7 @@ all of the evil keybindings in buffers like magit, without compromises." ;; (evil-define-key 'normal dired-mode-map (kbd "-") ;; (lambda () (interactive) (find-alternate-file ".."))) ;; (lambda () (interactive) (find-alternate-file ".."))) + (all-the-icons-dired-mode) (evil-define-key 'normal dired-mode-map (kbd "") (lambda () (interactive) (dired-find-alternate-file))))) @@ -199,9 +202,9 @@ all of the evil keybindings in buffers like magit, without compromises." (evil-define-key 'normal 'global (kbd "hg") 'helpful-at-point) (evil-define-key 'normal 'global (kbd "ff") 'bookmark-jump) (evil-define-key 'normal 'global (kbd "fi") 'joe/edit-init) -(evil-define-key 'normal 'global (kbd "bb") 'mode-line-other-buffer) -(evil-define-key 'normal 'global (kbd "bl") 'switch-to-buffer) -(evil-define-key 'normal 'global (kbd "bk") 'kill-this-buffer) +(evil-define-key 'normal 'global (kbd "bl") 'mode-line-other-buffer) +(evil-define-key 'normal 'global (kbd "bb") 'switch-to-buffer) +(evil-define-key 'normal 'global (kbd "k") 'kill-this-buffer) (evil-define-key 'normal 'global (kbd "bi") 'ibuffer) (evil-define-key 'normal 'global (kbd "bm") 'joe/toggle-buffer-mode) (evil-define-key 'normal 'global (kbd "gg") 'magit-status)