Merge pull request #299 from nanasess/bump-packages

Bump packages

.emacs.d/bin/package.json

@@ -4,6 +4,7 @@
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
+    "@emacs-eask/cli": "^0.8.6",
     "@mermaid-js/mermaid-cli": "^10",
     "bash-language-server": "^5.0.0",
     "copilot-node-server": "^1.11.4",

.emacs.d/bin/php

@@ -4,7 +4,7 @@ if [ -x "/usr/local/bin/php" ]
 then
     PHP=/usr/local/bin/php
 fi
-PHP=$HOME/.phpbrew/php/php-8.1.6/bin/php
+# PHP=$HOME/.phpbrew/php/php-8.1.6/bin/php
 ARGS="-d apc.enable_cli=1 \
     -d error_log=/tmp/php_error.log \
     -d opcache.enable_cli=1 \

.emacs.d/el-get.lock

@@ -6,7 +6,7 @@
         (fosi :checksum "f5f61d91545e18ebe879a53f1c679da6d3aa9c4e")
         (wakatime-mode :checksum "ef923829912c3854d230834f81083814b7c9d992")
         (compat :checksum "32e737b145fef05105e2bad4ca34ca41072e9569")
-        (lsp-bridge :checksum "a3d67c80eb4a3f4ed17d6a4e90f142b8c22ae7ee")
+        (lsp-bridge :checksum "0da66c98b78c42e6894f53995b1739657879158b")
         (copilot :checksum "421703f5dd5218ec2a3aa23ddf09d5f13e5014c2")
         (eldoc-box :checksum "5c067f5c195198ffd16df2f455da95e46cc8ce02")
         (eglot :checksum "e501275e06952889056268dabe08ccd0dbaf23e5")
@@ -17,7 +17,7 @@
         (lsp-docker :checksum "a0d7cbf80652429c0be4dc7d39e1887ba4691ec7")
         (initchart :checksum "2df1fbc965c5ef82906a0fa76b3517c5831d3581")
         (esup :checksum "4b49c8d599d4cc0fbf994e9e54a9c78e5ab62a5f")
-        (consult-dir :checksum "ed8f0874d26f10f5c5b181ab9f2cf4107df8a0eb")
+        (consult-dir :checksum "3f5f4b71ebe819392cb090cda71bd39a93bd830a")
         (consult-flycheck :checksum "c371996c571b7139ef4d9a8db142bf37a7ee826b")
         (sudo-edit :checksum "74eb1e6986461baed9a9269566ff838530b4379b")
         (consult-ls-git :checksum "7ba583abc16f70c497d038bfcbddbadd6894bd3d")
@@ -65,7 +65,7 @@
         (composer :checksum "5af1707fefbd9d7db1102afdaeb8f2da893fea37")
         (php-skeleton :checksum "208202c772be1320857d7b1ade9be28a8ddb35e5")
         (php-runtime :checksum "36e6ae862cb02104b5782a563f0a5846c00e0082")
-        (php-mode :checksum "38fd6ec205a02ccad6b3006afef0988e380adfa6")
+        (php-mode :checksum "4a29636243ba7f4afba476348587713531d994bc")
         (yaml-mode :checksum "3fcb36d6039bef57e2a0f6e24c51f623c0bf5fb7")
         (web-mode :checksum "9fdbfa0eeee40e4a3bcf990c81203dce7e028c67")
         (web-completion-data :checksum "c272c94e8a71b779c29653a532f619acad433a4f")

.emacs.d/init.d/arch/gnu/linux/init.el

@@ -1,24 +1,38 @@
 ;;----------------------- window settings ---------------------------
 ;; sudo apt-get install xfonts-mplus
