Merge pull request #1 from h7x4ABk3g/add-ifs-to-aliases

Add ifs to aliases
This commit is contained in:
Oystein Kristoffer Tveit 2021-05-23 03:03:36 +02:00 committed by GitHub
commit 2d360d3a04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 94 additions and 37 deletions

7
desktop/.aliases.desktop Normal file
View File

@ -0,0 +1,7 @@
#!/usr/bin/env bash
# Fix fn keys for Keychron K1
alias fixkeys="sudo echo 0 > /sys/module/hid_apple/parameters/fnmode"
# Fix the screens on Desktop computer
alias fixscreen="xrandr --output DP-4 --mode 1920x1080 --pos 0x0 -r 144 --output DVI-I-1 --primary --mode 1920x1080 --pos 1920x0 -r 144"

1
desktop/README.md Normal file
View File

@ -0,0 +1 @@
# Desktop-specific dotfiles

View File

@ -1,60 +1,99 @@
#!/usr/bin/env bash #!/usr/bin/env bash
export SCREENSHOT_DIR='~/pictures/screenshots'
# ░█▀█░█▀▄░█▀█░█▀▀░█▀▄░█▀█░█▄█░█▀▀ # ░█▀█░█▀▄░█▀█░█▀▀░█▀▄░█▀█░█▄█░█▀▀
# ░█▀▀░█▀▄░█░█░█░█░█▀▄░█▀█░█░█░▀▀█ # ░█▀▀░█▀▄░█░█░█░█░█▀▄░█▀█░█░█░▀▀█
# ░▀░░░▀░▀░▀▀▀░▀▀▀░▀░▀░▀░▀░▀░▀░▀▀▀ # ░▀░░░▀░▀░▀▀▀░▀▀▀░▀░▀░▀░▀░▀░▀░▀▀▀
alias m="ncmpcpp" alias m="ncmpcpp"
alias vim="nvim"
alias p="ipython" if command -v nvim &> /dev/null; then
alias dp="python ~/.scripts/dropbox.py" alias vim="nvim"
alias vi="nvim"
elif command -v vim &> /dev/null; then
alias nvim="vim"
alias vi="vim"
elif command -v vi &> /dev/null; then
alias nvim="vi"
alias vim="vi"
else
echo -e "\033[31m[ERROR] No vim program found on the system! Couldn't bind aliases!\033[0m"
fi
if command -v ipython &> /dev/null; then
alias p="ipython"
fi
if command -v youtube-dl &> /dev/null; then
alias youtube-dl-list='youtube-dl -f "bestvideo[ext=mp4]+bestaudio[ext=m4a]/bestvideo+bestaudio" -o "%(playlist_index)s-%(title)s.%(ext)s"'
alias music-dl='youtube-dl --extract-audio -f "bestaudio[ext=m4a]/best""'
alias music-dl-list='youtube-dl --extract-audio -f "bestaudio[ext=m4a]/best" -o "%(playlist_index)s-%(title)s.%(ext)s"'
fi
if command -v maim &> /dev/null; then
alias skusho='maim -u -k $(echo $SCREENSHOT_DIR)/$(date +%s).png'
if command -v xclip &> /dev/null; then
alias skushoclip='maim -k -s -u | xclip -selection clipboard -t image/png -i'
fi
fi
if command -v rsync &> /dev/null; then
alias cp='rsync --progress -h'
fi
# ░█▀▀░█▀█░█░░░█▀█░█▀▄ # ░█▀▀░█▀█░█░░░█▀█░█▀▄
# ░█░░░█░█░█░░░█░█░█▀▄ # ░█░░░█░█░█░░░█░█░█▀▄
# ░▀▀▀░▀▀▀░▀▀▀░▀▀▀░▀░▀ # ░▀▀▀░▀▀▀░▀▀▀░▀▀▀░▀░▀
# alias ls='ls --group-directories-first --color=auto' if command -v exa &> /dev/null; then
# alias ll='ls -alFh --group-directories-first --color=auto' alias ls='exa'
# alias la='ls -A --group-directories-first --color=auto -F' alias ll='exa --long --header --git'
alias ls='exa' alias sl='exa -a --long --header --git'
alias ll='exa --long --header --git' alias la='exa -a'
alias sl='exa -a --long --header --git' else
alias la='exa -a' alias ls='ls --group-directories-first --color=auto'
alias ll='ls -alFh --group-directories-first --color=auto'
alias la='ls -A --group-directories-first --color=auto -F'
fi
alias dir='dir --color=auto' alias dir='dir --color=auto'
alias vdir='vdir --color=auto' alias vdir='vdir --color=auto'
alias grep='grep --color=auto' alias grep='grep --color=auto'
alias fgrep='fgrep --color=auto' alias fgrep='fgrep --color=auto'
alias egrep='egrep --color=auto' alias egrep='egrep --color=auto'
alias echo-colors='for x in 0 1 4 5 7 8; do for i in {30..37}; do for a in {40..47}; do echo -ne "\e[$x;$i;$a""m\\\e[$x;$i;$a""m\e[0;37;40m "; done; echo; done; done; echo "";'
# ░█▄█░▀█▀░█▀▀░█▀▀ # ░█▄█░▀█▀░█▀▀░█▀▀
# ░█░█░░█░░▀▀█░█░░ # ░█░█░░█░░▀▀█░█░░
# ░▀░▀░▀▀▀░▀▀▀░▀▀▀ # ░▀░▀░▀▀▀░▀▀▀░▀▀▀
# Cd to git folder # Cd to git folder
alias gt="cd ~/git" alias gt='cd ~/git'
# Make ftp server # Make ftp server
alias makeftp="python -m pyftpdlib --directory=$HOME/ --port=2121" alias makeftp='python -m pyftpdlib --directory=$HOME/ --port=2121'
# Get current Fcitx mode # Get current Fcitx mode
alias getFcitxMod='qdbus "org.fcitx.Fcitx" "/inputmethod" "GetCurrentIM"' alias get-fcitx-mode='qdbus "org.fcitx.Fcitx" "/inputmethod" "GetCurrentIM"'
alias youtube-dl-list='youtube-dl -o "%(playlist_index)s-%(title)s.%(ext)s" -f "bestvideo[ext=mp4]+bestaudio[ext=m4a]/bestvideo+bestaudio"' c-file() {
cfile() {
nvim $($HOME/.scripts/rofi/config-selector.py) nvim $($HOME/.scripts/rofi/config-selector.py)
} }
alias tangleDoomEmacs="cd $HOME/.doom.d && $HOME/.emacs.d/bin/org-tangle config.org && cd -" alias openfile='~/.scripts/rofi/config-selector.py | xargs nvim'
alias openfile="~/.scripts/rofi/config-selector.py | xargs nvim" # alias tangle-doom-emacs='cd $HOME/.doom.d && $HOME/.emacs.d/bin/org-tangle config.org && cd -'
alias xr='xmonad --recompile' alias xr='xmonad --recompile'
# TODO: Update to paru # TODO: Update to paru
alias xmr='yay -S xmobar-git --answerclean A --answerdiff N' alias xmr='yay -S xmobar-git --answerclean A --answerdiff N'
alias xxmr='xr; xmr' alias xxmr='xr; xmr'
alias tmuxkillall="tmux ls | awk '{print $1}' | sed 's/://g' | xargs -I{} tmux kill-session -t {}"
alias killall-tmux='tmux ls | awk '{print $1}' | sed 's/://g' | xargs -I{} tmux kill-session -t {}'
alias cd..='cd ..' alias cd..='cd ..'
alias ..='cd ..' alias ..='cd ..'
@ -63,24 +102,24 @@ alias ....='cd ../../..'
alias .....='cd ../../../..' alias .....='cd ../../../..'
alias ......='cd ../../../../..' alias ......='cd ../../../../..'
alias q="exit" alias q='exit'
alias rainbows='head -n 1000 /dev/random | toilet -f pagga | lolcat' # Supposed to be used as a pipe: "cat file | rainbow"
alias rainbow='toilet -f pagga | lolcat'
#TODO: Fix dynamic disable and enable (16 was a one time occurence) if [[ -f ~/.scripts/dropbox.py ]]; then
alias disableTouch="xinput set-prop 16 'Device Enabled' 0" alias dp="python ~/.scripts/dropbox.py"
alias enableTouch="xinput set-prop 16 'Device Enabled' 1" fi
# Connect to home media server if [[ -f ~/.aliases.private ]]; then
alias plexr=" ssh -L 8443:localhost:32400 -N desktop" source ~/.aliases.private
fi
# Fix fn keys for Keychron K1 if [[ -f ~/.aliases.desktop ]]; then
alias fixkeys="sudo echo 0 > /sys/module/hid_apple/parameters/fnmode" source ~/.aliases.desktop
fi
# Fix the screens on Desktop computer if [[ -f ~/.aliases.laptop ]]; then
alias fixscreen="xrandr --output DP-4 --mode 1920x1080 --pos 0x0 -r 144 --output DVI-I-1 --primary --mode 1920x1080 --pos 1920x0 -r 144" source ~/.aliases.laptop
fi
alias doubleScreen="xrandr --output DP-3 --mode 1920x1080"
alias exScreen="xrandr --output DP-3 --mode 1920x1080 --right-of eDP-1"
source ~/.privateAliases

