diff --git a/hjalmar-droneship/i3/config b/hjalmar-droneship/i3/config
index 5065481..ac739c1 100644
--- a/hjalmar-droneship/i3/config
+++ b/hjalmar-droneship/i3/config
@@ -42,7 +42,6 @@ bindsym $mod+Return exec $term
 bindsym $mod+Shift+q kill
 
 # start program launcher
-# bindsym $mod+d exec --no-startup-id dmenu_recency
 bindsym $mod+d exec --no-startup-id rofi -show combi -combi-modi "run#drun" -lines 10 -eh 2 -width 30
 
 ################################################################################################
@@ -153,56 +152,61 @@ bindsym $mod+Ctrl+Left workspace prev
 set $ws1 "1"
 set $ws2 "2"
 set $ws3 "3"
-set $ws4 "Ins"
-set $ws5 "Home"
-set $ws6 "PgUp"
-set $ws7 "Del"
-set $ws8 "End"
-set $ws9 "PgDn"
+set $ws4 "4"
+set $ws5 "Ins"
+set $ws6 "Home"
+set $ws7 "PgUp"
+set $ws8 "Del"
+set $ws9 "End"
+set $ws0 "PgDn"
 
 # switch to workspace
 bindsym $mod+1 workspace $ws1
 bindsym $mod+2 workspace $ws2
 bindsym $mod+3 workspace $ws3
-bindsym $mod+Insert workspace $ws4
-bindsym $mod+Home workspace $ws5
-bindsym $mod+Prior workspace $ws6
-bindsym $mod+Delete workspace $ws7
-bindsym $mod+End workspace $ws8
-bindsym $mod+Next workspace $ws9
+bindsym $mod+4 workspace $ws4
+bindsym $mod+Insert workspace $ws5
+bindsym $mod+Home workspace $ws6
+bindsym $mod+Prior workspace $ws7
+bindsym $mod+Delete workspace $ws8
+bindsym $mod+End workspace $ws9
+bindsym $mod+Next workspace $ws0
 
 # switch to workspace
-workspace $ws1 output HDMI-0
-workspace $ws2 output HDMI-0
-workspace $ws3 output HDMI-0
-workspace $ws4 output HDMI-0
-workspace $ws5 output HDMI-0
-workspace $ws6 output HDMI-0
-workspace $ws7 output HDMI-0
-workspace $ws8 output HDMI-0
-workspace $ws9 output HDMI-0
+workspace $ws1 output DP-2
+workspace $ws2 output DP-0
+workspace $ws3 output DP-2
+workspace $ws4 output DP-0
+workspace $ws5 output DP-2
+workspace $ws6 output DP-2
+workspace $ws7 output DP-2
+workspace $ws8 output DP-0
+workspace $ws9 output DP-0
+workspace $ws0 output DP-0
 
 # Move focused container to workspace
 bindsym $mod+Ctrl+1 move container to workspace $ws1
 bindsym $mod+Ctrl+2 move container to workspace $ws2
 bindsym $mod+Ctrl+3 move container to workspace $ws3
-bindsym $mod+Ctrl+Insert move container to workspace $ws4
-bindsym $mod+Ctrl+Home move container to workspace $ws5
-bindsym $mod+Ctrl+Prior move container to workspace $ws6
-bindsym $mod+Ctrl+Delete move container to workspace $ws7
-bindsym $mod+Ctrl+End move container to workspace $ws8
-bindsym $mod+Ctrl+Next move container to workspace $ws9
+bindsym $mod+Ctrl+4 move container to workspace $ws4
+bindsym $mod+Ctrl+Insert move container to workspace $ws5
+bindsym $mod+Ctrl+Home move container to workspace $ws6
+bindsym $mod+Ctrl+Prior move container to workspace $ws7
+bindsym $mod+Ctrl+Delete move container to workspace $ws8
+bindsym $mod+Ctrl+End move container to workspace $ws9
+bindsym $mod+Ctrl+Next move container to workspace $ws0
 
 # Move to workspace with focused container
 bindsym $mod+Shift+1 move container to workspace $ws1; workspace $ws1
 bindsym $mod+Shift+2 move container to workspace $ws2; workspace $ws2
 bindsym $mod+Shift+3 move container to workspace $ws3; workspace $ws3
-bindsym $mod+Shift+Insert move container to workspace $ws4; workspace $ws4
-bindsym $mod+Shift+Home move container to workspace $ws5; workspace $ws5
-bindsym $mod+Shift+Prior move container to workspace $ws6; workspace $ws6
-bindsym $mod+Shift+Delete move container to workspace $ws7; workspace $ws7
-bindsym $mod+Shift+End move container to workspace $ws8; workspace $ws8
-bindsym $mod+Shift+Next move container to workspace $ws9; workspace $ws9
+bindsym $mod+Shift+4 move container to workspace $ws4; workspace $ws4
+bindsym $mod+Shift+Insert move container to workspace $ws5; workspace $ws5
+bindsym $mod+Shift+Home move container to workspace $ws5; workspace $ws6
+bindsym $mod+Shift+Prior move container to workspace $ws7; workspace $ws7
+bindsym $mod+Shift+Delete move container to workspace $ws8; workspace $ws8
+bindsym $mod+Shift+End move container to workspace $ws9; workspace $ws9
+bindsym $mod+Shift+Next move container to workspace $ws0; workspace $ws0
 
 # Open applications on specific workspaces
 # assign [class="Thunderbird"] $ws1
@@ -311,7 +315,7 @@ exec --no-startup-id setxkbmap -layout no -variant nodeadkeys -option "caps:esca
 exec --no-startup-id redshift-gtk
 exec --no-startup-id dropbox start &
 exec --no-startup-id nvidia-settings -a GPUFanControlState=1 -a GPUTargetFanSpeed=60
-exec --no-startup-id xrandr --output DP-3 --mode 3840x2160 --primary
+exec --no-startup-id xrandr --output DP-2 --mode 3840x2160 --output DP-0 --mode 2560x1440 --right-of DP-2 --primary
 
 # Color palette used for the terminal ( ~/.Xresources file )
 # Colors are gathered based on the documentation:
