diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index e03db69..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-nvim/plugin/packer_compiled.lua
-zsh/powerlevel10k
diff --git a/Makefile b/Makefile
index 8c4534d..637dc8e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,20 +1,4 @@
-pwd = $(shell pwd)
-
-.PHONY: all
-all: dotfiles
-
-# dotfiles
-.PHONY: dotfiles
-dotfiles: ~/.gitconfig ~/.gitignore ~/.config/zsh ~/.config/nvim ~/.zshrc
-
-~/.gitconfig:
-	ln -s $(pwd)/git/config ~/.gitconfig || true
-~/.gitignore:
-	ln -s $(pwd)/git/ignore ~/.gitignore || true
-~/.config/nvim:
-	ln -s $(pwd)/nvim ~/.config/nvim || true
-~/.config/zsh:
-	ln -s $(pwd)/zsh ~/.config/zsh || true
-~/.zshrc:
-	@ln -s $(pwd)/zsh/zshrc ~/.zshrc || true
-
+all:
+	stow -v -t ~/.config config
+	stow -v zsh
+	stow -v git
diff --git a/brew_inventory.md b/brew_inventory.md
deleted file mode 100644
index 261a673..0000000
--- a/brew_inventory.md
+++ /dev/null
@@ -1,67 +0,0 @@
-# Brew Inventory
-
-Inventory created at: пятница,  7 января 2022 г. 03:53:45 (MSK)
-
-## Brews
-
-- [x] asciinema: Record and share terminal sessions
-- [x] avr-gcc@9: GNU compiler collection for AVR 8-bit and 32-bit Microcontrollers
-- [x] avrdude: Atmel AVR MCU programmer
-- [x] cmake: Cross-platform make
-- [x] exa: Modern replacement for 'ls'
-- [x] fac: Command line User Interface for fixing git conflicts
-- [x] fzf: Command-line fuzzy finder written in Go
-- [x] git: Distributed revision control system
-- [x] git-delta: Syntax-highlighting pager for git and diff output
-- [x] goreleaser: Deliver Go binaries as fast and easily as possible
-- [x] heroku: Everything you need to get started with Heroku
-- [x] htop: Improved top (interactive process viewer)
-- [x] hugo: Configurable static site generator
-- [x] jq: Lightweight and flexible command-line JSON processor
-- [x] lima: Linux virtual machines
-- [x] micro: Modern and intuitive terminal-based text editor
-- [x] mosh: Remote terminal application
-- [x] neovim: Ambitious Vim-fork focused on extensibility and agility
-- [x] node: Platform built on V8 to build network applications
-- [x] openttd: Simulation game based upon Transport Tycoon Deluxe
-- [x] podman: Tool for managing OCI containers and pods
-- [x] pomodoro: Pomodoro timer for nerds
-- [x] rabbitmq-c: C AMQP client library for RabbitMQ
-- [x] terminal-notifier: Send macOS User Notifications from the command-line
-- [x] tinygo: TinyGo is a Go compiler for small places. Microcontrollers, WebAssembly, and command-line tools. Based on LLVM.
-- [x] todo-txt: Minimal, todo.txt-focused editor
-- [x] track: Time tracker for nerds
-- [x] w3m: Pager/text based browser
-- [x] wget: Internet file retriever
-- [x] zenity: GTK+ dialog boxes for the command-line
-
-## Casks
-
-- [x] font-fira-mono: (failed to read homepage information)
-- [x] font-fira-mono-nerd-font: (failed to read homepage information)
-- [x] josm: (failed to read homepage information)
-- [x] telegram: (failed to read homepage information)
-- [x] vscodium: (failed to read homepage information)
-- [x] yandex: (failed to read homepage information)
-
-## Installed taps
-
-- [x] adrianmihalko/ch340g-ch34g-ch34x-mac-os-x-driver
-- [x] homebrew/cask-fonts
-- [x] go-swagger/go-swagger
-- [x] golangci/tap
-- [x] goreleaser/tap
-- [x] heroku/brew
-- [x] homebrew/cask
-- [x] homebrew/cask-versions
-- [x] homebrew/core
-- [x] homebrew/services
-- [x] koekeishiya/formulae
-- [x] metrue/fx
-- [x] mkchoi212/fac
-- [x] mongodb/brew
-- [x] neonxp/tap
-- [x] osx-cross/avr
-- [x] skyjake/lagrange
-- [x] tinygo-org/tools
-- [x] wtfutil/wtfutil
diff --git a/config/hypr/custom/rules.conf b/config/hypr/custom/rules.conf
new file mode 100644
index 0000000..68a4aac
--- /dev/null
+++ b/config/hypr/custom/rules.conf
@@ -0,0 +1,104 @@
+# ######## Window rules ########
+
+# Uncomment to apply global transparency to all windows:
+windowrulev2 = opacity 0.95 override 0.95 override, class:.*
+
+# Disable blur for XWayland windows (or context menus with shadow would look weird)
+windowrulev2 = noblur, xwayland:1
+
+# Floating
+windowrulev2 = float, class:^(blueberry\.py)$
+windowrulev2 = float, class:^(steam)$
+windowrulev2 = float, class:^(guifetch)$   # FlafyDev/guifetch
+windowrulev2 = float, class:^(pavucontrol)$
+windowrulev2 = size 45%, class:^(pavucontrol)$
+windowrulev2 = center, class:^(pavucontrol)$
+windowrulev2 = float, class:^(org.pulseaudio.pavucontrol)$
+windowrulev2 = size 45%, class:^(org.pulseaudio.pavucontrol)$
+windowrulev2 = center, class:^(org.pulseaudio.pavucontrol)$
+windowrulev2 = float, class:^(nm-connection-editor)$
+windowrulev2 = size 45%, class:^(nm-connection-editor)$
+windowrulev2 = center, class:^(nm-connection-editor)$
+
+# Tiling
+windowrulev2 = tile, class:^dev\.warp\.Warp$
+
+# Picture-in-Picture
+windowrulev2 = float, title:^([Pp]icture[-\s]?[Ii]n[-\s]?[Pp]icture)(.*)$
+windowrulev2 = keepaspectratio, title:^([Pp]icture[-\s]?[Ii]n[-\s]?[Pp]icture)(.*)$
+windowrulev2 = move 73% 72%, title:^([Pp]icture[-\s]?[Ii]n[-\s]?[Pp]icture)(.*)$
+windowrulev2 = size 25%, title:^([Pp]icture[-\s]?[Ii]n[-\s]?[Pp]icture)(.*)$
+windowrulev2 = float, title:^([Pp]icture[-\s]?[Ii]n[-\s]?[Pp]icture)(.*)$
+windowrulev2 = pin, title:^([Pp]icture[-\s]?[Ii]n[-\s]?[Pp]icture)(.*)$
+
+# Dialog windows – float+center these windows.
+windowrulev2 = center, title:^(Open File)(.*)$
+windowrulev2 = center, title:^(Select a File)(.*)$
+windowrulev2 = center, title:^(Choose wallpaper)(.*)$
+windowrulev2 = center, title:^(Open Folder)(.*)$
+windowrulev2 = center, title:^(Save As)(.*)$
+windowrulev2 = center, title:^(Library)(.*)$
+windowrulev2 = center, title:^(File Upload)(.*)$
+windowrulev2 = float, title:^(Open File)(.*)$
+windowrulev2 = float, title:^(Select a File)(.*)$
+windowrulev2 = float, title:^(Choose wallpaper)(.*)$
+windowrulev2 = float, title:^(Open Folder)(.*)$
+windowrulev2 = float, title:^(Save As)(.*)$
+windowrulev2 = float, title:^(Library)(.*)$
+windowrulev2 = float, title:^(File Upload)(.*)$
+
+
+# --- Tearing ---
+windowrulev2 = immediate, title:.*\.exe
+windowrulev2 = immediate, class:^(steam_app)
+
+# No shadow for tiled windows (matches windows that are not floating).
+windowrulev2 = noshadow, floating:0
+
+# ######## Workspace rules ########
+workspace = special:special, gapsout:30
+
+# ######## Layer rules ########
+layerrule = xray 1, .*
+# layerrule = noanim, .*
+layerrule = noanim, walker
+layerrule = noanim, selection
+layerrule = noanim, overview
+layerrule = noanim, anyrun
+layerrule = noanim, indicator.*
+layerrule = noanim, osk
+layerrule = noanim, hyprpicker
+
+layerrule = noanim, noanim
+layerrule = blur, gtk-layer-shell
+layerrule = ignorezero, gtk-layer-shell
+layerrule = blur, launcher
+layerrule = ignorealpha 0.5, launcher
+layerrule = blur, notifications
+layerrule = ignorealpha 0.69, notifications
+layerrule = blur, logout_dialog # wlogout
+
+# ags
+layerrule = animation slide left, sideleft.*
+layerrule = animation slide right, sideright.*
+layerrule = blur, session[0-9]*
+layerrule = blur, bar[0-9]*
+layerrule = ignorealpha 0.6, bar[0-9]*
+layerrule = blur, barcorner.*
+layerrule = ignorealpha 0.6, barcorner.*
+layerrule = blur, dock[0-9]*
+layerrule = ignorealpha 0.6, dock[0-9]*
+layerrule = blur, indicator.*
+layerrule = ignorealpha 0.6, indicator.*
+layerrule = blur, overview[0-9]*
+layerrule = ignorealpha 0.6, overview[0-9]*
+layerrule = blur, cheatsheet[0-9]*
+layerrule = ignorealpha 0.6, cheatsheet[0-9]*
+layerrule = blur, sideright[0-9]*
+layerrule = ignorealpha 0.6, sideright[0-9]*
+layerrule = blur, sideleft[0-9]*
+layerrule = ignorealpha 0.6, sideleft[0-9]*
+layerrule = blur, indicator.*
+layerrule = ignorealpha 0.6, indicator.*
+layerrule = blur, osk[0-9]*
+layerrule = ignorealpha 0.6, osk[0-9]*
diff --git a/config/hypr/hypridle.conf b/config/hypr/hypridle.conf
new file mode 100644
index 0000000..8809a22
--- /dev/null
+++ b/config/hypr/hypridle.conf
@@ -0,0 +1,33 @@
+$suspend_cmd = pidof steam || systemctl suspend || loginctl suspend
+
+# General_settings
+general {
+    before_sleep_cmd = hyprlock               # command before sleep
+    ignore_dbus_inhibit = false               # (used by e.g. firefox or steam)
+}
+
+# Screen_brightness
+listener {
+	timeout = 300
+	on-timeout = brightnessctl s 20%
+	on-resume = brightnessctl s 100%
+}
+
+# Screen_lock
+listener {
+    timeout = 600
+    on-timeout = hyprlock
+}
+
+# Screen_off
+listener {
+	timeout = 780
+	on-timeout = hyprctl dispatch dpms off
+	on-resume = hyprctl dispatch dpms on
+}
+
+# Suspend
+listener {
+    timeout = 1200
+    on-timeout = $suspend_cmd
+}
diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf
new file mode 100644
index 0000000..c5ae504
--- /dev/null
+++ b/config/hypr/hyprland.conf
@@ -0,0 +1,264 @@
+
+# #######################################################################################
+# AUTOGENERATED HYPR CONFIG.
+# PLEASE USE THE CONFIG PROVIDED IN THE GIT REPO /examples/hypr.conf AND EDIT IT,
+# OR EDIT THIS ONE ACCORDING TO THE WIKI INSTRUCTIONS.
+# #######################################################################################
+
+
+# This is an example Hyprland config file.
+# Refer to the wiki for more information.
+# https://wiki.hyprland.org/Configuring/Configuring-Hyprland/
+
+# Please note not all available settings / options are set here.
+# For a full list, see the wiki
+
+# You can split this configuration into multiple files
+# Create your files separately and then link them to this file like this:
+# source = ~/.config/hypr/myColors.conf
+
+
+################
+### MONITORS ###
+################
+
+# See https://wiki.hyprland.org/Configuring/Monitors/
+monitor=,preferred,auto,auto
+monitor=DP-7,1920x1080,auto,auto
+
+###################
+### MY PROGRAMS ###
+###################
+
+# See https://wiki.hyprland.org/Configuring/Keywords/
+
+# Set programs that you use
+$terminal = kitty
+$fileManager = dolphin
+$menu = wofi --show drun
+
+
+#################
+### AUTOSTART ###
+#################
+
+# Autostart necessary processes (like notifications daemons, status bars, etc.)
+# Or execute your favorite apps at launch like this:
+
+exec-once = $terminal
+exec-once = nm-applet &
+exec-once = waybar & hyprpaper & firefox
+
+
+#############################
+### ENVIRONMENT VARIABLES ###
+#############################
+
+# See https://wiki.hyprland.org/Configuring/Environment-variables/
+
+env = XCURSOR_SIZE,24
+env = HYPRCURSOR_SIZE,24
+
+
+#####################
+### LOOK AND FEEL ###
+#####################
+
+# Refer to https://wiki.hyprland.org/Configuring/Variables/
+
+# https://wiki.hyprland.org/Configuring/Variables/#general
+general {
+    gaps_in = 4
+    gaps_out = 8
+
+    border_size = 2
+
+    # https://wiki.hyprland.org/Configuring/Variables/#variable-types for info about colors
+    col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg
+    col.inactive_border = rgba(595959aa)
+
+    # Set to true enable resizing windows by clicking and dragging on borders and gaps
+    resize_on_border = false
+
+    # Please see https://wiki.hyprland.org/Configuring/Tearing/ before you turn this on
+    allow_tearing = false
+
+    layout = dwindle
+}
+
+# https://wiki.hyprland.org/Configuring/Variables/#decoration
+decoration {
+    rounding = 10
+
+    # Change transparency of focused and unfocused windows
+    active_opacity = 1.0
+    inactive_opacity = 1.0
+
+    drop_shadow = true
+    shadow_range = 4
+    shadow_render_power = 3
+    col.shadow = rgba(1a1a1aee)
+
+    # https://wiki.hyprland.org/Configuring/Variables/#blur
+    blur {
+        enabled = true
+        size = 3
+        passes = 1
+
+        vibrancy = 0.1696
+    }
+}
+
+# https://wiki.hyprland.org/Configuring/Variables/#animations
+animations {
+    enabled = true
+
+    # Default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more
+
+    bezier = myBezier, 0.05, 0.9, 0.1, 1.05
+
+    animation = windows, 1, 7, myBezier
+    animation = windowsOut, 1, 7, default, popin 80%
+    animation = border, 1, 10, default
+    animation = borderangle, 1, 8, default
+    animation = fade, 1, 7, default
+    animation = workspaces, 1, 6, default
+}
+
+# See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
+dwindle {
+    pseudotile = true # Master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
+    preserve_split = true # You probably want this
+}
+
+# See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
+master {
+    new_status = master
+}
+
+# https://wiki.hyprland.org/Configuring/Variables/#misc
+misc {
+    force_default_wallpaper = -1 # Set to 0 or 1 to disable the anime mascot wallpapers
+    disable_hyprland_logo = false # If true disables the random hyprland logo / anime girl background. :(
+}
+
+
+#############
+### INPUT ###
+#############
+
+# https://wiki.hyprland.org/Configuring/Variables/#input
+input {
+    kb_layout = us,ru
+    kb_variant =
+    kb_model =
+    kb_options = grp:caps_toggle,misc:typo,lv3:ralt_switch
+    kb_rules =
+
+    follow_mouse = 1
+
+    sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
+
+    touchpad {
+        natural_scroll = true
+    }
+}
+
+# https://wiki.hyprland.org/Configuring/Variables/#gestures
+gestures {
+    workspace_swipe = true
+}
+
+# Example per-device config
+# See https://wiki.hyprland.org/Configuring/Keywords/#per-device-input-configs for more
+device {
+    name = epic-mouse-v1
+    sensitivity = -0.5
+}
+
+
+
+####################
+### KEYBINDINGSS ###
+####################
+
+# See https://wiki.hyprland.org/Configuring/Keywords/
+$mainMod = SUPER # Sets "Windows" key as main modifier
+$shiftMod = SUPER_SHIFT
+# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
+bind = $mainMod, Q, exec, $terminal
+bind = $mainMod, C, killactive,
+bind = $mainMod, M, exit,
+bind = $mainMod, E, exec, $fileManager
+bind = $mainMod, L, exec, hyprlock
+bind = $mainMod, V, togglefloating,
+bind = $mainMod, R, exec, $menu
+bind = $mainMod, P, pseudo, # dwindle
+bind = $mainMod, J, togglesplit, # dwindle
+
+# Move focus with mainMod + arrow keys
+bind = $mainMod, left, movefocus, l
+bind = $mainMod, right, movefocus, r
+bind = $mainMod, up, movefocus, u
+bind = $mainMod, down, movefocus, d
+
+# Switch workspaces with mainMod + [0-9]
+bind = $mainMod, 1, workspace, 1
+bind = $mainMod, 2, workspace, 2
+bind = $mainMod, 3, workspace, 3
+bind = $mainMod, 4, workspace, 4
+bind = $mainMod, 5, workspace, 5
+bind = $mainMod, 6, workspace, 6
+bind = $mainMod, 7, workspace, 7
+bind = $mainMod, 8, workspace, 8
+bind = $mainMod, 9, workspace, 9
+bind = $mainMod, 0, workspace, 10
+
+# Move active window to a workspace with mainMod + SHIFT + [0-9]
+bind = $mainMod SHIFT, 1, movetoworkspace, 1
+bind = $mainMod SHIFT, 2, movetoworkspace, 2
+bind = $mainMod SHIFT, 3, movetoworkspace, 3
+bind = $mainMod SHIFT, 4, movetoworkspace, 4
+bind = $mainMod SHIFT, 5, movetoworkspace, 5
+bind = $mainMod SHIFT, 6, movetoworkspace, 6
+bind = $mainMod SHIFT, 7, movetoworkspace, 7
+bind = $mainMod SHIFT, 8, movetoworkspace, 8
+bind = $mainMod SHIFT, 9, movetoworkspace, 9
+bind = $mainMod SHIFT, 0, movetoworkspace, 10
+
+# Example special workspace (scratchpad)
+bind = $mainMod, S, togglespecialworkspace, magic
+bind = $mainMod SHIFT, S, movetoworkspace, special:magic
+
+# Scroll through existing workspaces with mainMod + scroll
+bind = $mainMod, mouse_down, workspace, e+1
+bind = $mainMod, mouse_up, workspace, e-1
+
+# Move/resize windows with mainMod + LMB/RMB and dragging
+bindm = $mainMod, mouse:272, movewindow
+bindm = $mainMod, mouse:273, resizewindow
+
+
+# Screenshot a window
+bind = $mainMod, PRINT, exec, hyprshot -m window
+# Screenshot a monitor
+bind = , PRINT, exec, hyprshot -m output
+# Screenshot a region
+bind = $shiftMod, PRINT, exec, hyprshot -m region
+
+##############################
+### WINDOWS AND WORKSPACES ###
+##############################
+
+source = ~/.config/hypr/custom/rules.conf
+
+# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
+# See https://wiki.hyprland.org/Configuring/Workspace-Rules/ for workspace rules
+
+# Example windowrule v1
+# windowrule = float, ^(kitty)$
+
+# Example windowrule v2
+# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
+windowrulev2 = suppressevent maximize, class:.* # You'll probably like this.
+
diff --git a/config/hypr/hyprlock.conf b/config/hypr/hyprlock.conf
new file mode 100644
index 0000000..94920bf
--- /dev/null
+++ b/config/hypr/hyprlock.conf
@@ -0,0 +1,74 @@
+background {
+    monitor =
+    path = $HOME/.config/hypr/lock.png   # only *.png supported for now
+    color = rgba(25, 20, 20, 1.0)
+    blur_passes = 4 # 0 disables blurring
+    blur_size = 2
+    noise = 0.0117
+    contrast = 0.8916
+    brightness = 0.8172
+    vibrancy = 0.1696
+    vibrancy_darkness = 0.0
+}
+
+input-field {
+    monitor =
+    size = 400, 50
+    outline_thickness = 1
+    dots_size = 0.4 # Scale of input-field height, 0.2 - 0.8
+    dots_spacing = 0.15 # Scale of dots' absolute size, 0.0 - 1.0
+    dots_center = true
+    outer_color = rgb(000000)
+    inner_color = rgb(200, 200, 200)
+    font_color = rgb(10, 10, 10)
+    fade_on_empty = true
+    placeholder_text = <i>Пароль</i> # Text rendered in the input box when it's empty.
+    hide_input = false
+    position = 0, -50
+    halign = center
+    valign = center
+}
+
+label {
+    monitor =
+    text = cmd[update:1000] echo "<span foreground='##ffffff'>$(date +"%H:%M")</span>"
+    color = rgba(200, 200, 200, 1.0)
+    font_size = 60
+    font_family = Noto Sans
+    position = 0, 150
+    halign = center
+    valign = center
+}
+
+label {
+    monitor =
+    text = cmd[update:1000] echo "<span foreground='##ffffff'>$(date +"%A, %d %B %Y")</span>"
+    color = rgba(200, 200, 200, 1.0)
+    font_size = 18
+    font_family = Noto Sans
+    position = 0, 100
+    halign = center
+    valign = center
+}
+
+label {
+    monitor =
+    text = cmd[update:5000] ${XDG_CONFIG_HOME:-$HOME/.config}/hypr/hyprlock/status.sh
+    color = rgba(200, 200, 200, 1.0)
+    font_size = 18
+    font_family = Noto Sans
+    position = 0, 50
+    halign = center
+    valign = center
+}
+
+label {
+    monitor =
+    text = <span foreground='##ffffff'>$USER</span>
+    color = rgba(200, 200, 200, 1.0)
+    font_size = 60
+    font_family = Noto Sans
+    position = 0, 320
+    halign = center
+    valign = center
+}
diff --git a/config/hypr/hyprlock/status.sh b/config/hypr/hyprlock/status.sh
new file mode 100755
index 0000000..ea2607e
--- /dev/null
+++ b/config/hypr/hyprlock/status.sh
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+
+############ Variables ############
+enable_battery=false
+battery_charging=false
+
+####### Check availability ########
+for battery in /sys/class/power_supply/*BAT*; do
+  if [[ -f "$battery/uevent" ]]; then
+    enable_battery=true
+    if [[ $(cat /sys/class/power_supply/*/status | head -1) == "Charging" ]]; then
+      battery_charging=true
+    fi
+    break
+  fi
+done
+
+############# Output #############
+if [[ $enable_battery == true ]]; then
+  if [[ $battery_charging == true ]]; then
+    echo -n " заряжается"
+  fi
+  echo -n "$(cat /sys/class/power_supply/*/capacity | head -1)"%
+  if [[ $battery_charging == false ]]; then
+    echo -n " осталось"
+  fi
+fi
+
+echo ''
diff --git a/config/hypr/hyprpaper.conf b/config/hypr/hyprpaper.conf
new file mode 100644
index 0000000..4d21b18
--- /dev/null
+++ b/config/hypr/hyprpaper.conf
@@ -0,0 +1,3 @@
+preload = ~/.config/hypr/wp.jpg
+wallpaper = , ~/.config/hypr/wp.jpg
+splash = true
diff --git a/config/hypr/lock.png b/config/hypr/lock.png
new file mode 100644
index 0000000..5a85e8e
Binary files /dev/null and b/config/hypr/lock.png differ
diff --git a/config/hypr/wp.jpg b/config/hypr/wp.jpg
new file mode 100644
index 0000000..2047b40
Binary files /dev/null and b/config/hypr/wp.jpg differ
diff --git a/config/kitty/kitty.conf b/config/kitty/kitty.conf
new file mode 100644
index 0000000..4ef1dc9
--- /dev/null
+++ b/config/kitty/kitty.conf
@@ -0,0 +1,18 @@
+font_size 10.0
+background_opacity 1
+background #0e0e20
+cursor_shape beam
+window_margin_width 4
+confirm_os_window_close 0
+
+# Zoom
+map ctrl+plus  change_font_size all +1
+map ctrl+equal  change_font_size all +1
+map ctrl+kp_add  change_font_size all +1
+
+map ctrl+minus       change_font_size all -1
+map ctrl+underscore       change_font_size all -1
+map ctrl+kp_subtract       change_font_size all -1
+
+map ctrl+0 change_font_size all 0
+map ctrl+kp_0 change_font_size all 0
diff --git a/config/mako/config b/config/mako/config
new file mode 100644
index 0000000..022c8ef
--- /dev/null
+++ b/config/mako/config
@@ -0,0 +1,28 @@
+sort=-time
+layer=overlay
+background-color=#2e3440
+width=300
+height=110
+border-size=2
+border-color=#33ccff
+border-radius=10
+icons=0
+max-icon-size=64
+default-timeout=5000
+ignore-timeout=1
+font=monospace 10
+
+[urgency=low]
+border-color=#595959
+
+[urgency=normal]
+border-color=#33ccff
+
+[urgency=high]
+border-color=#00ff99
+default-timeout=0
+
+[category=mpd]
+default-timeout=2000
+group-by=category
+
diff --git a/nvim/.editorconfig b/config/nvim/.editorconfig
similarity index 100%
rename from nvim/.editorconfig
rename to config/nvim/.editorconfig
diff --git a/nvim/.gitignore b/config/nvim/.gitignore
similarity index 100%
rename from nvim/.gitignore
rename to config/nvim/.gitignore
diff --git a/config/nvim/Session.vim b/config/nvim/Session.vim
new file mode 100644
index 0000000..510124f
--- /dev/null
+++ b/config/nvim/Session.vim
@@ -0,0 +1,54 @@
+let SessionLoad = 1
+let s:so_save = &g:so | let s:siso_save = &g:siso | setg so=0 siso=0 | setl so=-1 siso=-1
+let v:this_session=expand("<sfile>:p")
+silent only
+silent tabonly
+cd ~/projects/dotfiles/nvim
+if expand('%') == '' && !&modified && line('$') <= 1 && getline(1) == ''
+  let s:wipebuf = bufnr('%')
+endif
+let s:shortmess_save = &shortmess
+if &shortmess =~ 'A'
+  set shortmess=aoOA
+else
+  set shortmess=aoO
+endif
+badd +6 init.lua
+badd +25 lua/plugins/theme.lua
+badd +1 lua/plugins/tree.lua
+argglobal
+%argdel
+edit lua/plugins/tree.lua
+argglobal
+balt lua/plugins/theme.lua
+setlocal fdm=expr
+setlocal fde=nvim_treesitter#foldexpr()
+setlocal fmr={{{,}}}
+setlocal fdi=#
+setlocal fdl=6
+setlocal fml=1
+setlocal fdn=20
+setlocal fen
+let s:l = 1 - ((0 * winheight(0) + 22) / 44)
+if s:l < 1 | let s:l = 1 | endif
+keepjumps exe s:l
+normal! zt
+keepjumps 1
+normal! 0
+tabnext 1
+if exists('s:wipebuf') && len(win_findbuf(s:wipebuf)) == 0 && getbufvar(s:wipebuf, '&buftype') isnot# 'terminal'
+  silent exe 'bwipe ' . s:wipebuf
+endif
+unlet! s:wipebuf
+set winheight=1 winwidth=20
+let &shortmess = s:shortmess_save
+let s:sx = expand("<sfile>:p:r")."x.vim"
+if filereadable(s:sx)
+  exe "source " . fnameescape(s:sx)
+endif
+let &g:so = s:so_save | let &g:siso = s:siso_save
+set hlsearch
+nohlsearch
+doautoall SessionLoadPost
+unlet SessionLoad
+" vim: set ft=vim :
diff --git a/nvim/colors/neonxp.lua b/config/nvim/colors/neonxp.lua
similarity index 100%
rename from nvim/colors/neonxp.lua
rename to config/nvim/colors/neonxp.lua
diff --git a/nvim/init.lua b/config/nvim/init.lua
similarity index 96%
rename from nvim/init.lua
rename to config/nvim/init.lua
index e495d97..f6fd4ab 100644
--- a/nvim/init.lua
+++ b/config/nvim/init.lua
@@ -35,3 +35,4 @@ require("autocommands")
 require("lsp")
 require("syntax")
 -- require("dap")
