some dotfiles cleanup, update nvim
This commit is contained in:
parent
f678eff8c2
commit
d24692c45c
5 changed files with 31 additions and 80 deletions
68
.bashrc
68
.bashrc
|
|
@ -1,51 +1,37 @@
|
|||
#
|
||||
# Asara's bashrc
|
||||
#
|
||||
|
||||
|
||||
# Check if the shell is non-interactive
|
||||
if [[ $- != *i* ]] ; then
|
||||
if [[ $- != *i* ]]; then
|
||||
# Shell is non-interactive. Be done now!
|
||||
return
|
||||
fi
|
||||
|
||||
### HISTORY OPTIONS ###
|
||||
|
||||
# Ignore duplicate commands and commands starting with a space for Bash history
|
||||
HISTCONTROL=ignoredups:ignorespace
|
||||
|
||||
# Bash History file size
|
||||
HISTSIZE=1000
|
||||
HISTFILESIZE=2000
|
||||
|
||||
|
||||
### SHELL OPTIONS ###
|
||||
HISTSIZE=100000
|
||||
HISTFILESIZE=2000000
|
||||
|
||||
# fix text wrap based on windows size
|
||||
shopt -s checkwinsize
|
||||
|
||||
# append to the history file, don't overwrite it
|
||||
shopt -s histappend
|
||||
|
||||
# entering directory name will automatically cd to it.
|
||||
shopt -s autocd
|
||||
|
||||
# make multiline input single line in history (i.e. \)
|
||||
shopt -s cmdhist
|
||||
|
||||
|
||||
### ALIASES ###
|
||||
|
||||
# enable color support of ls and also add handy aliases
|
||||
if [ -x /usr/bin/dircolors ]; then
|
||||
test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
|
||||
alias ls='ls --color=auto'
|
||||
alias dir='dir --color=auto'
|
||||
alias vdir='vdir --color=auto'
|
||||
test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
|
||||
alias ls='ls --color=auto'
|
||||
alias dir='dir --color=auto'
|
||||
alias vdir='vdir --color=auto'
|
||||
|
||||
alias grep='grep --color=auto'
|
||||
alias fgrep='fgrep --color=auto'
|
||||
alias egrep='egrep --color=auto'
|
||||
alias grep='grep --color=auto'
|
||||
alias fgrep='fgrep --color=auto'
|
||||
alias egrep='egrep --color=auto'
|
||||
fi
|
||||
|
||||
# some ls aliases
|
||||
|
|
@ -56,50 +42,18 @@ alias l='ls -CF'
|
|||
# IP
|
||||
alias ipme='wget -qO - icanhazip.com'
|
||||
alias speedtest='wget --output-document=/dev/null http://speedtest.wdc01.softlayer.com/downloads/test500.zip'
|
||||
alias netlist='lsof -i -nP'
|
||||
|
||||
### SHELL SETTINGS ###
|
||||
|
||||
# Bash Prompt
|
||||
PS1="\[\033[35m\]\t\[\033[m\]-\[\033[36m\]\u\[\033[m\]@\[\033[32m\]\h:\[\033[31;1m\]\w\[\033[m\]\$ "
|
||||
|
||||
|
||||
# Export environmental variables
|
||||
export EDITOR=vim
|
||||
export VISUAL=vim
|
||||
export BROWSER=firefox
|
||||
|
||||
|
||||
### FUNCTIONS ###
|
||||
|
||||
# Easy Extract
|
||||
extract () {
|
||||
if [ -f $1 ] ; then
|
||||
case $1 in
|
||||
*.tar.bz2) tar xvjf $1 ;;
|
||||
*.tar.gz) tar xvzf $1 ;;
|
||||
*.bz2) bunzip2 $1 ;;
|
||||
*.rar) unrar 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 "I dont know how to extract $1..." ;;
|
||||
esac
|
||||
else
|
||||
echo "`$1` is not a file!"
|
||||
fi
|
||||
}
|
||||
|
||||
# Source external file
|
||||
if [[ -f ~/.customrc ]]; then
|
||||
. ~/.customrc
|
||||
fi
|
||||
if [[ -f ~/.update ]]; then
|
||||
. ~/.update
|
||||
. ~/.customrc
|
||||
fi
|
||||
|
||||
bash ~/.motd
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
-- bootstrap lazy.nvim, LazyVim and your plugins
|
||||
require("config.lazy")
|
||||
require("orgmode").setup_ts_grammar()
|
||||
vim.cmd("language en_US.utf8")
|
||||
|
||||
require("nvim-treesitter.configs").setup({
|
||||
|
|
|
|||
17
.custom_profile
Normal file
17
.custom_profile
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
#!/bin/bash
|
||||
# set PATH so it includes user's private bin if it exists
|
||||
if [ -d "$HOME/.local/bin" ]; then
|
||||
PATH="$HOME/.local/bin:$PATH"
|
||||
fi
|
||||
|
||||
# add go to path
|
||||
PATH=${HOME}/go/bin:/usr/lib/go-1.22/bin:${PATH}
|
||||
# add uxn to path
|
||||
PATH=${HOME}/code/git.sr.ht/rabbits/uxn/bin:${PATH}
|
||||
|
||||
# add lexaloffle binaries to path
|
||||
PATH=${HOME}/emulators/pico-8:${PATH}
|
||||
PATH=${HOME}/emulators/picotron:${PATH}
|
||||
PATH=${HOME}/emulators/voxatron:${PATH}
|
||||
|
||||
export PATH=${PATH}
|
||||
15
.customrc
15
.customrc
|
|
@ -1,23 +1,10 @@
|
|||
#!/bin/bash
|
||||
# add golang to PATH
|
||||
|
||||
if [ -d "/usr/lib/go-1.22/bin/" ]; then
|
||||
export PATH=${PATH}:/usr/lib/go-1.22/bin
|
||||
fi
|
||||
|
||||
if [ -d "${HOME}/go/bin" ]; then
|
||||
export PATH=${PATH}:${HOME}/go/bin
|
||||
fi
|
||||
|
||||
# add uxn to path
|
||||
if [ -d "$HOME/code/git.sr.ht/rabbits/uxn/bin" ]; then
|
||||
export PATH=${PATH}:${HOME}/code/git.sr.ht/rabbits/uxn/bin
|
||||
fi
|
||||
|
||||
# set up moolticute ssh agent
|
||||
if ! pgrep -u "$USER" mc-agent >/dev/null; then
|
||||
mc-agent >~/.mc-agent-env
|
||||
fi
|
||||
if pgrep -u "$USER" mc-agent &>/dev/null && grep -q 'SSH_AUTH_SOCK=' ~/.mc-agent-env; then
|
||||
# once mc-agent started successfully override gnome-keyring ssh component
|
||||
eval "$(<~/.mc-agent-env)"
|
||||
fi
|
||||
|
|
|
|||
10
.profile
10
.profile
|
|
@ -6,13 +6,7 @@ if [ -n "$BASH_VERSION" ]; then
|
|||
fi
|
||||
fi
|
||||
|
||||
# set PATH so it includes user's private bin dirs if they exists
|
||||
if [ -d "$HOME/bin" ]; then
|
||||
PATH="$HOME/bin:$PATH"
|
||||
fi
|
||||
if [ -d "$HOME/.local/bin" ]; then
|
||||
PATH="$HOME/.local/bin:$PATH"
|
||||
fi
|
||||
source ${HOME}/.custom_profile
|
||||
|
||||
# set up wayland env vars
|
||||
if [ -z "${WAYLAND_DISPLAY}" ] && [ "${XDG_VTNR}" -eq 1 ]; then
|
||||
|
|
@ -20,5 +14,5 @@ if [ -z "${WAYLAND_DISPLAY}" ] && [ "${XDG_VTNR}" -eq 1 ]; then
|
|||
export MOZ_WEBRENDER=1
|
||||
export XDG_SESSION_TYPE=wayland
|
||||
export XDG_CURRENT_DESKTOP=sway
|
||||
exec sway
|
||||
exec dbus-run-session /usr/bin/sway
|
||||
fi
|
||||
|
|
|
|||
Loading…
Reference in a new issue