switch to bashrc, fix sway config
This commit is contained in:
Opal
@@ -0,0 +1,333 @@
|
||||
#!/bin/bash
|
||||
iatest=$(expr index "$-" i)
|
||||
|
||||
#Source global definitions
|
||||
if [ -f /etc/bashrc ]; then
|
||||
. /etc/bashrc
|
||||
fi
|
||||
|
||||
#Enable bash programmable completion features in interactive shells
|
||||
if [ -f /usr/share/bash-completion/bash_completion ]; then
|
||||
. /usr/share/bash-completion/bash_completion
|
||||
elif [ -f /etc/bash_completion ]; then
|
||||
. /etc/bash_completion
|
||||
fi
|
||||
|
||||
#######################################################
|
||||
# EXPORTS
|
||||
#######################################################
|
||||
|
||||
# Expand the history size
|
||||
export HISTFILESIZE=99999
|
||||
export HISTSIZE=99999
|
||||
|
||||
# Don't put duplicate lines in the history and do not add lines that start with a space
|
||||
export HISTCONTROL=erasedups:ignoredups:ignorespace
|
||||
|
||||
# Check the window size after each command and, if necessary, update the values of LINES and COLUMNS
|
||||
shopt -s checkwinsize
|
||||
|
||||
# Causes bash to append to history instead of overwriting it so if you start a new terminal, you have old session history
|
||||
shopt -s histappend
|
||||
PROMPT_COMMAND='history -a'
|
||||
|
||||
# Allow ctrl-S for history navigation (with ctrl-R)
|
||||
stty -ixon
|
||||
|
||||
# Ignore case on auto-completion
|
||||
# Note: bind used instead of sticking these in .inputrc
|
||||
if [[ $iatest > 0 ]]; then bind "set completion-ignore-case on"; fi
|
||||
|
||||
# Show auto-completion list automatically, without double tab
|
||||
if [[ $iatest > 0 ]]; then bind "set show-all-if-ambiguous On"; fi
|
||||
|
||||
# Set the default editor
|
||||
export EDITOR=vim
|
||||
export VISUAL=vim
|
||||
|
||||
# To have colors for ls and all grep commands such as grep, egrep and zgrep
|
||||
export CLICOLOR=1
|
||||
export LS_COLORS='no=00:fi=00:di=00;34:ln=01;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arj=01;31:*.taz=01;31:*.lzh=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.gz=01;31:*.bz2=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.jpg=01;35:*.jpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.avi=01;35:*.fli=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.ogg=01;35:*.mp3=01;35:*.wav=01;35:*.xml=00;31:'
|
||||
alias grep="/usr/bin/grep $GREP_OPTIONS"
|
||||
unset GREP_OPTIONS
|
||||
|
||||
# Color for manpages in less makes manpages a little easier to read
|
||||
export LESS_TERMCAP_mb=$'\E[01;31m'
|
||||
export LESS_TERMCAP_md=$'\E[01;31m'
|
||||
export LESS_TERMCAP_me=$'\E[0m'
|
||||
export LESS_TERMCAP_se=$'\E[0m'
|
||||
export LESS_TERMCAP_so=$'\E[01;44;33m'
|
||||
export LESS_TERMCAP_ue=$'\E[0m'
|
||||
export LESS_TERMCAP_us=$'\E[01;32m'
|
||||
export LC_WHO=rorlando
|
||||
# Scripts Path
|
||||
PATH=$PATH:~/scripts
|
||||
# Ruby Path
|
||||
PATH=$PATH:~/.local/share/gem/ruby/2.7.0/bin
|
||||
|
||||
#######################################################
|
||||
# ALIAS
|
||||
#######################################################
|
||||
# To temporarily bypass an alias, we preceed the command with a \
|
||||
# EG: the ls command is aliased, but to use the normal ls command you would type \ls
|
||||
|
||||
# Add an "alert" alias for long running commands. Use like so:
|
||||
# sleep 10; alert
|
||||
alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
|
||||
|
||||
# alias to show the date
|
||||
alias da='date "+%Y-%m-%d %A %T %Z"'
|
||||
|
||||
# Alias's to modified commands
|
||||
alias cp='cp -i'
|
||||
alias mv='mv -i'
|
||||
alias rm='rm -iv'
|
||||
alias trash='mv $1 ~/.trash/'
|
||||
alias mkdir='mkdir -p'
|
||||
alias ps='ps auxf'
|
||||
alias ping='ping -c 10'
|
||||
alias less='less -R'
|
||||
alias vi='vim'
|
||||
alias vis='vim "+set si"'
|
||||
|
||||
# Change directory aliases
|
||||
alias home='cd ~'
|
||||
alias cd..='cd ..'
|
||||
alias ..='cd ..'
|
||||
alias ...='cd ../..'
|
||||
alias ....='cd ../../..'
|
||||
alias .....='cd ../../../..'
|
||||
|
||||
# cd into the old directory
|
||||
alias bd='cd "$OLDPWD"'
|
||||
|
||||
# Alias's for multiple directory listing commands
|
||||
alias la='ls -Alh' # show hidden files
|
||||
alias ls='ls -aFh --color=always' # add colors and file type extensions
|
||||
alias lx='ls -lXBh' # sort by extension
|
||||
alias lk='ls -lSrh' # sort by size
|
||||
alias lc='ls -lcrh' # sort by change time
|
||||
alias lu='ls -lurh' # sort by access time
|
||||
alias lr='ls -lRh' # recursive ls
|
||||
alias lt='ls -ltrh' # sort by date
|
||||
alias lm='ls -alh |more' # pipe through 'more'
|
||||
alias lw='ls -xAh' # wide listing format
|
||||
alias ll='ls -Fls' # long listing format
|
||||
alias labc='ls -lap' #alphabetical sort
|
||||
alias lf="ls -l | egrep -v '^d'" # files only
|
||||
alias ldir="ls -l | egrep '^d'" # directories only
|
||||
|
||||
# Search command line history
|
||||
alias h="history | grep "
|
||||
|
||||
# Search files in the current folder
|
||||
alias f="find . | grep "
|
||||
|
||||
# Count all files (recursively) in the current folder
|
||||
alias countfiles="for t in files links directories; do echo \`find . -type \${t:0:1} | wc -l\` \$t; done 2> /dev/null"
|
||||
|
||||
# Show current network connections to the server
|
||||
alias ipview="netstat -anpl | grep :80 | awk {'print \$5'} | cut -d\":\" -f1 | sort | uniq -c | sort -n | sed -e 's/^ *//' -e 's/ *\$//'"
|
||||
|
||||
# Show open ports
|
||||
alias openports='netstat -nape --inet'
|
||||
|
||||
# Alias's to show disk space and space used in a folder
|
||||
alias diskspace="du -S | sort -n -r |more"
|
||||
alias folders='du -h --max-depth=1'
|
||||
alias folderssort='find . -maxdepth 1 -type d -print0 | xargs -0 du -sk | sort -rn'
|
||||
alias tree='tree -CAhF --dirsfirst'
|
||||
alias treed='tree -CAFd'
|
||||
alias mountedinfo='df -hT'
|
||||
|
||||
# Alias's for archives
|
||||
alias mktar='tar -cvf'
|
||||
alias mkbz2='tar -cvjf'
|
||||
alias mkgz='tar -cvzf'
|
||||
alias untar='tar -xvf'
|
||||
alias unbz2='tar -xvjf'
|
||||
alias ungz='tar -xvzf'
|
||||
|
||||
# Show all logs in /var/log
|
||||
alias logs="sudo find /var/log -type f -exec file {} \; | grep 'text' | cut -d' ' -f1 | sed -e's/:$//g' | grep -v '[0-9]$' | xargs tail -f"
|
||||
|
||||
# SHA1
|
||||
alias sha1='openssl sha1'
|
||||
|
||||
# #######################################################
|
||||
# # SPECIAL FUNCTIONS
|
||||
# #######################################################
|
||||
|
||||
# Searches for text in all files in the current folder
|
||||
ftext() {
|
||||
# -i case-insensitive
|
||||
# -I ignore binary files
|
||||
# -H causes filename to be printed
|
||||
# -r recursive search
|
||||
# -n causes line number to be printed
|
||||
# optional: -F treat search term as a literal, not a regular expression
|
||||
# optional: -l only print filenames and not the matching lines ex. grep -irl "$1" *
|
||||
grep -iIHrn --color=always "$1" . | less -r
|
||||
}
|
||||
|
||||
# Copy file with a progress bar
|
||||
cpp() {
|
||||
set -e
|
||||
strace -q -ewrite cp -- "${1}" "${2}" 2>&1 |
|
||||
awk '{
|
||||
count += $NF
|
||||
if (count % 10 == 0) {
|
||||
percent = count / total_size * 100
|
||||
printf "%3d%% [", percent
|
||||
for (i=0;i<=percent;i++)
|
||||
printf "="
|
||||
printf ">"
|
||||
for (i=percent;i<100;i++)
|
||||
printf " "
|
||||
printf "]\r"
|
||||
}
|
||||
}
|
||||
END { print "" }' total_size=$(stat -c '%s' "${1}") count=0
|
||||
}
|
||||
|
||||
# Copy and go to the directory
|
||||
cpg() {
|
||||
if [ -d "$2" ]; then
|
||||
cp $1 $2 && cd $2
|
||||
else
|
||||
cp $1 $2
|
||||
fi
|
||||
}
|
||||
|
||||
# Move and go to the directory
|
||||
mvg() {
|
||||
if [ -d "$2" ]; then
|
||||
mv $1 $2 && cd $2
|
||||
else
|
||||
mv $1 $2
|
||||
fi
|
||||
}
|
||||
|
||||
# Create and go to the directory
|
||||
mkdirg() {
|
||||
mkdir -p $1
|
||||
cd $1
|
||||
}
|
||||
|
||||
# Goes up a specified number of directories (i.e. up 4)
|
||||
up() {
|
||||
local d=""
|
||||
limit=$1
|
||||
for ((i = 1; i <= limit; i++)); do
|
||||
d=$d/..
|
||||
done
|
||||
d=$(echo $d | sed 's/^\///')
|
||||
if [ -z "$d" ]; then
|
||||
d=..
|
||||
fi
|
||||
cd $d
|
||||
}
|
||||
|
||||
# Show current network information
|
||||
netinfo() {
|
||||
echo "--------------- Network Information ---------------"
|
||||
/sbin/ifconfig | awk /'inet addr/ {print $2}'
|
||||
echo ""
|
||||
/sbin/ifconfig | awk /'Bcast/ {print $3}'
|
||||
echo ""
|
||||
/sbin/ifconfig | awk /'inet addr/ {print $4}'
|
||||
|
||||
/sbin/ifconfig | awk /'HWaddr/ {print $4,$5}'
|
||||
echo "---------------------------------------------------"
|
||||
}
|
||||
|
||||
# IP address lookup
|
||||
alias whatismyip="whatsmyip"
|
||||
function whatsmyip() {
|
||||
# Dumps a list of all IP addresses for every device
|
||||
# /sbin/ifconfig |grep -B1 "inet addr" |awk '{ if ( $1 == "inet" ) { print $2 } else if ( $2 == "Link" ) { printf "%s:" ,$1 } }' |awk -F: '{ print $1 ": " $3 }';
|
||||
|
||||
# Internal IP Lookup
|
||||
echo -n "Internal IP: "
|
||||
/sbin/ifconfig eth0 | grep "inet addr" | awk -F: '{print $2}' | awk '{print $1}'
|
||||
|
||||
# External IP Lookup
|
||||
echo -n "External IP: "
|
||||
wget http://smart-ip.net/myip -O - -q
|
||||
}
|
||||
|
||||
# View Apache logs
|
||||
apachelog() {
|
||||
if [ -f /etc/httpd/conf/httpd.conf ]; then
|
||||
cd /var/log/httpd && ls -xAh && multitail --no-repeat -c -s 2 /var/log/httpd/*_log
|
||||
else
|
||||
cd /var/log/apache2 && ls -xAh && multitail --no-repeat -c -s 2 /var/log/apache2/*.log
|
||||
fi
|
||||
}
|
||||
|
||||
#######################################################
|
||||
# Prompt
|
||||
#######################################################
|
||||
|
||||
function __setprompt {
|
||||
|
||||
# Define colors
|
||||
local LIGHTGRAY="\033[0;37m"
|
||||
local WHITE="\033[1;37m"
|
||||
local BLACK="\033[0;30m"
|
||||
local DARKGRAY="\033[1;30m"
|
||||
local RED="\033[0;31m"
|
||||
local LIGHTRED="\033[1;31m"
|
||||
local GREEN="\033[0;32m"
|
||||
local LIGHTGREEN="\033[1;32m"
|
||||
local BROWN="\033[0;33m"
|
||||
local YELLOW="\033[1;33m"
|
||||
local BLUE="\033[0;34m"
|
||||
local LIGHTBLUE="\033[1;34m"
|
||||
local MAGENTA="\033[0;35m"
|
||||
local LIGHTMAGENTA="\033[1;35m"
|
||||
local CYAN="\033[0;36m"
|
||||
local LIGHTCYAN="\033[1;36m"
|
||||
local NOCOLOR="\033[0m"
|
||||
|
||||
PS1=""
|
||||
# User and server
|
||||
local SSH_IP=$(echo $SSH_CLIENT | awk '{ print $1 }')
|
||||
local SSH2_IP=$(echo $SSH2_CLIENT | awk '{ print $1 }')
|
||||
if [ $SSH2_IP ] || [ $SSH_IP ]; then
|
||||
PS1+="(\[${RED}\]\u@\h"
|
||||
else
|
||||
PS1+="(\[${RED}\]\u"
|
||||
fi
|
||||
|
||||
# Current directory
|
||||
PS1+="\[${LIGHTGRAY}\]:\[${BROWN}\]\w\[${LIGHTGRAY}\])-"
|
||||
|
||||
# Total size of files in current directory
|
||||
PS1+="(\[${GREEN}\]$(/bin/ls -lah | /bin/grep -m 1 total | /bin/sed 's/total //')\[${LIGHTGRAY}\]:"
|
||||
|
||||
# Number of files
|
||||
PS1+="\[${GREEN}\]\$(/bin/ls -A -1 | /usr/bin/wc -l)\[${LIGHTGRAY}\])-"
|
||||
|
||||
# git branch
|
||||
PS1+="(\[${LIGHTGRAY}\]\$(git branch --show-current 2>/dev/null)\[${LIGHTGRAY}\])"
|
||||
|
||||
# Skip to the next line
|
||||
PS1+="\n"
|
||||
|
||||
if [[ $EUID -ne 0 ]]; then
|
||||
PS1+="\[${GREEN}\] >\[${NOCOLOR}\] " # Normal user
|
||||
else
|
||||
PS1+="\[${RED}\]>\[${NOCOLOR}\] " # Root user
|
||||
fi
|
||||
|
||||
# PS2 is used to continue a command using the \ character
|
||||
PS2="\[${LIGHTGRAY}\]>\[${NOCOLOR}\] "
|
||||
|
||||
# PS3 is used to enter a number choice in a script
|
||||
PS3='Please enter a number from above list: '
|
||||
|
||||
# PS4 is used for tracing a script in debug mode
|
||||
PS4='\[${LIGHTGRAY}\]+\[${NOCOLOR}\] '
|
||||
}
|
||||
PROMPT_COMMAND='__setprompt'
|
||||
@@ -8,3 +8,6 @@ font:
|
||||
offset:
|
||||
x: 0
|
||||
y: 0
|
||||
|
||||
window:
|
||||
opacity: 0.98
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
directory: /run/media/opal/790e21c0-77d3-4119-ad86-e9a6857fc89d/music
|
||||
library: /run/media/opal/790e21c0-77d3-4119-ad86-e9a6857fc89d/beets-library.db
|
||||
directory: ~/music/to-push
|
||||
library: ~/.config/beets/beets-library.db
|
||||
|
||||
import:
|
||||
move: yes
|
||||
|
||||
+12
-19
@@ -103,7 +103,8 @@ bindsym $mod+space focus mode_toggle
|
||||
|
||||
# Move focus to the parent container
|
||||
bindsym $mod+a focus parent
|
||||
#
|
||||
|
||||
|
||||
# Scratchpad:
|
||||
#
|
||||
# Sway has a "scratchpad", which is a bag of holding for windows.
|
||||
@@ -158,13 +159,13 @@ bindsym $mod+Shift+e exec swaynag -t custom -m 'What action would you like to pe
|
||||
exec_always dunst
|
||||
|
||||
# flash focus
|
||||
exec_always --no-startup-id flashfocus
|
||||
exec flashfocus
|
||||
|
||||
# Wlsunset (Night Light)
|
||||
exec_always wlsunset -l 47.6 -L -122.3 -t 3000 -T 6500
|
||||
exec wlsunset -l 47.6 -L -122.3 -t 3000 -T 6500
|
||||
|
||||
# udiskie - auto usb mounting
|
||||
exec /usr/bin/udiskie
|
||||
exec /usr/bin/udi8000
|
||||
|
||||
# Network Manager tray applet
|
||||
exec /usr/bin/nm-applet --indicator
|
||||
@@ -176,29 +177,22 @@ exec /usr/bin/blueman-applet
|
||||
#exec_always ~/.config/sway/clamshell.sh
|
||||
|
||||
# polkit
|
||||
#exec /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
|
||||
exec /usr/libexec/polkit-gnome-authentication-agent-1
|
||||
|
||||
# Gtk
|
||||
# exec systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK
|
||||
# exec hash dbus-update-activation-environment 2>/dev/null && \
|
||||
# dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK
|
||||
|
||||
|
||||
set $opacity 0.98
|
||||
for_window [class=".*"] opacity $opacity
|
||||
for_window [app_id=".*"] opacity $opacity
|
||||
exec systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK
|
||||
exec hash dbus-update-activation-environment 2>/dev/null && dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK
|
||||
|
||||
# Window Borders
|
||||
default_border none
|
||||
default_border pixel 1
|
||||
default_floating_border none
|
||||
client.focused "#9f1209" "#9f1209" "#ffffff" "#9f1209"
|
||||
|
||||
# Gaps
|
||||
smart_gaps on
|
||||
gaps inner 5
|
||||
gaps outer 2
|
||||
|
||||
for_window [app_id="galendae"] floating enable, sticky enable, move position cursor, move down 35
|
||||
|
||||
# Idle configuration
|
||||
exec swayidle -w \
|
||||
timeout 120 'swaylock -f' \
|
||||
@@ -231,7 +225,7 @@ input type:keyboard {
|
||||
}
|
||||
|
||||
# Hide mouse cursor after inactivity
|
||||
seat * hide_cursor 4000
|
||||
seat * hide_cursor 8000
|
||||
|
||||
set $laptop eDP-1
|
||||
bindswitch --reload --locked lid:on output $laptop disable
|
||||
@@ -244,8 +238,7 @@ bindswitch --reload --locked lid:off output $laptop enable
|
||||
#output HDMI-A-1 pos 0 0 res 2560x1440
|
||||
|
||||
# Wallpaper
|
||||
output DP-3 bg /home/opal/.config/wallpapers/3.jpg fill
|
||||
output HDMI-A-1 bg /home/opal/.config/wallpapers/3.jpg fill
|
||||
output * bg /home/opal/.config/wallpapers/2.jpg fill
|
||||
|
||||
# Assign workspaces to numbers
|
||||
set $ws1 number 1
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
# This file is written by xdg-user-dirs-update
|
||||
# If you want to change or add directories, just edit the line you're
|
||||
# interested in. All local changes will be retained on the next run.
|
||||
# Format is XDG_xxx_DIR="$HOME/yyy", where yyy is a shell-escaped
|
||||
# homedir-relative path, or XDG_xxx_DIR="/yyy", where /yyy is an
|
||||
# absolute path. No other format is supported.
|
||||
#
|
||||
XDG_DESKTOP_DIR="$HOME/desktop"
|
||||
XDG_DOWNLOAD_DIR="$HOME/downloads"
|
||||
XDG_TEMPLATES_DIR="$HOME/"
|
||||
XDG_PUBLICSHARE_DIR="$HOME/"
|
||||
XDG_DOCUMENTS_DIR="$HOME/documents"
|
||||
XDG_MUSIC_DIR="$HOME/music"
|
||||
XDG_PICTURES_DIR="$HOME/pictures"
|
||||
XDG_VIDEOS_DIR="$HOME/"
|
||||
@@ -7,6 +7,7 @@ alias update="sudo dnf update"
|
||||
# ~ Commands ~ #
|
||||
alias ip="ip -c"
|
||||
alias cpv='rsync -ah --info=progress2'
|
||||
alias music-push="rsync -e 'ssh -p 46668' --info=progress2 -r /home/opal/music/to-push/ cleric:/data/container_storage/jellyfin/media/music/to-sort/"
|
||||
|
||||
# ~ Heck the GNU Coreutils ~ #
|
||||
alias ls="exa"
|
||||
|
||||
Reference in New Issue
Block a user