blabla

5 files changed, 50 insertions, 104 deletions

diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc
index bd119af..a26498f 100644
--- a/.config/shell/aliasrc
+++ b/.config/shell/aliasrc
@@ -6,7 +6,7 @@
 [ -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 ; do
+for command in mount umount sv apt apt-get aptitude dpkg su shutdown poweroff reboot cryptsetup ; do
     alias $command="sudo $command"
 done; unset command
 
@@ -20,6 +20,8 @@ alias \
     rm="logrm -vI" \
     rmd="rmdir -vp" \
     rsync="rsync -vrPlu" \
+    pstree="pstree -np" \
+    less="less -XER"
 
 # Colorize commands when possible.
 alias \
@@ -36,9 +38,9 @@ alias \
 # Making stuff easy to customize and source automatically
 alias \
   vrc='vim "$HOME/.config/vim/.vimrc"' \
-  zal='vim "$ZSHDIR/aliasrc"  && source "$ZSHDIR/aliasrc"' \
-  zen='vim "$ZSHDIR/envvarrc" && source "$ZSHDIR/envvarrc"' \
-  zrc='vim "$HOME/.zshrc"     && source "$HOME/.zshrc"' \
+  zal='vim "$ZDOTDIR/aliasrc"  && source "$ZDOTDIR/aliasrc"' \
+  zen='vim "$ZDOTDIR/envvarrc" && source "$ZDOTDIR/envvarrc"' \
+  zrc='vim "$ZDOTDIR/.zshrc"   && source "$ZDOTDIR/.zshrc"' \
 
 # Aliases for connecting to server
 alias \
@@ -53,15 +55,15 @@ alias \
     copy="xsel -ib" \
     cs="chadsearch" \
     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" \
-    ndw_connect="nmcli device wifi connect" \
-    ndw_list="nmcli device wifi list" \
     wttr="curl wttr.in/Wroclaw" \
 
 # Git aliases
diff --git a/.config/shell/envvarrc b/.config/shell/envvarrc
new file mode 100644
index 0000000..6f1ff7d
--- /dev/null
+++ b/.config/shell/envvarrc
@@ -0,0 +1,15 @@
+#!/bin/sh
+# This little script sets my environment variables.
+
+export ALIASRC="$ZSHDIR/aliasrc"
+export BROWSER="librewolf"
+export EDITOR="vim"
+export MANPAGER="vim -M +MANPAGER - "
+export RSYNC_OPTIONS="-rtvzP"
+export SCRIPTS="$HOME/.scripts"
+export SHELL="/usr/bin/zsh"
+export VIMINFO="$HOME/.config/vim/.viminfo"
+export VIMINIT="source $HOME/.config/vim/.vimrc"
+export XDG_CONFIG_HOME="$HOME/.config"
+export XDG_DATA_HOME="$HOME/.config"
+export ZSHDIR="$HOME/.config/shell"
diff --git a/.config/vim/vimium-options.json b/.config/vim/vimium-options.json
new file mode 100644
index 0000000..a966423
--- /dev/null
+++ b/.config/vim/vimium-options.json
@@ -0,0 +1,21 @@
+{
+  "newTabUrl": "https://searx.rabiega.xyz/?q=",
+  "ignoreKeyboardLayout": true,
+  "searchEngines": "w: https://www.wikipedia.org/w/index.php?title=Special:Search&search=%s Wikipedia\ng: https://www.google.com/search?q=%s Google\nyt: https://www.youtube.com/results?search_query=%s Youtube\ngm: https://www.google.com/maps?q=%s Google maps\nd: https://duckduckgo.com/?q=%s DuckDuckGo\na: https://wiki.archlinux.org/index.php?search=%s Arch Wiki\ngt: https://wiki.gentoo.org/index.php?title=Special%3ASearch&search=%s&go=Go Gentoo Wiki\nms: https://math.stackexchange.com/search?q= Math Stackexchange\nwt: https://en.wiktionary.org/w/index.php?search=%s Wiktionary\nwb: https://wiby.me/?q= Wiby",
+  "settingsVersion": "2.3",
+  "userDefinedLinkHintCss": "div > .vimiumHintMarker {\n  padding: 2px 3px;\n  background-color: #282828;\n  border: 0;\n  border-radius: 2px;\n  box-shadow: 0em 0.1em 0.6em 0.1em rgba(0, 0, 0, 0.4);\n  background-image: none;\n}\n\ndiv > .vimiumHintMarker span {\n  font-size: 18px;\n  font-family: Hack Nerd Font;\n  font-weight: bold;\n  text-shadow: none;\n  color: #458588;\n}\n\ndiv > .vimiumHintMarker > .matchingCharacter {\n  color: #83a598;\n}\n\n/*VOMNIBAR*/\n#vomnibar{\n    background-color: #282828;\n}\n\n#vomnibar input {\n  color: #ebdbb2;\n  font-weight: normal;\n  font-size: 20px;\n  font-family: Hack Nerd Font;\n  height: 34px;\n  margin-bottom: 0;\n  padding: 4px;\n  background-color: #1d2021;\n  border-radius: 3px;\n  border: 1px solid #282828;\n  box-shadow: #add8e6 0px 0px 1px;\n  width: 100%;\n  outline: none;\n  box-sizing: border-box;\n}\n\n#vomnibar .vomnibarSearchArea {\n  display: block;\n  padding: 10px;\n  background-color: #1d2021;\n  border-radius: 4px 4px 0 0;\n  border-bottom: 0px solid #add8e6;\n}\n\n#vomnibar ul {\n  background-color: #282828;\n  border-radius: 0 0 4px 4px;\n  list-style: none;\n  padding-top: 0;\n  padding-bottom: 0;\n  margin-block-start: 2px;\n  margin-block-end: 0px;\n}\n\n#vomnibar li {\n  border-bottom: 1px solid #1d2021;\n  line-height: 1.1em;\n  padding: 7px 10px;\n  font-size: 16px;\n  color: f8f8f2;\n  position: relative;\n  display: list-item;\n  margin: auto;\n}\n\n#vomnibar li .vomnibarBottomHalf {\n  font-size: 15px;\n  margin-top: 3px;\n  padding: 2px 0;\n}\n\n#vomnibar li .vomnibarSource {\n  color: #689d6a;\n  margin-right: 4px;\n}\n#vomnibar li .vomnibarRelevancy {\n  position: absolute;\n  right: 0;\n  top: 0;\n  padding: 5px;\n  background-color: #282a36;\n  color: #ebdbb2;\n  font-family: Hack Nerd Font Mono;\n  width: 100px;\n  overflow: hidden;\n}\n\n#vomnibar li .vomnibarUrl {\n   color: #83a598;\n   #\n}\n\n#vomnibar li .vomnibarMatch {\n  font-weight: bold;\n  color: #ebdbb2;\n}\n\n#vomnibar li.vomnibarSelected {\n    background-color: #181D24;\n}\n\n#vomnibar li em, #vomnibar li .vomnibarTitle {\n  color: #ebdbb2;\n  margin-left: 4px;\n  font-weight: normal;\n}\n#vomnibar li em { font-style: italic; }\n#vomnibar li em .vomnibarMatch, #vomnibar li .vomnibarTitle .vomnibarMatch {\n  color: #fabd2f;\n}\n\n#vomnibarInput::selection {\n  background-color: #458588;\n}",
+  "exclusionRules": [
+    {
+      "passKeys": "",
+      "pattern": "https?://mail.google.com/*"
+    },
+    {
+      "passKeys": "",
+      "pattern": "https?://www.gry.pl/*"
+    },
+    {
+      "passKeys": "",
+      "pattern": "https?://localhost:8888/*"
+    }
+  ]
+}
diff --git a/.profile b/.profile
index 60d4ba4..12237fd 100644
--- a/.profile
+++ b/.profile
@@ -13,9 +13,8 @@ export EDITOR="vim"
 export SHELL="zsh"
 export TERMINAL="st"
 
-export ZSHDIR="$HOME/.config/shell"
-export SCRIPTS="$HOME"/.scripts
-export ALIASRC="$ZSHDIR/aliasrc"
+export SCRIPTS="$HOME/.scripts"
+export ALIASRC="$ZDOTDIR/aliasrc"
 export VIMINFO="$HOME/.config/vim/.viminfo"
 export VIMINIT="source $HOME/.config/vim/.vimrc"
 export LS_OPTIONS="-lha --color=auto"
@@ -24,3 +23,7 @@ export PATH="$SCRIPTS:$HOME/.cargo/bin:$HOME/.local/bin:$PATH"
 export RSYNC_OPTIONS="-rtvzP"
 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
+remaps
diff --git a/.zshrc b/.zshrc
deleted file mode 100644
index b2cd36a..0000000
--- a/.zshrc
+++ /dev/null
@@ -1,95 +0,0 @@
-# Luke's config for the Zoomer Shell
-
-# Enable colors and change prompt:
-autoload -U colors && colors	# Load colors
-export PS1="%{$(tput setaf 34)%}%n%{$(tput setaf 40)%}@%{$(tput setaf 46)%}%m %{$(tput setaf 154)%}%1~ %{$(tput sgr0)%}$ "
-setopt autocd		# Automatically cd into typed directory.
-stty stop undef		# Disable ctrl-s to freeze terminal.
-setopt interactive_comments
-
-# History in cache directory:
-HISTSIZE=10000000
-SAVEHIST=10000000
-HISTFILE="${XDG_CACHE_HOME:-$HOME/.cache}/zsh/history"
-setopt inc_append_history
-
-# Load aliases and shortcuts if existent.
-[ -f "$HOME/.config/shell/envvarrc" ] && source "$HOME/.config/shell/envvarrc"
-[ -f "$HOME/.config/shell/aliasrc"  ] && source "$HOME/.config/shell/aliasrc"
-[ -f "$HOME/.config/shell/funcrc"   ] && source "$HOME/.config/shell/funcrc"
-
-# Basic auto/tab complete:
-autoload -U compinit
-zstyle ':completion:*' menu select
-zmodload zsh/complist
-compinit
-_comp_options+=(globdots)		# Include hidden files.
-
-# vi mode
-# bindkey -v
-export KEYTIMEOUT=1
-
-# Use vim keys in tab complete menu:
-bindkey -M menuselect 'h' vi-backward-char
-bindkey -M menuselect 'k' vi-up-line-or-history
-bindkey -M menuselect 'l' vi-forward-char
-bindkey -M menuselect 'j' vi-down-line-or-history
-bindkey -v '^?' backward-delete-char
-
-## Change cursor shape for different vi modes.
-#function zle-keymap-select () {
-#    case $KEYMAP in
-#        vicmd) echo -ne '\e[1 q';;      # block
-#        viins|main) echo -ne '\e[5 q';; # beam
-#    esac
-#}
-#zle -N zle-keymap-select
-#zle-line-init() {
-#    zle -K viins # initiate `vi insert` as keymap (can be removed if `bindkey -V` has been set elsewhere)
-#    echo -ne "\e[5 q"
-#}
-#zle -N zle-line-init
-#echo -ne '\e[5 q' # Use beam shape cursor on startup.
-#preexec() { echo -ne '\e[5 q' ;} # Use beam shape cursor for each new prompt.
-
-# Edit line in vim with ctrl-e:
-autoload edit-command-line; zle -N edit-command-line
-bindkey '^e' edit-command-line
-bindkey -M vicmd '^[[P' vi-delete-char
-bindkey -M vicmd '^e' edit-command-line
-bindkey -M visual '^[[P' vi-delete
-
-# Use custom options remaps from the script
-remaps
-
-# Exit even of there are running jobs
-setopt NO_CHECK_JOBS
-
-### Added by Zinit's installer
-if [[ ! -f $HOME/.local/share/zinit/zinit.git/zinit.zsh ]]; then
-    print -P "%F{33} %F{220}Installing %F{33}ZDHARMA-CONTINUUM%F{220} Initiative Plugin Manager (%F{33}zdharma-continuum/zinit%F{220})…%f"
-    command mkdir -p "$HOME/.local/share/zinit" && command chmod g-rwX "$HOME/.local/share/zinit"
-    command git clone https://github.com/zdharma-continuum/zinit "$HOME/.local/share/zinit/zinit.git" && \
-        print -P "%F{33} %F{34}Installation successful.%f%b" || \
-        print -P "%F{160} The clone has failed.%f%b"
-fi
-
-source "$HOME/.local/share/zinit/zinit.git/zinit.zsh"
-autoload -Uz _zinit
-(( ${+_comps} )) && _comps[zinit]=_zinit
-
-# Load a few important annexes, without Turbo
-# (this is currently required for annexes)
-zinit light-mode for \
-    zdharma-continuum/zinit-annex-as-monitor \
-    zdharma-continuum/zinit-annex-bin-gem-node \
-    zdharma-continuum/zinit-annex-patch-dl \
-    zdharma-continuum/zinit-annex-rust
-
-### End of Zinit's installer chunk
-
-# Load plugins with zinit
-zinit ice depth=1
-zinit light jeffreytse/zsh-vi-mode
-ZVM_VI_INSERT_ESCAPE_BINDKEY=jk
-zinit light zsh-users/zsh-syntax-highlighting