update doom config and add dekstop rofi-mpd

doom/config.el

@@ -179,7 +179,6 @@
   :config
   (defalias 'browse-web #'eaf-open-browser))
 
-
 (require 'eaf-system-monitor)
 (require 'eaf-pdf-viewer)
 (require 'eaf-terminal)
@@ -211,6 +210,12 @@
         (kbd "SPC"))))
 
 
+;;; vterm
+
+(after! vterm
+  (set-popup-rule! "*doom:vterm-popup:main" :size 0.45 :vslot -4 :select t :quit nil :ttl 0 :side 'right)
+  )
+
 ;;; gif screencast
 
 (with-eval-after-load 'gif-screencast
@@ -264,6 +269,9 @@
 
   ; (add-hook 'sql-interactive-mode-hook 'my-sql-save-history-hook 'upercase-sql-keywords')
 
+;;; mozc for emacs
+(require 'mozc)
+(setq default-input-method "japanese-mozc")
 
 ;;; VARIABLES
 ;; This determines the style of line numbers in effect. If set to `nil', line
@@ -282,6 +290,7 @@
 (setq jedi:environment-virtualenv ["source", "./env/bin/activate"])
 (setq jedi:key-complete ["Tab"])
 (setq format-all-debug nil)
+(setq projectile-project-search-path '("~/Projects/" "~/Work/Projects/"))
 
 (setq lsp-ui-doc-position 'bottom)
 (setq lsp-ui-doc-alignment 'window)

doom/config.el.org

@@ -0,0 +1,344 @@
+* config
+;;; $DOOMDIR/config.el -*- lexical-binding: t; -*-
+
+;; Place your private configuration here! Remember, you do not need to run 'doom
+;; sync' after modifying this file!
+
+
+;; Some functionality uses this to identify you, e.g. GPG configuration, email
+;; clients, file templates and snippets.
+(setq user-full-name "Kyle Yasuda"
+      user-mail-address "ksyasuda@umich.edu")
+
+;; Doom exposes five (optional) variables for controlling fonts in Doom. Here
+;; are the three important ones:
+;;
+;; + `doom-font'
+;; + `doom-variable-pitch-font'
+;; + `doom-big-font' -- used for `doom-big-font-mode'; use this for
+;;   presentations or streaming.
+;;
+;; They all accept either a font-spec, font string ("Input Mono-12"), or xlfd
+;; font string. You generally only need these two:
+;; (setq doom-font (font-spec :family "monospace" :size 12 :weight 'semi-light)
+;;       doom-variable-pitch-font (font-spec :family "sans" :size 13))
+;; (setq doom-font (font-spec :family "FiraCode Nerd Font" :size 14))
+(setq doom-font (font-spec :family "FiraCode Nerd Font" :size 18))
+
+;; There are two ways to load a theme. Both assume the theme is installed and
+;; available. You can either set `doom-theme' or manually load a theme with the
+;; `load-theme' function. This is the default:
+(setq doom-theme 'doom-one)
+
+;; If you use `org' and don't want your org files in the default location below,
+;; change `org-directory'. It must be set before org loads!
+(setq org-directory "~/org/")
+
+
+;; Here are some additional functions/macros that could help you configure Doom:
+;;
+;; - `load!' for loading external *.el files relative to this one
+;; - `use-package!' for configuring packages
+;; - `after!' for running code after a package has loaded
+;; - `add-load-path!' for adding directories to the `load-path', relative to
+;;   this file. Emacs searches the `load-path' when you load packages with
+;;   `require' or `use-package'.
+;; - `map!' for binding new keys
+;;
+;; To get information about any of these functions/macros, move the cursor over
+;; the highlighted symbol at press 'K' (non-evil users must press 'C-c c k').
+;; This will open documentation for it, including demos of how they are used.
+;;
+;; You can also try 'gd' (or 'C-c c d') to jump to their definition and see how
+;; they are implemented.
+
+
+
+(setq python-prettify-symbols-alist
+  '(("lambda"  . ?λ)
+    ("and" . ?∧)
+    ("or" . ?∨)
+    ("in" . ?∈)
+    ("for" . ?∀)
+    ("def" . ?ƒ)
+    ("int" . ?ℤ)
+    ("not" . ?¬)))
+
+(setq prettify-symbols-alist
+  '(("lambda"  . ?λ)
+    ("&&" . ?∧)
+    ("||" . ?∨)
+    ("in" . ?∈)
+    ("for" . ?∀)
+    ("function" . ?ƒ)
+    ("int" . ?ℤ)
+    ("not" . ?¬)))
+
+
+(use-package! wakatime-mode :ensure t)
+(global-wakatime-mode)
+
+
+(use-package! fira-code-mode
+  :hook prog-mode)
+
+;;; LSP
+(use-package! lsp
+  :init
+  (setq lsp-pyls-plugins-pylint-enabled t)
+  (setq lsp-pyls-plugins-autopep8-enabled t)
+  (setq lsp-pyls-plugins-yapf-enabled t)
+  (setq lsp-pyls-plugins-pyflakes-enabled t)
+)
+
+(lsp-ui-mode)
+
+
+(use-package! lsp-mode
+  :commands lsp
+  :hook
+  (sh-mode . 'lsp))
+
+(setq lsp-enable-folding t)
+
+(org-babel-do-load-languages
+ 'org-babel-load-languages
+ '((python . t)))
+
+
+;; (setq python-shell-interpreter "ipython"
+;;         python-shell-interpreter-args "-i --simple-prompt --InteractiveShell.display_page=True")
+
+(setf (lsp-session-folders-blacklist (lsp-session)) nil)
+(lsp--persist-session (lsp-session))
+
+(advice-add 'lsp :before (lambda (&rest _args) (eval '(setf (lsp-session-server-id->folders (lsp-session)) (ht)))))
+
+;;; all the icons
+
+(add-load-path! (expand-file-name "~/Downloads/all-the-icons-dired"))
+(load "all-the-icons-dired.el")
+(use-package all-the-icons-dired
+  :hook (dired-mode . all-the-icons-dired-mode)
+  :config
+  (add-to-list 'all-the-icons-icon-alist
+               '("\\.mkv" all-the-icons-faicon "film"
+                 :face all-the-icons-blue))
+  (add-to-list 'all-the-icons-icon-alist
+               '("\\.srt" all-the-icons-octicon "file-text"
+                 :v-adjust 0.0 :face all-the-icons-dcyan))
+
+  ;; Turn off all-the-icons-dired-mode before wdired-mode
+  ;; TODO: disable icons just before save, not during wdired-mode
+  (defadvice wdired-change-to-wdired-mode (before turn-off-icons activate)
+    (all-the-icons-dired-mode -1))
+  (defadvice wdired-change-to-dired-mode (after turn-on-icons activate)
+    (all-the-icons-dired-mode 1)))
+(add-hook 'dired-mode-hook 'all-the-icons-dired-mode)
+
+;;; peep dired
+(use-package! peep-dired
+  :ensure t
+  :defer t ; don't access `dired-mode-map' until `peep-dired' is loaded
+  :bind (:map dired-mode-map
+              ("P" . peep-dired)))
+
+
+;;; company tabnine
+
+(use-package! company-tabnine)
+
+(after! company
+    (setq +lsp-company-backends '(company-tabnine :separate company-capf company-yasnippet company-shell))
+    (setq company-show-quick-access t)
+    (setq company-idle-delay 0)
+    (define-key company-active-map (kbd "C-c h") #'company-quickhelp-manual-begin)
+)
+
+(require 'company-tabnine)
+
+;;; lsp jedi
+
+(use-package! lsp-jedi)
+  ; :config
+  ; (with-eval-after-load "lsp-mode"
+  ;   ;; (add-to-list 'lsp-disabled-clients 'pyls)
+  ;   (add-to-list 'lsp-enabled-clients 'jedi)
+  ;   (add-to-list 'lsp-enabled-clients 'lsp)))
+
+;; (defun my/python-mode-hook ()
+;;   (add-to-list 'company-backends 'company-jedi))
+
+;;; enacs application framework
+(use-package eaf
+  :load-path "~/Downloads/emacs-application-framework" ; Set to "/usr/share/emacs/site-lisp/eaf" if installed from AUR
+  :custom
+  ; See https://github.com/emacs-eaf/emacs-application-framework/wiki/Customization
+  (eaf-browser-continue-where-left-off t)
+  (eaf-browser-enable-adblocker t)
+  (browse-url-browser-function 'eaf-open-browser)
+  :config
+  (defalias 'browse-web #'eaf-open-browser))
+
+(require 'eaf-system-monitor)
+(require 'eaf-pdf-viewer)
+(require 'eaf-terminal)
+(require 'eaf-music-player)
+(require 'eaf-browser)
+(require 'eaf-jupyter)
+(require 'eaf-file-browser)
+(require 'eaf-markdown-previewer)
+(require 'eaf-image-viewer)
+(require 'eaf-file-manager)
+(require 'eaf-airshare)
+(require 'eaf-org-previewer)
+(require 'eaf-file-sender)
+(require 'eaf-video-player)
+
+(require 'eaf-evil)
+
+
+(define-key key-translation-map (kbd "SPC")
+    (lambda (prompt)
+      (if (derived-mode-p 'eaf-mode)
+          (pcase eaf--buffer-app-name
+            ("browser" (if  (string= (eaf-call-sync "call_function" eaf--buffer-id "is_focus") "True")
+                           (kbd "SPC")
+                         (kbd eaf-evil-leader-key)))
+            ("pdf-viewer" (kbd eaf-evil-leader-key))
+            ("image-viewer" (kbd eaf-evil-leader-key))
+            (_  (kbd "SPC")))
+        (kbd "SPC"))))
+
+
+;;; vterm
+
+(after! vterm
+  (set-popup-rule! "*doom:vterm-popup:main" :size 0.45 :vslot -4 :select t :quit nil :ttl 0 :side 'right)
+  )
+
+;;; gif screencast
+
+(with-eval-after-load 'gif-screencast
+  (define-key gif-screencast-mode-map (kbd "<f8>") 'gif-screencast-toggle-pause))
+
+(global-set-key (kbd "<f9>") 'gif-screencast-start-or-stop)
+
+
+;;; HOOKS
+
+
+(add-hook 'python-mode 'python-pylint)
+; (add-hook 'sh-mode-hook 'flycheck-mode)
+
+; enable bash language server
+;(setq lsp-auto-configure nil)
+
+(add-hook 'org-mode-hook #'org-bullets-mode)
+(add-hook 'before-save-hook 'py-isort-before-save)
+
+
+;;; SQL MODE
+
+
+(defun my-sql-save-history-hook ()
+    (let ((lval 'sql-input-ring-file-name)
+          (rval 'sql-product))
+      (if (symbol-value rval)
+          (let ((filename 
+                 (concat "~/.emacs.d/sql/"
+                         (symbol-name (symbol-value rval))
+                         "-history.sql")))
+            (set (make-local-variable lval) filename))
+        (error
+         (format "SQL history will not be saved because %s is nil"
+                 (symbol-name rval))))))
+ 
+  (add-hook 'sql-interactive-mode-hook 'my-sql-save-history-hook)
+
+  (defun upcase-sql-keywords ()
+    (interactive)
+    (save-excursion
+      (dolist (keywords sql-mode-postgres-font-lock-keywords)
+        (goto-char (point-min))
+        (while (re-search-forward (car keywords) nil t)
+          (goto-char (+ 1 (match-beginning 0)))
+          (when (eql font-lock-keyword-face (face-at-point))
+            (backward-char)
+            (upcase-word 1)
+            (forward-char))))))
+
+  ; (add-hook 'sql-interactive-mode-hook 'my-sql-save-history-hook 'upercase-sql-keywords')
+
+
+;;; VARIABLES
+;; This determines the style of line numbers in effect. If set to `nil', line
+;; numbers are disabled. For relative line numbers, set this to `relative'.
+(setq display-line-numbers-type t)
+(setq rainbow-delimiters-mode t)
+(setq rainbow-mode t)
+(setq confirm-kill-emacs nil)
+(setq prettify-symbols-mode nil)
+(setq global-prettify-symbols-mode nil)
+(setq browse-url-browser-function 'browse-url-firefox)
+
+
+(setq jedi:setup-keys t)
+(setq jedi:complete-on-dot t)
+(setq jedi:environment-virtualenv ["source", "./env/bin/activate"])
+(setq jedi:key-complete ["Tab"])
+(setq format-all-debug nil)
+
+(setq lsp-ui-doc-position 'bottom)
+(setq lsp-ui-doc-alignment 'window)
+(setq lsp-ui-doc-max-height 25)
+(setq lsp-ui-doc-max-width 350)
+(setq lsp-ui-doc-mode t)
+(setq lsp-ui-peek-mode t)
+(setq lsp-ui-peek-enable t)
+(setq lsp-ui-doc-delay 0.25)
+(setq company-quickhelp-delay 0.5)
+(setq lsp-jedi-python-library-directories '(/usr .env/lib/))
+
+(setq eaf-terminal-font-size 12)
+(setq lsp-treemacs-sync-mode 1)
+
+(after! 'treemacs
+  (define-key treemacs-mode-map [mouse-1] #'treemacs-single-click-expand-action))
+
+;;; KEYBINDINGS
+
+(map! :leader
+      (:prefix ("o" . "+open")
+      :desc "Launch lsp-ui-imenu"
+      "i" #'lsp-ui-imenu))
+
+(map! :leader
+      (:prefix ("c" . "+code")
+      :desc "LSP Peek"
+      (:prefix ("p" . "+peek")
+       :desc "Find references"
+       "r" #'lsp-ui-peek-find-references)))
+
+(map! :leader
+      (:prefix ("c" . "+code")
+       :desc "Peek definition of thing under the cursor"
+       (:prefix ("p" . "+peek")
+        :desc "Find definitions"
+        "d" #'lsp-ui-peek-find-definitions)))
+
+(map! :leader
+       :desc "nohls"
+       "s c" #'evil-ex-nohighlight)
+
+(map! :leader
+      :desc "Restart LSP server"
+      "c R" #'lsp-workspace-restart)
+
+(map! :leader
+      :desc "Search web"
+      "o w" #'eaf-open-browser-with-history)
+
+(map! :leader
+      :desc "Open link under cursor in browser"
+      "o l" #'eaf-open-url-at-point)

doom/packages.el

@@ -76,3 +76,4 @@
 (package! treemacs-icons-dired)
 (package! howdoi)
 (package! persist)
+(package! mozc)

dotfiles/.zshrc

@@ -253,10 +253,10 @@ source $(dirname $(gem which colorls))/tab_complete.sh
 ## ibus config
 # export GTK_IM_MODULE=ibus
 # # will make libreoffice work
-# export XMODIFIERS=@im=ibus
+export XMODIFIERS=@im=ibus
-# export QT_IM_MODULE=ibus
+export QT_IM_MODULE=ibus
-# export QT4_IM_MODULE=xim
+export QT4_IM_MODULE=xim
-# ibus-daemon -drx
+ibus-daemon -drx
 
 export VISUAL=vim
 export XDG_CONFIG_HOME="$HOME/.config"

i3-wm/config-desktop

@@ -581,7 +581,7 @@ bindsym Control+Mod1+f exec --no-startup-id firefox
 bindsym $mod+t exec --no-startup-id thunar
 
 # ROFI
-bindsym $mod+m exec --no-startup-id bash /usr/bin/rofi-mpd -s
+bindsym $mod+m exec --no-startup-id ~/SudacodeRice/scripts/rofi-mpd-desktop -s
 
 bindsym $mod+Shift+p exec --no-startup-id ~/SudacodeRice/scripts/rofi/rofi-picom.sh
 bindsym Control+g exec --no-startup-id ~/SudacodeRice/scripts/rofi/rofi-search.sh
@@ -602,5 +602,5 @@ bindsym $mod+minus scratchpad show
 bindsym $mod+e exec --no-startup-id emacsclient -n -c ~
 bindsym $mod+Shift+v exec --no-startup-id emacsclient -n -c -e '(+vterm/here nil)'
 bindsym $mod+Shift+Return exec --no-startup-id emacsclient -n -c -e '(+vterm/here nil)'
-bindsym Control+Shift+a exec --no-startup-id ~/SudacodeRice/scripts/emc ~/Projects/Scripts/ani-cli
+bindsym Control+Shift+a exec --no-startup-id ~/SudacodeRice/scripts/emc ~/Projects/Scripts/aniwrapper
 bindsym Control+e exec --no-startup-id ~/SudacodeRice/scripts/emc ~/.config

rofi/dracula.rasi

@@ -1,7 +1,7 @@
 /*Dracula theme based on the Purple official rofi theme*/
 
 * {
-    font: "Jetbrains Mono 12";
+    font: "Jetbrains Mono 15";
     foreground: #f8f8f2;
     background: #282a36;
     active-background: #6272a4;
@@ -16,9 +16,13 @@
 #window {
     background-color: @background;
     border:           1;
-    border-radius: 6;
+    border-radius: 16;
     border-color: @bordercolor;
     padding:          5;
+    anchor: north;
+    location: north;
+    width: 100%;
+    height: 50%;
 }
 #mainbox {
     border:  0;

scripts/rofi-mpd-desktop

@@ -0,0 +1,85 @@
+#!/usr/bin/env sh
+
+m() { rofi -theme -dmenu -config ~/SudacodeRice/rofi/dracula.rasi -l 24 -i "$@"; }
+mb() { rofi -dmenu -config ~/SudacodeRice/rofi/dracula.rasi -l 24 -i -kb-custom-1 "Alt+q" "$@"; }
+
+artist() {
+  lines="$(mpc list artist | wc -l)"
+  [ "$lines" -gt 30 ] && lines=30
+  mpc list artist | sort -f | m -p "Artists" -l $lines
+}
+
+a_album() {
+  artist="$1"
+  lines="$(mpc list album artist "$artist" | wc -l)"
+  [ "$lines" -gt 30 ] && lines=30
+  mpc list album artist "$artist" | sort -f | mb -p "Albums" -l $lines
+}
+
+album() {
+  lines="$(mpc list album | wc -l)"
+  [ "$lines" -gt 30 ] && lines=30
+  mpc list album | sort -f | mb -p "Album" -l $lines
+}
+
+song() {
+  lines="$(mpc list title | wc -l)"
+  [ "$lines" -gt 30 ] && lines=30
+  mpc list title | sort -f | mb -p "Song" -l 30
+}
+
+case "$1" in
+-l | --library) mode=Library ;;
+-A | --album) mode=Album ;;
+-s | --song) mode=Song ;;
+-a | --ask)
+  MODE=$(printf "Library\nAlbum\nSong" | m -p "Choose mode" -l 3)
+  mode=$MODE
+  ;;
+-h | --help)
+  echo "
+  usage: rofi-mpd [-h] [-l] [-s] [-a]
+
+  arguments:
+  -h, --help        show this message and exit
+  -l, --library     library mode (artist -> album)
+  -A, --album       album mode
+  -s, --song        song mode (select one song)
+  -a, --ask         ask for mode
+
+  bindings:
+  enter             play song/album now
+  Alt+q             add song/album to queue
+    "
+  exit
+  ;;
+esac
+
+case "$mode" in
+Library)
+  artist=$(artist)
+  [ ! "$artist" ] && exit
+  album=$(a_album "$artist")
+  cod=$?
+  [ ! "$album" ] && exit
+  [ "$cod" -eq 10 ] || mpc clear
+  mpc find artist "$artist" album "$album" | mpc add
+  mpc play >/dev/null
+  ;;
+Song)
+  song=$(song)
+  cod=$?
+  [ ! "$song" ] && exit
+  [ "$cod" -eq 10 ] || mpc clear
+  mpc search "(title==\"$song\")" | mpc add
+  mpc play >/dev/null
+  ;;
+Album)
+  album=$(album)
+  cod=$?
+  [ ! "$album" ] && exit
+  [ "$cod" -eq 10 ] || mpc clear
+  mpc find album "$album" | mpc add
+  mpc play >/dev/null
+  ;;
+esac