+vim.cmd [[colorscheme nightfly]]
diff --git a/nvim/lazy-lock.json b/config/nvim/lazy-lock.json
similarity index 88%
rename from nvim/lazy-lock.json
rename to config/nvim/lazy-lock.json
index d0ab947..6b58a8b 100644
--- a/nvim/lazy-lock.json
+++ b/config/nvim/lazy-lock.json
@@ -3,7 +3,7 @@
   "auto-save.nvim": { "branch": "main", "commit": "37c82fd548e3f5ffc2d9d020a65dac1044584f44" },
   "blink.cmp": { "branch": "main", "commit": "022521a8910a5543b0251b21c9e1a1e989745796" },
   "codecompanion.nvim": { "branch": "main", "commit": "9edf22cb71711cd7fab7671a25ed5424011a379d" },
-  "conform.nvim": { "branch": "master", "commit": "f643d1b51d1d3d14c8641a46ce44f6bce73c2697" },
+  "conform.nvim": { "branch": "master", "commit": "0e93e0d12d2f7ebdea9e3e444dfaff0050cefbe6" },
   "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
   "go.nvim": { "branch": "master", "commit": "a3455f48cff718a86275115523dcc735535a13aa" },
   "goerr-nvim": { "branch": "main", "commit": "d30ba1cab652e78dbf6a644eb4823be57e9af203" },
