words are hard

4 files changed, 69 insertions, 23 deletions

diff --git a/.bash_aliases b/.bash_aliases
index 7917b05..02521cf 100644
--- a/.bash_aliases
+++ b/.bash_aliases
@@ -1,15 +1,35 @@
+alias mv='mv -i'
+alias rm='rm -i'
+alias cp='cp -i'
+alias echo='echo -n'
+alias journalctl='journalctl -xe'
+
 alias ls='ls $LS_OPTIONS'
 alias mkdir='mkdir $MKDIR_OPTIONS'
-alias r='ranger'
-alias obs='/usr/bin/obsidian --detach'
+
 alias vrc='vim ~/.vimrc'
 alias brc='vim ~/.bashrc && source $_'
+alias bal='vim ~/.bash_aliases && source $_'
+
 alias cts='ssh root@rabiega.xyz'
 alias ctg='ssh git@rabiega.xyz'
-alias ff='/usr/bin/firefox &'
+
+alias r='ranger'
+alias sd="sudo shutdown -h now"
 alias nb='newsboat'
 alias nb-add='cat >> ~/.newsboat/urls << EOF'
+
+alias obs='exec /usr/bin/obsidian'
+alias ff='/usr/bin/firefox   &'
+alias lw='/usr/bin/librewolf &'
+alias tor="cd ~/Downloads/tor-browser/ && ./start-tor-browser.desktop && cd -"
+
 alias dotfiles="/usr/bin/git --git-dir=$HOME/.dotfiles --work-tree=$HOME"
 alias obsidian="/usr/bin/git --git-dir=$HOME/obsidian  --work-tree=$HOME"
-alias tor="cd ~/Downloads/tor-browser/ && ./start-tor-browser.desktop && cd -"
-alias sd="shutdown -P"
+
+alias update="sudo apt update && apt upgrade"
+alias update-dwm='cd ~/repos/dwm && cp ~/repos/dwm/config.def.h ~/repos/dwm/config.h && sudo make clean install && cd -'
+
+alias wttr='curl wttr.in/Wroclaw'
+alias b='buku --suggest'
+alias c='clear'alias cs='chadsearch'alias bd='buku-dmenu'
\ No newline at end of file
diff --git a/.bashrc b/.bashrc
index 15df153..a7196b3 100644
--- a/.bashrc
+++ b/.bashrc
@@ -56,11 +56,6 @@ if [ -n "$force_color_prompt" ]; then
     fi
 fi
 
-if [ "$color_prompt" = yes ]; then
-    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
 unset color_prompt force_color_prompt
 
 # If this is an xterm set the title to user@host:dir
@@ -114,17 +109,35 @@ fi
 # Set vi mode as the default mode
 set -o vi
 
+# Groff shenanigans
+groffe(){
+    groff -Kutf8 -Tpdf -mec -ms $1.ms > $1.pdf
+}
+
+# Opam configuration
+test -r /home/filipek/.opam/opam-init/init.sh && . /home/filipek/.opam/opam-init/init.sh > /dev/null 2> /dev/null || true
+
 # Set options for some frequently used programs
 export LS_OPTIONS='-lha --color=auto'
 export TAR_EXTRACT='-xvzf'
 export TAR_ARCHIVE='-cvzf'
 export MKDIR_OPTIONS='-p'
+export RSYNC_OPTIONS='-rtvzP'
+export MANPAGER="vim -M +MANPAGER - "
 
-# Groff shenanigans
-groffe(){
-    groff -Kutf8 -Tpdf -mec -ms $1.ms > $1.pdf
-}
+export PATH=$HOME/.scripts:$HOME/.cargo/bin:$PATH
+export EDITOR="vim"
+export BROWSER="librewolf"
 
-# Bind Esc to CapsLock and vice versa
-export MANPAGER="vim -M +MANPAGER - "
-setxkbmap -option caps:swapescape
+# GPG Config
+GPG_TTY=$(tty)
+export GPG_TTY
+
+# Prompt colors
+export PS1="\[$(tput setaf 2)\]\u\[$(tput setaf 35)\]@\[$(tput setaf 10)\]\h \[$(tput setaf 33)\]\w \[$(tput sgr0)\]$ "
+
+# Run these scripts at login
+bash remaps
+
+source auxless
+source add-alias
diff --git a/.newsboat/config b/.newsboat/config
index 1cabc83..a8b7399 100644
--- a/.newsboat/config
+++ b/.newsboat/config
@@ -1,11 +1,13 @@
 # general settings
-auto-reload yes
-max-items 50
+auto-reload no
+max-items 100
+bookmark-autopilot yes
+bookmark-cmd "/home/filipek/.local/bin/buku --nostdin -a"
 
-# externel browser
-browser firefox
+# external browser
+browser librewolf
 macro m set browser "/usr/bin/mpv %u"; open-in-browser ; set browser "/usr/local/bin/w3m %u"
-macro l set browser "/usr/bin/firefox %u"; open-in-browser ; set browser "/usr/local/bin/w3m %u"
+macro l set browser "/usr/bin/librewolf %u"; open-in-browser ; set browser "/usr/local/bin/w3m %u"
 
 # unbind keys
 unbind-key ENTER
@@ -19,3 +21,11 @@ bind-key j down
 bind-key k up
 bind-key l open
 bind-key h quit
+
+# set colors
+color listnormal green default
+color listfocus black yellow standout bold
+color listnormal_unread blue default
+color listfocus_unread yellow default bold
+color info red black bold
+color article white default bold
diff --git a/.vimrc b/.vimrc
index 24e6d3a..d4409e1 100644
--- a/.vimrc
+++ b/.vimrc
@@ -18,6 +18,9 @@ set smartindent
 set nowrap
 set ignorecase
 set smartcase
+set laststatus=2
+set incsearch
+set wildignore=*.o,*.obj,*.bak,*.exe
 
 " Use pathogen (plugin manager)
 
@@ -50,7 +53,7 @@ let g:pymode_doc = 1
 " Automatically source .vimrc after saving
 autocmd BufWritePost ~/.vimrc source $MYVIMRC
 
-"Automatically source .inputrc after saving
+" Automatically source .inputrc after saving
 autocmd BufWritePost ~/.inputrc !bind -f ~/.inputrc
 
 " Automatically deletes all trailing whitespace and newlines at end of file on save. & reset cursor position