Clean up some unused crap
This commit is contained in:
parent
09f6b2d9ec
commit
3f26c0452f
138
bashrc.sh.bak
138
bashrc.sh.bak
@ -1,138 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
# Setting up defaults just to be on the safe side
|
|
||||||
PROMPT_COMMAND="__prompt_command; $PROMPT_COMMAND"
|
|
||||||
|
|
||||||
__prompt_command() {
|
|
||||||
PS1="$(powerline-shell.py --cwd-mode fancy --cwd-max-depth 3 --cwd-max-dir-size 16 --mode patched $? 2> /dev/null)"
|
|
||||||
}
|
|
||||||
|
|
||||||
# Command to be called every time PS1 is composed
|
|
||||||
# PROMPT_COMMAND makes this process very easy, it turns out
|
|
||||||
__prompt_command_old() {
|
|
||||||
local EXIT="$?"
|
|
||||||
PS1="\[\e[m\]"
|
|
||||||
|
|
||||||
# Determine which separator we should use
|
|
||||||
# Namely, don't use the Powerline separator if we know we're in a tty
|
|
||||||
|
|
||||||
local SEPARATOR=""
|
|
||||||
if [[ "$(tty)" == *"tty"* ]]; then
|
|
||||||
SEPARATOR=" "
|
|
||||||
else
|
|
||||||
SEPARATOR=""
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Generate the name color based on remote connection and root statuses
|
|
||||||
if [ "$(id -u)" == "0" ]; then
|
|
||||||
# We're root, gimme the flashy red prompt
|
|
||||||
PS1+="\[\e[37;41m\]"
|
|
||||||
else
|
|
||||||
# Generate a background based on remote status
|
|
||||||
if [ -z ${SSH_TTY+x} ]; then
|
|
||||||
#Light Grey on Light Blue (BG)
|
|
||||||
PS1+="\[\e[104m\]"
|
|
||||||
else
|
|
||||||
#Light Grey on Magenta (BG)
|
|
||||||
PS1+="\[\e[45m\]"
|
|
||||||
fi
|
|
||||||
# Generate a foreground based on whether or not we're in sudoers or wheel or whatever
|
|
||||||
# Unfortunately, there's no way for us to *really* check if we can sudo or not
|
|
||||||
local usergroups=($(groups))
|
|
||||||
local admgroups=( "wheel" "root" "sudo" )
|
|
||||||
PS1+="\[\e[30m\]"
|
|
||||||
for usergroup in $usergroups; do
|
|
||||||
for admgroup in $admgroups; do
|
|
||||||
if [ $usergroup == $admgroup ]; then
|
|
||||||
PS1+="\[\e[39m\]"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
done
|
|
||||||
#if [[ $USERGROUPS == *"wheel"* ]] || [[ $USERGROUPS == *"root"* ]] || [[ $USERGROUPS == *"sudo"* ]]; #then
|
|
||||||
# PS1+="\[\e[37m\]"
|
|
||||||
#else
|
|
||||||
# PS1+="\[\e[30m\]"
|
|
||||||
#fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Generate a name based on the remote connection and username
|
|
||||||
PS1+=" "
|
|
||||||
if [ -z ${SSH_TTY+x} ]; then
|
|
||||||
PS1+="$USER"
|
|
||||||
else
|
|
||||||
if [ "$USER" != "salt" ]; then
|
|
||||||
PS1+="$USER@"
|
|
||||||
fi
|
|
||||||
PS1+="$HOSTNAME"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Transition to PWD
|
|
||||||
PS1+=" \[\e[7;90m\]$SEPARATOR\[\e[m\e[100m\]"
|
|
||||||
|
|
||||||
# Generate the PWD
|
|
||||||
PS1+="${PWD/#$HOME/'~'}"
|
|
||||||
|
|
||||||
# Append a neat little arrow suffix
|
|
||||||
if [ $EXIT == 0 ]; then
|
|
||||||
#32: Green
|
|
||||||
PS1+="\[\e[7;32m\]$SEPARATOR\[\e[m\e[32m\]$SEPARATOR"
|
|
||||||
else
|
|
||||||
#31: Red
|
|
||||||
PS1+="\[\e[7;31m\]$SEPARATOR\[\e[0;39;41m\]$EXIT\[\e[m\e[31m\]$SEPARATOR"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Cleanup
|
|
||||||
PS1+="\[\e[m\] "
|
|
||||||
}
|
|
||||||
|
|
||||||
# Common miscellaneous aliases are all defined here for convenience
|
|
||||||
__define_aliases() {
|
|
||||||
|
|
||||||
# Common Aliases
|
|
||||||
|
|
||||||
alias cp='cp -i'
|
|
||||||
alias dd=dcfldd
|
|
||||||
alias ls='ls --color=auto'
|
|
||||||
alias ll='ls -alF'
|
|
||||||
alias la='ls -a --color=auto'
|
|
||||||
alias l='ls -CF'
|
|
||||||
alias waitwhat='echo $?'
|
|
||||||
|
|
||||||
# Simple history thing
|
|
||||||
|
|
||||||
alias fug='sudo $(history -p !!)'
|
|
||||||
}
|
|
||||||
|
|
||||||
# Functions to be exported to the shell
|
|
||||||
# Mostly just helper wrappers and such
|
|
||||||
__define_functions() {
|
|
||||||
# Arch-only helper functions
|
|
||||||
if [[ "$(ls /etc/*release)" == *"arch"* ]]; then
|
|
||||||
pac_helper="pacaur"
|
|
||||||
local helpers=( "pacaur" "yaourt" "pacman" )
|
|
||||||
for helper in $helpers; do
|
|
||||||
if [ $(pacman -Qq $helper > /dev/null) ]; then
|
|
||||||
pac_helper="$helper"
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
alias pac="$pac_helper"
|
|
||||||
alias pacq="$pac_helper -Qs"
|
|
||||||
alias pacqi="$pac_helper -Qi"
|
|
||||||
alias pacs="$pac_helper -S"
|
|
||||||
alias pacss="$pac_helper -Ss"
|
|
||||||
alias pacsu="$pac_helper -Syu"
|
|
||||||
alias pacsyu="$pac_helper -Syyu"
|
|
||||||
alias pacsr="$pac_helper -Rsnu"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# Call functions that need to be called
|
|
||||||
__define_aliases
|
|
||||||
__define_functions
|
|
||||||
|
|
||||||
EDITOR=$(which vim)
|
|
||||||
PATH=$PATH:~/.bin
|
|
||||||
export EDITOR
|
|
||||||
export PATH
|
|
||||||
42
wal-set
42
wal-set
@ -1,42 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
# Copyright (c) <year> rehashedsalt/vintagesalt
|
|
||||||
#
|
|
||||||
# Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
# of this software and associated documentation files (the "Software"), to deal
|
|
||||||
# in the Software without restriction, including without limitation the rights
|
|
||||||
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
# copies of the Software, and to permit persons to whom the Software is
|
|
||||||
# furnished to do so, subject to the following conditions:
|
|
||||||
#
|
|
||||||
# The above copyright notice and this permission notice shall be included in all
|
|
||||||
# copies or substantial portions of the Software.
|
|
||||||
#
|
|
||||||
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
# SOFTWARE.
|
|
||||||
|
|
||||||
# Set a wallpaper
|
|
||||||
wal -a 80 -i "$HOME/Pictures/Wallpapers/i3"
|
|
||||||
|
|
||||||
# Source its generated colors
|
|
||||||
source "$HOME/.cache/wal/colors.sh"
|
|
||||||
|
|
||||||
# Restart dunst
|
|
||||||
pkill dunst
|
|
||||||
dunst \
|
|
||||||
-lb "${color0}" \
|
|
||||||
-nb "${color0}" \
|
|
||||||
-cb "${color0}" \
|
|
||||||
-lfr "${color0}" \
|
|
||||||
-nfr "${color0}" \
|
|
||||||
-cfr "${color0}" \
|
|
||||||
-lf "${color7}" \
|
|
||||||
-nf "${color15}" \
|
|
||||||
-cf "${color9}" \
|
|
||||||
|
|
||||||
exit 0
|
|
||||||
35
xephrice
35
xephrice
@ -1,35 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
# Copyright (c) 2017 rehashedsalt/vintagesalt
|
|
||||||
#
|
|
||||||
# Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
# of this software and associated documentation files (the "Software"), to deal
|
|
||||||
# in the Software without restriction, including without limitation the rights
|
|
||||||
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
# copies of the Software, and to permit persons to whom the Software is
|
|
||||||
# furnished to do so, subject to the following conditions:
|
|
||||||
#
|
|
||||||
# The above copyright notice and this permission notice shall be included in all
|
|
||||||
# copies or substantial portions of the Software.
|
|
||||||
#
|
|
||||||
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
# SOFTWARE.
|
|
||||||
|
|
||||||
xephyrdisplay=":8"
|
|
||||||
|
|
||||||
Xephyr -screen 1920x1080 -title "Xephyr Instance" -br -ac $xephyrdisplay &
|
|
||||||
|
|
||||||
DISPLAY="$xephyrdisplay"
|
|
||||||
sleep 1
|
|
||||||
|
|
||||||
urxvt &
|
|
||||||
|
|
||||||
# Disown all of our jobs
|
|
||||||
printf "\nXephyr session started with urxvt in background. Disowning and closing this terminal may break them!\n"
|
|
||||||
|
|
||||||
exit 0
|
|
||||||
Loading…
Reference in New Issue
Block a user