@@ -15,10 +15,11 @@
   "lsp_signature.nvim": { "branch": "master", "commit": "a4e3c15dfdce8783c074539b1835edae75fa63d5" },
   "lspsaga.nvim": { "branch": "main", "commit": "920b1253e1a26732e53fac78412f6da7f674671d" },
   "lualine.nvim": { "branch": "master", "commit": "0c6cca9f2c63dadeb9225c45bc92bb95a151d4af" },
-  "nvim-dap": { "branch": "master", "commit": "b0f983507e3702f073bfe1516846e58b56d4e42f" },
+  "nightfly": { "branch": "master", "commit": "8c55003e89f321a48a8cd4bb426dd3e7c58f0646" },
+  "nvim-dap": { "branch": "master", "commit": "ea82027c3447dc1a022be9a9884de276c05cd33a" },
   "nvim-dap-go": { "branch": "main", "commit": "8763ced35b19c8dc526e04a70ab07c34e11ad064" },
   "nvim-dap-ui": { "branch": "master", "commit": "73a26abf4941aa27da59820fd6b028ebcdbcf932" },
-  "nvim-lspconfig": { "branch": "master", "commit": "8adb3b5938f6074a1bcc36d3c3916f497d2e8ec4" },
+  "nvim-lspconfig": { "branch": "master", "commit": "036885e8e5456d3907626b634693234f628afef6" },
   "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
   "nvim-tree.lua": { "branch": "master", "commit": "1c733e8c1957dc67f47580fe9c458a13b5612d5b" },
   "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
diff --git a/nvim/lua/autocommands.lua b/config/nvim/lua/autocommands.lua
similarity index 100%
rename from nvim/lua/autocommands.lua
rename to config/nvim/lua/autocommands.lua
diff --git a/nvim/lua/commands.lua b/config/nvim/lua/commands.lua
similarity index 100%
rename from nvim/lua/commands.lua
rename to config/nvim/lua/commands.lua
diff --git a/nvim/lua/keymaps.lua b/config/nvim/lua/keymaps.lua
similarity index 100%
rename from nvim/lua/keymaps.lua
rename to config/nvim/lua/keymaps.lua
diff --git a/nvim/lua/lsp.lua b/config/nvim/lua/lsp.lua
similarity index 100%
rename from nvim/lua/lsp.lua
rename to config/nvim/lua/lsp.lua
diff --git a/nvim/lua/myplugins/resize.lua b/config/nvim/lua/myplugins/resize.lua
similarity index 100%
rename from nvim/lua/myplugins/resize.lua
rename to config/nvim/lua/myplugins/resize.lua
diff --git a/nvim/lua/options.lua b/config/nvim/lua/options.lua
similarity index 93%
rename from nvim/lua/options.lua
rename to config/nvim/lua/options.lua
index a0b7dbb..8d55306 100644
--- a/nvim/lua/options.lua
+++ b/config/nvim/lua/options.lua
@@ -62,4 +62,7 @@ vim.filetype.add({
 		[".*/todo.txt"] = "todotxt",
 	},
 })
