Updoots

README.md

@@ -12,7 +12,7 @@
 + WM: i3
 
 ## Programs
-+ Editor: emacs / nvim
++ Editor: emacs + nvim
 + File-Browser: ranger
 + Image-Viewer: sxiv
 + Info: neofetch

files/.bashrc

@@ -5,7 +5,7 @@ git_branch() {
 
 HOST="\[\033[0;93m\]\h\[\033[m\]"
 GIT="\[\033[1;91m\]\$(git_branch)\[\033[m\]"
-ICON="\[\033[1;92m\]➜\[\033[m\]"
+ICON="\[\033[1;92m\]λ\[\033[m\]"
 DIR="\[\033[1;94m\]\w\[\033[m\]"
 export PS1="${HOST} ${DIR}${GIT} ${ICON} "
 

files/.zshrc

@@ -15,22 +15,16 @@ precmd_functions+=( precmd_vcs_info )
 setopt prompt_subst
 
 LN=$'\n'
-#ICON="%(?.%{$fg[green]%}.%{$fg[red]%})λ"
+ICON="%(?.%{$fg[green]%}.%{$fg[red]%})λ"
-ICON="%(?.%{$fg[green]%}.%{$fg[red]%})➜"
+#➜
 DIR="%{$fg[blue]%}%~"
-GIT_ICON=""
 GIT="%{$fg[red]%}\$vcs_info_msg_0_"
-LINE1="╭"
-LINE2="╰─"
 
 if [[ -n "$SSH_CONNECTION" ]]; then
-    NAME=" %{$fg[yellow]%}%m"
+    NAME="%{$fg[yellow]%}%m "
 fi
 
-FIRST_ROW="${LINE1}${NAME} ${DIR}${GIT}%{$reset_color%}"
+export PROMPT="${NAME}${DIR}${GIT} ${ICON}%{$reset_color%} "
-SECOND_ROW="${LINE2}%{$reset_color%}"
-
-export PROMPT="${FIRST_ROW}${LN}${SECOND_ROW} "
 zstyle ':vcs_info:git:*' formats '|%b '
 
 # ============================== Exports

files/init.el

@@ -60,21 +60,7 @@
 (use-package all-the-icons
   :ensure t)
 
-(custom-set-variables
+;; heuristic indentation
- ;; custom-set-variables was added by Custom.
- ;; If you edit it by hand, you could mess it up, so be careful.
- ;; Your init file should contain only one such instance.
- ;; If there is more than one, they won't work right.
- '(package-selected-packages
-   '(lsp-haskell haskell-mode lsp-java auctex rust-mode flycheck yasnippet counsel-projectile projectile company-box company lsp-ivy lsp-ui lsp-mode magit counsel evil-collection evil which-key general all-the-icons doom-themes use-package)))
-(custom-set-faces
- ;; custom-set-faces was added by Custom.
- ;; If you edit it by hand, you could mess it up, so be careful.
- ;; Your init file should contain only one such instance.
- ;; If there is more than one, they won't work right.
- )
-
-;; auto indent change like vim sleuth
 (use-package dtrt-indent
   :ensure t
   :hook
@@ -107,6 +93,18 @@
   :config
   (setq which-key-idle-delay 1))
 
+;; 80 charcater limit line in prog mode
+(use-package fill-column-indicator
+  :ensure t
+  :diminish fci-mode
+  :config
+  (setq fci-rule-width 1)
+  (setq fci-rule-width 80)
+  (setq fci-rule-color "green")
+  :hook
+  (prog-mode . fci-mode)
+  (markdown-mode . fci-mode))
+
 ;; vim mode
 (use-package evil
   :ensure t
@@ -125,7 +123,7 @@
   :config
   (evil-collection-init))
 
-;; completion
+;; completion for swiper
 (use-package ivy
   :ensure t
   :diminish
@@ -162,6 +160,7 @@
   (vim-leader-def 'normal 'global
     "gj" 'magit-blame
     "gs" 'magit-status
+    "gd" 'magit-diff
     "gl" 'magit-log
     "gc" 'magit-checkout
     "gb" 'magit-branch))
@@ -297,3 +296,17 @@
   :hook
   (haskell-mode . lsp)
   (haskell-literate-mode . lsp))
+
+(custom-set-variables
+ ;; custom-set-variables was added by Custom.
+ ;; If you edit it by hand, you could mess it up, so be careful.
+ ;; Your init file should contain only one such instance.
+ ;; If there is more than one, they won't work right.
+ '(package-selected-packages
+   '(fill-column-indicator lsp-haskell haskell-mode lsp-java auctex rust-mode flycheck yasnippet counsel-projectile projectile company-box company lsp-ivy lsp-ui lsp-mode magit counsel evil-collection evil which-key general all-the-icons doom-themes use-package)))
+(custom-set-faces
+ ;; custom-set-faces was added by Custom.
+ ;; If you edit it by hand, you could mess it up, so be careful.
+ ;; Your init file should contain only one such instance.
+ ;; If there is more than one, they won't work right.
+ )