blabla

4 files changed, 20 insertions, 26 deletions

diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc
index a26498f..c3d3a13 100644
--- a/.config/shell/aliasrc
+++ b/.config/shell/aliasrc
@@ -1,13 +1,14 @@
 #!/bin/sh
 
 # Use $XINITRC variable if file exists.
-[ -f "$XINITRC" ] && alias startx="startx $XINITRC"
+[ -f "$XINITRC" ] && alias startx="startx \$XINITRC"
 
-[ -f "$MBSYNCRC" ] && alias mbsync="mbsync -c $MBSYNCRC"
+[ -f "$MBSYNCRC" ] && alias mbsync="mbsync -c \$MBSYNCRC"
 
 # sudo not required for some system commands
-for command in mount umount sv apt apt-get aptitude dpkg su shutdown poweroff reboot cryptsetup ; do
-    alias $command="sudo $command"
+sudo_cmds="mount umount sv apt apt-get aptitude dpkg su shutdown poweroff reboot cryptsetup"
+for command in $sudo_cmds; do
+    alias \$command="sudo \$command"
 done; unset command
 
 # Verbosity and settings that you pretty much just always are going to want.
@@ -15,13 +16,13 @@ alias \
     cp="cp -iv" \
     echo="echo -n" \
     journalctl="journalctl -xe" \
-    mkd="mkdir -pv" \
+    mkdir="mkdir -pv" \
     mv="mv -iv" \
     rm="logrm -vI" \
-    rmd="rmdir -vp" \
+    rmdir="rmdir -vp" \
     rsync="rsync -vrPlu" \
     pstree="pstree -np" \
-    less="less -XER"
+    less="less -XER" \
 
 # Colorize commands when possible.
 alias \
@@ -32,7 +33,7 @@ alias \
     fgrep="fgrep --color=auto" \
     grep="grep --color=auto" \
     ip="ip -color=auto" \
-    ls="ls_new" \
+    ls="lsn" \
     vdir="vdir --color=auto" \
 
 # Making stuff easy to customize and source automatically
@@ -51,24 +52,22 @@ alias \
 alias \
     ..="cd .." \
     b="buku --suggest" \
+    bat="batcat" \
     bd="buku-dmenu" \
     copy="xsel -ib" \
-    cs="chadsearch" \
+    fd="fdfind" \
     lw="librewolf & exit -f" \
     moosic="ncmpcpp" \
-    ms="mansplain &" \
     nbadd='cat >> "$XDG_CONFIG_HOME"/newsboat/urls << EOF' \
-    obs="exec /usr/bin/obsidian" \
     py="python3" \
     sd="sudo shutdown -h now" \
     sql="pgcli" \
-    tor="cd ~/Downloads/tor-browser/ && ./start-tor-browser.desktop && cd -" \
     update="sudo apt update && apt upgrade" \
     wttr="curl wttr.in/Wroclaw" \
 
 # Git aliases
 alias \
-    dotfiles="/usr/bin/git --git-dir=$HOME/.dotfiles --work-tree=$HOME" \
-    obsidian="/usr/bin/git --git-dir=$HOME/obsidian  --work-tree=$HOME" \
+    dotfiles="/usr/bin/git --git-dir=\$HOME/.dotfiles --work-tree=\$HOME" \
+    obsidian="/usr/bin/git --git-dir=\$HOME/obsidian  --work-tree=\$HOME" \
 
 # Limbo
diff --git a/.config/shell/envvarrc b/.config/shell/envvarrc
index 6f1ff7d..62aaf2f 100644
--- a/.config/shell/envvarrc
+++ b/.config/shell/envvarrc
@@ -13,3 +13,7 @@ export VIMINIT="source $HOME/.config/vim/.vimrc"
 export XDG_CONFIG_HOME="$HOME/.config"
 export XDG_DATA_HOME="$HOME/.config"
 export ZSHDIR="$HOME/.config/shell"
+export STARDICT_DATA_DIR="$HOME/.local/share/stardict"
+export R_HOME="$HOME/langs/R"
+export R_LIBS_USER="$HOME/langs/R"
+export _CONDA_ROOT="$HOME/.local/opt/miniconda3"
diff --git a/.config/vim/.vimrc b/.config/vim/.vimrc
index b8f2f15..a217207 100644
--- a/.config/vim/.vimrc
+++ b/.config/vim/.vimrc
@@ -53,7 +53,7 @@ nnoremap Y y$
 nnoremap - ddp
 nnoremap _ ddkP
 nnoremap <C-J> "+yy
-nnoremap <C-W> "+yW
+nnoremap <C-C> "+yW
 nnoremap <C-K> "+p
 nnoremap <space> i<space><esc>
 nnoremap <silent> <F7> :tabnew ~/.vimrc<CR>
diff --git a/.profile b/.profile
index c710296..3b3caf6 100644
--- a/.profile
+++ b/.profile
@@ -1,19 +1,13 @@
 #!/bin/sh
 # Filip's .profile
 
-# do wywalenia
-[ "$( pgrep -c slstatus )" -eq 0 ] && slstatus &
-. "$HOME/.cargo/env"
+# Environmental variables
 
-### Environmental variables
-
-# Default programs
 export BROWSER="librewolf"
 export EDITOR="vim"
 export SHELL="zsh"
 export TERMINAL="st"
 export IMAGE_VIEWER="sxiv"
-
 export SCRIPTS="$HOME/.scripts"
 export ALIASRC="$HOME/.config/shell/aliasrc"
 export VIMINFO="$HOME/.config/vim/.viminfo"
@@ -23,16 +17,13 @@ export MANPAGER="vim -M +MANPAGER -"
 export PATH="$SCRIPTS:$HOME/.cargo/bin:$HOME/.local/bin:$PATH"
 export XDG_CONFIG_HOME="$HOME/.config"
 export XDG_DATA_HOME="$HOME/.config"
-export STARDICT_DATA_DIR="$HOME/.local/share/stardict"
 
 # Use custom remaps from the script
-
-autostart="remaps xcompmgr xhidecursor"
+autostart="remaps xcompmgr xhidecursor slstatus"
 
 for program in $autostart; do
 	pidof -sx "$program" || "$program" &
 done >/dev/null 2>&1
 
 # Set wallpaper
-
 xwallpaper --stretch "$HOME"/pix/wallpaper.jpg