From fb9968a7495df4310eb7320e62bdb6fa4aeae3e6 Mon Sep 17 00:00:00 2001 From: Filip Rojek Date: Mon, 6 Feb 2023 14:11:50 +0000 Subject: [PATCH 1/4] Add README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..a01fb2c --- /dev/null +++ b/README.md @@ -0,0 +1,4 @@ +## Setup + +`git clone --bare https://git.filiprojek.cz/filiprojek/dotfiles $HOME/.dotfiles` +`echo "alias config='/usr/bin/git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME'" >> .bashrc && source $HOME/.bashrc` \ No newline at end of file From ceb23922d365db74cceb87f27f86877d6d0fd70e Mon Sep 17 00:00:00 2001 From: Filip Rojek Date: Mon, 6 Feb 2023 14:12:20 +0000 Subject: [PATCH 2/4] Update 'README.md' --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a01fb2c..2a3ebad 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ ## Setup -`git clone --bare https://git.filiprojek.cz/filiprojek/dotfiles $HOME/.dotfiles` -`echo "alias config='/usr/bin/git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME'" >> .bashrc && source $HOME/.bashrc` \ No newline at end of file +- `git clone --bare https://git.filiprojek.cz/filiprojek/dotfiles $HOME/.dotfiles` +- `echo "alias config='/usr/bin/git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME'" >> .bashrc && source $HOME/.bashrc` \ No newline at end of file From e6554f13b495f2f9139d7d27fd2eb68b77a96add Mon Sep 17 00:00:00 2001 From: Filip Rojek Date: Mon, 6 Feb 2023 14:16:31 +0000 Subject: [PATCH 3/4] Update 'README.md' --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2a3ebad..6aba6c1 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ ## Setup -- `git clone --bare https://git.filiprojek.cz/filiprojek/dotfiles $HOME/.dotfiles` -- `echo "alias config='/usr/bin/git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME'" >> .bashrc && source $HOME/.bashrc` \ No newline at end of file +- `echo "alias config='/usr/bin/git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME'" >> .bashrc && source $HOME/.bashrc` +- `echo ".dotfiles" >> .gitignore` +- `git clone --bare https://git.filiprojek.cz/filiprojek/dotfiles $HOME/.dotfiles` \ No newline at end of file From 735c74d57a192a96c26641f7fe6460e48897660f Mon Sep 17 00:00:00 2001 From: Filip Rojek Date: Mon, 6 Feb 2023 22:18:27 +0100 Subject: [PATCH 4/4] changed: .bashrc --- .bashrc | 221 +++++++++++++++++++++++++++++++++++++++++++++++++- .ownrc | 248 -------------------------------------------------------- 2 files changed, 218 insertions(+), 251 deletions(-) delete mode 100644 .ownrc diff --git a/.bashrc b/.bashrc index be0e08a..ab490cc 100644 --- a/.bashrc +++ b/.bashrc @@ -1,9 +1,224 @@ +#!/bin/bash + +# +# ▒█▀▀▀ ▒█▀▀█ Filip Rojek +# ▒█▀▀▀ ▒█▄▄▀ http://git.filiprojek.cz/fr/ +# ▒█░░░ ▒█░▒█ http://filiprojek.cz/ +# + # .bashrc source /etc/profile + # If not running interactively, don't do anything [[ $- != *i* ]] && return -alias ls='ls --color=auto' -PS1='[\u@\h \W]\$ ' -source ~/.ownrc +# PS1 shell color +## based on: https://www.cyberciti.biz/faq/bash-shell-change-the-color-of-my-shell-prompt-under-linux-or-unix/ +## get current branch in git repo +function parse_git_branch() { + BRANCH=`git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/'` + if [ ! "${BRANCH}" == "" ] + then + STAT=`parse_git_dirty` + echo "[${BRANCH}${STAT}]" + else + echo "" + fi +} + +## get current status of git repo +function parse_git_dirty { status=`git status 2>&1 | tee` + dirty=`echo -n "${status}" 2> /dev/null | grep "modified:" &> /dev/null; echo "$?"` + untracked=`echo -n "${status}" 2> /dev/null | grep "Untracked files" &> /dev/null; echo "$?"` + ahead=`echo -n "${status}" 2> /dev/null | grep "Your branch is ahead of" &> /dev/null; echo "$?"` + newfile=`echo -n "${status}" 2> /dev/null | grep "new file:" &> /dev/null; echo "$?"` + renamed=`echo -n "${status}" 2> /dev/null | grep "renamed:" &> /dev/null; echo "$?"` + deleted=`echo -n "${status}" 2> /dev/null | grep "deleted:" &> /dev/null; echo "$?"` + bits='' + if [ "${renamed}" == "0" ]; then + bits=">${bits}" + fi + if [ "${ahead}" == "0" ]; then + bits="*${bits}" + fi + if [ "${newfile}" == "0" ]; then + bits="+${bits}" + fi + if [ "${untracked}" == "0" ]; then + bits="?${bits}" + fi + if [ "${deleted}" == "0" ]; then + bits="x${bits}" + fi + if [ "${dirty}" == "0" ]; then + bits="!${bits}" + fi + if [ ! "${bits}" == "" ]; then + echo " ${bits}" + else + echo "" + fi +} + +export PS1="\[\e[36m\][\[\e[m\]\[\e[36m\]\u\[\e[m\]\[\e[36m\]@\[\e[m\]\[\e[36m\]\h\[\e[m\]\[\e[36m\] \[\e[m\]\[\e[36m\]\W\[\e[m\]\[\e[36m\]]\[\e[m\]\[\e[32;40m\]\`parse_git_branch\`\[\e[m\]\[\e[36m\]\\$\[\e[m\] " + + +# Functions +function convertm() { + for f in *.jpg; do + convert ./"$f" ./"${f%.}.pdf" + done +} + +## Create new directory and descend into it +function mkcd() { mkdir -p "$@" && cd "$@"; } + +## Kill all that use port +killport () { + kill $(lsof -t -i:"$1") +} + +## Enable runit service (for Void Linux) +function sv-enable () { + if test -e /etc/sv/$1; then + doas ln -sv /etc/sv/$1 /var/service/ + else + echo "Error: /etc/sv/$1 does not exist" + fi +} + +## Switch keyboard layouts +function xkb-switch () { +LAYOUT=$(setxkbmap -query | grep layout | awk '{print $2}') + if [[ $LAYOUT == "us" ]]; then + setxkbmap cz qwerty + else + setxkbmap us + fi +} + +## Repeat command until exit +function dorepeat() { + while true; do + "$@" + sleep 1 + echo + done +} + +## Generate random password (default length is 16 chars) +function genpasswd() { + local l=$1 + [ -n "$l" ] || l=16 + tr -dc A-Za-z0-9_ < /dev/urandom \ + | head -c "$l" | xargs +} + +## Download m3u8 stream +m3u8-download() { + youtube-dl --list-formats "$1" + echo "enter format code:" + read format_code + youtube-dl -f $format_code --hls-prefer-native "$1" +} + + +# Aliases and Exports +## utility +alias cal="cal -m" + +## shell +set -o vi # vim keybinding in terminal +EDITOR=vim # prefered editor +stty -ixon # reverse i search bash +alias ls="ls --color=auto" +alias ll="ls -lFh" +alias la="ls -alh" +alias l="ls -CF" +alias ld="ls -d -F */" +alias lda="ls -l -d -p */" + +## network + +## shortcuts +alias lgfr="cd ~/git/filiprojek/" +alias lgfw="cd ~/git/fofrweb/" +alias lbc="cd ~/git/fr/pedf/bc" + +## programs +alias r="ranger" +alias feh="feh --scale-down" +alias dragon="dragon-drop" +alias xclip="xclip -selection c" +alias grep='grep --color=auto' +alias passmenu="passmenu -l 10" +alias speedtest="speedtest-cli" +alias "cd.."="cd .." +alias df='df -h' # human-readable sizes +alias free='free -m' # show sizes in MB + +## gpg encryption +# verify signature for isos +alias gpg-check="gpg2 --keyserver-options auto-key-retrieve --verify" +# receive the key of a developer +alias gpg-retrieve="gpg2 --keyserver-options auto-key-retrieve --receive-keys" + +## confirm before overwriting something +alias cp="cp -i" +alias mv='mv -i' +alias rm='rm -i' + +## downloaders +alias uloztodl="ulozto-downloader --auto-captcha --parts 40" +alias wgetall="wget -r --no-parent" +### yt-dlp +alias yta-aac="yt-dlp --extract-audio --audio-format aac " +alias yta-best="yt-dlp --extract-audio --audio-format best " +alias yta-flac="yt-dlp --extract-audio --audio-format flac " +alias yta-m4a="yt-dlp --extract-audio --audio-format m4a " +alias yta-mp3="yt-dlp --extract-audio --audio-format mp3 " +alias yta-opus="yt-dlp --extract-audio --audio-format opus " +alias yta-vorbis="yt-dlp --extract-audio --audio-format vorbis " +alias yta-wav="yt-dlp --extract-audio --audio-format wav " +alias ytv-best="yt-dlp -f bestvideo+bestaudio " + +## short scripts +alias wttr="curl -s wttr.in/Prague?q0M" +alias wttrfull="curl -s wttr.in/Prague?qM" +alias whatsmyip="dig +short myip.opendns.com @resolver1.opendns.com" +alias htmlvlna="vlna -s -r -x 266E6273703B" +alias fuck='doas $(history -p \!\!)' +alias sudo="doas" + +## void xbps aliases +alias xi="doas xbps-install" +alias xq="doas xbps-query -Rs" +alias xr="doas xbps-remove" +alias xrd="doas xbps-remove -R" # remove all dependencies +alias xu="doas xbps-install -Suv" # update +alias xreinstall="doas xbps-install -f" +alias xlu="xbps-install -Suvn" # list packages requiring updates + +## random +#alias vim="nvim" +alias todo="vim ~/_todo.md" +alias schm="~/.screenlayout/home.sh" +alias sclp="~/.screenlayout/laptop.sh" +### bare git repo alias for dotfiles +alias config="/usr/bin/git --git-dir=$HOME/.dotfiles --work-tree=$HOME" + + +# Exports +export PATH="$PATH:$HOME/.cargo/bin" +export PATH="$PATH:$HOME/.local/bin" +export PATH="$PATH:/var/lib/flatpak/exports/bin" +export PATH="$PATH:$HOME/.local/share/flatpak/exports/bin" + +# autologin on tty1 + if [ -z "$DISPLAY" ] && [ "$(fgconsole)" -eq 1 ]; then + exec startx + fi + + export $(dbus-launch) + diff --git a/.ownrc b/.ownrc deleted file mode 100644 index 862678c..0000000 --- a/.ownrc +++ /dev/null @@ -1,248 +0,0 @@ -#!/bin/bash - - -# PS1 shell color -# based on: https://www.cyberciti.biz/faq/bash-shell-change-the-color-of-my-shell-prompt-under-linux-or-unix/ -#export PS1="\e[1;33m[\u@\h \W]\$ \e[m" - -# get current branch in git repo -function parse_git_branch() { - BRANCH=`git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/'` - if [ ! "${BRANCH}" == "" ] - then - STAT=`parse_git_dirty` - echo "[${BRANCH}${STAT}]" - else - echo "" - fi -} - -# get current status of git repo -function parse_git_dirty { status=`git status 2>&1 | tee` - dirty=`echo -n "${status}" 2> /dev/null | grep "modified:" &> /dev/null; echo "$?"` - untracked=`echo -n "${status}" 2> /dev/null | grep "Untracked files" &> /dev/null; echo "$?"` - ahead=`echo -n "${status}" 2> /dev/null | grep "Your branch is ahead of" &> /dev/null; echo "$?"` - newfile=`echo -n "${status}" 2> /dev/null | grep "new file:" &> /dev/null; echo "$?"` - renamed=`echo -n "${status}" 2> /dev/null | grep "renamed:" &> /dev/null; echo "$?"` - deleted=`echo -n "${status}" 2> /dev/null | grep "deleted:" &> /dev/null; echo "$?"` - bits='' - if [ "${renamed}" == "0" ]; then - bits=">${bits}" - fi - if [ "${ahead}" == "0" ]; then - bits="*${bits}" - fi - if [ "${newfile}" == "0" ]; then - bits="+${bits}" - fi - if [ "${untracked}" == "0" ]; then - bits="?${bits}" - fi - if [ "${deleted}" == "0" ]; then - bits="x${bits}" - fi - if [ "${dirty}" == "0" ]; then - bits="!${bits}" - fi - if [ ! "${bits}" == "" ]; then - echo " ${bits}" - else - echo "" - fi -} - -export PS1="\[\e[36m\][\[\e[m\]\[\e[36m\]\u\[\e[m\]\[\e[36m\]@\[\e[m\]\[\e[36m\]\h\[\e[m\]\[\e[36m\] \[\e[m\]\[\e[36m\]\W\[\e[m\]\[\e[36m\]]\[\e[m\]\[\e[32;40m\]\`parse_git_branch\`\[\e[m\]\[\e[36m\]\\$\[\e[m\] " - - - - -function convertm() { - for f in *.jpg; do - convert ./"$f" ./"${f%.}.pdf" - done -} - -# Create new directory and descend into it -function mkcd() { mkdir -p "$@" && cd "$@"; } - -# Extract function -extract () { - if [ -f $1 ] ; then - case $1 in - *.tar.bz2) tar xvjf $1 ;; - *.tar.gz) tar xvzf $1 ;; - *.tar.xz) tar Jxvf $1 ;; - *.bz2) bunzip2 $1 ;; - *.rar) unrar-free x $1 ;; - *.gz) gunzip $1 ;; - *.tar) tar xvf $1 ;; - *.tbz2) tar xvjf $1 ;; - *.tgz) tar xvzf $1 ;; - *.zip) unzip $1 ;; - *.Z) uncompress $1 ;; - *.7z) 7z x $1 ;; - *) echo "don't know how to extract '$1'..." ;; - esac - else - echo "'$1' is not a valid file!" - fi - } - -# Kill all that use port -killport () { - kill $(lsof -t -i:"$1") -} - -function sv-enable () { - if test -e /etc/sv/$1; then - doas ln -sv /etc/sv/$1 /var/service/ - else - echo "Error: /etc/sv/$1 does not exist" - fi -} - -function xkb-switch () { -LAYOUT=$(setxkbmap -query | grep layout | awk '{print $2}') - if [[ $LAYOUT == "us" ]]; then - setxkbmap cz qwerty - else - setxkbmap us - fi -} - -function dorepeat() { - while true; do - "$@" - sleep 1 - echo - done -} - -function genpasswd() { - local l=$1 - [ -n "$l" ] || l=16 - tr -dc A-Za-z0-9_ < /dev/urandom \ - | head -c "$l" | xargs -} -# Run JetBrains IDEs from terminal in detached mode -phpstorm() { - ~/.local/bin/phpstorm "$1" > /dev/null 2>&1 & -} - -webstorm() { - ~/.local/bin/webstorm "$1" > /dev/null 2>&1 & -} - -m3u8-download() { - youtube-dl --list-formats "$1" - echo "enter format code:" - read format_code - youtube-dl -f $format_code --hls-prefer-native "$1" -} - -#function subl() { -# flatpak run com.sublimetext.three "$1" /dev/null 2>&1 & -#} - -# Intel Graphics Optimus screen tearing -#xrandr --output eDP-1-1 --set 'PRIME Synchronization' '1' -# by: https://www.reddit.com/r/linux_gaming/comments/aoh5be/guide_hybrid_graphics_on_linux_nvidia_optimus/ -# make /etc/init.d/startup.sh and put that command in - - - - -# thefuck app alias -#eval "$(thefuck --alias)" - -# Aliases and Exports -## utility -alias cal="cal -m" - -## shell -set -o vi # vim keybinding in terminal -EDITOR=vim # prefered editor -alias ls="ls --color=auto" -alias ll="ls -lFh" -alias la="ls -alh" -alias l="ls -CF" -alias ld="ls -d -F */" -alias lda="ls -l -d -p */" -stty -ixon # reverse i search bash -alias xclip="xclip -selection c" - -## network - -## shortcuts -alias lgfr="cd ~/git/filiprojek/" -alias lgfw="cd ~/git/fofrweb/" -alias lbc="cd ~/git/fr/pedf/bc" - -## programs -alias r="ranger" -alias feh="feh --scale-down" -alias dragon="dragon-drop" -alias passmenu="passmenu -l 10" -alias speedtest="speedtest-cli" - -## random -#alias vim="nvim" -function touchpaddisable () { -xinput set-prop $1 'Device Enabled' 0 -} -function touchpadenable () { -xinput set-prop $1 'Device Enabled' 1 -} -alias todo="vim ~/_todo.md" -alias schm="~/.screenlayout/home.sh" -alias sclp="~/.screenlayout/laptop.sh" - -## downloaders -alias ytdl-mp3="yt-dlp-f bestaudio --extract-audio --audio-format mp3 --audio-quality 0" -alias ytmp3="yt-dlp -x --audio-quality 0 --audio-format mp3" -alias ytmp4-best="yt-dlp -f best" -alias uloztodl="ulozto-downloader --auto-captcha --parts 40" -alias wgetall="wget -r --no-parent" - -## short scripts -alias wttr="curl -s wttr.in/Prague?q0M" -alias wttrfull="curl -s wttr.in/Prague?qM" -alias whatsmyip="dig +short myip.opendns.com @resolver1.opendns.com" -#alias logout="gnome-session-quit" -alias batstat="(upower -i `upower -e | grep BAT0` && upower -i `upower -e | grep BAT1`) | grep -e percentage -e 'time to empty' -e state" -#alias volstat="amixer sget Master" -alias htmlvlna="vlna -s -r -x 266E6273703B" -alias sudo="doas" -alias fuck='doas $(history -p \!\!)' - -## void xbps aliases -alias xi="doas xbps-install" -alias xq="doas xbps-query -Rs" -alias xr="doas xbps-remove" -alias xrd="doas xbps-remove -R" # remove all dependencies -alias xu="doas xbps-install -Suv" # update -alias xreinstall="doas xbps-install -f" -alias xlu="xbps-install -Suvn" # list packages requiring updates - - -alias untar="tar -xvf" -alias norklhbin="node /home/filiprojek/git/filiprojek/nork/dist/app.js" -alias norklh="ts-node /home/filiprojek/git/filiprojek/nork/src/app.ts" -alias docsgnlh="nodemon /home/filiprojek/git/filiprojek/docsgn/src/app.ts" -alias "cd.."="cd .." -#alias docker-compose="docker compose" -export PATH="$PATH:/home/filiprojek/.cargo/bin" -export PATH="$PATH:/home/filiprojek/.local/bin" -export PATH="$PATH:/home/filiprojek/git/filiprojek/linux-stuff/scripts" -export PATH="$PATH:/var/lib/flatpak/exports/bin" -export PATH="$PATH:~/.local/share/flatpak/exports/bin" - -# GnuPG TUI -#export GPG_TTY=$(tty) - -# autologin on tty1 - if [ -z "$DISPLAY" ] && [ "$(fgconsole)" -eq 1 ]; then - exec startx - fi - - export $(dbus-launch)