View File

@ -2,6 +2,9 @@
# Initialize p10k if present # Initialize p10k if present
if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
ZSH_THEME="powerlevel10k/powerlevel10k"
else
ZSH_THEME="robbyrussell"
fi fi
# Path to your oh-my-zsh installation. # Path to your oh-my-zsh installation.
@ -9,8 +12,6 @@ export ZSH="$HOME/.oh-my-zsh"
source ~/.aliases source ~/.aliases
ZSH_THEME="powerlevel10k/powerlevel10k"
plugins=( plugins=(
git git
vscode vscode
@ -31,4 +32,4 @@ plugins=(
source $ZSH/oh-my-zsh.sh source $ZSH/oh-my-zsh.sh
# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh. # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh

8
laptop/.aliases.laptop Normal file
View File

@ -0,0 +1,8 @@
#!/usr/bin/env bash
#TODO: Fix dynamic disable and enable (16 was a one time occurence)
alias disable-touch="xinput set-prop 16 'Device Enabled' 0"
alias enable-touch="xinput set-prop 16 'Device Enabled' 1"
alias doubleScreen="xrandr --output DP-3 --mode 1920x1080"
alias exScreen="xrandr --output DP-3 --mode 1920x1080 --right-of eDP-1"

1
laptop/README.md Normal file
View File

@ -0,0 +1 @@
# Laptop-specific dotfiles