diff --git a/i3status/config b/hjalmar-droneship/i3status/config
similarity index 79%
rename from i3status/config
rename to hjalmar-droneship/i3status/config
index c7c4664..7e56f30 100644
--- a/i3status/config
+++ b/hjalmar-droneship/i3status/config
@@ -40,12 +40,17 @@ ethernet _first_ {
 
 order += "disk /"
 disk "/" {
-        format = " SSD ⛁ %avail / %percentage_avail "
+        format = " /  %avail / %percentage_avail "
 }
 
-order += "disk /mnt/goshHDD/"
-disk "/mnt/goshHDD/" {
-        format = " HDD ⛁ %avail / %percentage_avail "
+order += "disk /mnt/nuuetHDD/"
+disk "/mnt/nuuetHDD/" {
+        format = " /mnt/nuuetHDD/ ⛁ %avail / %percentage_avail "
+}
+
+order += "disk /mnt/OneDrive/"
+disk "/mnt/OneDrive/" {
+        format = " /mnt/OneDrive/ ⛁ %avail / %percentage_avail "
 }
 
 # order += "battery 0"
diff --git a/hjalmar-mothership/i3/config b/hjalmar-mothership/i3/config
index 70eef30..dbb5a49 100644
--- a/hjalmar-mothership/i3/config
+++ b/hjalmar-mothership/i3/config
@@ -42,7 +42,6 @@ bindsym $mod+Return exec $term
 bindsym $mod+Shift+q kill
 
 # start program launcher
-# bindsym $mod+d exec --no-startup-id dmenu_recency
 bindsym $mod+d exec --no-startup-id rofi -show combi -combi-modi "run#drun" -lines 10 -eh 2 -width 30
 
 ################################################################################################
@@ -66,11 +65,11 @@ bindsym Scroll_Lock exec amixer -q sset Master toggle
 # bindsym XF86MonBrightnessDown exec "xbacklight -dec 10; notify-send 'brightness down'"
 
 # enable / disable caps->escape bind
-bindsym $mod+F10 exec "setxkbmap -layout no -variant nodeadkeys -option"
-bindsym $mod+F11 exec "setxkbmap -layout no -variant nodeadkeys -option 'caps:backspace'"
-bindsym $mod+F12 exec "setxkbmap -layout no -variant nodeadkeys -option 'caps:escape'"
-bindsym $mod+F9 exec "xrandr --output DP-4 --primary --output DP-2 --auto --rotate left --right-of DP-4 --output DP-0 --auto --rotate left --left-of DP-4"
-bindsym $mod+Shift+F9 exec "xrandr --output DP-4 --primary --output DP-2 --off --output DP-0 --off"
+bindsym $mod+F10 exec "setxkbmap -layout no -model pc105 -variant nodeadkeys -option"
+bindsym $mod+F11 exec "setxkbmap -layout no -model pc105 -variant nodeadkeys -option 'caps:backspace'"
+bindsym $mod+F12 exec "setxkbmap -layout no -model pc105 -variant nodeadkeys -option 'caps:escape'"
+bindsym $mod+F9 exec "xrandr --dpi 96 --output DP-4 --primary --output DP-0 --auto --rotate left --left-of DP-4"
+bindsym $mod+Shift+F9 exec "xrandr --dpi 96 --output DP-4 --primary --output DP-2 --off --output DP-0 --off"
 
 # Start Applications
 bindsym $mod+Ctrl+b exec $term -e 'bmenu'
@@ -155,59 +154,61 @@ bindsym $mod+Ctrl+Left workspace prev
 set $ws1 "1"
 set $ws2 "2"
 set $ws3 "3"
-set $ws4 "Ins"
-set $ws5 "Home"
-set $ws6 "PgUp"
-set $ws7 "Del"
-set $ws8 "End"
-set $ws9 "PgDn"
-set $display1 DP-0
-set $display2 DP-4
-set $display3 DP-2
+set $ws4 "4"
+set $ws5 "Ins"
+set $ws6 "Home"
+set $ws7 "PgUp"
+set $ws8 "Del"
+set $ws9 "End"
+set $ws0 "PgDn"
 
 # switch to workspace
 bindsym $mod+1 workspace $ws1
 bindsym $mod+2 workspace $ws2
 bindsym $mod+3 workspace $ws3
-bindsym $mod+Insert workspace $ws4
-bindsym $mod+Home workspace $ws5
-bindsym $mod+Prior workspace $ws6
-bindsym $mod+Delete workspace $ws7
-bindsym $mod+End workspace $ws8
-bindsym $mod+Next workspace $ws9
+bindsym $mod+4 workspace $ws4
+bindsym $mod+Insert workspace $ws5
+bindsym $mod+Home workspace $ws6
+bindsym $mod+Prior workspace $ws7
+bindsym $mod+Delete workspace $ws8
+bindsym $mod+End workspace $ws9
+bindsym $mod+Next workspace $ws0
 
 # switch to workspace
-workspace $ws1 output $display1
-workspace $ws2 output $display2
-workspace $ws3 output $display3
-workspace $ws4 output $display1
-workspace $ws5 output $display2
-workspace $ws6 output $display3
-workspace $ws7 output $display1
-workspace $ws8 output $display2
-workspace $ws9 output $display3
+workspace $ws1 output DP-0
+workspace $ws2 output DP-4
+workspace $ws3 output DP-0
+workspace $ws4 output DP-4
+workspace $ws5 output DP-0
+workspace $ws6 output DP-0
+workspace $ws7 output DP-0
+workspace $ws8 output DP-4
+workspace $ws9 output DP-4
+workspace $ws0 output DP-4
 
 # Move focused container to workspace
 bindsym $mod+Ctrl+1 move container to workspace $ws1
 bindsym $mod+Ctrl+2 move container to workspace $ws2
 bindsym $mod+Ctrl+3 move container to workspace $ws3
-bindsym $mod+Ctrl+Insert move container to workspace $ws4
-bindsym $mod+Ctrl+Home move container to workspace $ws5
-bindsym $mod+Ctrl+Prior move container to workspace $ws6
-bindsym $mod+Ctrl+Delete move container to workspace $ws7
-bindsym $mod+Ctrl+End move container to workspace $ws8
-bindsym $mod+Ctrl+Next move container to workspace $ws9
+bindsym $mod+Ctrl+4 move container to workspace $ws4
+bindsym $mod+Ctrl+Insert move container to workspace $ws5
+bindsym $mod+Ctrl+Home move container to workspace $ws6
+bindsym $mod+Ctrl+Prior move container to workspace $ws7
+bindsym $mod+Ctrl+Delete move container to workspace $ws8
+bindsym $mod+Ctrl+End move container to workspace $ws9
+bindsym $mod+Ctrl+Next move container to workspace $ws0
 
 # Move to workspace with focused container
 bindsym $mod+Shift+1 move container to workspace $ws1; workspace $ws1
 bindsym $mod+Shift+2 move container to workspace $ws2; workspace $ws2
 bindsym $mod+Shift+3 move container to workspace $ws3; workspace $ws3
-bindsym $mod+Shift+Insert move container to workspace $ws4; workspace $ws4
-bindsym $mod+Shift+Home move container to workspace $ws5; workspace $ws5
-bindsym $mod+Shift+Prior move container to workspace $ws6; workspace $ws6
-bindsym $mod+Shift+Delete move container to workspace $ws7; workspace $ws7
-bindsym $mod+Shift+End move container to workspace $ws8; workspace $ws8
-bindsym $mod+Shift+Next move container to workspace $ws9; workspace $ws9
+bindsym $mod+Shift+4 move container to workspace $ws4; workspace $ws4
+bindsym $mod+Shift+Insert move container to workspace $ws5; workspace $ws5
+bindsym $mod+Shift+Home move container to workspace $ws5; workspace $ws6
+bindsym $mod+Shift+Prior move container to workspace $ws7; workspace $ws7
+bindsym $mod+Shift+Delete move container to workspace $ws8; workspace $ws8
+bindsym $mod+Shift+End move container to workspace $ws9; workspace $ws9
+bindsym $mod+Shift+Next move container to workspace $ws0; workspace $ws0
 
 # Open applications on specific workspaces
 # assign [class="Thunderbird"] $ws1
@@ -309,11 +310,11 @@ exec --no-startup-id xautolock -time 30 -locker blurlock
 exec_always --no-startup-id sbxkb
 #exec_always --no-startup-id ff-theme-util
 exec_always --no-startup-id fix_xcursor
-exec --no-startup-id xrandr --output $display2 --primary --output $display3 --auto --rotate left --right-of $display2 --output $display1 --auto --rotate left --left-of $display2
+exec --no-startup-id xrandr --dpi 96 --output $display2 --primary --output $display3 --auto --rotate left --right-of $display2 --output $display1 --auto --rotate left --left-of $display2
 exec_always for id in $(xinput list | grep "pointer" | cut -d '=' -f 2 | cut -f 1); do xinput --set-prop $id 'libinput Accel Profile Enabled' 0, 1; done
 
 # HB STARTUP ADDITIONS
-exec --no-startup-id setxkbmap -layout no -variant nodeadkeys -option "caps:escape"
+exec --no-startup-id setxkbmap -layout no -model pc105 -variant nodeadkeys -option "caps:escape"
 exec --no-startup-id redshift-gtk
 exec --no-startup-id dropbox start &
 exec --no-startup-id nvidia-settings -a GPUFanControlState=1 -a GPUTargetFanSpeed=60
@@ -358,11 +359,9 @@ bar {
 ## please set your primary output first. Example: 'xrandr --output eDP1 --primary'
 
 	tray_output primary
-#	tray_output eDP1
-
 	bindsym button4 nop
 	bindsym button5 nop
-#   font xft:URWGothic-Book 11
+    font xft:URWGothic-Book 12
 	strip_workspace_numbers yes
 
     colors {
diff --git a/hjalmar-mothership/i3status/config b/hjalmar-mothership/i3status/config
new file mode 100644
index 0000000..6b53700
--- /dev/null
+++ b/hjalmar-mothership/i3status/config
@@ -0,0 +1,84 @@
+# i3status configuration file.
+# see "man i3status" for documentation.
+
+general {
+        colors = true
+        interval = 5
+}
+
+# order += "ipv6"
+
+order += "cpu_usage"
+cpu_usage {
+        format = " ☢ CPU %usage "
+}
+
+order += "cpu_temperature 0"
+cpu_temperature 0 {
+        format = " %degrees °C "
+}
+
+order += "load"
+load {
+        format = "load %1min"
+}
+
+# order += "wireless wlan0"
+# order += "ethernet eth0"
+order += "wireless _first_"
+wireless _first_ {
+        # format_up = "  W: (%quality at %essid, %bitrate / %frequency) %ip "
+        format_up = "  W: (%quality at %essid, %bitrate / %frequency) "
+        format_down = " no wlan "
+}
+
+order += "ethernet _first_"
+ethernet _first_ {
+        format_up = " lan: %ip %speed "
+        format_down = " no lan "
+}
+
+order += "disk /"
+disk "/" {
+        format = " /  %avail / %percentage_avail "
+}
+
+order += "disk /mnt/Games/"
+disk "/mnt/Games/" {
+        format = " /mnt/Games/ ⛁ %avail / %percentage_avail "
+}
+
+order += "disk /mnt/nuuetHDD/"
+disk "/mnt/nuuetHDD/" {
+        format = " /mnt/nuuetHDD/ ⛁ %avail / %percentage_avail "
+}
+
+order += "disk /mnt/OneDrive/"
+disk "/mnt/OneDrive/" {
+        format = " /mnt/OneDrive/ ⛁ %avail / %percentage_avail "
+}
+
+order += "disk /mnt/src/"
+disk "/mnt/src/" {
+        format = " /mnt/src/ ⛁ %avail / %percentage_avail "
+}
+
+# order += "battery 0"
+battery 0 {
+        format = "%status %percentage %remaining "
+}
+
+# order += "run_watch DHCP"
+run_watch DHCP {
+        pidfile = "/var/run/dhclient*.pid"
+}
+
+# order += "run_watch VPN"
+run_watch VPN {
+        pidfile = "/var/run/vpnc/pid"
+}
+
+order += "tztime local"
+tztime local {
+        format = " %Y-%m-%d %H:%M:%S "
+}
diff --git a/liquidctl/liquidcfg.service b/hjalmar-mothership/liquidctl/liquidcfg.service
similarity index 100%
rename from liquidctl/liquidcfg.service
rename to hjalmar-mothership/liquidctl/liquidcfg.service
diff --git a/manjaro.md b/manjaro.md
index b6c5b98..61f7457 100644
--- a/manjaro.md
+++ b/manjaro.md
@@ -1,53 +1,39 @@
 # linux
-* yay stuff
+* basics
   * AUR `sudo pacman -S yay`
-  * `yay -S onedrive-abraunegg dropbox slack-desktop ncspot-git rxvt-unicode-truecolor-wide-glyphs chromium`
+* fonts
+  * `yay -S nerd-fonts-source-code-pro powerline-fonts-git libxft-bgra`
 * applications
-  * helpers `sudo pacman -S zathura-pdf-mupdf trash-cli rofi`
-  * base16 shell `git clone https://github.com/chriskempson/base16-shell.git ~/.config/base16-shell`
-  * night colors `sudo pacman -S redshift`
-  * gaming `sudo pacman -S steam-manjaro steam-native`
-  * vlc player `sudo pacman -S libmicrodns protobuf vlc`
+  * `yay -S onedrive-abraunegg dropbox slack-desktop chromium zathura-pdf-mupdf trash-cli rofi redshift flameshot fish pavucontrol thunar`
+* gaming and media
+  + `yay -S steam-manjaro vlc libmicrodns protobuf ncspot-git`
 * hardware
-  * glances
-  * liquidctl
-  * `sudo pacman -S pulseaudio-bluetooth`
+  * `yay -S liquidctl glances pulseaudio-bluetooth asus-fan-control`
 
 # coding
-* dry `yay dry-bin`
-* cuda `sudo pacman -S cuda`
-* cuda-docker `yay nvidia-container-toolkit`
-* core `sudo pacman -S neovim tmux`
+* `yay -S cuda nvidia-container-toolkit`
+  `yay -S docker docker-compose dry-bin neovim tmux diff-so-fancy the_silver_searcher ripgrep bat npm nodejs yarn ninja ctags tig`
 * `git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm`
-* fonts `yay nerd-fonts-source-code-pro powerline-fonts-git libxft-bgra`
-* git addons `sudo pacman -S diff-so-fancy`
-* search `sudo pacman -S the_silver_searcher ripgrep`
-* cat replacement `sudo pacman -S bat`
-* javascript `sudo pacman -S npm nodejs yarn`
-* c++ `sudo pacman -S ninja`
-
-# settings
-* set shell to 'fish' via `bmenu`
-* replace caps with esc `setxkbmap -option 'caps:escape' `
-* ssh setup
-  * enable SSH `sudo systemctl enable --now sshd.service`
-  * enable X11 forwarding in `/etc/ssh/sshd_config`
 
 # python
-* `pip install torch torchvision`
-* `pip install plotly flake8 numpy scipy sympy matplotlib seaborn pytorch-lightning ggplot ptvsd tensorboard torchtext ipython matplotlib-label-lines ipympl pytest qbstyles`
+* `pip install ipython pytest neovim numpy scipy sympy flake8 ptvsd addict dill`
+* matplotlib stuff `pip install matplotlib seaborn matplotlib-label-lines ipympl qbstyles`
+* other plotting `pip install plotly ggplot`
+* install torch from [link](https://pytorch.org/)
+* `pip install tensorboard torchtext pytorch-lightning torchvision`
 
-# enable services
-* `systemctl enable --user onedrive --now`
-* `sudo systemctl enable fstrim.timer --now`
+# settings
+* bmenu for system config incl setting shell
+* replace caps with esc `setxkbmap -option 'caps:escape'`
+* enable docker non-root daemon [link](https://docs.docker.com/engine/install/linux-postinstall)
+* base16 shell `git clone https://github.com/chriskempson/base16-shell.git ~/.config/base16-shell`
+* ssh enable `sudo systemctl enable --now sshd.service`
+* jupyter `openssl req -x509 -nodes -days 365 -newkey rsa:1024 -keyout ~/.jupyter/mykey.key -out ~/.jupyter/mycert.pem`
+* start onedrive `systemctl enable --user onedrive --now`
+* ssd maintenance `sudo systemctl enable fstrim.timer --now`
+* show log `journalctl --user-unit onedrive -f`
 
-# log services
-* log onedrive `journalctl --user-unit onedrive -f`
-
-# IP
-* hjalmar-droneship 88.89.64.249 10.0.0.2
-
-#OMF
+# OMF
 * curl -L https://get.oh-my.fish | fish
 * omf install https://github.com/FabioAntunes/fish-nvm
 * omf install https://github.com/edc/bass
@@ -61,3 +47,4 @@
   * **inxi** (=tool to show stuff) see network drivers `inxi -N`
   * **iwconfig** (=wireless ifconfig) see signal strength, bit rate etc `iwconfig`
   * **lsusb & lspci**: show info on usb & pci `sudo lsusb -vv -s [device]` and `sudo lspci -vv -s [device]`
+
diff --git a/moc/config b/moc/config
index 2123fbc..99e3665 100644
--- a/moc/config
+++ b/moc/config
@@ -1,673 +1,3 @@
-# This is a configuration file for the MOC player.  It should be named
-# 'config' and placed in the ~/.moc directory.  As this file can specify
-# commands which invoke other applications, MOC will refuse to start if it
-# is not owned by either root or the current user, or if it is writable by
-# anyone other than its owner.  All options are given with their default
-# values, and therefore commented.
-
-# Comments begin with '#'.
-# You can use quotes and escape ('\') in parameters.
-#
-# You can have variable values substituted by enclosing the variable name
-# as "${...}".  (This only applies to the portion of the option following
-# the '='.)  Variables are substituted first from the environment then,
-# if not found, from the configuration options.  (Note that the value of
-# a configuration option substituted is that which it has at the time the
-# substitution variable is encountered.)  If there is a naming conflict
-# between an environment and configuration variable, you may be able to
-# resolve it by using lowercase as the environment variable matches are
-# case-sensitive whereas the configuration variables are not.
-#
-# You can also use the form "${...:-...}" where the value in the second
-# position will be substituted if the variable name given in the first
-# position is unset or null.
-#
-# So, for example:
-#
-#     MusicDir = /music/${USER:-public}
-#     Fastdir1 = ${MusicDir}/mp3/rock
-#     Fastdir2 = ${MusicDir}/mp3/electronic
-#     Fastdir3 = ${MusicDir}/mp3/rap
-#     Fastdir4 = ${MusicDir}/mp3/etc
-#
-# Variable names are limited to those accepted by the BASH shell; that
-# is, those comprising the upper- and lowercase ASCII characters, digits
-# and the underscore.
-#
-# If you need to use the "${" sequence for any other purpose, write "$${"
-# and it will be replaced by "${" and not treated as a substitution.
-#
-# Some options take lists of strings as their values.  The strings are
-# separated by colons.  Additional strings can be appended to the list
-# using "+=" in place of a plain "=" to assign the value.  For an example,
-# see the XTerms option.
-#
-# You can override any configuration option when you run MOC using the
-# '-O' command line option:
-#
-#     mocp -O AutoNext=no -O messagelingertime=1 -O XTerms+=xxt:xwt
-#
-# This command line option can be repeated as many times as needed and
-# the configuration option name is not case sensitive.  (Note that MOC
-# does not perform variable substitution on the value of such overridden
-# configuration options.)  Most option values are set before the
-# configuration file is processed (which allows the new values to be
-# picked up by substitutions), however list-valued options are overridden
-# afterwards (which gives the choice of whether the configured values are
-# replaced or added to).
-
-# Remember that the client and server are separate processes and the
-# server will retain the configuration values formed from the environment
-# within which it was originally started.
-
-# Show file titles (title, author, album) instead of file names?
 ReadTags = no
-
-# In which directory do you store your music files?  If you specify it
-# you will be able to jump straight to this directory with the '-m'
-# parameter or the 'm' command.  This can also point to a playlist.
-#
-# Example:    MusicDir = "/home/joe/music"
-#
-#MusicDir =
-
-# Start in the music directory by default?  If set to 'no', start
-# in the current directory by default.  A single directory on
-# the command line takes precedence.
-#StartInMusicDir = no
-
-# How to sort?  FileName is the option's only value for now.
-#Sort = FileName
-
-# Show errors in the streams (for example, broken frames in MP3 files)?
-#ShowStreamErrors = no
-
-# Ignore CRC errors in MP3 files?  Most players do that, so the default
-# value is 'yes'.
-#MP3IgnoreCRCErrors = yes
-
-# Set playback toggles.
-#Repeat = no
-#Shuffle = no
-#AutoNext = yes
-
-# Default FormatString:
-#
-#   %n - Track number
-#   %a - Artist
-#   %A - Album
-#   %t - Title
-#   %(X:TRUE:FALSE) - Ternary expression: if X exists, do TRUE,
-#                     otherwise FALSE.  The escape character must
-#                     be doubled (i.e., '\\').  (See zshmisc
-#                     documentation for more information.)
-#
-#FormatString = "%(n:%n :)%(a:%a - :)%(t:%t:)%(A: \(%A\):)"
-
-# Input and output buffer sizes (in kilobytes).
-#InputBuffer = 512                  # Minimum value is 32KB
-#OutputBuffer = 512                 # Minimum value is 128KB
-
-# How much to fill the input buffer before playing (in kilobytes)?
-# This can't be greater than the value of InputBuffer.  While this has
-# a positive effect for network streams, it also causes the broadcast
-# audio to be delayed.
-#Prebuffering = 64
-
-# Use this HTTP proxy server for internet streams.  If not set, the
-# environment variables http_proxy and ALL_PROXY will be used if present.
-#
-# Format: HTTPProxy = PROXY_NAME:PORT
-#
-#HTTPProxy =
-
-# Sound driver - OSS, ALSA, JACK, SNDIO (on OpenBSD) or null (only for
-# debugging).  You can enter more than one driver as a colon-separated
-# list.  The first working driver will be used.
-#SoundDriver = JACK:ALSA:OSS
-
-# Jack output settings.
-#JackClientName = "moc"
-#JackStartServer = no
-#JackOutLeft = "system:playback_1"
-#JackOutRight = "system:playback_2"
-
-# OSS output settings.
-#OSSDevice = /dev/dsp
-#OSSMixerDevice = /dev/mixer
-#OSSMixerChannel1 = pcm             # 'pcm', 'master' or 'speaker'
-#OSSMixerChannel2 = master          # 'pcm', 'master' or 'speaker'
-
-# ALSA output settings.  If you need to dump the audio produced by MOC
-# to a file for diagnostic purposes, the following setting of 'ALSADevice'
-# should do that:
-#
-#    ALSADevice=tee:hw,'/tmp/out.wav',wav
-#
-#ALSADevice = default
-#ALSAMixer1 = PCM
-#ALSAMixer2 = Master
-
-# Save software mixer state?
-# If enabled, a file 'softmixer' will be created in '~/.moc/' storing the
-# mixersetting set when the server is shut down.
-# Note that there is a "hidden" 'Amplification' setting in that file.
-# Amplification (0-200) is used to scale the mixer setting (0-100).  This
-# results in a higher signal amplitude but may also produce clipping.
-#Softmixer_SaveState = yes
-
-# Save equalizer state?
-# If enabled, a file 'equalizer' will be created in '~/.moc/' storing the
-# equalizer settings when the server is shut down.
-# Note that there is a "hidden" 'Mixin' setting in that file.
-# Mixin (0.0-1.0) is used to determine how much of the original signal is
-# used after equalizing.  0 means to only use the equalized sound, while 1
-# effectively disabled the mixer.  The default is 0.25.
-#Equalizer_SaveState = yes
-
-# Show files with dot at the beginning?
-#ShowHiddenFiles = no
-
-# Hide file name extensions?
-#HideFileExtension = no
-
-# Show file format in menu?
-#ShowFormat = yes
-
-# Show file time in menu?  Possible values: 'yes', 'no' and 'IfAvailable'
-# (meaning show the time only when it is already known, which often works
-# faster).
-#ShowTime = IfAvailable
-
-# Show time played as a percentage in the time progress bar.
-#ShowTimePercent = no
-
-# Values of the TERM environment variable which are deemed to be managed by
-# screen(1).  If you are setting a specific terminal using screen(1)'s
-# '-T <term>' option, then you will need to add 'screen.<term>' to this list.
-# Note that this is only a partial test; the value of the WINDOW environment
-# variable must also be a number (which screen(1) sets).
-#ScreenTerms = screen:screen-w:vt100
-
-# Values of the TERM environment variable which are deemed to be xterms.  If
-# you are using MOC within screen(1) under an xterm, then add screen(1)'s
-# TERM setting here as well to cause MOC to update the xterm's title.
-#XTerms = xterm
-#XTerms += xterm-colour:xterm-color
-#XTerms += xterm-256colour:xterm-256color
-#XTerms += rxvt:rxvt-unicode
-#XTerms += rxvt-unicode-256colour:rxvt-unicode-256color
-#XTerms += eterm
-
-# Theme file to use.  This can be absolute path or relative to
-# /usr/share/moc/themes/ (depends on installation prefix) or
-# ~/.moc/themes/ .
-#
-# Example:    Theme = laras_theme
-#
 Theme = manjaro
-
-# The theme used when running on an xterm.
-#
-# Example:    XTermTheme = transparent-background
-#
-#XTermTheme =
-
-# Should MOC try to autoload the default lyrics file for an audio?  (The
-# default lyrics file is a text file with the same file name as the audio
-# file name with any trailing "extension" removed.)
-#AutoLoadLyrics = yes
-
-# MOC directory (where pid file, socket and state files are stored).
-# You can use ~ at the beginning.
-#MOCDir = ~/.moc
-
-# Use mmap() to read files.  mmap() is much slower on NFS.
-#UseMMap = no
-
-# Use MIME to identify audio files.  This can make for slower loading
-# of playlists but is more accurate than using "extensions".
-#UseMimeMagic = no
-
-# Assume this encoding for ID3 version 1/1.1 tags (MP3 files).  Unlike
-# ID3v2, UTF-8 is not used here and MOC can't guess how tags are encoded.
-# Another solution is using librcc (see the next option).  This option is
-# ignored if UseRCC is set to 'yes'.
-#ID3v1TagsEncoding = WINDOWS-1250
-
-# Use librcc to fix ID3 version 1/1.1 tags encoding.
-#UseRCC = yes
-
-# Use librcc to filenames and directory names encoding.
-#UseRCCForFilesystem = yes
-
-# When this option is set the player assumes that if the encoding of
-# ID3v2 is set to ISO-8859-1 then the ID3v1TagsEncoding is actually
-# that and applies appropriate conversion.
-#EnforceTagsEncoding = no
-
-# Enable the conversion of filenames from the local encoding to UTF-8.
-#FileNamesIconv = no
-
-# Enable the conversion of the xterm title from UTF-8 to the local encoding.
-#NonUTFXterm = no
-
-# Remember the playlist after exit?
-#SavePlaylist = yes
-
-# When using more than one client (interface) at a time, do they share
-# the playlist?
-#SyncPlaylist = yes
-
-# Choose a keymap file (relative to '~/.moc/' or using an absolute path).
-# An annotated example keymap file is included ('keymap.example').
-#
-# Example:    Keymap = my_keymap
-#
 Keymap = keymap
-
-# Use ASCII rather than graphic characters for drawing lines.  This
-# helps on some terminals.
-#ASCIILines = no
-
-# FastDirs, these allow you to jump directly to a directory, the key
-# bindings are in the keymap file.
-#
-# Examples:   Fastdir1 = /mp3/rock
-#             Fastdir2 = /mp3/electronic
-#             Fastdir3 = /mp3/rap
-#             Fastdir4 = /mp3/etc
-#
-#Fastdir1 =
-#Fastdir2 =
-#Fastdir3 =
-#Fastdir4 =
-#Fastdir5 =
-#Fastdir6 =
-#Fastdir7 =
-#Fastdir8 =
-#Fastdir9 =
-#Fastdir10 =
-
-# How fast to seek (in number of seconds per keystroke).  The first
-# option is for normal seek and the second for silent seek.
-#SeekTime = 1
-#SilentSeekTime = 5
-
-# PreferredDecoders allows you to specify which decoder should be used
-# for any given audio format.  It is a colon-separated list in which
-# each entry is of the general form 'code(decoders)', where 'code'
-# identifies the audio format and 'decoders' is a comma-separated list
-# of decoders in order of preference.
-#
-# The audio format identifier may be either a filename extension or a
-# MIME media type.  If the latter, the format is 'type/subtype' (e.g.,
-# 'audio/flac').  Because different systems may give different MIME
-# media types, any 'x-' prefix of the subtype is ignored both here and
-# in the actual file MIME type (so all combinations of 'audio/flac' and
-# 'audio/x-flac' match each other).
-#
-# For Internet streams the matching is done on MIME media type and on
-# actual content.  For files the matches are made on MIME media type
-# (if the 'UseMimeMagic' option is set) and on filename extension.  The
-# MIME media type of a file is not determined until the first entry for
-# MIME is encountered in the list.
-#
-# The matching is done in the order of appearance in the list with any
-# entries added from the command line being matched before those listed
-# here.  Therefore, if you place all filename extension entries before
-# all MIME entries you will speed up MOC's processing of directories
-# (which could be significant for remote file systems).
-#
-# The decoder list may be empty, in which case no decoders will be used
-# for files (and files with that audio format ignored) while Internet
-# streams will be assessed on the actual content.  Any decoder position
-# may contain an asterisk, in which case any decoder not otherwise listed
-# which can handle the audio format will be used.  It is not an error to
-# list the same decoder twice, but neither does it make sense to do so.
-#
-# If you have a mix of audio and non-audio files in your directories, you
-# may wish to include entries at top of the list which ignore non-audio
-# files by extension.
-#
-# In summary, the PreferredDecoders option provides fine control over the
-# type of matching which is performed (filename extension, MIME media
-# type and streamed media content) and which decoder(s) (if any) are used
-# based on the option's list entries and their ordering.
-#
-# Examples:   aac(aac,ffmpeg)             first try FAAD2 for AACs then FFmpeg
-#             mp3()                       ignore MP3 files
-#             wav(*,sndfile)              use sndfile for WAV as a last resort
-#             ogg(vorbis,*):flac(flac,*)  try Xiph decoders first
-#             ogg():audio/ogg()           ignore OGG files, and
-#                                         force Internet selection by content
-#             gz():html()                 ignore some non-audio files
-#
-# Any unspecified audio formats default to trying all decoders.
-# Any unknown (or misspelt) drivers are ignored.
-# All names are case insensitive.
-# The default setting reflects the historical situation modified by
-# the experience of users.
-#
-#PreferredDecoders  = aac(aac,ffmpeg):m4a(ffmpeg)
-#PreferredDecoders += mpc(musepack,*,ffmpeg):mpc8(musepack,*,ffmpeg)
-#PreferredDecoders += sid(sidplay2):mus(sidplay2)
-#PreferredDecoders += wav(sndfile,*,ffmpeg)
-#PreferredDecoders += wv(wavpack,*,ffmpeg)
-#PreferredDecoders += audio/aac(aac):audio/aacp(aac):audio/m4a(ffmpeg)
-#PreferredDecoders += audio/wav(sndfile,*)
-
-# The following PreferredDecoders attempt to handle the ambiguity surrounding
-# container types such as OGG for files.  The first two entries will force
-# a local file to the correct decoder (assuming the .ogg file contains Vorbis
-# audio), while the MIME media types will cause Internet audio streams to
-# be assessed on content (which may be either Vorbis or Speex).
-#
-#PreferredDecoders += ogg(vorbis,ffmpeg):oga(vorbis,ffmpeg):ogv(ffmpeg)
-#PreferredDecoders += opus(ffmpeg)
-#PreferredDecoders += spx(speex)
-#PreferredDecoders += application/ogg(vorbis):audio/ogg(vorbis)
-
-# Which resampling method to use.  There are a few methods of resampling
-# sound supported by libresamplerate.  The default is 'Linear') which is
-# also the fastest.  A better description can be found at:
-#
-#    http://www.mega-nerd.com/libsamplerate/api_misc.html#Converters
-#
-# but briefly, the following methods are based on bandlimited interpolation
-# and are higher quality, but also slower:
-#
-#    SincBestQuality   - really slow (I know you probably have an xx GHz
-#                        processor, but it's still not enough to not see
-#                        this in the top output :)  The worst case
-#                        Signal-to-Noise Ratio is 97dB.
-#    SincMediumQuality - much faster.
-#    SincFastest       - the fastest bandlimited interpolation.
-#
-# And these are lower quality, but much faster methods:
-#
-#    ZeroOrderHold - really poor quality, but it's really fast.
-#    Linear - a bit better and a bit slower.
-#
-#ResampleMethod = Linear
-
-# Always use this sample rate (in Hz) when opening the audio device (and
-# resample the sound if necessary).  When set to 0 the device is opened
-# with the file's rate.
-#ForceSampleRate = 0
-
-# By default, even if the sound card reports that it can output 24bit samples
-# MOC converts 24bit PCM to 16bit.  Setting this option to 'yes' allows MOC
-# to use 24bit output.  (The MP3 decoder, for example, uses this format.)
-# This is disabled by default because there were reports that it prevents
-# MP3 files from playing on some soundcards.
-#Allow24bitOutput = no
-
-# Use realtime priority for output buffer thread.  This will prevent gaps
-# while playing even with heavy load.  The user who runs MOC must have
-# permissions to set such a priority.  This could be dangerous, because it
-# is possible that a bug in MOC will freeze your computer.
-#UseRealtimePriority = no
-
-# The number of audio files for which MOC will cache tags.  When this limit
-# is reached, file tags are discarded on a least recently used basis (with
-# one second resolution).  You can disable the cache by giving it a size of
-# zero.  Note that if you decrease the cache size below the number of items
-# currently in the cache, the number will not decrease immediately (if at
-# all).
-#TagsCacheSize = 256
-
-# Number items in the playlist.
-#PlaylistNumbering = yes
-
-# Main window layouts can be configured.  You can change the position and
-# size of the menus (directory and playlist).  You have three layouts and
-# can switch between then using the 'l' key (standard mapping).  By default,
-# only two layouts are configured.
-#
-# The format is as follows:
-#
-#     - Each layout is described as a list of menu entries.
-#     - Each menu entry is of the form:
-#
-#           menu(position_x, position_y, width, height)
-#
-#       where 'menu' is either 'directory' or 'playlist'.
-#     - The parameters define position and size of the menu.  They can
-#       be absolute numbers (like 10) or a percentage of the screen size
-#       (like 45%).
-#     - 'width' and 'height' can have also value of 'FILL' which means
-#        fill the screen from the menu's position to the border.
-#     - Menus may overlap.
-#
-# You must describe at least one menu (default is to fill the whole window).
-# There must be at least one layout (Layout1) defined; others can be empty.
-#
-# Example:    Layout1 = playlist(50%,50%,50%,50%)
-#             Layout2 = ""
-#             Layout3 = ""
-#
-#             Just one layout, the directory will occupy the whole
-#             screen, the playlist will have 1/4 of the screen size
-#             and be positioned at lower right corner.  (Note that
-#             because the playlist will be hidden by the directory
-#             you will have to use the TAB key to make the playlist
-#             visible.)
-#
-# Example:    Layout1 = playlist(0,0,100%,10):directory(0,10,100%,FILL)
-#
-#             The screen is split into two parts: playlist at the top
-#             and the directory menu at the bottom.  Playlist will
-#             occupy 10 lines and the directory menu the rest.
-#
-#Layout1 = directory(0,0,50%,100%):playlist(50%,0,FILL,100%)
-#Layout2 = directory(0,0,100%,100%):playlist(0,0,100%,100%)
-#Layout3 = ""
-
-# When the song changes, should the menu be scrolled so that the currently
-# played file is visible?
-#FollowPlayedFile = yes
-
-# What to do if the interface was started and the server is already playing
-# something from the playlist?  If CanStartInPlaylist is set to 'yes', the
-# interface will switch to the playlist.  When set to 'no' it will start
-# from the last directory.
-#CanStartInPlaylist = yes
-
-# Executing external commands (1 - 10) invoked with key commands (F1 - F10
-# by default).
-#
-# Some arguments are substituted before executing:
-#
-#     %f - file path
-#     %i - title made from tags
-#     %S - start block mark (in seconds)
-#     %E - end block mark (in seconds)
-#
-# Data from tags can also be substituted:
-#
-#     %t - title
-#     %a - album
-#     %r - artist
-#     %n - track
-#     %m - time of the file (in seconds)
-#
-# The parameters above apply to the currently selected file.  If you change
-# them to capital letters, they are taken from the file currently playing.
-#
-# Programs are run using execv(), not a shell, so you can't do things like
-# redirecting the output to a file.  The command string is split using blank
-# characters as separators; the first element is the command to be executed
-# and the rest are its parameters, so if you use "echo Playing: %I" we run
-# program 'echo' (from $PATH) with 2 parameters: the string 'Playing:' and
-# the title of the file currently playing.  Even if the title contains
-# spaces, it's still one parameter and it's safe if it contains `rm -rf /`.
-#
-# Examples:   ExecCommand1 = "cp %f /mnt/usb_drive"
-#             ExecCommand2 = "/home/joe/now_playing %I"
-#
-#ExecCommand1 =
-#ExecCommand2 =
-#ExecCommand3 =
-#ExecCommand4 =
-#ExecCommand5 =
-#ExecCommand6 =
-#ExecCommand7 =
-#ExecCommand8 =
-#ExecCommand9 =
-#ExecCommand10 =
-
-# Display the cursor in the line with the selected file.  Some braille
-# readers (the Handy Tech modular series ZMU 737, for example) use the
-# cursor to focus and can make use of it to present the file line even
-# when other fields are changing.
-#UseCursorSelection = no
-
-# Set the terminal title when running under xterm.
-#SetXtermTitle = yes
-
-# Set the terminal title when running under screen(1).  If MOC can detect
-# that it is running under screen(1), then it will set an appropriate
-# title (see description of ScreenTerms above).  However, if multiple
-# levels of screen management are involved, detection might fail and this
-# could cause a screen upset.  In that situation you can use this option
-# to force screen titles off.
-#SetScreenTitle = yes
-
-# Display full paths instead of just file names in the playlist.
-#PlaylistFullPaths = yes
-
-# The following setting describes how block markers are displayed in
-# the play time progress bar.  Its value is a string of exactly three
-# characters.  The first character is displayed in a position which
-# corresponds to the time marked as the start of a block and the last
-# character to the time marked as the end of the block.  The middle
-# character is displayed instead if both the start and the end of the block
-# would fall in the same position (within the resolution of the interface).
-# You can turn off the displaying of these block marker positions by using
-# three space characters.
-#BlockDecorators = "`\"'"
-
-# How long (in seconds) to leave a message displayed on the screen.
-# Setting this to a high value allows you to scroll through the messages
-# using the 'hide_message' key.  Setting it to zero means you'll have to
-# be quick to see any message at all.  Any new messages will be queued up
-# and displayed after the current message's linger time expires.
-#MessageLingerTime = 3
-
-# Does MOC display a prefix on delayed messages indicating
-# the number of queued messages still to be displayed?
-#PrefixQueuedMessages = yes
-
-# String to append to the queued message count if any
-# error messages are still waiting to be displayed.
-#ErrorMessagesQueued = "!"
-
-# Self-describing ModPlug options (with 'yes' or 'no' values).
-#ModPlug_Oversampling = yes
-#ModPlug_NoiseReduction = yes
-#ModPlug_Reverb = no
-#ModPlug_MegaBass = no
-#ModPlug_Surround = no
-
-# ModPlug resampling mode.
-# Valid values are:
-#
-#     FIR -      8 tap fir filter (extremely high quality)
-#     SPLINE -   Cubic spline interpolation (high quality)
-#     LINEAR -   Linear interpolation (fast, good quality)
-#     NEAREST -  No interpolation (very fast, extremely bad sound quality)
-#
-#ModPlug_ResamplingMode = FIR
-
-# Other self-describing ModPlug audio characteristic options.
-# (Note that the 32 bit sample size seems to be buggy.)
-#ModPlug_Channels = 2               # 1 or 2 channels
-#ModPlug_Bits = 16                  # 8, 16 or 32 bits
-#ModPlug_Frequency = 44100          # 11025, 22050, 44100 or 48000 Hz
-#ModPlug_ReverbDepth = 0            # 0 (quiet) to 100 (loud)
-#ModPlug_ReverbDelay = 0            # Delay in ms (usually 40-200ms)
-#ModPlug_BassAmount = 0             # 0 (quiet) to 100 (loud).
-#ModPlug_BassRange = 10             # Cutoff in Hz (10-100).
-#ModPlug_SurroundDepth = 0          # Surround level 0(quiet)-100(heavy).
-#ModPlug_SurroundDelay = 0          # Surround delay in ms, usually 5-40ms.
-#ModPlug_LoopCount = 0              # 0 (never), n (times) or -1 (forever)
-
-# Self-describing TiMidity audio characteristic options.
-#TiMidity_Rate = 44100              # Between 8000 and 48000
-#TiMidity_Bits = 16                 # 8 or 16
-#TiMidity_Channels = 2              # 1 or 2
-#TiMidity_Volume = 100              # 0 to 800
-
-# You can setup a TiMidity-Config-File here.
-# Leave it unset to use library defaults (/etc/timidity.cfg mostly).
-# Setting it to 'yes' also uses the library defaults.
-# Set it to 'no' if you don't have any configuration file.
-# Otherwise set it to the name of a specific file.
-#TiMidity_Config =
-
-# Self-describing SidPlay2 audio characteristic options.
-#SidPlay2_DefaultSongLength = 180   # If not in database (in seconds)
-#SidPlay2_MinimumSongLength = 0     # Play at least n (in seconds)
-#SidPlay2_Frequency = 44100         # 4000 to 48000
-#SidPlay2_Bits = 16                 # 8 or 16
-#SidPlay2_Optimisation = 0          # 0 (worst quality) to 2 (best quality)
-
-# Set path to a HVSC-compatible database (if not set, database is disabled).
-#SidPlay2_Database =
-
-# SidPlay2 playback Mode:
-#
-#     "M": Mono (best for many SIDs)
-#     "S": Stereo
-#     "L"/"R": Left / Right
-#
-#SidPlay2_PlayMode = "M"
-
-# Use start-song information from SID ('yes') or start at first song
-# ('no').  Songs before the start-song won't be played.  (Note that this
-# option previously took the values 1 and 0; these are now deprecated
-# in favour of 'yes' and 'no'.)
-#SidPlay2_StartAtStart = yes
-
-# Play sub-tunes.  (Note that this option previously took the values 1
-# and 0; these are now deprecated in favour of 'yes' and 'no'.)
-#SidPlay2_PlaySubTunes = yes
-
-# Run the OnSongChange command when a new song starts playing.
-# Specify the full path (i.e. no leading '~') of an executable to run.
-# Arguments will be passed, and you can use the following escapes:
-#
-#     %a artist
-#     %r album
-#     %f filename
-#     %t title
-#     %n track
-#     %d file duration in XX:YY form
-#     %D file duration, number of seconds
-#
-# No pipes/redirects can be used directly, but writing a shell script
-# can do the job.
-#
-# Example:    OnSongChange = "/home/jack/.moc/myscript %a %r"
-#
-#OnSongChange =
-
-# If RepeatSongChange is 'yes' then MOC will execute the command every time
-# a song starts playing regardless of whether or not it is just repeating.
-# Otherwise the command will only be executed when a different song is
-# started.
-#RepeatSongChange = no
-
-# Run the OnStop command (full path, no arguments) when MOC changes state
-# to stopped (i.e., when user stopped playing or changes a song).
-#OnStop = "/home/jack/.moc/myscript_on_stop"
-
-# This option determines which song to play after finishing all the songs
-# in the queue.  Setting this to 'yes' causes MOC to play the song which
-# follows the song being played before queue playing started. If set to
-# 'no', MOC will play the song following the last song in the queue if it
-# is in the playlist.  The default is 'yes' because this is the way other
-# players usually behave.  (Note that this option previously took the
-# values 1 and 0; these are now deprecated in favour of 'yes' and 'no'.)
-#QueueNextSongReturn = yes
diff --git a/nvim/coc-settings.json b/nvim/coc-settings.json
index 5113f9d..e61610b 100644
--- a/nvim/coc-settings.json
+++ b/nvim/coc-settings.json
@@ -9,7 +9,6 @@
     "python.linting.flake8Args": ["--ignore=E221,E226,E231,E241,E501,E701,E704"],
     "python.linting.enabled": true,
     "git.enableGutters": true,
-    "tabnine.shortcut": "TN",
     "yaml.format.enable": true,
     "yaml.format.singleQuote": true,
     "diagnostic-languageserver.filetypes": {
diff --git a/nvim/init.vim b/nvim/init.vim
index 65b13ff..d6c6b36 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -1,4 +1,5 @@
-set shell=bash
+set shell=/usr/bin/bash
+let $SHELL="/usr/bin/bash"
 " -----------------------------------------------------------------------------
 " PLUGINS
 " -----------------------------------------------------------------------------
@@ -31,6 +32,7 @@ Plug 'tpope/vim-fugitive'
 " markdown
 Plug 'iamcco/markdown-preview.nvim', { 'do': { -> mkdp#util#install() } }
 Plug 'plasticboy/vim-markdown'        " markdown helper.
+Plug 'godlygeek/tabular'
 " helpers
 Plug 'tpope/vim-repeat'
 Plug 'tpope/vim-commentary'           " commenting tool
@@ -162,8 +164,6 @@ set lazyredraw
 set updatetime=300
 set timeoutlen=500
 set conceallevel=2
-set shell=/usr/bin/bash
-let $SHELL="/usr/bin/bash"
 let g:BASH_Ctrl_j='off'            " avoid 'C-j' being overridden to newline
 let g:BASH_Ctrl_l='off'            " avoid 'C-l' being overridden to newline
 highlight clear SignColumn         " SignColumn should match background
diff --git a/picom/picom.conf b/picom/picom.conf
deleted file mode 100644
index 719a567..0000000
--- a/picom/picom.conf
+++ /dev/null
@@ -1,227 +0,0 @@
-# Thank you code_nomad: http://9m.no/ꪯ鵞
-# and Arch Wiki contributors: https://wiki.archlinux.org/index.php/Compton
-
-#################################
-#
-# Backend
-#
-#################################
-
-# Backend to use: "xrender" or "glx".
-# GLX backend is typically much faster but depends on a sane driver.
-backend = "glx";
-
-#################################
-#
-# GLX backend
-#
-#################################
-
-glx-no-stencil = true;
-
-# GLX backend: Copy unmodified regions from front buffer instead of redrawing them all.
-# My tests with nvidia-drivers show a 10% decrease in performance when the whole screen is modified,
-# but a 20% increase when only 1/4 is.
-# My tests on nouveau show terrible slowdown.
-glx-copy-from-front = false;
-
-# GLX backend: Use MESA_copy_sub_buffer to do partial screen update.
-# My tests on nouveau shows a 200% performance boost when only 1/4 of the screen is updated.
-# May break VSync and is not available on some drivers.
-# Overrides --glx-copy-from-front.
-# glx-use-copysubbuffermesa = true;
-
-# GLX backend: Avoid rebinding pixmap on window damage.
-# Probably could improve performance on rapid window content changes, but is known to break things on some drivers (LLVMpipe).
-# Recommended if it works.
-# glx-no-rebind-pixmap = true;
-
-# GLX backend: GLX buffer swap method we assume.
-# Could be undefined (0), copy (1), exchange (2), 3-6, or buffer-age (-1).
-# undefined is the slowest and the safest, and the default value.
-# copy is fastest, but may fail on some drivers,
-# 2-6 are gradually slower but safer (6 is still faster than 0).
-# Usually, double buffer means 2, triple buffer means 3.
-# buffer-age means auto-detect using GLX_EXT_buffer_age, supported by some drivers.
-# Useless with --glx-use-copysubbuffermesa.
-# Partially breaks --resize-damage.
-# Defaults to undefined.
-#glx-swap-method = "undefined";
-
-#################################
-#
-# Shadows
-#
-#################################
-
-# Enabled client-side shadows on windows.
-shadow = true;
-# The blur radius for shadows. (default 12)
-shadow-radius = 5;
-# The left offset for shadows. (default -15)
-shadow-offset-x = -5;
-# The top offset for shadows. (default -15)
-shadow-offset-y = -5;
-# The translucency for shadows. (default .75)
-shadow-opacity = 0.5;
-
-# Set if you want different colour shadows
-# shadow-red = 0.0;
-# shadow-green = 0.0;
-# shadow-blue = 0.0;
-
-# The shadow exclude options are helpful if you have shadows enabled. Due to the way picom draws its shadows, certain applications will have visual glitches
-# (most applications are fine, only apps that do weird things with xshapes or argb are affected).
-# This list includes all the affected apps I found in my testing. The "! name~=''" part excludes shadows on any "Unknown" windows, this prevents a visual glitch with the XFWM alt tab switcher.
-shadow-exclude = [
-    "! name~=''",
-    "name = 'Notification'",
-    "name = 'Plank'",
-    "name = 'Docky'",
-    "name = 'Kupfer'",
-    "name = 'xfce4-notifyd'",
-    "name *= 'VLC'",
-    "name *= 'compton'",
-    "name *= 'picom'",
-    "name *= 'Chromium'",
-    "name *= 'Chrome'",
-    "class_g = 'Firefox' && argb",
-    "class_g = 'Conky'",
-    "class_g = 'Kupfer'",
-    "class_g = 'Synapse'",
-    "class_g ?= 'Notify-osd'",
-    "class_g ?= 'Cairo-dock'",
-    "class_g ?= 'Xfce4-notifyd'",
-    "class_g ?= 'Xfce4-power-manager'",
-    "_GTK_FRAME_EXTENTS@:c",
-    "_NET_WM_STATE@:32a *= '_NET_WM_STATE_HIDDEN'"
-];
-# Avoid drawing shadow on all shaped windows (see also: --detect-rounded-corners)
-shadow-ignore-shaped = false;
-
-#################################
-#
-# Opacity
-#
-#################################
-
-inactive-opacity = 1;
-active-opacity = 1;
-frame-opacity = 1;
-inactive-opacity-override = false;
-
-# Dim inactive windows. (0.0 - 1.0)
-# inactive-dim = 0.2;
-# Do not let dimness adjust based on window opacity.
-# inactive-dim-fixed = true;
-# Blur background of transparent windows. Bad performance with X Render backend. GLX backend is preferred.
-# blur-background = true;
-# Blur background of opaque windows with transparent frames as well.
-# blur-background-frame = true;
-# Do not let blur radius adjust based on window opacity.
-blur-background-fixed = false;
-blur-background-exclude = [
-    "window_type = 'dock'",
-    "window_type = 'desktop'"
-];
-
-#################################
-#
-# Fading
-#
-#################################
-
-# Fade windows during opacity changes.
-fading = true;
-# The time between steps in a fade in milliseconds. (default 10).
-fade-delta = 4;
-# Opacity change between steps while fading in. (default 0.028).
-fade-in-step = 0.03;
-# Opacity change between steps while fading out. (default 0.03).
-fade-out-step = 0.03;
-# Fade windows in/out when opening/closing
-# no-fading-openclose = true;
-
-# Specify a list of conditions of windows that should not be faded.
-fade-exclude = [ ];
-
-#################################
-#
-# Other
-#
-#################################
-
-# Try to detect WM windows and mark them as active.
-mark-wmwin-focused = true;
-# Mark all non-WM but override-redirect windows active (e.g. menus).
-mark-ovredir-focused = true;
-# Use EWMH _NET_WM_ACTIVE_WINDOW to determine which window is focused instead of using FocusIn/Out events.
-# Usually more reliable but depends on a EWMH-compliant WM.
-use-ewmh-active-win = true;
-# Detect rounded corners and treat them as rectangular when --shadow-ignore-shaped is on.
-detect-rounded-corners = true;
-
-# Detect _NET_WM_OPACITY on client windows, useful for window managers not passing _NET_WM_OPACITY of client windows to frame windows.
-# This prevents opacity being ignored for some apps.
-# For example without this enabled my xfce4-notifyd is 100% opacity no matter what.
-detect-client-opacity = true;
-
-# Specify refresh rate of the screen.
-# If not specified or 0, picom will try detecting this with X RandR extension.
-refresh-rate = 0;
-
-# Vertical synchronization: match the refresh rate of the monitor
-vsync = true;
-
-# Enable DBE painting mode, intended to use with VSync to (hopefully) eliminate tearing.
-# Reported to have no effect, though.
-dbe = false;
-
-# Limit picom to repaint at most once every 1 / refresh_rate second to boost performance.
-# This should not be used with --vsync drm/opengl/opengl-oml as they essentially does --sw-opti's job already,
-# unless you wish to specify a lower refresh rate than the actual value.
-#sw-opti = true;
-
-# Unredirect all windows if a full-screen opaque window is detected, to maximize performance for full-screen windows, like games.
-# Known to cause flickering when redirecting/unredirecting windows.
-unredir-if-possible = false;
-
-# Specify a list of conditions of windows that should always be considered focused.
-focus-exclude = [ ];
-
-# Use WM_TRANSIENT_FOR to group windows, and consider windows in the same group focused at the same time.
-detect-transient = true;
-# Use WM_CLIENT_LEADER to group windows, and consider windows in the same group focused at the same time.
-# WM_TRANSIENT_FOR has higher priority if --detect-transient is enabled, too.
-detect-client-leader = true;
-
-#################################
-#
-# Window type settings
-#
-#################################
-
-wintypes:
-{
-    tooltip =
-    {
-        # fade: Fade the particular type of windows.
-        fade = true;
-        # shadow: Give those windows shadow
-        shadow = false;
-        # opacity: Default opacity for the type of windows.
-        opacity = 0.85;
-        # focus: Whether to always consider windows of this type focused.
-        focus = true;
-    };
-};
-
-######################
-#
-# XSync
-# See: https://github.com/yshui/picom/commit/b18d46bcbdc35a3b5620d817dd46fbc76485c20d
-#
-######################
-
-# Use X Sync fence to sync clients' draw calls. Needed on nvidia-drivers with GLX backend for some users.
-xrender-sync-fence = true;
diff --git a/root/.xinitrc b/root/.xinitrc
deleted file mode 100644
index 1c510bc..0000000
--- a/root/.xinitrc
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/sh
-#
-# ~/.xinitrc
-#
-# Executed by startx (run your window manager from here)
-
-userresources=$HOME/.Xresources
-usermodmap=$HOME/.Xmodmap
-sysresources=/etc/X11/xinit/.Xresources
-sysmodmap=/etc/X11/xinit/.Xmodmap
-
-DEFAULT_SESSION='i3 --shmlog-size 0'
-
-# merge in defaults and keymaps
-
-if [ -f $sysresources ]; then
-    xrdb -merge $sysresources
-fi
-
-if [ -f $sysmodmap ]; then
-    xmodmap $sysmodmap
-fi
-
-if [ -f "$userresources" ]; then
-    xrdb -merge "$userresources"
-fi
-
-if [ -f "$usermodmap" ]; then
-    xmodmap "$usermodmap"
-fi
-
-# start some nice programs
-
-if [ -d /etc/X11/xinit/xinitrc.d ] ; then
-    for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do
-        [ -x "$f" ] && . "$f"
-    done
-    unset f
-fi
-
-get_session(){
-	local dbus_args=(--sh-syntax --exit-with-session)
-	case $1 in
-		awesome) dbus_args+=(awesome) ;;
-		bspwm) dbus_args+=(bspwm-session) ;;
-		budgie) dbus_args+=(budgie-desktop) ;;
-		cinnamon) dbus_args+=(cinnamon-session) ;;
-		deepin) dbus_args+=(startdde) ;;
-		enlightenment) dbus_args+=(enlightenment_start) ;;
-		fluxbox) dbus_args+=(startfluxbox) ;;
-		gnome) dbus_args+=(gnome-session) ;;
-		i3|i3wm) dbus_args+=(i3 --shmlog-size 0) ;;
-		jwm) dbus_args+=(jwm) ;;
-		kde) dbus_args+=(startkde) ;;
-		lxde) dbus_args+=(startlxde) ;;
-		lxqt) dbus_args+=(lxqt-session) ;;
-		mate) dbus_args+=(mate-session) ;;
-		xfce) dbus_args+=(xfce4-session) ;;
-		openbox) dbus_args+=(openbox-session) ;;
-		*) dbus_args+=($DEFAULT_SESSION) ;;
-	esac
-
-	echo "dbus-launch ${dbus_args[*]}"
-}
-
-exec $(get_session)