diff --git a/.gitmodules b/.gitmodules

deleted file mode 100644

index b5ef094c1fcfaaf15f309ac256412a4ec6002868..0000000000000000000000000000000000000000

--- a/.gitmodules

+++ /dev/null

@@ -1,6 +0,0 @@

-[submodule "zsh/zsh-syntax"]

- path = zsh/zsh-syntax

- url = git://github.com/zsh-users/zsh-syntax-highlighting.git

-[submodule "zsh/.zsh/zsh-syntax-highlighting"]

- path = zsh/.zsh/zsh-syntax-highlighting

- url = git://github.com/zsh-users/zsh-syntax-highlighting.git

diff --git a/README.md b/README.md

index c596e9f4efff6f29576891cf2c5d6e95ffdb5bfb..0b5d40b9d07fa6b07813593eb8271dc9091c75b1 100644

--- a/README.md

+++ b/README.md

@@ -9,3 +9,4 @@ $ ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear %I $TERM

```

> Remember to add user to `video` group in `/etc/group` to be allow to change brightness by `light`

+> chsh -s /usr/bin/fish

diff --git a/fish/.config/fish/fish_variables b/fish/.config/fish/fish_variables

new file mode 100644

index 0000000000000000000000000000000000000000..0286c75af1e67791e7affd1561e897285475e344

--- /dev/null

+++ b/fish/.config/fish/fish_variables

@@ -0,0 +1,30 @@

+# This file contains fish universal variable definitions.

+# VERSION: 3.0

+SETUVAR __fish_initialized:3100

+SETUVAR fish_color_autosuggestion:555\x1ebrblack

+SETUVAR fish_color_cancel:\x2dr

+SETUVAR fish_color_command:005fd7

+SETUVAR fish_color_comment:990000

+SETUVAR fish_color_cwd:green

+SETUVAR fish_color_cwd_root:red

+SETUVAR fish_color_end:009900

+SETUVAR fish_color_error:ff0000

+SETUVAR fish_color_escape:00a6b2

+SETUVAR fish_color_history_current:\x2d\x2dbold

+SETUVAR fish_color_host:normal

+SETUVAR fish_color_host_remote:yellow

+SETUVAR fish_color_normal:normal

+SETUVAR fish_color_operator:00a6b2

+SETUVAR fish_color_param:00afff

+SETUVAR fish_color_quote:999900

+SETUVAR fish_color_redirection:00afff

+SETUVAR fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack

+SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack

+SETUVAR fish_color_status:red

+SETUVAR fish_color_user:brgreen

+SETUVAR fish_color_valid_path:\x2d\x2dunderline

+SETUVAR fish_key_bindings:fish_vi_key_bindings

+SETUVAR fish_pager_color_completion:\x1d

+SETUVAR fish_pager_color_description:B3A06D\x1eyellow

+SETUVAR fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline

+SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan

diff --git a/zsh/.zprofile b/zsh/.zprofile

deleted file mode 100644

index 613bc6be01f00b74e7f00164c2c955b607b5b49e..0000000000000000000000000000000000000000

--- a/zsh/.zprofile

+++ /dev/null

@@ -1,3 +0,0 @@

-if [[ ! $DISPLAY && $XDG_VTNR -eq 1 ]]; then

- exec sway

-fi

diff --git a/zsh/.zshenv b/zsh/.zshenv

deleted file mode 100644

index 7645ec2feab4d446ecbd869f6f7c0f4e5dafa3ca..0000000000000000000000000000000000000000

--- a/zsh/.zshenv

+++ /dev/null

@@ -1,5 +0,0 @@

-#!/bin/zsh

-export QT_QPA_PLATFORMTHEME=qt5ct

-export EDITOR='nvim'

-export TERM='alacritty'

-

diff --git a/zsh/.zshrc b/fish/.config/fish/config.fish

rename from zsh/.zshrc

rename to fish/.config/fish/config.fish

index 98000ace9cce3755b5584da0309e5a8c5dc48987..65ec58c40ad77edbaf8d1d9cdd33b80d6c3cd3c1 100644

--- a/zsh/.zshrc

+++ b/fish/.config/fish/config.fish

@@ -1,9 +1,20 @@

-export PATH=$HOME/.local/bin:/usr/local/bin:$PATH

-export ZSH="/home/michal/.oh-my-zsh"

-ZSH_THEME="gallois"

-plugins=(git bgnotify )

-source $ZSH/oh-my-zsh.sh

+# Autostart sway after login on tty1

+if status --is-login

+ if test (tty) = /dev/tty1

+ exec sway

+ end

+end

+# Envionment Variables

+set QT_QPA_PLATFORMTHEME qt5ct

+set EDITOR nvim

+set TERM alacritty

+set PATH $HOME/.local/bin /usr/local/bin $PATH

+set HOME /home/michal/

+set USER michal

+set fish_greeting

+# Aliases

alias cal="cal -m"

+alias t='date +%H:%M'

alias cpp="rsync -a --info=progress2"

alias v="nvim"

alias pacmans="pacman -Slq | fzf --multi --preview 'pacman -Si {1}' | xargs -ro sudo pacman -Sy"

@@ -19,6 +30,6 @@ alias n="setsid -f "

alias la='ls --color -h --group-directories-first -A1 '

alias ls='ls --color -h --group-directories-first -1 '

alias f='vifm .'

-source ~/.zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.plugin.zsh

-set -o vi

+alias timer='termdown '

+alias stoper='termdown'