Merge pull request #120 from tanhongit/develop

Develop

Author: tanhongit

.backup/run.sh

@@ -1,21 +1,36 @@
 #!/bin/bash
 
-cp -TRv "${ZSH_CUSTOM:-$HOME}"/.local/share/gnome-shell ../.local/share/gnome-shell
-cp -TRv "${ZSH_CUSTOM:-$HOME}"/.local/share/grilo-plugins ../.local/share/grilo-plugins
-cp -TRv "${ZSH_CUSTOM:-$HOME}"/.local/share/sounds ../.local/share/sounds
-
 cp -TRv "${ZSH_CUSTOM:-$HOME}"/.psensor ../.psensor
+cp -TRv "${ZSH_CUSTOM:-$HOME}"/.bashrc ../.bashrc
+cp -TRv "${ZSH_CUSTOM:-$HOME}"/.p10k.zsh ../.p10k.zsh
+cp -TRv "${ZSH_CUSTOM:-$HOME}"/.zshrc ../.zshrc
 
+cp -TRv "${ZSH_CUSTOM:-$HOME}"/.config/bleachbit ../.config/bleachbit
 cp -TRv "${ZSH_CUSTOM:-$HOME}"/.config/autostart ../.config/autostart
 cp -TRv "${ZSH_CUSTOM:-$HOME}"/.config/compton ../.config/compton
-cp -TRv "${ZSH_CUSTOM:-$HOME}"/.config/bleachbit ../.config/bleachbit
-cp -TRv "${ZSH_CUSTOM:-$HOME}"/.config/dconf ../.config/dconf
-cp -TRv "${ZSH_CUSTOM:-$HOME}"/.config/gnome-shell ../.config/gnome-shell
 cp -TRv "${ZSH_CUSTOM:-$HOME}"/.config/nautilus ../.config/nautilus
 cp -TRv "${ZSH_CUSTOM:-$HOME}"/.config/terminator ../.config/terminator
 cp -TRv "${ZSH_CUSTOM:-$HOME}"/.config/ulauncher ../.config/ulauncher
-cp -TRv "${ZSH_CUSTOM:-$HOME}"/.config/mimeapps.list ../.config/mimeapps.list
 
-cp -TRv "${ZSH_CUSTOM:-$HOME}"/.bashrc ../.bashrc
-cp -TRv "${ZSH_CUSTOM:-$HOME}"/.p10k.zsh ../.p10k.zsh
-cp -TRv "${ZSH_CUSTOM:-$HOME}"/.zshrc ../.zshrc
+# shellcheck disable=SC1091
+if [ -f "/etc/os-release" ]; then
+    . /etc/os-release
+    OS=$NAME
+
+    if [ "$OS" == "Ubuntu" ]; then
+        cp -TRv "${ZSH_CUSTOM:-$HOME}"/.config/dconf ../ubuntu/.config/dconf
+        cp -TRv "${ZSH_CUSTOM:-$HOME}"/.config/mimeapps.list ../ubuntu/.config/mimeapps.list
+        cp -TRv "${ZSH_CUSTOM:-$HOME}"/.local/share/sounds ../ubuntu/.local/share/sounds
+        cp -TRv "${ZSH_CUSTOM:-$HOME}"/.config/gnome-shell ../ubuntu/.config/gnome-shell
+
+        cp -TRv "${ZSH_CUSTOM:-$HOME}"/.local/share/gnome-shell ../ubuntu/.local/share/gnome-shell
+        cp -TRv "${ZSH_CUSTOM:-$HOME}"/.local/share/grilo-plugins ../ubuntu/.local/share/grilo-plugins
+
+    elif [ "$OS" == "Zorin OS" ]; then
+        cp -TRv "${ZSH_CUSTOM:-$HOME}"/.config/dconf ../zorin/.config/dconf
+        cp -TRv "${ZSH_CUSTOM:-$HOME}"/.config/mimeapps.list ../zorin/.config/mimeapps.list
+        cp -TRv "${ZSH_CUSTOM:-$HOME}"/.local/share/sounds ../zorin/.local/share/sounds
+
+        cp -TRv "${ZSH_CUSTOM:-$HOME}"/.local/share/gnome-shell ../zorin/.local/share/gnome-shell
+    fi
+fi

.config/ulauncher/ext_preferences/com.github.ulauncher.ulauncher-hash.db

@@ -2,22 +2,29 @@
     "com.github.nastuzzisamy.ulauncher-youtube-search": {
         "id": "com.github.nastuzzisamy.ulauncher-youtube-search",
         "url": "https://github.com/NastuzziSamy/ulauncher-youtube-search",
-        "updated_at": "2023-09-30T22:45:42.596093",
+        "updated_at": "2023-12-08T02:09:57.852183",
         "last_commit": "fe855811358b2f15ec6ed69ca18e20639874fa28",
         "last_commit_time": "2021-03-27T11:29:18"
     },
     "com.github.glovecc.ulauncher-github-search": {
         "id": "com.github.glovecc.ulauncher-github-search",
         "url": "https://github.com/Glovecc/ulauncher-github-search",
-        "updated_at": "2023-09-30T22:46:08.147696",
+        "updated_at": "2023-12-08T02:10:17.461929",
         "last_commit": "ee3ea43e905cf184449c328f0dadaa4395f3ec0c",
         "last_commit_time": "2022-01-14T13:46:35"
     },
     "com.github.brpaz.ulauncher-timestamp": {
         "id": "com.github.brpaz.ulauncher-timestamp",
         "url": "https://github.com/brpaz/ulauncher-timestamp",
-        "updated_at": "2023-09-30T22:46:20.315746",
+        "updated_at": "2023-12-08T02:10:39.017559",
         "last_commit": "e366a81f92b8130dddc0b1bddecad253124c49b9",
         "last_commit_time": "2021-12-12T15:49:08"
+    },
+    "com.github.ulauncher.ulauncher-hash": {
+        "id": "com.github.ulauncher.ulauncher-hash",
+        "url": "https://github.com/Ulauncher/ulauncher-hash",
+        "updated_at": "2023-12-08T10:18:42.039069",
+        "last_commit": "237dbb3610ff04df993c3223b12df42cb7df221f",
+        "last_commit_time": "2022-09-04T14:29:55"
     }
 }

.config/ulauncher/extensions.json

@@ -47,7 +47,7 @@ if ! command -v $COMMAND_NAME &>/dev/null; then
         PHP_VERSION=$1
         echo "You choose php$PHP_VERSION"
     }
-    PS3="Select setup the php version (press * to setup default version - php$PHP_VERSION) - (latest version is php$PHP_VERSION): "
+    PS3="Press * to setup default version - php$PHP_VERSION (latest version is php$PHP_VERSION) \n Select setup the php version (Warning: choose new version may not be successful because it is not yet complete support, please choose the stable version): "
     select opt in "8.2" "8.1" "8.0" "7.4" "7.2" "7.0" "5.6"; do
         case $opt in
         "8.2")

.setup/options/develop/web/php/php.sh

@@ -115,8 +115,8 @@ source ~/.oh-my-zsh/custom/plugins/fast-syntax-highlighting/F-Sy-H.plugin.zsh
 # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
 [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
 
+export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"
+
 export NVM_DIR="$HOME/.nvm"
 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
 [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
-
-export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"