From 46746842542fdb6158cebbe00780725e08111110 Mon Sep 17 00:00:00 2001 From: Jan Andrle Date: Fri, 11 Oct 2024 09:25:12 +0200 Subject: [PATCH] :zap: update --- .bash/.bash_aliases | 3 +++ .bash/.bash_completions | 3 ++- .bash/.bash_jaaENV | 16 +++++++++++- .bash/.bash_promt | 6 ++++- .bashrc | 3 ++- .config/geany/geany.conf | 9 +++---- .config/github-releases/config.json | 36 +++++++++++++-------------- .config/nodejsscript/completions.json | 11 ++++++++ .profile | 2 ++ bin/socky.mjs | 4 +-- 10 files changed, 64 insertions(+), 29 deletions(-) diff --git a/.bash/.bash_aliases b/.bash/.bash_aliases index 423e3a9..88f0e34 100644 --- a/.bash/.bash_aliases +++ b/.bash/.bash_aliases @@ -14,6 +14,9 @@ if [ -x /usr/bin/dircolors ]; then alias egrep='egrep --color=auto' alias diff='diff --color=auto' fi + +~sezení(){ ~/Dokumenty/Projekty/Sezení; } + alias §rm='rm -vi' alias §cp='cp -vi' alias §mv='mv -vi' diff --git a/.bash/.bash_completions b/.bash/.bash_completions index e65918d..5793770 100644 --- a/.bash/.bash_completions +++ b/.bash/.bash_completions @@ -10,12 +10,13 @@ complete -F _complete_alias gitdotfiles alias C--asana='eval "$($HOME/bin/asana.mjs completion_bash)"' alias C--himalaya='\. "$BASH_DOTFILES/himalaya.completion"' alias C--uu='eval "$($HOME/bin/uu --completion-bash)"' -alias C--bs='eval "$(bs .completion bash)"' alias C--jc='eval "$(jc -B)" … newer version needed' +eval "$(bs .completion bash)" \. "$BASH_DOTFILES/cordova.completion" eval "$(node --completion-bash)" eval "$(npm completion)" eval "$(nodejsscript --completion bash)" +\. "$BASH_DOTFILES/pnpm.completion" _npx() { local cur="${COMP_WORDS[COMP_CWORD]}" diff --git a/.bash/.bash_jaaENV b/.bash/.bash_jaaENV index 1176488..c558fae 100644 --- a/.bash/.bash_jaaENV +++ b/.bash/.bash_jaaENV @@ -86,6 +86,20 @@ function jaaENV { echo 'No env file `compose.yaml` or `.jaaENV`' return 1 fi + + local chP="\[\033[0;35m\]" #purple + local chW="\[\033[00m\]" #white + export PS1_jaaENV="${chP}⋮${chW}" + + if [ ! -z ${ANDROID_SDK_ROOT_BAK+x} ]; then + export ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT_BAK + echo \$ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT_BAK + unset ANDROID_SDK_ROOT_BAK + fi + if [ ! -z ${unset_android_sdk+x} ]; then + export ANDROID_SDK_ROOT_BAK=$ANDROID_SDK_ROOT + unset ANDROID_SDK_ROOT + fi if [ ! -z ${java+x} ]; then [[ "$java" == "8" ]] && java=1.8 local java_local=$(java -version 2>&1 | awk -F '"' '/version/ {print $2}') @@ -135,5 +149,5 @@ function jaaENV { fi # Cleanup variables - unset android_home nodejs gradle php java + unset android_home unset_android_sdk nodejs gradle php java } diff --git a/.bash/.bash_promt b/.bash/.bash_promt index acb0593..41ca12b 100644 --- a/.bash/.bash_promt +++ b/.bash/.bash_promt @@ -52,7 +52,11 @@ function updatePromt { PS1+="] " fi PS1+="${chB}\w${chW}" - PS1+="\n:" + if [ ! -z ${PS1_jaaENV+x} ]; then + PS1+="\n$PS1_jaaENV" + else + PS1+="\n:" + fi history -a } setPromt diff --git a/.bashrc b/.bashrc index 1457926..e3e130b 100644 --- a/.bashrc +++ b/.bashrc @@ -14,6 +14,7 @@ shopt -s expand_aliases # Install Ruby Gems to ~/.local/share/gems export GEM_HOME="$HOME/.local/share/gems" export PATH="$HOME/.local/share/gems/bin:$HOME/.local/bin:$PATH" +. "$HOME/.cargo/env" # https://docs.astral.sh/uv/ [ -f $BASH_DOTFILES/.bash_completions ] && . $BASH_DOTFILES/.bash_completions # for Vim [[ $- != *i* ]] && return # If not running interactively, don't do anything @@ -62,4 +63,4 @@ export GPG_TTY=$(tty) # HSTR configuration - add this to ~/.bashrc # if this is interactive shell, then bind hstr to Ctrl-space -if [[ $- =~ .*i.* ]]; then bind '"\C-@": "\e^ihstr -- \n"'; fi +if [[ $- =~ .*i.* ]]; then bind '"\C-@": "\e^ihstr -- \C-j"'; fi diff --git a/.config/geany/geany.conf b/.config/geany/geany.conf index 6de093f..1501d3d 100644 --- a/.config/geany/geany.conf +++ b/.config/geany/geany.conf @@ -211,8 +211,8 @@ replace_search_backwards=false replace_close_dialog=true find_all_expanded=false replace_all_expanded=true -position_find_x=2201 -position_find_y=372 +position_find_x=1014 +position_find_y=519 position_replace_x=504 position_replace_y=397 position_fif_x=-1 @@ -228,7 +228,6 @@ session_file= project_file_path=/home/jaandrle/Dokumenty/Projekty/geany [files] -recent_files=/home/jaandrle/Stažené/config.xml;/home/jaandrle/Stažené/sentry.php.json;/home/jaandrle/Vzdálené/GitHub/DHLC-Internet-Networking-old/web/api/index.php;/media/jaandrle/WARTY WARTH/geany/filetype_extensions.conf;/media/jaandrle/WARTY WARTH/geany/plugins/geanydoc/geanydoc.conf;/media/jaandrle/WARTY WARTH/geany/plugins/saveactions/saveactions.conf;/media/jaandrle/WARTY WARTH/geany/plugins/vimode/vimode.conf;/media/jaandrle/WARTY WARTH/geany/plugins/filebrowser/filebrowser.conf;/media/jaandrle/WARTY WARTH/geany/plugins/VC/VC.conf;/media/jaandrle/WARTY WARTH/geany/plugins/spellcheck/spellcheck.conf; +recent_files=/home/jaandrle/Vzdálené/GitHub/dcp-fe-container-certifedpassport/package-lock.json;/home/jaandrle/Vzdálené/GitHub/dcp-fe-container-certifedpassport/package.json;/home/jaandrle/Vzdálené/GitHub/dcp-fe-container-certifedpassport/bs/test;/home/jaandrle/Vzdálené/GitHub/dcp-fe-container-certifedpassport/src/api/auth.ts;/home/jaandrle/Vzdálené/GitHub/dcp-fe-container-certifedpassport/src/core/appState.ts;/home/jaandrle/Vzdálené/GitHub/dcp-fe-container-certifedpassport/bs/dev/mock;/home/jaandrle/Vzdálené/GitHub/dcp-fe-container-certifedpassport/bs/localhost;/home/jaandrle/Vzdálené/GitHub/dcp-fe-container-certifedpassport/src/index.tsx;/home/jaandrle/Vzdálené/GitHub/dcp-fe-container-certifedpassport/staticwebapp.config.ts;/home/jaandrle/Vzdálené/GitHub/dcp-fe-container-certifedpassport/bs/README.md; recent_projects=/home/jaandrle/Dokumenty/Projekty/geany/Facilitator-App-Native.geany;/home/jaandrle/Dokumenty/Projekty/geany/deka-dom-el.geany;/home/jaandrle/Dokumenty/Projekty/geany/Facilitator-App-Native;/home/jaandrle/Dokumenty/Projekty/geany/deka-dom-el;/home/jaandrle/Dokumenty/Projekty/geany/deka-dom-el/deka-dom-el;/home/jaandrle/Dokumenty/Projekty/geany/.babelrc; -current_page=0 -FILE_NAME_0=0;XML;0;EUTF-8;1;1;0;%2Fhome%2Fjaandrle%2FStažené%2Fconfig.xml;0;4 +current_page=-1 diff --git a/.config/github-releases/config.json b/.config/github-releases/config.json index e9e1b91..959eb61 100644 --- a/.config/github-releases/config.json +++ b/.config/github-releases/config.json @@ -8,9 +8,9 @@ "file_name": "github-desktop", "exec": "yes", "description": "Fork of GitHub Desktop to support various Linux distributions", - "last_update": "2024-08-10T17:00:04Z", + "last_update": "2024-08-17T01:47:21Z", "downloads": "/home/jaandrle/bin/github-desktop", - "version": "release-3.4.3-linux1", + "version": "release-3.4.4-linuxbeta2", "glare": ".*x86_64.*.AppImage" }, { @@ -21,8 +21,8 @@ "exec": "yes", "description": "AI Browser", "glare": "AppImage", - "last_update": "2024-07-29T15:29:11Z", - "version": "2.1.17", + "last_update": "2024-09-17T15:03:29Z", + "version": "2.15.1", "downloads": "/home/jaandrle/bin/pinokio" }, { @@ -44,9 +44,9 @@ "group": "nondev", "file_name": "youtube-music", "exec": "yes", - "last_update": "2024-08-01T11:48:59Z", + "last_update": "2024-09-17T12:41:29Z", "downloads": "/home/jaandrle/bin/youtube-music", - "version": "v3.5.1", + "version": "v3.5.3", "glare": "AppImage" }, { @@ -176,9 +176,9 @@ "group": "nondev", "file_name": "fedistar", "exec": "yes", - "last_update": "2024-08-08T13:46:23Z", + "last_update": "2024-09-17T12:12:24Z", "downloads": "/home/jaandrle/bin/fedistar", - "version": "v1.9.10", + "version": "v1.9.11", "glare": ".*amd64.*.AppImage" }, { @@ -188,9 +188,9 @@ "group": "ai", "file_name": "ollama", "exec": "yes", - "last_update": "2024-08-13T20:27:42Z", + "last_update": "2024-09-23T03:39:10Z", "downloads": "/home/jaandrle/bin/ollama", - "version": "v0.3.6", + "version": "v0.3.12", "glare": "linux-amd64" }, { @@ -212,9 +212,9 @@ "group": "dev", "file_name": "escrcpy", "exec": "yes", - "last_update": "2024-08-03T17:09:45Z", + "last_update": "2024-09-16T08:23:35Z", "downloads": "/home/jaandrle/bin/escrcpy", - "version": "v1.22.4", + "version": "v1.24.2", "glare": ".*x86_64.*.AppImage" }, { @@ -224,9 +224,9 @@ "group": "dev-test", "file_name": "drovp", "exec": "yes", - "last_update": "2023-12-06T11:30:02Z", + "last_update": "2024-10-06T16:26:38Z", "downloads": "/home/jaandrle/bin/drovp", - "version": "0.8.0", + "version": "0.8.2", "glare": "x64.AppImage" }, { @@ -236,9 +236,9 @@ "group": "ai", "file_name": "jan", "exec": "yes", - "last_update": "2024-07-15T08:37:42Z", + "last_update": "2024-10-04T09:57:58Z", "downloads": "/home/jaandrle/bin/jan", - "version": "v0.5.2", + "version": "v0.5.6", "glare": ".*x86_64.*.AppImage" }, { @@ -248,9 +248,9 @@ "group": "ai", "file_name": "Chatbox", "exec": "yes", - "last_update": "2024-05-15T06:10:47Z", + "last_update": "2024-09-20T13:20:44Z", "downloads": "/home/jaandrle/bin/Chatbox", - "version": "v1.3.10", + "version": "v0.10.0", "glare": ".*x86_64.*.AppImage" } ] diff --git a/.config/nodejsscript/completions.json b/.config/nodejsscript/completions.json index b43d19b..8620991 100644 --- a/.config/nodejsscript/completions.json +++ b/.config/nodejsscript/completions.json @@ -48,6 +48,17 @@ "--help", "--version" ] + }, + "/home/jaandrle/Vzdálené/GitHub/DGF-Certified-Supervisory-Academy/build/bs/publishModule.mjs": { + "npx": true, + "completions": {}, + "completions_all": [ + "--lang", + "--division", + "--APP_CODE", + "--help", + "--version" + ] } } } \ No newline at end of file diff --git a/.profile b/.profile index 200ee16..c7019b5 100644 --- a/.profile +++ b/.profile @@ -40,3 +40,5 @@ PATH=/home/jaandrle/.local/share/umake/bin:$PATH # Added by Toolbox App export PATH="$PATH:/home/jaandrle/.local/share/JetBrains/Toolbox/scripts" + +. "$HOME/.cargo/env" diff --git a/bin/socky.mjs b/bin/socky.mjs index c9097d0..1909e2f 100755 --- a/bin/socky.mjs +++ b/bin/socky.mjs @@ -2,8 +2,8 @@ /* jshint esversion: 11,-W097, -W040, module: true, node: true, expr: true, undef: true *//* global echo, $, pipe, s, fetch, cyclicLoop */ $.api("") -.version("2024-03-18") -.command("silicon [file]", [ +.version("2024-09-05") +.command("silicon ", [ "Generovat obrázek s kódem pro sdílení na sociálních sítích. (alternativa k Carbon)", "Toto je jen drobný wrapper s mými defaultními parametry.", "Další nápověda viz `silicon --help`.",