-vim.cmd([[colorscheme neonxp]])
+
+vim.g.nightflyCursorColor = true
+vim.g.nightflyVirtualTextColor = true
+vim.g.nightflyTransparent = true
diff --git a/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua
similarity index 91%
rename from nvim/lua/plugins.lua
rename to config/nvim/lua/plugins.lua
index 4ef30d4..0e9701d 100644
--- a/nvim/lua/plugins.lua
+++ b/config/nvim/lua/plugins.lua
@@ -1,4 +1,5 @@
 require("lazy").setup({
+	{ "bluz71/vim-nightfly-colors", name = "nightfly", lazy = false, priority = 1000 },
 	{ "nvim-lua/plenary.nvim" },
 	{
 		"ray-x/guihua.lua",
diff --git a/nvim/lua/plugins/autosave.lua b/config/nvim/lua/plugins/autosave.lua
similarity index 100%
rename from nvim/lua/plugins/autosave.lua
rename to config/nvim/lua/plugins/autosave.lua
diff --git a/nvim/lua/plugins/blankline.lua b/config/nvim/lua/plugins/blankline.lua
similarity index 100%
rename from nvim/lua/plugins/blankline.lua
rename to config/nvim/lua/plugins/blankline.lua
diff --git a/nvim/lua/plugins/cmp.lua b/config/nvim/lua/plugins/cmp.lua
similarity index 83%
rename from nvim/lua/plugins/cmp.lua
rename to config/nvim/lua/plugins/cmp.lua
index 43d911a..718d8cb 100644
--- a/nvim/lua/plugins/cmp.lua
+++ b/config/nvim/lua/plugins/cmp.lua
@@ -37,8 +37,14 @@ return {
 			},
 		},
 		cmdline = {
-			keymap = { preset = "inherit" },
-			completion = { menu = { auto_show = true } },
+			keymap = {
+				preset = "inherit",
+				['<Tab>'] = { 'show', 'accept' },
+			},
+			completion = {
+				menu = { auto_show = false },
+				ghost_text = { enabled = true },
+			},
 			sources = { "cmdline" },
 		},
 		snippets = { preset = "luasnip" },
diff --git a/nvim/lua/plugins/columns.lua b/config/nvim/lua/plugins/columns.lua
similarity index 100%
rename from nvim/lua/plugins/columns.lua
rename to config/nvim/lua/plugins/columns.lua
diff --git a/nvim/lua/plugins/conform.lua b/config/nvim/lua/plugins/conform.lua
similarity index 100%
rename from nvim/lua/plugins/conform.lua
rename to config/nvim/lua/plugins/conform.lua
diff --git a/nvim/lua/plugins/dap.lua b/config/nvim/lua/plugins/dap.lua
similarity index 100%
rename from nvim/lua/plugins/dap.lua
rename to config/nvim/lua/plugins/dap.lua
diff --git a/nvim/lua/plugins/dap_go.lua b/config/nvim/lua/plugins/dap_go.lua
similarity index 100%
rename from nvim/lua/plugins/dap_go.lua
rename to config/nvim/lua/plugins/dap_go.lua
diff --git a/nvim/lua/plugins/dapui.lua b/config/nvim/lua/plugins/dapui.lua
similarity index 100%
rename from nvim/lua/plugins/dapui.lua
rename to config/nvim/lua/plugins/dapui.lua
diff --git a/nvim/lua/plugins/go.lua b/config/nvim/lua/plugins/go.lua
similarity index 100%
rename from nvim/lua/plugins/go.lua
rename to config/nvim/lua/plugins/go.lua
diff --git a/nvim/lua/plugins/goimpl.lua b/config/nvim/lua/plugins/goimpl.lua
similarity index 100%
rename from nvim/lua/plugins/goimpl.lua
rename to config/nvim/lua/plugins/goimpl.lua
diff --git a/nvim/lua/plugins/headlines.lua b/config/nvim/lua/plugins/headlines.lua
similarity index 100%
rename from nvim/lua/plugins/headlines.lua
rename to config/nvim/lua/plugins/headlines.lua
diff --git a/nvim/lua/plugins/lsp_saga.lua b/config/nvim/lua/plugins/lsp_saga.lua
similarity index 100%
rename from nvim/lua/plugins/lsp_saga.lua
rename to config/nvim/lua/plugins/lsp_saga.lua
diff --git a/nvim/lua/plugins/lsp_signature.lua b/config/nvim/lua/plugins/lsp_signature.lua
similarity index 100%
rename from nvim/lua/plugins/lsp_signature.lua
rename to config/nvim/lua/plugins/lsp_signature.lua
diff --git a/nvim/lua/plugins/lualine.lua b/config/nvim/lua/plugins/lualine.lua
similarity index 97%
rename from nvim/lua/plugins/lualine.lua
rename to config/nvim/lua/plugins/lualine.lua
index c35b162..920e729 100644
--- a/nvim/lua/plugins/lualine.lua
+++ b/config/nvim/lua/plugins/lualine.lua
@@ -4,7 +4,7 @@ return {
 	opts = {
 		options = {
 			icons_enabled = true,
-			theme = "auto",
+			theme = "nightfly",
 			component_separators = { left = "", right = "" },
 			section_separators = { left = "", right = "" },
 			disabled_filetypes = {
diff --git a/nvim/lua/plugins/resize.lua b/config/nvim/lua/plugins/resize.lua
similarity index 87%
rename from nvim/lua/plugins/resize.lua
rename to config/nvim/lua/plugins/resize.lua
index f0c6175..7e22517 100644
--- a/nvim/lua/plugins/resize.lua
+++ b/config/nvim/lua/plugins/resize.lua
@@ -3,28 +3,28 @@ return {
 	dir = "~/.config/nvim/lua/myplugins",
 	keys = {
 		{
-			"<C-S-Left>",
+			"<C-A-Left>",
 			function()
 				require("myplugins.resize").ResizeLeft()
 			end,
 			silent = true,
 		},
 		{
-			"<C-S-Right>",
+			"<C-A-Right>",
 			function()
 				require("myplugins.resize").ResizeRight()
 			end,
 			silent = true,
 		},
 		{
-			"<C-S-Up>",
+			"<C-A-Up>",
 			function()
 				require("myplugins.resize").ResizeUp()
 			end,
 			silent = true,
 		},
 		{
-			"<C-S-Down>",
+			"<C-A-Down>",
 			function()
 				require("myplugins.resize").ResizeDown()
 			end,
diff --git a/nvim/lua/plugins/telescope.lua b/config/nvim/lua/plugins/telescope.lua
similarity index 100%
rename from nvim/lua/plugins/telescope.lua
rename to config/nvim/lua/plugins/telescope.lua
diff --git a/nvim/lua/plugins/todo.lua b/config/nvim/lua/plugins/todo.lua
similarity index 100%
rename from nvim/lua/plugins/todo.lua
rename to config/nvim/lua/plugins/todo.lua
diff --git a/nvim/lua/plugins/tree.lua b/config/nvim/lua/plugins/tree.lua
similarity index 100%
rename from nvim/lua/plugins/tree.lua
rename to config/nvim/lua/plugins/tree.lua
diff --git a/nvim/lua/plugins/treesitter.lua b/config/nvim/lua/plugins/treesitter.lua
similarity index 100%
rename from nvim/lua/plugins/treesitter.lua
rename to config/nvim/lua/plugins/treesitter.lua
diff --git a/nvim/lua/syntax/hjson.lua b/config/nvim/lua/syntax/hjson.lua
similarity index 100%
rename from nvim/lua/syntax/hjson.lua
rename to config/nvim/lua/syntax/hjson.lua
diff --git a/nvim/lua/syntax/init.lua b/config/nvim/lua/syntax/init.lua
similarity index 100%
rename from nvim/lua/syntax/init.lua
rename to config/nvim/lua/syntax/init.lua
diff --git a/nvim/lua/theme/asset/hsv-to-rgb.lua b/config/nvim/lua/theme/asset/hsv-to-rgb.lua
similarity index 100%
rename from nvim/lua/theme/asset/hsv-to-rgb.lua
rename to config/nvim/lua/theme/asset/hsv-to-rgb.lua
diff --git a/nvim/lua/theme/colors.lua b/config/nvim/lua/theme/colors.lua
similarity index 100%
rename from nvim/lua/theme/colors.lua
rename to config/nvim/lua/theme/colors.lua
diff --git a/nvim/lua/theme/modifiers.lua b/config/nvim/lua/theme/modifiers.lua
similarity index 100%
rename from nvim/lua/theme/modifiers.lua
rename to config/nvim/lua/theme/modifiers.lua
diff --git a/nvim/snippets/go.json b/config/nvim/snippets/go.json
similarity index 100%
rename from nvim/snippets/go.json
rename to config/nvim/snippets/go.json
diff --git a/nvim/snippets/package.json b/config/nvim/snippets/package.json
similarity index 100%
rename from nvim/snippets/package.json
rename to config/nvim/snippets/package.json
diff --git a/nvim/spell/en.utf-8.add b/config/nvim/spell/en.utf-8.add
similarity index 100%
rename from nvim/spell/en.utf-8.add
rename to config/nvim/spell/en.utf-8.add
diff --git a/nvim/spell/en.utf-8.add.spl b/config/nvim/spell/en.utf-8.add.spl
similarity index 100%
rename from nvim/spell/en.utf-8.add.spl
rename to config/nvim/spell/en.utf-8.add.spl
diff --git a/nvim/spell/ru.cp1251.spl b/config/nvim/spell/ru.cp1251.spl
similarity index 100%
rename from nvim/spell/ru.cp1251.spl
rename to config/nvim/spell/ru.cp1251.spl
diff --git a/nvim/spell/ru.cp1251.sug b/config/nvim/spell/ru.cp1251.sug
similarity index 100%
rename from nvim/spell/ru.cp1251.sug
rename to config/nvim/spell/ru.cp1251.sug
diff --git a/nvim/spell/ru.koi8-r.spl b/config/nvim/spell/ru.koi8-r.spl
similarity index 100%
rename from nvim/spell/ru.koi8-r.spl
rename to config/nvim/spell/ru.koi8-r.spl
diff --git a/nvim/spell/ru.koi8-r.sug b/config/nvim/spell/ru.koi8-r.sug
similarity index 100%
rename from nvim/spell/ru.koi8-r.sug
rename to config/nvim/spell/ru.koi8-r.sug
diff --git a/nvim/spell/ru.utf-8.spl b/config/nvim/spell/ru.utf-8.spl
similarity index 100%
rename from nvim/spell/ru.utf-8.spl
rename to config/nvim/spell/ru.utf-8.spl
diff --git a/nvim/spell/ru.utf-8.sug b/config/nvim/spell/ru.utf-8.sug
similarity index 100%
rename from nvim/spell/ru.utf-8.sug
rename to config/nvim/spell/ru.utf-8.sug
diff --git a/config/waybar/config.jsonc b/config/waybar/config.jsonc
new file mode 100644
index 0000000..66e648d
--- /dev/null
+++ b/config/waybar/config.jsonc
@@ -0,0 +1,203 @@
+// -*- mode: jsonc -*-
+{
+    // "layer": "top", // Waybar at top layer
+    // "position": "bottom", // Waybar position (top|bottom|left|right)
+    "height": 20, // Waybar height (to be removed for auto height)
+    // "width": 1280, // Waybar width
+    "spacing": 0, // Gaps between modules (4px)
+    // Choose the order of the modules
+    "modules-left": [
+		"hyprland/workspaces",
+        "custom/media"
+    ],
+    "modules-center": [
+        "hyprland/window"
+    ],
+    "modules-right": [
+        "mpd",
+        "idle_inhibitor",
+        "pulseaudio",
+        "network",
+        "power-profiles-daemon",
+        "cpu",
+        "memory",
+       // "temperature",
+       // "backlight",
+        "keyboard-state",
+        "hyprland/language",
+        "battery",
+        "battery#bat2",
+        "clock",
+        "tray"
+    ],
+    // Modules configuration
+    // "sway/workspaces": {
+    //     "disable-scroll": true,
+    //     "all-outputs": true,
+    //     "warp-on-scroll": false,
+    //     "format": "{name}: {icon}",
+    //     "format-icons": {
+    //         "1": "",
+    //         "2": "",
+    //         "3": "",
+    //         "4": "",
+    //         "5": "",
+    //         "urgent": "",
+    //         "focused": "",
+    //         "default": ""
+    //     }
+    // },
+    "keyboard-state": {
+        "numlock": true,
+        "capslock": true,
+        "format": "{name} {icon}",
+        "format-icons": {
+            "locked": "",
+            "unlocked": ""
+        }
+    },
+	"hyprland/workspaces": {
+		"format": "{name}",
+		"on-click": "activate",
+		"on-scroll-up": "hyprctl dispatch workspace e+1",
+    	"on-scroll-down": "hyprctl dispatch workspace e-1"
+	},
+	"hyprland/window": {
+    	"separate-outputs": true
+	},
+	"hyprland/language": {
+		"format": "{short}"
+	},
+    "mpd": {
+        "format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ⸨{songPosition}|{queueLength}⸩ {volume}% ",
+        "format-disconnected": "Disconnected ",
+        "format-stopped": "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ",
+        "unknown-tag": "N/A",
+        "interval": 5,
+        "consume-icons": {
+            "on": " "
+        },
+        "random-icons": {
+            "off": "<span color=\"#f53c3c\"> </span> ",
+            "on": " "
+        },
+        "repeat-icons": {
+            "on": " "
+        },
+        "single-icons": {
+            "on": " 1 "
+        },
+        "state-icons": {
+            "paused": "",
+            "playing": ""
+        },
+        "tooltip-format": "MPD (connected)",
+        "tooltip-format-disconnected": "MPD (disconnected)",
+		"on-click": "mpc toggle"
+    },
+    "idle_inhibitor": {
+        "format": "{icon}",
+        "format-icons": {
+            "activated": "",
+            "deactivated": ""
+        }
+    },
+    "tray": {
+        // "icon-size": 21,
+        "spacing": 10
+    },
+    "clock": {
+        // "timezone": "America/New_York",
+        "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
+        "format-alt": "{:%Y-%m-%d}"
+    },
+    "cpu": {
+        "format": "{usage}%",
+        "tooltip": false
+    },
+    "memory": {
+        "format": " / {}%"
+    },
+    "temperature": {
+        // "thermal-zone": 2,
+        // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
+        "critical-threshold": 80,
+        // "format-critical": "{temperatureC}°C {icon}",
+        "format": "{temperatureC}°C {icon}",
+        "format-icons": ["", "", ""]
+    },
+    "backlight": {
+        // "device": "acpi_video1",
+        "format": "{percent}% {icon}",
+        "format-icons": ["", "", "", "", "", "", "", "", ""]
+    },
+    "battery": {
+        "states": {
+            // "good": 95,
+            "warning": 30,
+            "critical": 15
+        },
+        "format": "{capacity}% {icon}",
+        "format-full": "{capacity}% {icon}",
+        "format-charging": "{capacity}% ",
+        "format-plugged": "{capacity}% ",
+        "format-alt": "{time} {icon}",
+        // "format-good": "", // An empty format will hide the module
+        // "format-full": "",
+        "format-icons": ["", "", "", "", ""]
+    },
+    "battery#bat2": {
+        "bat": "BAT2"
+    },
+    "power-profiles-daemon": {
+      "format": "{icon}",
+      "tooltip-format": "Power profile: {profile}\nDriver: {driver}",
+      "tooltip": true,
+      "format-icons": {
+        "default": "",
+        "performance": "",
+        "balanced": "",
+        "power-saver": ""
+      }
+    },
+    "network": {
+        // "interface": "wlp2*", // (Optional) To force the use of this interface
+        "format-wifi": "{essid} ({signalStrength}%) ",
+        "format-ethernet": "{ipaddr}/{cidr} ",
+        "tooltip-format": "{ifname} via {gwaddr} ",
+        "format-linked": "{ifname} (No IP) ",
+        "format-disconnected": "Disconnected ⚠",
+        "format-alt": "{ifname}: {ipaddr}/{cidr}"
+    },
+    "pulseaudio": {
+        // "scroll-step": 1, // %, can be a float
+        "format": "{volume}% {icon} {format_source}",
+        "format-bluetooth": "{volume}% {icon} {format_source}",
+        "format-bluetooth-muted": " {icon} {format_source}",
+        "format-muted": " {format_source}",
+        "format-source": "{volume}% ",
+        "format-source-muted": "",
+        "format-icons": {
+            "headphone": " ",
+            "hands-free": " ",
+            "headset": " ",
+            "phone": " ",
+            "portable": " ",
+            "car": " ",
+            "default": [" ", " ", " "]
+        },
+        "on-click": "pavucontrol"
+    },
+    "custom/media": {
+        "format": "{icon} {}",
+        "return-type": "json",
+        "max-length": 40,
+        "format-icons": {
+            "spotify": "",
+            "default": "🎜"
+        },
+        "escape": true,
+        "exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder
+        // "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name
+    }
+}
diff --git a/config/waybar/style.css b/config/waybar/style.css
new file mode 100644
index 0000000..b13d2dc
--- /dev/null
+++ b/config/waybar/style.css
@@ -0,0 +1,325 @@
+* {
+    /* `otf-font-awesome` is required to be installed for icons */
+    font-family: FontAwesome, Roboto, Helvetica, Arial, sans-serif;
+    font-size: 13px;
+}
+
+window#waybar {
+    background-color: rgba(43, 48, 59, 0.5);
+    border-bottom: 2px solid rgba(51, 204, 256, 238);
+    color: #ffffff;
+    transition-property: background-color;
+    transition-duration: .5s;
+}
+
+window#waybar.hidden {
+    opacity: 0.2;
+}
+
+/*
+window#waybar.empty {
+    background-color: transparent;
+}
+window#waybar.solo {
+    background-color: #FFFFFF;
+}
+*/
+
+window#waybar.termite {
+    background-color: #3F3F3F;
+}
+
+window#waybar.chromium {
+    background-color: #000000;
+    border: none;
+}
+
+button {
+    /* Use box-shadow instead of border so the text isn't offset */
+    box-shadow: inset 0 -3px transparent;
+    /* Avoid rounded borders under each button name */
+    border: none;
+    border-radius: 0;
+}
+
+/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
+button:hover {
+    background: inherit;
+    box-shadow: inset 0 -3px #ffffff;
+}
+
+/* you can set a style on hover for any module like this */
+#pulseaudio:hover {
+    background-color: #a37800;
+}
+
+#workspaces button {
+    padding: 0 5px;
+    background-color: transparent;
+    color: #ffffff;
+}
+
+#workspaces button:hover {
+    background: rgba(0, 0, 0, 0.2);
+}
+
+#workspaces button.focused {
+    background-color: #64727D;
+    box-shadow: inset 0 -3px #ffffff;
+}
+
+#workspaces button.urgent {
+    background-color: #eb4d4b;
+}
+
+#mode {
+    background-color: #64727D;
+    box-shadow: inset 0 -3px #ffffff;
+}
+
+#clock,
+#battery,
+#disk,
+#temperature,
+#backlight,
+#network,
+#pulseaudio,
+#wireplumber,
+#custom-media,
+#tray,
+#mode,
+#idle_inhibitor,
+#scratchpad,
+#power-profiles-daemon,
+#mpd {
+    padding: 0 10px;
+    color: #ffffff;
+}
+
+#window,
+#workspaces {
+    margin: 0 4px;
+}
+
+/* If workspaces is the leftmost module, omit left margin */
+.modules-left > widget:first-child > #workspaces {
+    margin-left: 0;
+}
+
+/* If workspaces is the rightmost module, omit right margin */
+.modules-right > widget:last-child > #workspaces {
+    margin-right: 0;
+}
+
+#clock {
+    /*background-color: #64727D;*/
+}
+
+#battery {
+    /*background-color: #ffffff;*/
+    /*color: #000000;*/
+}
+
+#battery.charging, #battery.plugged {
+    color: #ffffff;
+    /*background-color: #26A65B;*/
+}
+
+@keyframes blink {
+    to {
+        background-color: #ffffff;
+        color: #000000;
+    }
+}
+
+/* Using steps() instead of linear as a timing function to limit cpu usage */
+#battery.critical:not(.charging) {
+    background-color: #f53c3c;
+    color: #ffffff;
+    animation-name: blink;
+    animation-duration: 0.5s;
+    animation-timing-function: steps(12);
+    animation-iteration-count: infinite;
+    animation-direction: alternate;
+}
+
+#power-profiles-daemon {
+    padding-right: 15px;
+}
+
+#power-profiles-daemon.performance {
+    /*background-color: #f53c3c;*/
+    color: #ffffff;
+}
+
+#power-profiles-daemon.balanced {
+    /*background-color: #2980b9;*/
+    color: #ffffff;
+}
+
+#power-profiles-daemon.power-saver {
+    /*background-color: #2ecc71;*/
+    /*color: #000000;*/
+}
+
+label:focus {
+    background-color: #000000;
+}
+
+#cpu {
+    /*background-color: #2ecc71;*/
+    /*color: #000000;*/
+}
+
+#memory {
+    /*background-color: #9b59b6;*/
+}
+
+#disk {
+    /*background-color: #964B00;*/
+}
+
+#backlight {
+    /*background-color: #90b1b1;*/
+}
+
+#network {
+    /*background-color: #2980b9;*/
+}
+
+#network.disconnected {
+    /*background-color: #f53c3c;*/
+}
+
+#pulseaudio {
+    /*background-color: #f1c40f;*/
+    /*color: #000000;*/
+}
+
+#pulseaudio.muted {
+    /*background-color: #90b1b1;*/
+    /*color: #2a5c45;*/
+}
+
+#wireplumber {
+    /*background-color: #fff0f5;*/
+    /*color: #000000;*/
+}
+
+#wireplumber.muted {
+    /*background-color: #f53c3c;*/
+}
+
+#custom-media {
+    /*background-color: #66cc99;*/
+    /*color: #2a5c45;*/
+    min-width: 100px;
+}
+
+#custom-media.custom-spotify {
+    /*background-color: #66cc99;*/
+}
+
+#custom-media.custom-vlc {
+    /*background-color: #ffa000;*/
+}
+
+#temperature {
+    /*background-color: #f0932b;*/
+}
+
+#temperature.critical {
+    background-color: #eb4d4b;
+}
+
+#tray {
+    /*background-color: #2980b9;*/
+}
+
+#tray > .passive {
+    -gtk-icon-effect: dim;
+}
+
+#tray > .needs-attention {
+    -gtk-icon-effect: highlight;
+    background-color: #eb4d4b;
+}
+
+#idle_inhibitor {
+    /*background-color: #2d3436;*/
+}
+
+#idle_inhibitor.activated {
+    /*background-color: #ecf0f1;*/
+    color: #cfcfcf;
+}
+
+#mpd {
+    /*background-color: #66cc99;*/
+    /*color: #2a5c45;*/
+}
+
+#mpd.disconnected {
+    /*background-color: #f53c3c;*/
+}
+
+#mpd.stopped {
+    /*background-color: #90b1b1;*/
+}
+
+#mpd.paused {
+    /*background-color: #51a37a;*/
+}
+
+#language {
+    /*background: #00b093;*/
+    /*color: #740864;*/
+    /*padding: 0 5px;*/
+    margin: 0 5px;
+    min-width: 16px;
+}
+
+#keyboard-state {
+    background: #97e1ad;
+    color: #000000;
+    padding: 0 0px;
+    margin: 0 5px;
+    min-width: 16px;
+}
+
+#keyboard-state > label {
+    padding: 0 5px;
+}
+
+#keyboard-state > label.locked {
+    background: rgba(0, 0, 0, 0.2);
+}
+
+#scratchpad {
+    background: rgba(0, 0, 0, 0.2);
+}
+
+#scratchpad.empty {
+	background-color: transparent;
+}
+
+#privacy {
+    padding: 0;
+}
+
+#privacy-item {
+    padding: 0 5px;
+    color: white;
+}
+
+#privacy-item.screenshare {
+    background-color: #cf5700;
+}
+
+#privacy-item.audio-in {
+    background-color: #1ca000;
+}
+
+#privacy-item.audio-out {
+    background-color: #0069d4;
+}
diff --git a/git/config b/git/.gitconfig
similarity index 100%
rename from git/config
rename to git/.gitconfig
diff --git a/git/ignore b/git/.gitignore
similarity index 100%
rename from git/ignore
rename to git/.gitignore
diff --git a/zsh/antigen.zsh b/zsh/.config/zsh/antigen.zsh
similarity index 100%
rename from zsh/antigen.zsh
rename to zsh/.config/zsh/antigen.zsh
diff --git a/zsh/comp/cobra.zsh-completion b/zsh/.config/zsh/comp/cobra.zsh-completion
similarity index 100%
rename from zsh/comp/cobra.zsh-completion
rename to zsh/.config/zsh/comp/cobra.zsh-completion
diff --git a/zsh/comp/goldwarden.zsh-completion b/zsh/.config/zsh/comp/goldwarden.zsh-completion
similarity index 100%
rename from zsh/comp/goldwarden.zsh-completion
rename to zsh/.config/zsh/comp/goldwarden.zsh-completion
diff --git a/zsh/comp/hugo.zsh-completion b/zsh/.config/zsh/comp/hugo.zsh-completion
similarity index 100%
rename from zsh/comp/hugo.zsh-completion
rename to zsh/.config/zsh/comp/hugo.zsh-completion
diff --git a/zsh/comp/pass.zsh-completion b/zsh/.config/zsh/comp/pass.zsh-completion
similarity index 100%
rename from zsh/comp/pass.zsh-completion
rename to zsh/.config/zsh/comp/pass.zsh-completion
diff --git a/zsh/comp/todotxt.zsh-completion b/zsh/.config/zsh/comp/todotxt.zsh-completion
similarity index 100%
rename from zsh/comp/todotxt.zsh-completion
rename to zsh/.config/zsh/comp/todotxt.zsh-completion
diff --git a/zsh/comp/vgo.zsh-completion b/zsh/.config/zsh/comp/vgo.zsh-completion
similarity index 100%
rename from zsh/comp/vgo.zsh-completion
rename to zsh/.config/zsh/comp/vgo.zsh-completion
diff --git a/zsh/conf.d/dlv.zsh b/zsh/.config/zsh/conf.d/dlv.zsh
similarity index 100%
rename from zsh/conf.d/dlv.zsh
rename to zsh/.config/zsh/conf.d/dlv.zsh
diff --git a/zsh/conf.d/kind.zsh b/zsh/.config/zsh/conf.d/kind.zsh
similarity index 100%
rename from zsh/conf.d/kind.zsh
rename to zsh/.config/zsh/conf.d/kind.zsh
diff --git a/zsh/conf.d/todo.zsh b/zsh/.config/zsh/conf.d/todo.zsh
similarity index 100%
rename from zsh/conf.d/todo.zsh
rename to zsh/.config/zsh/conf.d/todo.zsh
diff --git a/zsh/termsupport.zsh b/zsh/.config/zsh/termsupport.zsh
similarity index 100%
rename from zsh/termsupport.zsh
rename to zsh/.config/zsh/termsupport.zsh
diff --git a/zsh/theme.zsh b/zsh/.config/zsh/theme.zsh
similarity index 100%
rename from zsh/theme.zsh
rename to zsh/.config/zsh/theme.zsh
diff --git a/zsh/theme/LICENSE b/zsh/.config/zsh/theme/LICENSE
similarity index 100%
rename from zsh/theme/LICENSE
rename to zsh/.config/zsh/theme/LICENSE
diff --git a/zsh/theme/Makefile b/zsh/.config/zsh/theme/Makefile
similarity index 100%
rename from zsh/theme/Makefile
rename to zsh/.config/zsh/theme/Makefile
diff --git a/zsh/theme/README.md b/zsh/.config/zsh/theme/README.md
similarity index 100%
rename from zsh/theme/README.md
rename to zsh/.config/zsh/theme/README.md
diff --git a/zsh/theme/config/p10k-classic.zsh b/zsh/.config/zsh/theme/config/p10k-classic.zsh
similarity index 100%
rename from zsh/theme/config/p10k-classic.zsh
rename to zsh/.config/zsh/theme/config/p10k-classic.zsh
diff --git a/zsh/theme/config/p10k-lean-8colors.zsh b/zsh/.config/zsh/theme/config/p10k-lean-8colors.zsh
similarity index 100%
rename from zsh/theme/config/p10k-lean-8colors.zsh
rename to zsh/.config/zsh/theme/config/p10k-lean-8colors.zsh
diff --git a/zsh/theme/config/p10k-lean.zsh b/zsh/.config/zsh/theme/config/p10k-lean.zsh
similarity index 100%
rename from zsh/theme/config/p10k-lean.zsh
rename to zsh/.config/zsh/theme/config/p10k-lean.zsh
diff --git a/zsh/theme/config/p10k-pure.zsh b/zsh/.config/zsh/theme/config/p10k-pure.zsh
similarity index 100%
rename from zsh/theme/config/p10k-pure.zsh
rename to zsh/.config/zsh/theme/config/p10k-pure.zsh
diff --git a/zsh/theme/config/p10k-rainbow.zsh b/zsh/.config/zsh/theme/config/p10k-rainbow.zsh
similarity index 100%
rename from zsh/theme/config/p10k-rainbow.zsh
rename to zsh/.config/zsh/theme/config/p10k-rainbow.zsh
diff --git a/zsh/theme/config/p10k-robbyrussell.zsh b/zsh/.config/zsh/theme/config/p10k-robbyrussell.zsh
similarity index 100%
rename from zsh/theme/config/p10k-robbyrussell.zsh
rename to zsh/.config/zsh/theme/config/p10k-robbyrussell.zsh
diff --git a/zsh/theme/font.md b/zsh/.config/zsh/theme/font.md
similarity index 100%
rename from zsh/theme/font.md
rename to zsh/.config/zsh/theme/font.md
diff --git a/zsh/theme/gitstatus/.clang-format b/zsh/.config/zsh/theme/gitstatus/.clang-format
similarity index 100%
rename from zsh/theme/gitstatus/.clang-format
rename to zsh/.config/zsh/theme/gitstatus/.clang-format
diff --git a/zsh/theme/gitstatus/.gitattributes b/zsh/.config/zsh/theme/gitstatus/.gitattributes
similarity index 100%
rename from zsh/theme/gitstatus/.gitattributes
rename to zsh/.config/zsh/theme/gitstatus/.gitattributes
diff --git a/zsh/theme/gitstatus/.gitignore b/zsh/.config/zsh/theme/gitstatus/.gitignore
similarity index 100%
rename from zsh/theme/gitstatus/.gitignore
rename to zsh/.config/zsh/theme/gitstatus/.gitignore
diff --git a/zsh/.config/zsh/theme/gitstatus/.vscode/c_cpp_properties.json b/zsh/.config/zsh/theme/gitstatus/.vscode/c_cpp_properties.json
new file mode 100644
index 0000000..323a6cd
--- /dev/null
+++ b/zsh/.config/zsh/theme/gitstatus/.vscode/c_cpp_properties.json
@@ -0,0 +1,17 @@
+{
+    "configurations": [
+        {
+            "name": "Linux",
+            "includePath": [
+                "${workspaceFolder}/src"
+            ],
+            "defines": [
+            ],
+            "compilerPath": "/usr/bin/g++",
+            "cStandard": "c11",
+            "cppStandard": "c++17",
+            "intelliSenseMode": "gcc-x64"
+        }
+    ],
+    "version": 4
+}
diff --git a/zsh/.config/zsh/theme/gitstatus/.vscode/settings.json b/zsh/.config/zsh/theme/gitstatus/.vscode/settings.json
new file mode 100644
index 0000000..bec79f9
--- /dev/null
+++ b/zsh/.config/zsh/theme/gitstatus/.vscode/settings.json
@@ -0,0 +1,72 @@
+{
+  "files.exclude": {
+    "*.zwc": true,
+    "core": true,
+    "locks/": true,
+    "logs/": true,
+    "obj/": true,
+    "usrbin/": true,
+  },
+  "files.associations": {
+    "array": "cpp",
+    "atomic": "cpp",
+    "*.tcc": "cpp",
+    "cctype": "cpp",
+    "chrono": "cpp",
+    "clocale": "cpp",
+    "cmath": "cpp",
+    "complex": "cpp",
+    "condition_variable": "cpp",
+    "cstddef": "cpp",
+    "cstdint": "cpp",
+    "cstdio": "cpp",
+    "cstdlib": "cpp",
+    "cstring": "cpp",
+    "ctime": "cpp",
+    "cwchar": "cpp",
+    "cwctype": "cpp",
+    "deque": "cpp",
+    "unordered_map": "cpp",
+    "unordered_set": "cpp",
+    "vector": "cpp",
+    "exception": "cpp",
+    "fstream": "cpp",
+    "functional": "cpp",
+    "future": "cpp",
+    "initializer_list": "cpp",
+    "iomanip": "cpp",
+    "iosfwd": "cpp",
+    "iostream": "cpp",
+    "istream": "cpp",
+    "limits": "cpp",
+    "memory": "cpp",
+    "mutex": "cpp",
+    "new": "cpp",
+    "numeric": "cpp",
+    "optional": "cpp",
+    "ostream": "cpp",
+    "ratio": "cpp",
+    "sstream": "cpp",
+    "stdexcept": "cpp",
+    "streambuf": "cpp",
+    "string_view": "cpp",
+    "system_error": "cpp",
+    "thread": "cpp",
+    "type_traits": "cpp",
+    "tuple": "cpp",
+    "typeinfo": "cpp",
+    "utility": "cpp",
+    "variant": "cpp",
+    "cstdarg": "cpp",
+    "charconv": "cpp",
+    "algorithm": "cpp",
+    "cinttypes": "cpp",
+    "iterator": "cpp",
+    "map": "cpp",
+    "memory_resource": "cpp",
+    "random": "cpp",
+    "string": "cpp",
+    "bit": "cpp",
+    "netfwd": "cpp"
+  }
+}
diff --git a/zsh/theme/gitstatus/LICENSE b/zsh/.config/zsh/theme/gitstatus/LICENSE
similarity index 100%
rename from zsh/theme/gitstatus/LICENSE
rename to zsh/.config/zsh/theme/gitstatus/LICENSE
diff --git a/zsh/theme/gitstatus/Makefile b/zsh/.config/zsh/theme/gitstatus/Makefile
similarity index 100%
rename from zsh/theme/gitstatus/Makefile
rename to zsh/.config/zsh/theme/gitstatus/Makefile
diff --git a/zsh/theme/gitstatus/README.md b/zsh/.config/zsh/theme/gitstatus/README.md
similarity index 100%
rename from zsh/theme/gitstatus/README.md
rename to zsh/.config/zsh/theme/gitstatus/README.md
diff --git a/zsh/theme/gitstatus/build b/zsh/.config/zsh/theme/gitstatus/build
similarity index 100%
rename from zsh/theme/gitstatus/build
rename to zsh/.config/zsh/theme/gitstatus/build
diff --git a/zsh/theme/gitstatus/build.info b/zsh/.config/zsh/theme/gitstatus/build.info
similarity index 100%
rename from zsh/theme/gitstatus/build.info
rename to zsh/.config/zsh/theme/gitstatus/build.info
diff --git a/zsh/theme/gitstatus/deps/.gitkeep b/zsh/.config/zsh/theme/gitstatus/deps/.gitkeep
similarity index 100%
rename from zsh/theme/gitstatus/deps/.gitkeep
rename to zsh/.config/zsh/theme/gitstatus/deps/.gitkeep
diff --git a/zsh/theme/gitstatus/docs/listdir.md b/zsh/.config/zsh/theme/gitstatus/docs/listdir.md
similarity index 100%
rename from zsh/theme/gitstatus/docs/listdir.md
rename to zsh/.config/zsh/theme/gitstatus/docs/listdir.md
diff --git a/zsh/theme/gitstatus/gitstatus.plugin.sh b/zsh/.config/zsh/theme/gitstatus/gitstatus.plugin.sh
similarity index 100%
rename from zsh/theme/gitstatus/gitstatus.plugin.sh
rename to zsh/.config/zsh/theme/gitstatus/gitstatus.plugin.sh
diff --git a/zsh/theme/gitstatus/gitstatus.plugin.zsh b/zsh/.config/zsh/theme/gitstatus/gitstatus.plugin.zsh
similarity index 100%
rename from zsh/theme/gitstatus/gitstatus.plugin.zsh
rename to zsh/.config/zsh/theme/gitstatus/gitstatus.plugin.zsh
diff --git a/zsh/theme/gitstatus/gitstatus.prompt.sh b/zsh/.config/zsh/theme/gitstatus/gitstatus.prompt.sh
similarity index 100%
rename from zsh/theme/gitstatus/gitstatus.prompt.sh
rename to zsh/.config/zsh/theme/gitstatus/gitstatus.prompt.sh
diff --git a/zsh/theme/gitstatus/gitstatus.prompt.zsh b/zsh/.config/zsh/theme/gitstatus/gitstatus.prompt.zsh
similarity index 100%
rename from zsh/theme/gitstatus/gitstatus.prompt.zsh
rename to zsh/.config/zsh/theme/gitstatus/gitstatus.prompt.zsh
diff --git a/zsh/theme/gitstatus/install b/zsh/.config/zsh/theme/gitstatus/install
similarity index 100%
rename from zsh/theme/gitstatus/install
rename to zsh/.config/zsh/theme/gitstatus/install
diff --git a/zsh/theme/gitstatus/install.info b/zsh/.config/zsh/theme/gitstatus/install.info
similarity index 100%
rename from zsh/theme/gitstatus/install.info
rename to zsh/.config/zsh/theme/gitstatus/install.info
diff --git a/zsh/theme/gitstatus/mbuild b/zsh/.config/zsh/theme/gitstatus/mbuild
similarity index 100%
rename from zsh/theme/gitstatus/mbuild
rename to zsh/.config/zsh/theme/gitstatus/mbuild
diff --git a/zsh/theme/gitstatus/src/algorithm.h b/zsh/.config/zsh/theme/gitstatus/src/algorithm.h
similarity index 100%
rename from zsh/theme/gitstatus/src/algorithm.h
rename to zsh/.config/zsh/theme/gitstatus/src/algorithm.h
diff --git a/zsh/theme/gitstatus/src/arena.cc b/zsh/.config/zsh/theme/gitstatus/src/arena.cc
similarity index 100%
rename from zsh/theme/gitstatus/src/arena.cc
rename to zsh/.config/zsh/theme/gitstatus/src/arena.cc
diff --git a/zsh/theme/gitstatus/src/arena.h b/zsh/.config/zsh/theme/gitstatus/src/arena.h
similarity index 100%
rename from zsh/theme/gitstatus/src/arena.h
rename to zsh/.config/zsh/theme/gitstatus/src/arena.h
diff --git a/zsh/theme/gitstatus/src/bits.h b/zsh/.config/zsh/theme/gitstatus/src/bits.h
similarity index 100%
rename from zsh/theme/gitstatus/src/bits.h
rename to zsh/.config/zsh/theme/gitstatus/src/bits.h
diff --git a/zsh/theme/gitstatus/src/check.h b/zsh/.config/zsh/theme/gitstatus/src/check.h
similarity index 100%
rename from zsh/theme/gitstatus/src/check.h
rename to zsh/.config/zsh/theme/gitstatus/src/check.h
diff --git a/zsh/theme/gitstatus/src/check_dir_mtime.cc b/zsh/.config/zsh/theme/gitstatus/src/check_dir_mtime.cc
similarity index 100%
rename from zsh/theme/gitstatus/src/check_dir_mtime.cc
rename to zsh/.config/zsh/theme/gitstatus/src/check_dir_mtime.cc
diff --git a/zsh/theme/gitstatus/src/check_dir_mtime.h b/zsh/.config/zsh/theme/gitstatus/src/check_dir_mtime.h
similarity index 100%
rename from zsh/theme/gitstatus/src/check_dir_mtime.h
rename to zsh/.config/zsh/theme/gitstatus/src/check_dir_mtime.h
diff --git a/zsh/theme/gitstatus/src/dir.cc b/zsh/.config/zsh/theme/gitstatus/src/dir.cc
similarity index 100%
rename from zsh/theme/gitstatus/src/dir.cc
rename to zsh/.config/zsh/theme/gitstatus/src/dir.cc
diff --git a/zsh/theme/gitstatus/src/dir.h b/zsh/.config/zsh/theme/gitstatus/src/dir.h
similarity index 100%
rename from zsh/theme/gitstatus/src/dir.h
rename to zsh/.config/zsh/theme/gitstatus/src/dir.h
diff --git a/zsh/theme/gitstatus/src/git.cc b/zsh/.config/zsh/theme/gitstatus/src/git.cc
similarity index 100%
rename from zsh/theme/gitstatus/src/git.cc
rename to zsh/.config/zsh/theme/gitstatus/src/git.cc
diff --git a/zsh/theme/gitstatus/src/git.h b/zsh/.config/zsh/theme/gitstatus/src/git.h
similarity index 100%
rename from zsh/theme/gitstatus/src/git.h
rename to zsh/.config/zsh/theme/gitstatus/src/git.h
diff --git a/zsh/theme/gitstatus/src/gitstatus.cc b/zsh/.config/zsh/theme/gitstatus/src/gitstatus.cc
similarity index 100%
rename from zsh/theme/gitstatus/src/gitstatus.cc
rename to zsh/.config/zsh/theme/gitstatus/src/gitstatus.cc
diff --git a/zsh/theme/gitstatus/src/index.cc b/zsh/.config/zsh/theme/gitstatus/src/index.cc
similarity index 100%
rename from zsh/theme/gitstatus/src/index.cc
rename to zsh/.config/zsh/theme/gitstatus/src/index.cc
diff --git a/zsh/theme/gitstatus/src/index.h b/zsh/.config/zsh/theme/gitstatus/src/index.h
similarity index 100%
rename from zsh/theme/gitstatus/src/index.h
rename to zsh/.config/zsh/theme/gitstatus/src/index.h
diff --git a/zsh/theme/gitstatus/src/logging.cc b/zsh/.config/zsh/theme/gitstatus/src/logging.cc
similarity index 100%
rename from zsh/theme/gitstatus/src/logging.cc
rename to zsh/.config/zsh/theme/gitstatus/src/logging.cc
diff --git a/zsh/theme/gitstatus/src/logging.h b/zsh/.config/zsh/theme/gitstatus/src/logging.h
similarity index 100%
rename from zsh/theme/gitstatus/src/logging.h
rename to zsh/.config/zsh/theme/gitstatus/src/logging.h
diff --git a/zsh/theme/gitstatus/src/options.cc b/zsh/.config/zsh/theme/gitstatus/src/options.cc
similarity index 100%
rename from zsh/theme/gitstatus/src/options.cc
rename to zsh/.config/zsh/theme/gitstatus/src/options.cc
diff --git a/zsh/theme/gitstatus/src/options.h b/zsh/.config/zsh/theme/gitstatus/src/options.h
similarity index 100%
rename from zsh/theme/gitstatus/src/options.h
rename to zsh/.config/zsh/theme/gitstatus/src/options.h
diff --git a/zsh/theme/gitstatus/src/print.h b/zsh/.config/zsh/theme/gitstatus/src/print.h
similarity index 100%
rename from zsh/theme/gitstatus/src/print.h
rename to zsh/.config/zsh/theme/gitstatus/src/print.h
diff --git a/zsh/theme/gitstatus/src/repo.cc b/zsh/.config/zsh/theme/gitstatus/src/repo.cc
similarity index 100%
rename from zsh/theme/gitstatus/src/repo.cc
rename to zsh/.config/zsh/theme/gitstatus/src/repo.cc
diff --git a/zsh/theme/gitstatus/src/repo.h b/zsh/.config/zsh/theme/gitstatus/src/repo.h
similarity index 100%
rename from zsh/theme/gitstatus/src/repo.h
rename to zsh/.config/zsh/theme/gitstatus/src/repo.h
diff --git a/zsh/theme/gitstatus/src/repo_cache.cc b/zsh/.config/zsh/theme/gitstatus/src/repo_cache.cc
similarity index 100%
rename from zsh/theme/gitstatus/src/repo_cache.cc
rename to zsh/.config/zsh/theme/gitstatus/src/repo_cache.cc
diff --git a/zsh/theme/gitstatus/src/repo_cache.h b/zsh/.config/zsh/theme/gitstatus/src/repo_cache.h
similarity index 100%
rename from zsh/theme/gitstatus/src/repo_cache.h
rename to zsh/.config/zsh/theme/gitstatus/src/repo_cache.h
diff --git a/zsh/theme/gitstatus/src/request.cc b/zsh/.config/zsh/theme/gitstatus/src/request.cc
similarity index 100%
rename from zsh/theme/gitstatus/src/request.cc
rename to zsh/.config/zsh/theme/gitstatus/src/request.cc
diff --git a/zsh/theme/gitstatus/src/request.h b/zsh/.config/zsh/theme/gitstatus/src/request.h
similarity index 100%
rename from zsh/theme/gitstatus/src/request.h
rename to zsh/.config/zsh/theme/gitstatus/src/request.h
diff --git a/zsh/theme/gitstatus/src/response.cc b/zsh/.config/zsh/theme/gitstatus/src/response.cc
similarity index 100%
rename from zsh/theme/gitstatus/src/response.cc
rename to zsh/.config/zsh/theme/gitstatus/src/response.cc
diff --git a/zsh/theme/gitstatus/src/response.h b/zsh/.config/zsh/theme/gitstatus/src/response.h
similarity index 100%
rename from zsh/theme/gitstatus/src/response.h
rename to zsh/.config/zsh/theme/gitstatus/src/response.h
diff --git a/zsh/theme/gitstatus/src/scope_guard.h b/zsh/.config/zsh/theme/gitstatus/src/scope_guard.h
similarity index 100%
rename from zsh/theme/gitstatus/src/scope_guard.h
rename to zsh/.config/zsh/theme/gitstatus/src/scope_guard.h
diff --git a/zsh/theme/gitstatus/src/serialization.h b/zsh/.config/zsh/theme/gitstatus/src/serialization.h
similarity index 100%
rename from zsh/theme/gitstatus/src/serialization.h
rename to zsh/.config/zsh/theme/gitstatus/src/serialization.h
diff --git a/zsh/theme/gitstatus/src/stat.h b/zsh/.config/zsh/theme/gitstatus/src/stat.h
similarity index 100%
rename from zsh/theme/gitstatus/src/stat.h
rename to zsh/.config/zsh/theme/gitstatus/src/stat.h
diff --git a/zsh/theme/gitstatus/src/string_cmp.h b/zsh/.config/zsh/theme/gitstatus/src/string_cmp.h
similarity index 100%
rename from zsh/theme/gitstatus/src/string_cmp.h
rename to zsh/.config/zsh/theme/gitstatus/src/string_cmp.h
diff --git a/zsh/theme/gitstatus/src/string_view.h b/zsh/.config/zsh/theme/gitstatus/src/string_view.h
similarity index 100%
rename from zsh/theme/gitstatus/src/string_view.h
rename to zsh/.config/zsh/theme/gitstatus/src/string_view.h
diff --git a/zsh/theme/gitstatus/src/strings.cc b/zsh/.config/zsh/theme/gitstatus/src/strings.cc
similarity index 100%
rename from zsh/theme/gitstatus/src/strings.cc
rename to zsh/.config/zsh/theme/gitstatus/src/strings.cc
diff --git a/zsh/theme/gitstatus/src/strings.h b/zsh/.config/zsh/theme/gitstatus/src/strings.h
similarity index 100%
rename from zsh/theme/gitstatus/src/strings.h
rename to zsh/.config/zsh/theme/gitstatus/src/strings.h
diff --git a/zsh/theme/gitstatus/src/tag_db.cc b/zsh/.config/zsh/theme/gitstatus/src/tag_db.cc
similarity index 100%
rename from zsh/theme/gitstatus/src/tag_db.cc
rename to zsh/.config/zsh/theme/gitstatus/src/tag_db.cc
diff --git a/zsh/theme/gitstatus/src/tag_db.h b/zsh/.config/zsh/theme/gitstatus/src/tag_db.h
similarity index 100%
rename from zsh/theme/gitstatus/src/tag_db.h
rename to zsh/.config/zsh/theme/gitstatus/src/tag_db.h
diff --git a/zsh/theme/gitstatus/src/thread_pool.cc b/zsh/.config/zsh/theme/gitstatus/src/thread_pool.cc
similarity index 100%
rename from zsh/theme/gitstatus/src/thread_pool.cc
rename to zsh/.config/zsh/theme/gitstatus/src/thread_pool.cc
diff --git a/zsh/theme/gitstatus/src/thread_pool.h b/zsh/.config/zsh/theme/gitstatus/src/thread_pool.h
similarity index 100%
rename from zsh/theme/gitstatus/src/thread_pool.h
rename to zsh/.config/zsh/theme/gitstatus/src/thread_pool.h
diff --git a/zsh/theme/gitstatus/src/time.h b/zsh/.config/zsh/theme/gitstatus/src/time.h
similarity index 100%
rename from zsh/theme/gitstatus/src/time.h
rename to zsh/.config/zsh/theme/gitstatus/src/time.h
diff --git a/zsh/theme/gitstatus/src/timer.cc b/zsh/.config/zsh/theme/gitstatus/src/timer.cc
similarity index 100%
rename from zsh/theme/gitstatus/src/timer.cc
rename to zsh/.config/zsh/theme/gitstatus/src/timer.cc
diff --git a/zsh/theme/gitstatus/src/timer.h b/zsh/.config/zsh/theme/gitstatus/src/timer.h
similarity index 100%
rename from zsh/theme/gitstatus/src/timer.h
rename to zsh/.config/zsh/theme/gitstatus/src/timer.h
diff --git a/zsh/theme/gitstatus/src/tribool.h b/zsh/.config/zsh/theme/gitstatus/src/tribool.h
similarity index 100%
rename from zsh/theme/gitstatus/src/tribool.h
rename to zsh/.config/zsh/theme/gitstatus/src/tribool.h
diff --git a/zsh/theme/gitstatus/usrbin/.gitkeep b/zsh/.config/zsh/theme/gitstatus/usrbin/.gitkeep
similarity index 100%
rename from zsh/theme/gitstatus/usrbin/.gitkeep
rename to zsh/.config/zsh/theme/gitstatus/usrbin/.gitkeep
diff --git a/zsh/theme/internal/configure.zsh b/zsh/.config/zsh/theme/internal/configure.zsh
similarity index 100%
rename from zsh/theme/internal/configure.zsh
rename to zsh/.config/zsh/theme/internal/configure.zsh
diff --git a/zsh/theme/internal/configure.zsh.zwc b/zsh/.config/zsh/theme/internal/configure.zsh.zwc
similarity index 100%
rename from zsh/theme/internal/configure.zsh.zwc
rename to zsh/.config/zsh/theme/internal/configure.zsh.zwc
diff --git a/zsh/theme/internal/icons.zsh b/zsh/.config/zsh/theme/internal/icons.zsh
similarity index 100%
rename from zsh/theme/internal/icons.zsh
rename to zsh/.config/zsh/theme/internal/icons.zsh
diff --git a/zsh/theme/internal/icons.zsh.zwc b/zsh/.config/zsh/theme/internal/icons.zsh.zwc
similarity index 100%
rename from zsh/theme/internal/icons.zsh.zwc
rename to zsh/.config/zsh/theme/internal/icons.zsh.zwc
diff --git a/zsh/theme/internal/notes.md b/zsh/.config/zsh/theme/internal/notes.md
similarity index 100%
rename from zsh/theme/internal/notes.md
rename to zsh/.config/zsh/theme/internal/notes.md
diff --git a/zsh/theme/internal/p10k.zsh b/zsh/.config/zsh/theme/internal/p10k.zsh
similarity index 100%
rename from zsh/theme/internal/p10k.zsh
rename to zsh/.config/zsh/theme/internal/p10k.zsh
diff --git a/zsh/theme/internal/p10k.zsh.zwc b/zsh/.config/zsh/theme/internal/p10k.zsh.zwc
similarity index 100%
rename from zsh/theme/internal/p10k.zsh.zwc
rename to zsh/.config/zsh/theme/internal/p10k.zsh.zwc
diff --git a/zsh/theme/internal/parser.zsh b/zsh/.config/zsh/theme/internal/parser.zsh
similarity index 100%
rename from zsh/theme/internal/parser.zsh
rename to zsh/.config/zsh/theme/internal/parser.zsh
diff --git a/zsh/theme/internal/parser.zsh.zwc b/zsh/.config/zsh/theme/internal/parser.zsh.zwc
similarity index 100%
rename from zsh/theme/internal/parser.zsh.zwc
rename to zsh/.config/zsh/theme/internal/parser.zsh.zwc
diff --git a/zsh/theme/internal/wizard.zsh b/zsh/.config/zsh/theme/internal/wizard.zsh
similarity index 100%
rename from zsh/theme/internal/wizard.zsh
rename to zsh/.config/zsh/theme/internal/wizard.zsh
diff --git a/zsh/theme/internal/worker.zsh b/zsh/.config/zsh/theme/internal/worker.zsh
similarity index 100%
rename from zsh/theme/internal/worker.zsh
rename to zsh/.config/zsh/theme/internal/worker.zsh
diff --git a/zsh/theme/internal/worker.zsh.zwc b/zsh/.config/zsh/theme/internal/worker.zsh.zwc
similarity index 100%
rename from zsh/theme/internal/worker.zsh.zwc
rename to zsh/.config/zsh/theme/internal/worker.zsh.zwc
diff --git a/zsh/theme/powerlevel10k.png b/zsh/.config/zsh/theme/powerlevel10k.png
similarity index 100%
rename from zsh/theme/powerlevel10k.png
rename to zsh/.config/zsh/theme/powerlevel10k.png
diff --git a/zsh/theme/powerlevel10k.zsh-theme b/zsh/.config/zsh/theme/powerlevel10k.zsh-theme
similarity index 100%
rename from zsh/theme/powerlevel10k.zsh-theme
rename to zsh/.config/zsh/theme/powerlevel10k.zsh-theme
diff --git a/zsh/theme/powerlevel10k.zsh-theme.zwc b/zsh/.config/zsh/theme/powerlevel10k.zsh-theme.zwc
similarity index 100%
rename from zsh/theme/powerlevel10k.zsh-theme.zwc
rename to zsh/.config/zsh/theme/powerlevel10k.zsh-theme.zwc
diff --git a/zsh/theme/powerlevel9k.zsh-theme b/zsh/.config/zsh/theme/powerlevel9k.zsh-theme
similarity index 100%
rename from zsh/theme/powerlevel9k.zsh-theme
rename to zsh/.config/zsh/theme/powerlevel9k.zsh-theme
diff --git a/zsh/theme/powerlevel9k.zsh-theme.zwc b/zsh/.config/zsh/theme/powerlevel9k.zsh-theme.zwc
similarity index 100%
rename from zsh/theme/powerlevel9k.zsh-theme.zwc
rename to zsh/.config/zsh/theme/powerlevel9k.zsh-theme.zwc
diff --git a/zsh/theme/prompt_powerlevel10k_setup b/zsh/.config/zsh/theme/prompt_powerlevel10k_setup
similarity index 100%
rename from zsh/theme/prompt_powerlevel10k_setup
rename to zsh/.config/zsh/theme/prompt_powerlevel10k_setup
diff --git a/zsh/theme/prompt_powerlevel9k_setup b/zsh/.config/zsh/theme/prompt_powerlevel9k_setup
similarity index 100%
rename from zsh/theme/prompt_powerlevel9k_setup
rename to zsh/.config/zsh/theme/prompt_powerlevel9k_setup
diff --git a/zsh/title.zsh b/zsh/.config/zsh/title.zsh
similarity index 100%
rename from zsh/title.zsh
rename to zsh/.config/zsh/title.zsh
diff --git a/zsh/zshrc b/zsh/.zshrc
similarity index 98%
rename from zsh/zshrc
rename to zsh/.zshrc
index 95f285d..7f666ad 100644
--- a/zsh/zshrc
+++ b/zsh/.zshrc
@@ -15,6 +15,8 @@ source ~/.config/zsh/termsupport.zsh
 source ~/.config/zsh/title.zsh
 foreground () { fg }
 zle -N foreground
+clearscr () { clear }
+zle -N clearscr
 
 antigen bundle zsh-users/zsh-syntax-highlighting
 antigen bundle zsh-users/zsh-history-substring-search
@@ -152,6 +154,9 @@ bindkey "^[[Z" undo					# Shift+tab undo last action
 bindkey "^z" foreground
 # ctrl + space accept suggestion
 bindkey "^ " autosuggest-accept
+
+
+bindkey "^k" clearscr
 # }}}
 
 ZSH_THEME_TERM_TAB_TITLE_IDLE="%15<..<%~%<<" #15 char left truncated PWD