diff --git a/.bash_aliases b/.bash_aliases index 939fba9..c19403f 100644 --- a/.bash_aliases +++ b/.bash_aliases @@ -6,8 +6,7 @@ alias vf='vim $(find -type f 2>&1 | grep -v "Permission denied" | fzf)' alias please="sudo \"$@\"" alias diff="diff -u --color" alias colour="sed 's/ 500 /\x1b[41m 500 /;s/\s200\s/\x1b[42m 200 /;s/ 404 /\x1b[41m 404 /;s/$/\x1b[0m/'" -alias ls="exa" alias magentoinstall="sudo docker-compose exec magento /app/bin/magento setup:ins tall --admin-firstname=Tobiyo --admin-lastname=Kuujikai --admin-email=g.akrum@sma rtsecure.solutions --admin-user=admin --admin-password='user1i1' --base-url=https ://magento2.shop --base-url-secure=https://magento2.shop --backend-frontname=admi n --db-host=mysql --db-name=magento --db-user=root --db-password=root --use-rewri tes=1 --language=en_US --currency=SRD --timezone=America/New_York --use-secure-ad min=1 --admin-use-security-key=1 --session-save=files --use-sample-data" alias qemustart="qemu-system-x86_64 -hda ubuntu-touch-mainline-generic-amd64.img -vga virtio -display gtk,gl=on -m 2G -enable-kvm" alias myls="`echo history| grep ${1:-ls}|grep -v \"grep\|myls\"|tail -n 1|awk '{print $2}'`" -function dwmsrc () { cd ${HOME}/.local/src/${1-dwm}; } +function srcrackle () { cd ${HOME}/.local/src/${1-crackle}; } diff --git a/.bashrc b/.bashrc index 7de3cfd..2c1db18 100644 --- a/.bashrc +++ b/.bashrc @@ -17,7 +17,6 @@ shopt -s histappend # cd into directories by typing their names shopt -s autocd - # for setting history length see HISTSIZE and HISTFILESIZE in bash(1) HISTSIZE=1000 HISTFILESIZE=2000 @@ -46,7 +45,7 @@ esac # uncomment for a colored prompt, if the terminal has the capability; turned # off by default to not distract the user: the focus in a terminal window # should be on the output of commands, not on the prompt -#force_color_prompt=yes +force_color_prompt=yes if [ -n "$force_color_prompt" ]; then if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then @@ -60,7 +59,8 @@ if [ -n "$force_color_prompt" ]; then fi if [ "$color_prompt" = yes ]; then - PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ ' + #PS1=" \t [ \u@\h \W ] \\$\$?> :\[$(tput sgr0)\]" + PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\W\[\033[00m\]\$ ' else PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ ' fi @@ -118,7 +118,9 @@ if ! shopt -oq posix; then . /etc/bash_completion fi fi -export PS1=" \t [ \u@\h \W ] \\$\$?> :\[$(tput sgr0)\]" [ -r $HOME/.config/byobu/prompt ] && . $HOME/.config/byobu/prompt #byobu-prompt# -. "$HOME/.cargo/env" +[ -r $HOME/.cargo/env ] && . "$HOME/.cargo/env" + +PATH="$HOME/.gem/bin:$HOME/.local/bin:$PATH" +[ -f "${XDG_CONFIG_HOME:-$HOME/.config}/crackle/cracklerc" ] && . "${XDG_CONFIG_HOME:-$HOME/.config}/crackle/cracklerc" diff --git a/.byobu/.tmux.conf b/.byobu/.tmux.conf index b7ad556..120c837 100644 --- a/.byobu/.tmux.conf +++ b/.byobu/.tmux.conf @@ -1,4 +1,3 @@ set -g mouse on -"set -g terminal-overrides 'xterm*:smcup@:rmcup@' # move tmux copy buffer into x clipboard bind-key -t vi-copy y copy-pipe 'xclip -selection clipboard >/dev/null' diff --git a/.byobu/color.tmux b/.byobu/color.tmux index e2e194a..09e756c 100644 --- a/.byobu/color.tmux +++ b/.byobu/color.tmux @@ -1,5 +1,5 @@ -BYOBU_DARK="\#222222" -BYOBU_LIGHT=white -BYOBU_ACCENT=magenta -BYOBU_HIGHLIGHT=red +BYOBU_DARK="\#333333" +BYOBU_LIGHT="\#EEEEEE" +BYOBU_ACCENT="\#75507B" +BYOBU_HIGHLIGHT="\#DD4814" MONOCHROME= diff --git a/.byobu/prompt b/.byobu/prompt index e4e1e4a..cdfdd4d 100644 --- a/.byobu/prompt +++ b/.byobu/prompt @@ -1 +1,3 @@ -. /usr/share/byobu/profiles/bashrc #byobu-prompt# +[ -r /usr/share/byobu/profiles/bashrc ] && . /usr/share/byobu/profiles/bashrc #byobu-prompt# + +[ -r $HOME/.local/share/crackle/byobu/usr/share/byobu/profiles/bashrc ] && . $HOME/.local/share/crackle/byobu/usr/share/byobu/profiles/bashrc #byobu-prompt# diff --git a/.byobu/status b/.byobu/status index e5657b8..b0a2883 100644 --- a/.byobu/status +++ b/.byobu/status @@ -26,12 +26,12 @@ screen_upper_left="color" screen_upper_right="color whoami hostname ip_address menu" screen_lower_left="color logo distro release #arch session" -screen_lower_right="color network #disk_io custom #entropy raid reboot_required updates_available #apport #services #mail users uptime #ec2_cost #rcs_cost #fan_speed #cpu_temp battery wifi_quality #processes load_average cpu_count cpu_freq memory #swap disk #time_utc date time" +screen_lower_right="color network #disk_io custom #entropy raid reboot_required updates_available #apport #services #mail users uptime #fan_speed #cpu_temp battery wifi_quality #processes load_average cpu_count cpu_freq memory #swap disk #time_utc date time" # Tmux has one status line, with 2 halves for status -tmux_left=" logo #distro release #arch session" +tmux_left="logo #distro release #arch session" # You can have as many tmux right lines below here, and cycle through them using Shift-F5 -tmux_right=" network #disk_io #custom #entropy #raid reboot_required updates_available #apport services #mail #users uptime #ec2_cost #rcs_cost #fan_speed #cpu_temp #battery wifi_quality processes #load_average cpu_count cpu_freq memory #swap disk #whoami #hostname ip_address #time_utc date time" -#tmux_right="network #disk_io #custom entropy raid reboot_required updates_available #apport #services #mail users uptime #ec2_cost #rcs_cost fan_speed cpu_temp battery wifi_quality #processes load_average cpu_count cpu_freq memory #swap #disk whoami hostname ip_address #time_utc date time" -#tmux_right="network #disk_io custom #entropy raid reboot_required updates_available #apport #services #mail users uptime #ec2_cost #rcs_cost #fan_speed #cpu_temp battery wifi_quality #processes load_average cpu_count cpu_freq memory #swap #disk #whoami #hostname ip_address #time_utc date time" -#tmux_right="#network disk_io #custom entropy #raid #reboot_required #updates_available #apport #services #mail #users #uptime #ec2_cost #rcs_cost fan_speed cpu_temp #battery #wifi_quality #processes #load_average #cpu_count #cpu_freq #memory #swap whoami hostname ip_address #time_utc disk date time" +tmux_right="#network #disk_io #custom #entropy raid reboot_required updates_available #apport #services #mail #users uptime #fan_speed #cpu_temp #battery #wifi_quality #processes load_average cpu_count cpu_freq memory #swap disk #whoami #hostname #ip_address #time_utc date time" +#tmux_right="network #disk_io #custom entropy raid reboot_required updates_available #apport #services #mail users uptime fan_speed cpu_temp battery wifi_quality #processes load_average cpu_count cpu_freq memory #swap #disk whoami hostname ip_address #time_utc date time" +#tmux_right="network #disk_io custom #entropy raid reboot_required updates_available #apport #services #mail users uptime #fan_speed #cpu_temp battery wifi_quality #processes load_average cpu_count cpu_freq memory #swap #disk #whoami #hostname ip_address #time_utc date time" +#tmux_right="#network disk_io #custom entropy #raid #reboot_required #updates_available #apport #services #mail #users #uptime fan_speed cpu_temp #battery #wifi_quality #processes #load_average #cpu_count #cpu_freq #memory #swap whoami hostname ip_address #time_utc disk date time" diff --git a/.gitconfig b/.gitconfig index 7b77f7d..19e3ca7 100644 --- a/.gitconfig +++ b/.gitconfig @@ -1,7 +1,7 @@ [user] email = fuseteam@duck.com name = Rahammetoela Toekiman - signingKey = ACD083CB585C9AA9 + signingKey = ACD083CB585C9AA9 [core] editor = vim [merge] diff --git a/.vimrc b/.vimrc index 6b745c1..d9ce1b5 100644 --- a/.vimrc +++ b/.vimrc @@ -50,6 +50,7 @@ set background=dark " set utf-8 as the default encoding set encoding=utf-8 set fileencoding=utf-8 +set tabstop=4 " Uncomment the following to have Vim jump to the last position when " reopening a file @@ -80,9 +81,6 @@ autocmd VimEnter TAG_EDITMSG startinsert! "set mouse=a " Enable mouse usage (all modes) " Source a global configuration file if available -if filereadable("/etc/vim/vimrc") - source /etc/vim/vimrc -endif set number set relativenumber set autoindent @@ -149,7 +147,6 @@ nnoremap + :bn "change to working directory command! Cwd cd %:p:h -"functions to strip strings and numbers "windows switching commands function! s:winswitch(...) let i = 0 @@ -157,8 +154,6 @@ function! s:winswitch(...) if arg =~ '[A-Za-z_|=]' && arg !~ '[^A-Za-z_|=]' let command = ":wincmd ".arg execute command - let command = ":".s:chop(arg, s:chopnumbers(arg))."wincmd ".s:chopnumbers(arg) - execute command elseif arg =~'[1-9+-]' let command = ":resize ".arg execute command