diff --git a/bashrc b/bashrc old mode 100644 new mode 100755 index 5f2ba9a..4f7ae04 --- a/bashrc +++ b/bashrc @@ -27,13 +27,21 @@ WHITE='\033[1;37m' set -o vi # add directorie to PATH -export PATH="$HOME/dev/script/:$PATH" -export PATH="$HOME/dev/opt/script.download/:$PATH" -export PATH="$HOME/dev/opt/built/:$PATH" +export DEV_PATH="$HOME/dev" +export OPT_PATH="$HOME/opt" +export DEV_OPT_PATH="$OPT_PATH/dev" +export SCRIPT_PATH="$DEV_PATH/script" + +export PATH="$SCRIPT_PATH/:$PATH" +export PATH="$SCRIPT_PATH.download/:$PATH" +export PATH="$DEV_PATH/opt/built/:$PATH" +export PATH="/usr/sbin:$PATH" export EDITOR="nvim" +export SOUND_CARD=$(amixer scontrols | head -n 1 | cut -d "'" -f2) + # source file -source ~/dev/script/completion +source $SCRIPT_PATH/completion #source /home/cptbb/downloads/git/bash-wakatime/bash-wakatime.sh # variable @@ -59,7 +67,7 @@ alias rm="trash" alias shut="figlet 'finito' && sleep 0.5; shutdown 0" alias v="nvim" alias g="git" -alias hm="gnome-terminal --full-screen -- bash -c \"exec bash; cd ~/dev && cls\" && exit" +alias hm="gnome-terminal --full-screen -- bash -c \"exec bash; cd $DEV_PATH && cls\" && exit" alias hlm="dev; cls" alias ..="cd .." alias ...="cd ../.." @@ -69,7 +77,7 @@ alias libresprite="~/documents/libresprite.AppImage 1>/dev/null &" alias lsa="ls -a" alias lsA="ls -A" alias lsl="ls -l" -alias bashrc="nvim ~/dev/script/bashrc && exec bash" +alias bashrc="nvim $SCRIPT_PATH/bashrc && exec bash" alias agenda="v ~/documents/agenda" alias quoi="echo feur && espeak -v fr-fr feur" alias espeak="espeak -v fr-fr" @@ -85,7 +93,7 @@ alias pipe="pipes.sh -r 0 -p 5" alias wlc="wl-copy" alias wlp="wl-paste" alias laverite="echo -n 'linux > ' && echo wingay | lolcat -p 0.2" -alias mcphrase="shuf -n 1 ~/dev/script/mcphrase | figlet -w 999" +alias mcphrase="shuf -n 1 $SCRIPT_PATH/mcphrase | figlet -w 999" alias gay-ouataz="figlet gay-ouataz | lolcat -p 0.5 2>/dev/null" alias tg="figlet TG " alias livres="cd ~/livres" @@ -93,16 +101,16 @@ alias spinningrat="pqiv --fullscreen -ti --background-pattern=white ~/videos/rat alias cleanindicator="ls -A ~ | wc -l | figlet" #alias srvcheck="ssh nbbsrv sh /home/cptbbot/arualiv.sh" alias srvcheck="echo no srv ?" -alias nbprj="expr \$(cgit ~/dev) - 1" -alias lsprj="ls ~/dev | grep -v opt | grep -v script | tr '\n' ' ' && echo" +alias nbprj="expr \$(cgit $DEV_PATH) - 1" +alias lsprj="ls $DEV_PATH | grep -v opt | grep -v script | tr '\n' ' ' && echo" alias lsal="ls -al" -alias note="v $HOME/dev/opt/notes/global" +alias note="v $DEV_PATH/opt/notes/global" alias list="ssh nbbsrv docker exec mcsrv-create rcon-cli list" alias listf="ssh nbbsrv docker exec mcsrv-f rcon-cli list" alias listr="ssh nbbsrv docker exec mcsrv-ram rcon-cli list" alias lista="list; listf; listr" -alias cpmake="cp $HOME/dev/script/Makefile ." -alias vbashrc="v $HOME/dev/script/bashrc" +alias cpmake="cp $SCRIPT_PATH/Makefile ." +alias vbashrc="v $SCRIPT_PATH/bashrc" alias obsidian="~/downloads/Obsidian-1.3.5.AppImage >/dev/null 2>/dev/null &" alias hamood="figlet habibi | lolcat -p 0.5 && espeak -v af habibi" alias please="sudo" @@ -115,22 +123,23 @@ alias lampp="sudo /opt/lampp/lampp" alias clean="alias clr=\"clear\" && clear" alias oracle="cd ~/downloads/sqldeveloper/ && ./sqldeveloper.sh" alias elephant="pqiv --fullscreen -ti ~/pictures/dall-e" -alias l="if [ \$(pwd) == \"\$HOME/dev\" ]; then lsprj; else ls $*; fi" +alias l="if [ \$(pwd) == \"\$DEV_PATH\" ]; then lsprj; else ls $*; fi" alias muz="mpv ~/music &" alias krunker="~/downloads/setup.AppImage" alias :wq="echo don\'t worry, it\'s saved" alias coredir="echo /var/lib/apport/coredump" alias man="man -L fr" -alias todo="v $HOME/dev/opt/notes/TODO" +alias todo="v $DEV_PATH/opt/notes/TODO" alias kys="shut" alias lastcd="back && pwd && back" alias sae="cd /opt/lampp/htdocs/SAE_Reseaux" alias unity="/home/cptbb/Unity-2023.2.8f1/Editor/Unity" -alias mantra="v $HOME/dev/opt/notes/mantra" +alias mantra="v $DEV_PATH/opt/notes/mantra" +alias qr-network="nmcli device wifi show-password" # alias avec parametre emoji(){ grep -i $1 ~/documents/emoji; } -dev(){ [ -z $1 ] && cd ~/dev/ || cd ~/dev/*$1* ;} +dev(){ [ -z $1 ] && cd $DEV_PATH/ || cd $DEV_PATH/*$1* ;} cours(){ [ -z $1 ] && cd ~/cours/ || cd ~/cours/*$1* ;} lsd(){ ls -d $1*/;} lsf(){ ls -p $1 | grep -v /$;} diff --git a/completion b/completion old mode 100644 new mode 100755 diff --git a/gui-cmd b/gui-cmd deleted file mode 100644 index 2202dba..0000000 --- a/gui-cmd +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -# sudo init 3 -# sudo systemctl start gdm3 diff --git a/luminosity b/luminosity new file mode 100755 index 0000000..9b05afe --- /dev/null +++ b/luminosity @@ -0,0 +1,28 @@ +#!/bin/bash + +curr=$(xrandr --prop --verbose | grep -A10 " connected" | grep Brightness | cut -f2 -d' ' | head -n 1) +case $1 in + "get") + echo "100 * $curr" | bc | sed "s/\.[0-9]*$/%/g" + exit + ;; + "add") + curr=$(echo "$curr + 0.05" | bc) + ;; + "min") + curr=$(echo "$curr - 0.05" | bc) + ;; +esac + +if [ $(echo "$curr < 0.1" | bc) -eq 1 ]; then + curr=0.1 +elif [ $(echo "$curr > 1" | bc) -eq 1 ]; then + curr=1 +fi + +monitors=$(xrandr --listmonitors | sort -r | cut -d' ' -f6) +for m in $monitors; do + xrandr --output $m --brightness $curr +done + +statusbar.sh once diff --git a/mcphrase b/mcphrase old mode 100644 new mode 100755 index 6adef2d..8cd5ca7 --- a/mcphrase +++ b/mcphrase @@ -6,7 +6,7 @@ CSC bomboclaat nique zebi windaube -I will use ARCH btw +I use ARCH btw Boulbi Corp. malveillance max bienveillance min diff --git a/monitor-display b/monitor-display new file mode 100755 index 0000000..7a74a7b --- /dev/null +++ b/monitor-display @@ -0,0 +1,31 @@ +#!/bin/bash + +mode=$(echo -e "same\ndifferent" | dmenu -p "monitors layout:") +monitors=$(xrandr --listmonitors | sort -r | cut -d' ' -f6) + +main=$(echo $monitors | tr ' ' '\n' | dmenu -p "which monitor is main:") +monitors=$(echo $monitors | sed "s/$main//") + +if [[ $mode == "same" ]]; then + for m in $monitors; do + xrandr --output $m --auto --same-as $main --mode 1920x1080 + done +elif [[ $mode == "different" ]]; then + for m in $monitors; do + direction=$(echo -e "left\nright\nabove\nbelow\nsame" | dmenu -p "monitor '$m' direction from '$main'") + + case $direction in + "left" | "right") + direction="--$direction-of" + ;; + "above" | "below") + direction="--$direction" + ;; + "same") + direction="--$direction-as" + ;; + esac + + xrandr --output $main --primary --mode 1920x1080 --output $m --mode 1920x1080 $direction $main + done +fi diff --git a/newp-template/cpp.template/Makefile b/newp-template/cpp.template/Makefile deleted file mode 120000 index 94aaae2..0000000 --- a/newp-template/cpp.template/Makefile +++ /dev/null @@ -1 +0,0 @@ -../../Makefile \ No newline at end of file diff --git a/newp-template/cppl.template/Makefile b/newp-template/cppl.template/Makefile deleted file mode 120000 index 94aaae2..0000000 --- a/newp-template/cppl.template/Makefile +++ /dev/null @@ -1 +0,0 @@ -../../Makefile \ No newline at end of file diff --git a/newp-template/sh.template b/newp-template/sh.template old mode 100755 new mode 100644 diff --git a/reseaux-manager b/reseaux-manager new file mode 100755 index 0000000..e1fdad4 --- /dev/null +++ b/reseaux-manager @@ -0,0 +1,15 @@ +#!/bin/bash + +to_ssid=$(nmcli device wifi list | awk '{print $2}' | sed -e "/--/d" | sed "/BSSID/d" | dmenu -l 10) +#to_ssid=$(cat ~/wifi | awk '{print $2}' | sed -e "/--/d" | sed "/BSSID/d" | dmenu -i -l 10) + +need_pass=$(echo -e "YES\nNO" | dmenu -i -p "need password?") + +if [[ $need_pass == "NO" ]]; then + nmcli device wifi connect $to_ssid +else + password=$(echo -e "azerty\n1234\nhamood" | dmenu -p "enter password:") + nmcli device wifi connect $to_ssid password $password +fi + +statusbar.sh once diff --git a/set-sound-card b/set-sound-card new file mode 100755 index 0000000..c1ad599 --- /dev/null +++ b/set-sound-card @@ -0,0 +1,5 @@ +#!/bin/bash + +echo $(amixer scontrols | cut -d "'" -f2 | dmenu -l 10) > $XDG_CONFIG_HOME/sound_card + +statusbar.sh once diff --git a/statusbar.sh b/statusbar.sh index c5db8cf..6ad3801 100755 --- a/statusbar.sh +++ b/statusbar.sh @@ -1,15 +1,22 @@ #!/bin/bash -while true; do +status_bar(){ + wifi=$(/usr/sbin/iwgetid -r) + date=$(date +"%a %d %b. %Y") + hour=$(date +"%H:%M") + battery=$(upower -i $(upower -e | grep BAT) | grep percentage | sed "s/ //g" | cut -d ":" -f2) + sound_card=$(cat ~/.config/sound_card) + volume=$(amixer get $sound_card | grep % | head -n 1 | cut -f7 -d' ' | sed "s/\[\|\]//g") + brightness=$(~/dev/script/luminosity get) -wifi=$(iwgetid -r) -date=$(date +"%a %d %b. %Y") -hour=$(date +"%H:%M") -battery=$(upower -i $(upower -e | grep BAT) | grep percentage | sed "s/ //g" | cut -d ":" -f2) -volume=$(amixer get Master | grep dB | head -n 1 | cut -f7 -d' ' | sed "s/\[\|\]//g") -brightness=$(echo "100 * $(xrandr --prop --verbose | grep -A10 " connected" | grep Brightness | cut -f2 -d' ')" | bc | sed "s/\.[0-9]$/%/g") + xsetroot -name "| res: $wifi | lum: $brightness | vol: $volume [$sound_card] | bat: $battery | $date | $hour |" +} -xsetroot -name "| res: $wifi | lum: $brightness | vol: $volume | bat: $battery | $date | $hour |" - -sleep 15 -done +if [[ $1 == "once" ]]; then + status_bar +else + while true; do + status_bar + sleep 15 + done +fi diff --git a/volume b/volume new file mode 100755 index 0000000..c5a60b5 --- /dev/null +++ b/volume @@ -0,0 +1,16 @@ +#!/bin/bash + +sound_card=$(cat $XDG_CONFIG_HOME/sound_card) +lev=$(amixer get $sound_card | grep % | head -n 1 | cut -f7 -d' ' | sed "s/\[\|\]\|%//g") + +if [[ $1 == "add" ]]; then + lev=$(($lev+5)) +elif [[ $1 == "min" ]]; then + lev=$(($lev-5)) +elif [[ $1 == "set" ]]; then + lev=$2 +fi + +amixer set $sound_card $lev% >/dev/null + +statusbar.sh once diff --git a/wallpaper b/wallpaper new file mode 100755 index 0000000..fdb6b66 --- /dev/null +++ b/wallpaper @@ -0,0 +1,6 @@ +#!/bin/bash + +wallpath=$OPT_PATH/img/funny-linux +img=$(ls $wallpath | dmenu -l 10 -p "wallpaper:") + +feh --bg-scale $wallpath/$img diff --git a/xinitrc b/xinitrc index 93fa23c..0c26e45 100755 --- a/xinitrc +++ b/xinitrc @@ -1,8 +1,5 @@ -# status bar -~/statusbar.sh & - # terminal alpha -xcompmgr -c & +# xcompmgr -c & # fr keyboard layout setxkbmap -layout fr & @@ -10,5 +7,8 @@ setxkbmap -layout fr & # wallpaper feh --bg-scale ~/Downloads/wallpaper.jpg & +# status bar +~/dev/script/statusbar.sh & + # dwm exec /usr/local/bin/dwm