From: Dmitry Fedotov <dm.fe@yandex.ru>
Date: Mon, 26 Aug 2024 21:38:18 +0000 (+0300)
Subject: Add xephyr script. Shell changes.
X-Git-Url: https://www.git.dmfe.net/?a=commitdiff_plain;h=a1711f07621d2ecf02d5c36b345c52c3ad2573e2;p=dotfiles

Add xephyr script. Shell changes.
---

diff --git a/scripts/xephyr.sh b/scripts/xephyr.sh
index 8905dbc..3490cda 100755
--- a/scripts/xephyr.sh
+++ b/scripts/xephyr.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
 
-Xephyr -br -ac -reset -screen 1920x1080 :1 &
+Xephyr -br -ac -reset -screen 1920x1080 :5 &
 # Xephyr -br -ac -reset -screen 800x600 :1 &
 sleep 1s
 
-export DISPLAY=:1
+export DISPLAY=:5
 
-wallpaper 20 &
+# wallpaper 20 &
 xrdb ~/.Xresources
 $1 &
 
diff --git a/shell/aliases/00-aliases b/shell/aliases/00-aliases
index bf065d7..03da67b 100644
--- a/shell/aliases/00-aliases
+++ b/shell/aliases/00-aliases
@@ -16,10 +16,15 @@ alias tmux="tmux -f ${XDG_CONFIG_HOME}/tmux/config"
 alias shutdown="sudo shutdown"
 alias shtd="shutdown -h now"
 alias reboot="sudo reboot"
+alias s="systemctl"
 
 # rsync
-alias rsync="rsync -vrP --delete-after"
+alias rsync="rsync -uvrP --delete-after"
 
 # arango db
 alias arangor="sudo /etc/init.d/arangodb start"
 alias arangos="sudo /etc/init.d/arangodb stop"
+
+# docker
+alias d="docker"
+alias dc="docker-compose"
diff --git a/shell/bash_profile b/shell/bash_profile
index cbce496..feec38e 100644
--- a/shell/bash_profile
+++ b/shell/bash_profile
@@ -19,6 +19,17 @@ fi
 # Local .bashrc
 source ${HOME}/.bashrc
 
+# Set dircolors
+[ -e ${HOME}/.dircolors ] && eval $(dircolors -b ${HOME}/.dircolors) ||
+  eval $(dircolors -b)
+
 # Start X
 [[ ! ${DISPLAY} && $(tty) = /dev/tty1 ]] && exec startx
 
+
+
+## [Completion]
+## Completion scripts setup. Remove the following line to uninstall
+[ -f /home/dima/.config/.dart-cli-completion/bash-config.bash ] && . /home/dima/.config/.dart-cli-completion/bash-config.bash || true
+## [/Completion]
+
diff --git a/shell/bashrc b/shell/bashrc
index f22d0d6..9f9a76e 100644
--- a/shell/bashrc
+++ b/shell/bashrc
@@ -45,3 +45,8 @@ POWERLINE_BASH_CONTINUATION=1
 POWERLINE_BASH_SELECT=1
 . /usr/share/powerline/bindings/bash/powerline.sh
 
+# NVM configuration
+export NVM_DIR="$HOME/.config/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
+
diff --git a/shell/envs/01-path b/shell/envs/01-path
index c17b624..e1383b4 100644
--- a/shell/envs/01-path
+++ b/shell/envs/01-path
@@ -1,4 +1,5 @@
 LOCAL_BIN=${HOME}/.local/bin
+GO_BIN=/usr/local/go/bin
 if [[ -d ${LOCAL_BIN} ]]; then
-    export PATH=${LOCAL_BIN}:${PATH}
+    export PATH=${GO_BIN}:${LOCAL_BIN}:${PATH}
 fi
diff --git a/shell/envs/03-java b/shell/envs/03-java
index 2cec07a..0100a27 100644
--- a/shell/envs/03-java
+++ b/shell/envs/03-java
@@ -1,3 +1,3 @@
-export JAVA_HOME=/opt/jdks/jdk-17.0.9+9
-export GRADLE_HOME=/opt/build/gradle-8.2.1
+export JAVA_HOME=/opt/jdks/jdk-21.0.1+12
+export GRADLE_HOME=/opt/build/gradle-8.10