-;; (if (display-graphic-p)
-;;     (progn
-;;             (create-fontset-from-ascii-font "M+ 1m-12:weight=normal:slant=normal" nil "linux")
-;;             (set-fontset-font "fontset-linux" 'unicode
-;;                               (font-spec :family "M+ 1m" ) nil 'append)
-;;             (set-fontset-font "fontset-linux" '(#x0080 .  #x024F)
-;;                               (font-spec :family "M+ 1m") nil 'prepend)
-;;             (setq initial-frame-alist
-;;                   (append (list
-;;                            '(height . 32)
-;;                            '(width  . 82)
-;;                            '(font . "fontset-linux")
-;;                            initial-frame-alist)))
-;;             (setq default-frame-alist initial-frame-alist)))
+(if (display-graphic-p)
+    (progn
+      (set-face-attribute 'default nil :family "UDEV Gothic JPDOC" :height 120)
+      (when (executable-find "wl-copy")
+        ;; https://www.emacswiki.org/emacs/CopyAndPaste#h5o-4
+        ;; credit: yorickvP on Github
+        (setq wl-copy-process nil)
+        (defun wl-copy (text)
+          (setq wl-copy-process (make-process :name "wl-copy"
+                                              :buffer nil
+                                              :command '("wl-copy" "-f" "-n")
+                                              :connection-type 'pipe))
+          (process-send-string wl-copy-process text)
+          (process-send-eof wl-copy-process))
+        (defun wl-paste ()
+          (if (and wl-copy-process (process-live-p wl-copy-process))
+            nil ; should return nil if we're the current paste owner
+            (shell-command-to-string "wl-paste -n | tr -d \r")))
+        (setq interprogram-cut-function 'wl-copy)
+        (setq interprogram-paste-function 'wl-paste))))
+;; (setq initial-frame-alist
+;;       (append (list
+;;                '(height . 32)
+;;                '(width  . 82)
+;;                initial-frame-alist)))
+;; (setq default-frame-alist initial-frame-alist))
+;; )
 ;;;
 ;;; see https://github.com/4U6U57/wsl-open
 (when (executable-find "wsl-open")
   (setq browse-url-generic-program "wsl-open")
   (setq browse-url-browser-function 'browse-url-generic))
+
 (require 'server)
 (unless (server-running-p)
   (server-start))

.emacs.d/init.el

@@ -551,7 +551,6 @@
 )
 
 (el-get-bundle dockerfile-mode)
-(el-get-bundle docker-tramp)
 
 (add-to-list 'load-path (concat user-emacs-directory ".mew.d"))
 (load "mew-config" t t)
@@ -588,10 +587,6 @@
 (defvar mkpasswd-command
   "head -c 10 < /dev/random | uuencode -m - | tail -n 2 |head -n 1 | head -c10")
 (autoload 'mkpasswd "mkpasswd" nil t)
-;; (el-get-bundle emacs-id-manager
-;;   :type github
-;;   :autoloads "id-manager"
-;;   :pkgname "nanasess/emacs-id-manager")
 
 (el-get-bundle nginx-mode)
 (el-get-bundle po-mode)

.zsh/.zshrc.mine

@@ -7,7 +7,7 @@ else
     if which emacsclient > /dev/null; then export EDITOR=emacsclient; fi
 fi
 
-export PATH=$HOME/bin:$HOME/.nodebrew/current/bin:$HOME/.cpan/CPAN/bin:$HOME/.cabal/bin:/Library/Frameworks/HaskellPlatform.framework/bin:/usr/local/texlive/2014/bin/x86_64-darwin:/opt/local/lib/postgresql91/bin:/usr/local/heroku/bin:/opt/local/bin:/usr/local/bin:$PATH
+export PATH=$HOME/bin:$HOME/.nodebrew/current/bin:$HOME/go/bin:$HOME/.cpan/CPAN/bin:$HOME/.cabal/bin:/Library/Frameworks/HaskellPlatform.framework/bin:/usr/local/texlive/2014/bin/x86_64-darwin:/opt/local/lib/postgresql91/bin:/usr/local/heroku/bin:/opt/local/bin:/usr/local/bin:$PATH
 
 export UID=${UID} GID=${GID}