Merge pull request #367 from nanasess/use-powerlevel10k

Fix misc

.emacs.d/el-get.lock

@@ -1,11 +1,13 @@
 (setq el-get-lock-package-versions
-      '((oauth2 :checksum "cc2dd7f3e2aae621365a8297b61198c1694bdb5e")
+      '((ebuild-mode :checksum "529191d3b6691401f9612e761e1c5448f9359857")
+        (eglot :checksum "db91d58374627a195b731a61bead9b4f84a7e4bc")
+        (oauth2 :checksum "cc2dd7f3e2aae621365a8297b61198c1694bdb5e")
         (nerd-icons.el :checksum "66658b89287c3599c7b9b6babea7bcb3dff9a9e4")
         (fsharp-mode :checksum "b4d31c3da018cfbb3d1f9e6fd416d8777f0835bd")
         (nard-icons.el :checksum "8095215a503d8048739de8b4ea4066598edb8cbb")
         (undo-tree :checksum "7eb78fa1fcb076621235c46fc730f485d3225dbb")
         (tree-sitter-php-mode :checksum "2f791d9d83c35b11e9a14daf9a58dd7e23566041")
-        (php-ts-mode :checksum "b398a871ce7dda880997196666083e850d153388")
+        (php-ts-mode :checksum "6c0214eb1a323cfc9cedb5e187c4ed20da763e9b")
         (jq-mode :checksum "d533567a680bc87060c56a50f83d80e58646d2f2")
         (terraform-mode :checksum "a645c32a8f0f0d04034262ae5fea330d5c7a33c6")
         (hcl-mode :checksum "ec27736c4c16fbf7f1ecab0210ec3c71ac2406fa")

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

@@ -2,25 +2,7 @@
 ;; sudo apt-get install xfonts-mplus
 (if (display-graphic-p)
     (progn
-      (set-face-attribute 'default nil :family "UDEV Gothic JPDOC" :height 120)
-      (when (equal window-system 'pgtk)
-        (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)))))
+      (set-face-attribute 'default nil :family "UDEV Gothic JPDOC" :height 120)))
 ;; (setq initial-frame-alist
 ;;       (append (list
 ;;                '(height . 32)

.emacs.d/init.el

@@ -230,7 +230,8 @@
           (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")))
+              (when (executable-find "wl-paste")
+                (shell-command-to-string "type -a wl-paste > /dev/null 2>&1 && wl-paste -n | tr -d \r"))))
           (setq interprogram-cut-function 'wl-copy)
           (setq interprogram-paste-function 'wl-paste))))
 
@@ -965,6 +966,8 @@
   :build `(("make" ,(format "EMACS=%s" el-get-emacs))))
 (add-to-list 'auto-mode-alist '("\\.\\(inc\\|php[s34]?\\)$" . php-ts-mode))
 (with-eval-after-load 'php-ts-mode
+  (add-to-list 'treesit-language-source-alist
+               '(php "https://github.com/tree-sitter/tree-sitter-php" "v0.21.1" "php/src"))
   (with-eval-after-load 'lsp-bridge
     (add-hook 'php-ts-mode-hook #'(lambda ()
                                     (push '(php-ts-mode . lsp-bridge-php-lsp-server) lsp-bridge-single-lang-server-mode-list)
@@ -1093,6 +1096,11 @@
 (with-eval-after-load 'terraform-mode
   (setq terraform-format-on-save t))
 
+(el-get-bundle ebuild-mode
+  :type git
+  :url "https://anongit.gentoo.org/git/proj/ebuild-mode.git"
+  :build `(("make" ,(format "EMACS=%s" el-get-emacs))))
+
 (el-get-bundle wakatime-mode)
 (add-to-list 'load-path (concat user-emacs-directory ".wakatime.d"))
 (load "wakatime-config" t t)

.zsh/.zaliases

@@ -1,5 +1,5 @@
 # -*- mode:shell-script -*-
-alias ls="eza --color=always"
+alias ls="eza --color=always --all"
 alias less='less -X'
 if [ -f $HOME/Applications/Emacs.app/Contents/Resources/bin/emacsclient ]
 then