Fix environment

.emacs.d/el-get.lock

@@ -1,5 +1,6 @@
 (setq el-get-lock-package-versions
-      '((ebuild-mode :checksum "529191d3b6691401f9612e761e1c5448f9359857")
+      '((ddskk :checksum "8c47f46e38a29a0f3eabcd524268d20573102467")
+        (ebuild-mode :checksum "529191d3b6691401f9612e761e1c5448f9359857")
         (eglot :checksum "db91d58374627a195b731a61bead9b4f84a7e4bc")
         (oauth2 :checksum "cc2dd7f3e2aae621365a8297b61198c1694bdb5e")
         (nerd-icons.el :checksum "66658b89287c3599c7b9b6babea7bcb3dff9a9e4")
@@ -132,7 +133,6 @@
         (s :checksum "dda84d38fffdaf0c9b12837b504b402af910d01d")
         (dash :checksum "5df7605da5a080df769d4f260034fb0e5e86a7a4")
         (cp5022x :checksum "ea7327dd75e54539576916f592ae1be98179ae35")
-        (ddskk :checksum "8c47f46e38a29a0f3eabcd524268d20573102467")
         (doom-themes :checksum "3b2422b208d28e8734b300cd3cc6a7f4af5eba55")
         (all-the-icons :checksum "ee414384938ccf2ce93c77d717b85dc5538a257d")
         (memoize :checksum "51b075935ca7070f62fae1d69fe0ff7d8fa56fdd")

.emacs.d/init.el

@@ -143,9 +143,12 @@
   :type github
   :pkgname "skk-dev/ddskk"
   ;; :info "doc/skk.info"
-  :load-path (".")
-  :autoloads "skk-autoloads"
-  :build `((,el-get-emacs "-batch" "-q" "-no-site-file" "-l" "SKK-MK" "-f" "SKK-MK-compile")
+  ;; :load-path (".")
+  ;; :autoloads "skk-autoloads"
+  :features ("skk-setup")
+  :build `(("sh" "-c" "echo \"(setq SKK_SET_JISYO t)\" > SKK-CFG")
+           (,el-get-emacs "-batch" "-q" "-no-site-file" "-l" "SKK-MK" "-f" "SKK-MK-compile")
+           (,el-get-emacs "-batch" "-q" "-no-site-file" "-l" "SKK-MK" "-f" "SKK-MK-compile")
            ;; (,el-get-emacs "-batch" "-q" "-no-site-file" "-l" "SKK-MK" "-f" "SKK-MK-compile-info")
            ("cp" "skk-setup.el.in" "skk-setup.el")))
 (setopt skk-user-directory (concat external-directory "ddskk")
@@ -593,8 +596,8 @@
 
 (setopt howm-directory (concat external-directory "howm/"))
 (el-get-bundle howm
-  :type git
-  :url "git://git.osdn.jp/gitroot/howm/howm.git"
+  :type github
+  :pkgname "kaorahi/howm"
   :build `(("./configure" ,(concat "--with-emacs=" el-get-emacs)) ("make"))
   :prepare (progn
              (defvar howm-menu-lang 'ja)
@@ -906,7 +909,7 @@
   ;; (setq lsp-bridge-enable-log t)
   ;; (setq lsp-bridge-enable-debug t)
   ;; (setq lsp-bridge-signature-show-function 'lsp-bridge-signature-posframe)
-  (setq acm-enable-tabnine nil)
+  (setopt acm-enable-tabnine nil)
   (global-set-key [remap xref-find-definitions] #'lsp-bridge-find-def)
   (global-set-key [remap xref-pop-marker-stack] #'lsp-bridge-find-def-return)
   (global-set-key (kbd "M-.") #'lsp-bridge-find-def)
@@ -1105,6 +1108,8 @@
 (add-to-list 'load-path (concat user-emacs-directory ".wakatime.d"))
 (load "wakatime-config" t t)
 (add-hook 'emacs-startup-hook 'global-wakatime-mode)
+(with-eval-after-load 'wakatime-mode
+  (setopt wakatime-cli-path "/usr/bin/wakatime"))
 
 (el-get-bundle recentf-ext)
 (add-hook 'emacs-startup-hook

.zsh/.zshenv

@@ -1,3 +1,6 @@
 # -*- mode:shell-script -*-
-
-export ZDOTDIR=$HOME/dotfiles/.zsh
+export XDG_CONFIG_HOME=$HOME/.config
+export XDG_DATA_HOME=$HOME/.local/share
+export XDG_CACHE_HOME=$HOME/.cache
+export XDG_STATE_HOME=$HOME/.local/state
+export ZDOTDIR=$XDG_CONFIG_HOME/dotfiles/.zsh

.zsh/.zshrc.mine

@@ -56,14 +56,14 @@ then
     if which setxkbmap > /dev/null; then setxkbmap -layout us; fi
 fi
 
-if which docker > /dev/null; then
-    export ONEDRIVE_DATA_DIR="$HOME/OneDrive - Skirnir Inc"
-    export ONEDRIVE_GID=$(id -g)
-    export ONEDRIVE_UID=$(id -u)
-    [ ! "$(docker ps -a | grep onedrive)" ] &&
-        docker run -d --rm -it --name onedrive -v $HOME/.config/onedrive:/onedrive/conf \
-               -v "${ONEDRIVE_DATA_DIR}:/onedrive/data" \
-               -e "ONEDRIVE_UID=${ONEDRIVE_UID}" \
-               -e "ONEDRIVE_GID=${ONEDRIVE_GID}" \
-               -e "ONEDRIVE_RESYNC=1" driveone/onedrive:latest > /dev/null
-fi
+# if which docker > /dev/null; then
+#    export ONEDRIVE_DATA_DIR="$HOME/OneDrive - Skirnir Inc"
+#    export ONEDRIVE_GID=$(id -g)
+#    export ONEDRIVE_UID=$(id -u)
+#    [ ! "$(docker ps -a | grep onedrive)" ] &&
+#        docker run -d --rm -it --name onedrive -v $HOME/.config/onedrive:/onedrive/conf \
+#               -v "${ONEDRIVE_DATA_DIR}:/onedrive/data" \
+#               -e "ONEDRIVE_UID=${ONEDRIVE_UID}" \
+#               -e "ONEDRIVE_GID=${ONEDRIVE_GID}" \
+#               -e "ONEDRIVE_RESYNC=1" driveone/onedrive:latest > /dev/null
+# fi