diff --git a/.bashrc b/.bashrc index 32baadf..5a3e294 100644 --- a/.bashrc +++ b/.bashrc @@ -14,7 +14,7 @@ export HISTCONTROL=ignoreboth:erasedups -PS1='[\u@\h \W]\$ ' +PS1="\e[0m[\e[01;32m\u\e[0m@\e[1;36m\h \e[1;33m\W\e[0m]\e[1;31m λ \e[0m" if [ -d "$HOME/.bin" ] ; then PATH="$HOME/.bin:$PATH" @@ -28,31 +28,14 @@ fi bind "set completion-ignore-case on" #list -alias ls='ls --color=auto' -alias la='ls -a' -alias ll='ls -la' -alias l='ls' +alias ls="ls --color=auto" +alias ll="ls -lah" alias l.="ls -A | egrep '^\.'" -#fix obvious typo's -alias cd..='cd ..' -alias pdw="pwd" -alias udpate='sudo pacman -Syyu' -alias upate='sudo pacman -Syyu' -alias updte='sudo pacman -Syyu' -alias updqte='sudo pacman -Syyu' - ## Colorize the grep command output for ease of use (good for log files)## -alias grep='grep --color=auto' -alias egrep='egrep --color=auto' -alias fgrep='fgrep --color=auto' - -#readable output -alias df='df -h' - -#pacman unlock -alias unlock="sudo rm /var/lib/pacman/db.lck" -alias rmpacmanlock="sudo rm /var/lib/pacman/db.lck" +alias grep="grep --color=auto" +alias egrep="egrep --color=auto" +alias fgrep="fgrep --color=auto" #arcolinux logout unlock alias rmlogoutlock="sudo rm /tmp/arcologout.lock" @@ -73,13 +56,10 @@ alias userlist="cut -d: -f1 /etc/passwd" alias merge="xrdb -merge ~/.Xresources" # Aliases for software managment -# pacman or pm -alias pacman='sudo pacman --color auto' -alias update='sudo pacman -Syyu' - -# yay as aur helper - updates everything -alias pksyua="yay -Syu --noconfirm" -alias upall="yay -Syu --noconfirm" +alias pacman="sudo pacman --color auto" +alias yays="yay --mflags --skipinteg" +alias update="pacman -Syyu --noconfirm" +alias yupdate="yay -Syyu --noconfirm" #ps alias psa="ps auxf" @@ -89,34 +69,10 @@ alias psgrep="ps aux | grep -v grep | grep -i -e VSZ -e" alias update-grub="sudo grub-mkconfig -o /boot/grub/grub.cfg" #add new fonts -alias update-fc='sudo fc-cache -fv' - -#copy/paste all content of /etc/skel over to home folder - backup of config created - beware -alias skel='cp -Rf ~/.config ~/.config-backup-$(date +%Y.%m.%d-%H.%M.%S) && cp -rf /etc/skel/* ~' -#backup contents of /etc/skel to hidden backup folder in home/user -alias bupskel='cp -Rf /etc/skel ~/.skel-backup-$(date +%Y.%m.%d-%H.%M.%S)' - -#copy bashrc-latest over on bashrc - cb= copy bashrc -alias cb='sudo cp /etc/skel/.bashrc ~/.bashrc && source ~/.bashrc' -#copy /etc/skel/.zshrc over on ~/.zshrc - cb= copy zshrc -#alias cz='sudo cp /etc/skel/.zshrc ~/.zshrc && source ~/.zshrc' - -#switch between bash and zsh -alias tobash="sudo chsh $USER -s /bin/bash && echo 'Now log out.'" -alias tozsh="sudo chsh $USER -s /bin/zsh && echo 'Now log out.'" - -#quickly kill conkies -alias kc='killall conky' - -#hardware info --short -alias hw="hwinfo --short" - -#skip integrity check -alias yayskip='yay -S --mflags --skipinteg' -alias trizenskip='trizen -S --skipinteg' +alias update-fc="sudo fc-cache -fv" #check vulnerabilities microcode -alias microcode='grep . /sys/devices/system/cpu/vulnerabilities/*' +alias microcode="grep . /sys/devices/system/cpu/vulnerabilities/*" #get fastest mirrors in your neighborhood alias mirror="sudo reflector -f 30 -l 30 --number 10 --verbose --save /etc/pacman.d/mirrorlist" @@ -124,9 +80,6 @@ alias mirrord="sudo reflector --latest 50 --number 20 --sort delay --save /etc/p alias mirrors="sudo reflector --latest 50 --number 20 --sort score --save /etc/pacman.d/mirrorlist" alias mirrora="sudo reflector --latest 50 --number 20 --sort age --save /etc/pacman.d/mirrorlist" -#mounting the folder Public for exchange between host and guest on virtualbox -alias vbm="sudo /usr/local/bin/arcolinux-vbox-share" - #shopt shopt -s autocd # change to named directory shopt -s cdspell # autocorrects cd misspellings @@ -135,43 +88,13 @@ shopt -s dotglob shopt -s histappend # do not overwrite history shopt -s expand_aliases # expand aliases -#youtube-dl -alias yta-aac="youtube-dl --extract-audio --audio-format aac " -alias yta-best="youtube-dl --extract-audio --audio-format best " -alias yta-flac="youtube-dl --extract-audio --audio-format flac " -alias yta-m4a="youtube-dl --extract-audio --audio-format m4a " -alias yta-mp3="youtube-dl --extract-audio --audio-format mp3 " -alias yta-opus="youtube-dl --extract-audio --audio-format opus " -alias yta-vorbis="youtube-dl --extract-audio --audio-format vorbis " -alias yta-wav="youtube-dl --extract-audio --audio-format wav " - -alias ytv-best="youtube-dl -f bestvideo+bestaudio " - #Recent Installed Packages alias rip="expac --timefmt='%Y-%m-%d %T' '%l\t%n %v' | sort | tail -200 | nl" alias riplong="expac --timefmt='%Y-%m-%d %T' '%l\t%n %v' | sort | tail -3000 | nl" -#iso and version used to install ArcoLinux +#iso and version used to install the distro I use (ArcoLinux) alias iso="cat /etc/dev-rel | awk -F '=' '/ISO/ {print $2}'" -#Cleanup orphaned packages -alias cleanup='sudo pacman -Rns $(pacman -Qtdq)' - -#get the error messages from journalctl -alias jctl="journalctl -p 3 -xb" - -#nano for important configuration files -#know what you do in these files -alias nlightdm="sudo nano /etc/lightdm/lightdm.conf" -alias npacman="sudo nano /etc/pacman.conf" -alias ngrub="sudo nano /etc/default/grub" -alias nmkinitcpio="sudo nano /etc/mkinitcpio.conf" -alias nslim="sudo nano /etc/slim.conf" -alias noblogout="sudo nano /etc/oblogout.conf" -alias nmirrorlist="sudo nano /etc/pacman.d/mirrorlist" -alias nconfgrub="sudo nano /boot/grub/grub.cfg" -alias bls="betterlockscreen -u /usr/share/backgrounds/arcolinux/" - #gpg #verify signature for isos alias gpg-check="gpg2 --keyserver-options auto-key-retrieve --verify" @@ -185,14 +108,7 @@ alias downgrada="downgrade --ala-url 'https://bike.seedhost.eu/arcolinux/'" #systeminfo alias probe="sudo -E hw-probe -all -upload" -#shutdown or reboot -alias ssn="sudo shutdown now" -alias sr="sudo reboot" - -# # ex = EXtractor for all kinds of archives -# # usage: ex -ex () -{ +function bextract() { if [ -f $1 ] ; then case $1 in *.tar.bz2) tar xjf $1 ;; @@ -209,21 +125,25 @@ ex () *.deb) ar x $1 ;; *.tar.xz) tar xf $1 ;; *.tar.zst) unzstd $1 ;; - *) echo "'$1' cannot be extracted via ex()" ;; + *) echo "I cannot decompress '$1'" ;; esac - else - echo "'$1' is not a valid file" - fi + else echo "'$1' is not a valid file"; fi } +alias bextract=bextract + #create a file called .bashrc-personal and put all your personal aliases #in there. They will not be overwritten by skel. - [[ -f ~/.bashrc-personal ]] && . ~/.bashrc-personal # custom aliases alias emacs="emacs --no-window-system" +alias rr="curl -s -L http://bit.ly/10hA8iC | bash" + +function weather() { curl "wttr.in/$1"; } +alias weather=weather + +pfetch -neofetch diff --git a/.config/polybar/config-laptop b/.config/polybar/config similarity index 100% rename from .config/polybar/config-laptop rename to .config/polybar/config diff --git a/.config/polybar/config-pc b/.config/polybar/config-pc deleted file mode 100644 index f69cf04..0000000 --- a/.config/polybar/config-pc +++ /dev/null @@ -1,160 +0,0 @@ -[colors] -background = #222 -foreground = #eee -linecolor = #fba922 -bordercolor = #333 -accent = #e60053 - -[settings] -screenchange-reload = true - -[global/wm] -margin-top = 0 -margin-bottom = 0 - -[bar/top-left] -enable-ipc = true -monitor = HDMI-1 -width = 100% -height = 24 - -background = ${colors.background} -foreground = ${colors.foreground} - -line-color = ${colors.linecolor} -underline-size = 1 -overline-size = 2 - -border-bottom-size = 2 -border-bottom-color = ${colors.bordercolor} - -padding-left = 0 -padding-right = 2 -module-margin-left = 1 -module-margin-right = 2 - -font-0 = dina:pixelsize=9;1 -font-1 = siji:pixelsize=10;1 -font-2 = unifont:size=6;1 - -modules-left = i3 -modules-right = volume memory cpu date - -tray-position = right -tray-padding = 4 -tray-maxsize = 16 - -[bar/top-right] -enable-ipc = true -monitor = DP-1 -width = 100% -height = 24 - -background = ${colors.background} -foreground = ${colors.foreground} - -line-color = ${colors.linecolor} -underline-size = 1 -overline-size = 2 - -border-bottom-size = 2 -border-bottom-color = ${colors.bordercolor} - -padding-left = 0 -padding-right = 2 -module-margin-left = 1 -module-margin-right = 2 - -font-0 = dina:pixelsize=9;1 -font-1 = siji:pixelsize=10;1 -font-2 = unifont:size=6;1 - -modules-left = i3 - -tray-position = right -tray-padding = 4 -tray-maxsize = 16 - -[module/i3] -type = internal/i3 -index-sort = true -pin-workspaces = true -wrapping-scroll = true - -format = - -label-mode = %mode% -label-mode-padding = 2 -label-mode-background = ${colors.accent} - -label-focused = %index% -label-focused-foreground = #cccccc -label-focused-underline = #cccccc -label-focused-padding = 3 - -label-unfocused = %index% -label-unfocused-padding = 3 - -label-urgent = %index%! -label-urgent-background = #00ffa1 -label-urgent-padding = 3 - -label-visible = %index% -label-visible-padding = 3 - -[module/cpu] -type = internal/cpu -interval = 2 -label = %percentage%% -format-prefix = "CPU " -format-prefix-foreground = #666 - -[module/memory] -type = internal/memory -interval = 2 -label = %percentage_used%% -format-prefix = "RAM " -format-prefix-foreground = #666 - -[module/date] -type = internal/date -label = %{F#666}TIME%{F-} %time% - %date% -label-prefix = "TIME" -date = %d.%m.%Y -time = %H:%M -interval = 5 - -[module/volume] -type = internal/pulseaudio -speaker-mixer = Speaker -headphone-mixer = Headphone -headphone-id = 9 - -format-volume = -format-volume-prefix = "AUDIO " -format-volume-prefix-foreground = #666 -label-volume = %percentage%% -label-volume-foreground = ${root.foreground} - -format-muted-foreground = #777 -label-muted = AUDIO MUTED - -[module/battery] -type = internal/battery -full-at = 99 -time-format = %H:%M - -format-charging = -format-charging-prefix = "CHR " -format-charging-prefix-foreground = #666 -label-charging = %percentage%% - %time% - -format-discharging = -format-discharging-prefix = "BAT " -format-discharging-prefix-foreground = #666 -label-discharging = %percentage%% - %time% - -format-full = -format-full-prefix = "FLL " -format-full-prefix-foreground = #666 - diff --git a/.vimrc b/.vimrc deleted file mode 100644 index fa40ebc..0000000 --- a/.vimrc +++ /dev/null @@ -1,49 +0,0 @@ -if has("syntax") - syntax on -endif - -nnoremap qt :vert term - -noremap qq :q -noremap qaq :qa -noremap qq1 :q! -noremap qaq1 :qa! - -noremap qf :NERDTreeToggle - -noremap vs :e $MYVIMRC - -inoremap qw :wi -inoremap ii - -imap - -inoremap ( () -inoremap { {} -inoremap [ [] -inoremap " "" -inoremap ' '' - -nnoremap qw :w - -set number - -call plug#begin() - " coding - Plug 'lervag/vimtex' - Plug 'neoclide/coc.nvim' - " ui - Plug 'scrooloose/nerdtree' - Plug 'itchyny/lightline.vim' -call plug#end() - -set encoding=UTF-8 -set expandtab -set tabstop=4 - -set laststatus=2 -set noshowmode -"set background=dark - -colors peachpuff - diff --git a/scripts/laptop-wm-setup.sh b/scripts/laptop-wm-setup.sh new file mode 100644 index 0000000..f60ea86 --- /dev/null +++ b/scripts/laptop-wm-setup.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +sudo pacman -S xmonad diff --git a/scripts/setup-laptop.sh b/scripts/setup-laptop.sh deleted file mode 100755 index 2c08899..0000000 --- a/scripts/setup-laptop.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/bash - -# install curl -sudo pacman -S curl --noconfirm - -sh update-pacman-mirrors.sh -sh vim-setup.sh -sh git-setup.sh - -# install python as a dependency for kitty -sudo pacman -S python --noconfirm - -# install kitty, i3-gaps, picom, polybar, nitrogen and rofi -sudo pacman -S kitty i3-gaps picom polybar nitrogen rofi --noconfirm - -# full system upgrade -sudo pacman -Syu --noconfirm - -mkdir ~/.config/kitty ~/.config/i3 ~/.config/picom ~/.config/polybar - -cp ../.config/kitty/kitty.conf ~/.config/kitty/kitty.conf -cp ../.config/i3/config-laptop ~/.config/i3/config -cp ../.config/picom/picom.conf ~/.config/picom/picom.conf -cp ../.config/polybar/config-laptop ~/.config/polybar/config - -cp ../.bashrc ~/.bashrc - -sudo echo "#!/bin/sh -e" > /etc/rc.local -sudo echo "chown $USER /sys/class/backlight/amdgpu_bl0/brightness" >> /etc/rc.local -sudo echo "exit 0" >> /etc/rc.local - -sh doom-emacs-setup.sh diff --git a/scripts/setup-pc.sh b/scripts/setup-pc.sh deleted file mode 100755 index 291bc8c..0000000 --- a/scripts/setup-pc.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh - -# install curl -sudo pacman -S curl --noconfirm - -sh update-pacman-mirrors.sh - - - -# git and vim setup -sh vim-setup.sh -sh git-setup.sh - -# install python as a dependency for kitty -sudo pacman -S python --noconfirm - -# install kitty, i3-gaps, picom, polybar and nitrogen -sudo pacman -S kitty i3-gaps picom polybar nitrogen --noconfirm - -# full system upgrade -sudo pacman -Syu --noconfirm - -mkdir ~/.config/kitty ~/.config/i3 ~/.config/picom ~/.config/polybar - -cp ../.config/kitty/kitty.conf ~/.config/kitty/kitty.conf -cp ../.config/i3/config-pc ~/.config/i3/config -cp ../.config/picom/picom.conf ~/.config/picom/picom.conf -cp ../.config/polybar/config-pc ~/.config/polybar/config -cp ../.bashrc ~/.bashrc - -# setup doom emacs -sh doom-emacs-setup.sh -sudo systemctl unmask snapd.service -sudo systemctl enable snapd.service -sudo systemctl start snapd.service -sudo ln -s /var/lib/snapd/snap /snap -sudo snap install core - -# setup snap package manager -sudo pacman -S snapd --noconfirm - - -# install rtl8821ce WiFi driver -# cd ~/Downloads -# git clone https://github.com/tomaspinho/rtl8821ce -# cd rtl8821ce -# makepkg -si --noconfirm -