diff --git a/.config/newsboat/urls b/.config/newsboat/urls
index 9c46c95..9c70726 100644
--- a/.config/newsboat/urls
+++ b/.config/newsboat/urls
@@ -1,13 +1,10 @@
 =====================NEWS====================================
-https://wtf.roflcopter.fr/rss-bridge/?action=display&bridge=Facebook&context=User&u=infoKONINpl&media_type=all&limit=-1&format=Mrss "~infoKONIN - Facebook"
 shttps://wtf.roflcopter.fr/rss-bridge/?action=display&bridge=Facebook&context=User&u=gminakleczew&media_type=all&limit=-1&format=Mrss "~Gmina Kleczew - Facebook"
 https://wtf.roflcopter.fr/rss-bridge/?action=display&bridge=Facebook&context=User&u=portalLM&media_type=all&limit=-1&format=Mrss "~Portal lm.pl - Facebook"
 https://nitter.net/MZ_GOV_PL/rss "~MZ_GOV_PL - Twitter"
 http://www.epoznan.pl/rss.php "~Epoznan - Website"
-http://rss.slashdot.org/Slashdot/slashdotMain "SlashDot"
 https://sekurak.pl/feed/ "~Sekurak"
 https://feeds.feedburner.com/niebezpiecznik/ "~Niebezpiecznik"
-https://www.cybsecurity.org/feed/podcast/ "~CybSecurity"
 ============================================================
 https://bugs.gentoo.org/buglist.cgi?bug_status=UNCONFIRMED&chfieldfrom=24h&ctype=atom&title=NEW&list_id=4468306&order=changeddate%20DESC%2Cbug_status%2Cpriority%2Cassigned_to%2Cbug_id&query_format=advanced Gentoo
 https://bugs.gentoo.org/buglist.cgi?component=Package%20issues&product=GURU&query_format=advanced&resolution=---&title=Bug%20List&ctype=atom GURU-BUGS
@@ -15,8 +12,6 @@ https://bugs.gentoo.org/buglist.cgi?component=Trusted%20Contributor%20ascension&
 https://www.reddit.com/r/gentoo/new.rss "~Gentoo - Reddit"
 ============================================================
 http://rss.uptimerobot.com/u674346-753d02ab763f3725330347d4419a7569 "~UpTimeRoboot"
-=====================ANIME===================================
-https://mirror.animetosho.org/feed/rss2?only_tor=1&q=%5BHorribleSubs%5D%20Sword%20Art%20Online%20720p&filter%5B0%5D%5Bt%5D=nyaa_class&filter%5B0%5D%5Bv%5D=trusted "~Sword Art Online"
 =====================YOUTUBE=================================
 https://www.youtube.com/feeds/videos.xml?channel_id=UCzuvRWjh7k1SZm1RvqvIx4w "~Krzysztof Gonciarz"
 https://www.youtube.com/feeds/videos.xml?channel_id=UC3QOjSZmJuYgb98BAzKfzig "~Zapytaj Beczkę"
@@ -67,4 +62,6 @@ https://www.youtube.com/feeds/videos.xml?channel_id=UCXRJfVWEjv9qxooSbOkFmkw
 https://www.youtube.com/feeds/videos.xml?channel_id=UCXuqSBlHAE6Xw-yeJA0Tunw
 https://www.youtube.com/feeds/videos.xml?channel_id=UCZgyxIrQnTDLwwEr9VSkoPA
 https://www.youtube.com/feeds/videos.xml?channel_id=UCZKqIdmPtIU6DOTmWxzudKw
+=====================ANIME===================================
+https://mirror.animetosho.org/feed/rss2?only_tor=1&q=%5BHorribleSubs%5D%20Sword%20Art%20Online%20720p&filter%5B0%5D%5Bt%5D=nyaa_class&filter%5B0%5D%5Bv%5D=trusted "~Sword Art Online"
 =============================================================
diff --git a/.config/nvim/coc-settings.json b/.config/nvim/coc-settings.json
new file mode 100644
index 0000000..64b2ba3
--- /dev/null
+++ b/.config/nvim/coc-settings.json
@@ -0,0 +1,18 @@
+{
+  "coc.preferences.formatOnSaveFiletypes": [
+    "sh",
+    "yaml",
+    "json",
+    "python",
+    "css",
+    "Markdown"
+  ],
+  "languageserver": {
+    "bash": {
+      "command": "bash-language-server",
+      "args": ["start"],
+      "filetypes": ["sh"],
+      "ignoredRootPaths": ["~"]
+    }
+  }
+}
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
new file mode 100644
index 0000000..21e8afe
--- /dev/null
+++ b/.config/nvim/init.vim
@@ -0,0 +1,133 @@
+" settings
+if ! filereadable(system('echo -n "$HOME/.config/nvim/autoload/plug.vim"'))
+	silent !mkdir -p $HOME/.config/nvim/autoload/
+	silent !curl --silent "https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim" > $HOME/.config/nvim/autoload/plug.vim
+	autocmd VimEnter * PlugInstall
+endif
+
+set laststatus=2
+set shiftwidth=4
+set softtabstop=4
+set tabstop=4
+au BufWritePre * let &bex = '@' . strftime("%F.%H:%M")
+let g:python3_host_prog = expand('/usr/src/python')
+
+" plugins
+call plug#begin('~/.config/nvim/plugged')
+Plug 'preservim/nerdtree'
+Plug 'nmante/vim-latex-live-preview'
+Plug 'lervag/vimtex'
+Plug 'junegunn/goyo.vim'
+Plug 'tpope/vim-commentary'
+Plug 'ap/vim-css-color'
+Plug 'tpope/vim-surround'
+Plug 'neoclide/coc.nvim', {'branch': 'release'}
+Plug 'neoclide/coc-python', {'do': 'yarn install --frozen-lockfile; pip install --user jedi'}
+Plug 'neoclide/coc-yaml', {'do': 'yarn install --frozen-lockfile'}
+Plug 'neoclide/coc-json', {'do': 'yarn install --frozen-lockfile'}
+Plug 'fannheyward/coc-markdownlint', {'do': 'yarn install --frozen-lockfile; sudo npm install markdownlint --save-dev'}
+Plug 'josa42/coc-sh', {'do': 'yarn install --frozen-lockfile; sudo npm i -g bash-language-server'}
+Plug 'neoclide/coc-prettier', {'do': 'yarn install --frozen-lockfile'}
+call plug#end()
+
+" Status-line
+set statusline=
+set statusline+=%#IncSearch#
+set statusline+=\ %y
+set statusline+=\ %r
+set statusline+=%#CursorLineNr#
+set statusline+=\ %F
+set statusline+=%= "Right side settings
+set statusline+=%#Search#
+set statusline+=\ %l/%L
+set statusline+=\ [%c]
+
+set nocompatible
+set hlsearch
+set incsearch
+set noshowmode
+set cmdheight=1
+syntax on
+filetype plugin indent on
+set encoding=utf-8
+
+" livepreviewer
+let g:livepreview_previewer = 'mupdf'
+
+" markdown preview
+let g:mkdp_browser = '/home/yorune/.local/bin/browser-x'
+let g:mkdp_echo_preview_url = 1
+
+" line numbers
+set number
+set ruler
+set title
+
+" indent
+set backspace=indent,eol,start
+set shiftwidth=4
+set expandtab
+
+" editing
+runtime! macros/matchit.vim
+set backspace=indent,eol,start
+
+" visual feedback
+set laststatus=2
+set showmode
+set showcmd
+
+" off mouse
+set mouse-=a
+
+" disable pcspkr beep
+set visualbell
+set t_vb=
+
+" searching
+set smartcase
+set ic
+
+" cursor
+let &t_SI = "\<esc>[6 q"
+let &t_EI = "\<esc>[2 q"
+
+" colors
+hi Pmenu ctermfg=NONE ctermbg=236 cterm=NONE guifg=NONE guibg=#64666d gui=NONE
+hi PmenuSel ctermfg=NONE ctermbg=24 cterm=NONE guifg=NONE guibg=#204a87 gui=NONE
+set bg=dark
+hi CursorLine cterm=NONE term=NONE ctermbg=NONE guibg=NONE
+hi CursorLine ctermbg=235
+
+" columne
+set textwidth=80
+set colorcolumn=-3
+highlight ColorColumn ctermbg=235
+
+" map
+nnoremap S :%s//g<Left><Left>
+nnoremap ee :!mupdf $(echo % \| sed 's/tex$/pdf/') & disown<CR><CR>
+map <C-n> :NERDTreeToggle<CR>
+nnoremap <silent> <C-t> :tabnew <CR>
+nnoremap <F11> :Goyo <CR>
+nnoremap <F7> :tabprevious<CR>
+nnoremap <F8> :tabnext<CR>
+
+cnoremap w!! execute 'silent! write !sudo tee % >/dev/null' <bar> edit!
+
+" latex
+let g:tex_flavor = "latex"
+autocmd BufWritePost *.tex silent! execute "!pdflatex --shell-escape -synctex=1 -interaction=nonstopmode % > /dev/null " | redraw!
+autocmd BufWritePost *.tex silent! execute "!latexmk -pdf -silent % > /dev/null" | redraw!
+autocmd BufWritePost *.tex silent! execute "!sudo rm -rf *.fls *.ilg *.nav *.snm *.toc *.idx *.lof *.lot *.synctex.gz *.aux *.fdb_latexmk *.fls *.log *.out > /dev/null" | redraw!
+autocmd BufWritePost *.tex silent! execute "!sudo pkill -HUP mupdf > /dev/null" | redraw!
+
+" mutt
+autocmd BufRead,BufNewFile /tmp/neomutt* let g:goyo_width=80
+autocmd BufRead,BufNewFile /tmp/neomutt* :Goyo
+autocmd BufRead,BufNewFile /tmp/neomutt* map ZZ :Goyo\|x!<CR>
+autocmd BufRead,BufNewFile /tmp/neomutt* map ZQ :Goyo\|q!<CR>
+
+" Automatically deletes all trailing whitespace and newlines at end of file on save.
+autocmd BufWritePre * %s/\s\+$//e
+autocmd BufWritepre * %s/\n\+\%$//e
diff --git a/.emacs.d/emacs-custom.el b/.emacs.d/emacs-custom.el
index 8d9f742..3ba8e06 100644
--- a/.emacs.d/emacs-custom.el
+++ b/.emacs.d/emacs-custom.el
@@ -3,11 +3,9 @@
  ;; If you edit it by hand, you could mess it up, so be careful.
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
- '(custom-safe-themes
-   '("2dff5f0b44a9e6c8644b2159414af72261e38686072e063aa66ee98a2faecf0e" default))
  '(markdown-command "/usr/bin/pandoc")
  '(package-selected-packages
-   '(company-jedi yaml-mode use-package treemacs-projectile treemacs-persp treemacs-magit treemacs-icons-dired treemacs-evil switch-window smex robe ox-reveal multiple-cursors move-text lsp-java jedi-core htmlize helm flymake-yaml flymake-shellcheck flymake-shell flymake-ruby flycheck-haskell flycheck-bashate dracula-theme dockerfile-mode dired-sidebar company-tabnine company-c-headers company-ansible auto-complete-clang apache-mode ansible-doc ansible)))
+   '(zenburn-theme yaml-mode use-package treemacs-projectile treemacs-persp treemacs-magit treemacs-icons-dired treemacs-evil switch-window smex robe ox-reveal multiple-cursors move-text lsp-java htmlize helm flymake-yaml flymake-shellcheck flymake-shell flymake-ruby flycheck-haskell flycheck-bashate dracula-theme dockerfile-mode dired-sidebar company-tabnine company-jedi company-c-headers company-ansible auto-complete-clang apache-mode ansible-doc ansible)))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index cd9976f..0cc0b94 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -23,7 +23,7 @@
 ;; Enable IDO mode
 (setq ido-enable-flex-matching t)
 ;;(setq ido-everywhere t)
-;;(ido-mode 1)
+(ido-mode 1)
 (global-set-key (kbd "C-x b") 'ido-switch-buffer)
 
 ;; Remove working cl
@@ -77,6 +77,10 @@
 (setq browse-url-browser-function 'browse-url-generic
       browse-url-generic-program "browser-x")
 
+;; Custom theme
+(add-to-list 'custom-theme-load-path
+	     "~/.emacs.d/plugins/")
+
 ;; Switch-window
 (use-package switch-window
   :ensure t
@@ -163,10 +167,17 @@
 (add-to-list 'default-frame-alist `(font . ,(rc/get-default-font)))
 
 ;; Theme
-(use-package dracula-theme
+;;(use-package dracula-theme
+;;  :ensure t
+;;  :config
+;;  (load-theme 'dracula t))
+
+(use-package zenburn-theme
   :ensure t
   :config
-  (load-theme 'dracula t))
+  (load-theme 'zenburn t))
+
+
 
 ;; Sitebar dirred
 (use-package dired-sidebar
@@ -250,6 +261,11 @@
   :config
   )
 
+;; pip install --user yamllint
+(require 'flycheck-yamllint)
+(eval-after-load 'flycheck
+  '(add-hook 'flycheck-mode-hook 'flycheck-yamllint-setup))
+
 ;; Ansible
 (use-package ansible
    :ensure t
@@ -340,46 +356,46 @@
   :config
   (progn
     (setq treemacs-collapse-dirs                 (if treemacs-python-executable 3 0)
-          treemacs-deferred-git-apply-delay      0.5
-          treemacs-directory-name-transformer    #'identity
-          treemacs-display-in-side-window        t
-          treemacs-eldoc-display                 t
-          treemacs-file-event-delay              5000
-          treemacs-file-extension-regex          treemacs-last-period-regex-value
-          treemacs-file-follow-delay             0.2
-          treemacs-file-name-transformer         #'identity
-          treemacs-follow-after-init             t
-          treemacs-git-command-pipe              ""
-          treemacs-goto-tag-strategy             'refetch-index
-          treemacs-indentation                   2
-          treemacs-indentation-string            " "
-          treemacs-is-never-other-window         nil
-          treemacs-max-git-entries               5000
-          treemacs-missing-project-action        'ask
-          treemacs-move-forward-on-expand        nil
-          treemacs-no-png-images                 nil
-          treemacs-no-delete-other-windows       t
-          treemacs-project-follow-cleanup        nil
-          treemacs-persist-file                  (expand-file-name ".cache/treemacs-persist" user-emacs-directory)
-          treemacs-position                      'left
-          treemacs-read-string-input             'from-child-frame
-          treemacs-recenter-distance             0.1
-          treemacs-recenter-after-file-follow    nil
-          treemacs-recenter-after-tag-follow     nil
-          treemacs-recenter-after-project-jump   'always
-          treemacs-recenter-after-project-expand 'on-distance
-          treemacs-show-cursor                   nil
-          treemacs-show-hidden-files             t
-          treemacs-silent-filewatch              nil
-          treemacs-silent-refresh                nil
-          treemacs-sorting                       'alphabetic-asc
-          treemacs-space-between-root-nodes      t
-          treemacs-tag-follow-cleanup            t
-          treemacs-tag-follow-delay              1.5
-          treemacs-user-mode-line-format         nil
-          treemacs-user-header-line-format       nil
-          treemacs-width                         35
-          treemacs-workspace-switch-cleanup      nil)
+	  treemacs-deferred-git-apply-delay      0.5
+	  treemacs-directory-name-transformer    #'identity
+	  treemacs-display-in-side-window        t
+	  treemacs-eldoc-display                 t
+	  treemacs-file-event-delay              5000
+	  treemacs-file-extension-regex          treemacs-last-period-regex-value
+	  treemacs-file-follow-delay             0.2
+	  treemacs-file-name-transformer         #'identity
+	  treemacs-follow-after-init             t
+	  treemacs-git-command-pipe              ""
+	  treemacs-goto-tag-strategy             'refetch-index
+	  treemacs-indentation                   2
+	  treemacs-indentation-string            " "
+	  treemacs-is-never-other-window         nil
+	  treemacs-max-git-entries               5000
+	  treemacs-missing-project-action        'ask
+	  treemacs-move-forward-on-expand        nil
+	  treemacs-no-png-images                 nil
+	  treemacs-no-delete-other-windows       t
+	  treemacs-project-follow-cleanup        nil
+	  treemacs-persist-file                  (expand-file-name ".cache/treemacs-persist" user-emacs-directory)
+	  treemacs-position                      'left
+	  treemacs-read-string-input             'from-child-frame
+	  treemacs-recenter-distance             0.1
+	  treemacs-recenter-after-file-follow    nil
+	  treemacs-recenter-after-tag-follow     nil
+	  treemacs-recenter-after-project-jump   'always
+	  treemacs-recenter-after-project-expand 'on-distance
+	  treemacs-show-cursor                   nil
+	  treemacs-show-hidden-files             t
+	  treemacs-silent-filewatch              nil
+	  treemacs-silent-refresh                nil
+	  treemacs-sorting                       'alphabetic-asc
+	  treemacs-space-between-root-nodes      t
+	  treemacs-tag-follow-cleanup            t
+	  treemacs-tag-follow-delay              1.5
+	  treemacs-user-mode-line-format         nil
+	  treemacs-user-header-line-format       nil
+	  treemacs-width                         35
+	  treemacs-workspace-switch-cleanup      nil)
 
     ;; The default width and height of the icons is 22 pixels. If you are
     ;; using a Hi-DPI display, uncomment this to double the icon size.
@@ -389,19 +405,19 @@
     (treemacs-filewatch-mode t)
     (treemacs-fringe-indicator-mode 'always)
     (pcase (cons (not (null (executable-find "git")))
-                 (not (null treemacs-python-executable)))
+		 (not (null treemacs-python-executable)))
       (`(t . t)
        (treemacs-git-mode 'deferred))
       (`(t . _)
        (treemacs-git-mode 'simple))))
   :bind
   (:map global-map
-        ("M-0"       . treemacs-select-window)
-        ("C-x t 1"   . treemacs-delete-other-windows)
-        ("C-x t t"   . treemacs)
-        ("C-x t B"   . treemacs-bookmark)
-        ("C-x t C-t" . treemacs-find-file)
-        ("C-x t M-t" . treemacs-find-tag)))
+	("M-0"       . treemacs-select-window)
+	("C-x t 1"   . treemacs-delete-other-windows)
+	("C-x t t"   . treemacs)
+	("C-x t B"   . treemacs-bookmark)
+	("C-x t C-t" . treemacs-find-file)
+	("C-x t M-t" . treemacs-find-tag)))
 
 (use-package treemacs-evil
   :after treemacs evil
@@ -436,6 +452,21 @@
 
 (add-hook 'python-mode-hook 'my/python-mode-hook)
 
+(setq-default ebuild-mode-update-copyright nil)
+
+(defun infer-indentation-style () (interactive)
+  (let ((space-count (how-many "^  " (point-min) (point-max)))
+	(tab-count (how-many "^\t" (point-min) (point-max))))
+    (if (> space-count tab-count) (setq indent-tabs-mode nil))
+    (if (> tab-count space-count) (setq indent-tabs-mode t))))
+
+(add-hook 'python-mode-hook
+	  (lambda ()
+	    (if indent-tabs-mode
+		(setq tab-width 4
+		      python-indent-offset 4))))
+(add-hook 'python-mode-hook 'infer-indentation-style)
+
 ;;; --- Look & Feel ---
 
 ;; Helm
@@ -445,7 +476,7 @@
 )
 
 (add-hook 'helm-minibuffer-set-up-hook
-          'helm-hide-minibuffer-maybe)
+	  'helm-hide-minibuffer-maybe)
 
 (setq helm-autoresize-max-height 0)
 (setq helm-autoresize-min-height 20)
diff --git a/.emacs.d/smex-items b/.emacs.d/smex-items
index a00fef1..e0042eb 100644
--- a/.emacs.d/smex-items
+++ b/.emacs.d/smex-items
@@ -1,13 +1,13 @@
 
 ;; ----- smex-history -----
 (
- table-insert
- table-insert-row
+ package-install
+ ido-mode
+ customize-themes
+ avy-isearch
  load-theme
- disable-theme
- shell
- package-refresh-contents
- treemacs
+ delete-rectangle
+ kill-rectangle
 )
 
 ;; ----- smex-data -----
@@ -33,10 +33,10 @@
  (inf-ruby-console-auto . 8)
  (shell . 6)
  (package-install-selected-packages . 1)
- (package-install . 1)
+ (package-install . 2)
  (compile . 2)
  (lsp-mode . 2)
- (load-theme . 15)
+ (load-theme . 16)
  (overwrite-mode . 1)
  (goto-line . 2)
  (package-refresh-contents . 1)
@@ -44,4 +44,9 @@
  (disable-theme . 1)
  (table-insert . 3)
  (table-insert-row . 1)
+ (kill-rectangle . 1)
+ (delete-rectangle . 1)
+ (avy-isearch . 1)
+ (customize-themes . 1)
+ (ido-mode . 1)
 )
diff --git a/.gitignore b/.gitignore
index b1ca5b6..8ad7ea6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,27 @@
 .Xauthority
+.config/Element/
+.config/TabNine/
+.config/coc/
+.config/google-chrome/
+.config/teamviewer/
+.ipython/
+.irbrc
+.jupyter/
+.local/bin/autopep8
+.local/bin/isort-identify-imports
+.local/bin/pycodestyle
+.local/bin/surprise
+.local/bin/yamllint
+.netrc
+.nvimlog
+.python_history
+.vmware/
+.local/bin/epylint
+.local/bin/isort
+.local/bin/pylint
+.local/bin/pyreverse
+.local/bin/symilar
+.aws/
 .anthy/
 .aspell.*
 .bash_history
diff --git a/.local/bin/sb-cpu b/.local/bin/sb-cpu
index 917f1ab..6de59ec 100755
--- a/.local/bin/sb-cpu
+++ b/.local/bin/sb-cpu
@@ -3,4 +3,4 @@ print_cpu() {
     cpuUse=$(top -bn1 | grep "Cpu(s)" | sed "s/.*, *\([0-9.]*\)%* id.*/\1/" | awk '{print int(100 - $1)"%"}')
     echo -e "💻 $cpuUse"
 }
-print_cpu
\ No newline at end of file
+print_cpu
diff --git a/.vimrc b/.vimrc
deleted file mode 100644
index 9c848e6..0000000
--- a/.vimrc
+++ /dev/null
@@ -1,128 +0,0 @@
-" settings
-if ! filereadable(system('echo -n "$HOME/.vim/autoload/plug.vim"'))
-	silent !mkdir -p $HOME/.vim/autoload/
-	silent !curl --silent "https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim" > $HOME/.vim/autoload/plug.vim
-	autocmd VimEnter * PlugInstall
-endif
-
-set laststatus=2
-set shiftwidth=4
-set softtabstop=4
-set tabstop=4
-au BufWritePre * let &bex = '@' . strftime("%F.%H:%M")
-
-" plugins
-call plug#begin('~/.vim/plugged')
-Plug 'preservim/nerdtree'
-Plug 'nmante/vim-latex-live-preview'
-Plug 'lervag/vimtex'
-Plug 'junegunn/goyo.vim'
-call plug#end()
-
-" Status-line
-set statusline=
-set statusline+=%#IncSearch#
-set statusline+=\ %y
-set statusline+=\ %r
-set statusline+=%#CursorLineNr#
-set statusline+=\ %F
-set statusline+=%= "Right side settings
-set statusline+=%#Search#
-set statusline+=\ %l/%L
-set statusline+=\ [%c]
-
-set nocompatible
-set hlsearch
-set incsearch
-set noshowmode
-set cmdheight=1
-syntax on
-filetype plugin indent on
-set encoding=utf-8
-
-" livepreviewer
-let g:livepreview_previewer = 'mupdf'
-
-" markdown preview
-let g:mkdp_browser = '/home/yorune/.local/bin/browser-x'
-let g:mkdp_echo_preview_url = 1
-
-" line numbers
-set number
-set ruler
-set title
-
-" indent
-set backspace=indent,eol,start
-set shiftwidth=4
-set expandtab
-
-" editing
-runtime! macros/matchit.vim
-set backspace=indent,eol,start
-
-" visual feedback
-set laststatus=2
-set showmode
-set showcmd
-
-" off mouse
-set mouse-=a
-
-" disable pcspkr beep
-set visualbell
-set t_vb=
-
-" searching
-set smartcase
-set ic
-
-" cursor
-let &t_SI = "\<esc>[6 q"
-let &t_EI = "\<esc>[2 q"
-
-" colors
-set bg=dark
-hi CursorLine cterm=NONE term=NONE ctermbg=NONE guibg=NONE
-hi CursorLine ctermbg=235
-
-" columne
-augroup collumnLimit
-  autocmd!
-  autocmd BufEnter,WinEnter,FileType *
-        \ highlight CollumnLimit ctermbg=DarkGrey guibg=DarkGrey
-  let collumnLimit = 79 " feel free to customize
-  let pattern =
-        \ '\%<' . (collumnLimit+1) . 'v.\%>' . collumnLimit . 'v'
-  autocmd BufEnter,WinEnter,FileType *
-        \ let w:m1=matchadd('CollumnLimit', pattern, -1)
-augroup END
-
-" map
-nnoremap S :%s//g<Left><Left>
-nnoremap ee :!mupdf $(echo % \| sed 's/tex$/pdf/') & disown<CR><CR>
-map <C-n> :NERDTreeToggle<CR>
-nnoremap <silent> <C-t> :tabnew <CR>
-nnoremap <F11> :Goyo <CR>
-nnoremap <F7> :tabprevious<CR>
-nnoremap <F8> :tabnext<CR>
-
-cnoremap w!! execute 'silent! write !sudo tee % >/dev/null' <bar> edit!
-
-" latex
-let g:tex_flavor = "latex"
-autocmd BufWritePost *.tex silent! execute "!pdflatex --shell-escape -synctex=1 -interaction=nonstopmode % > /dev/null " | redraw!
-autocmd BufWritePost *.tex silent! execute "!latexmk -pdf -silent % > /dev/null" | redraw!
-autocmd BufWritePost *.tex silent! execute "!sudo rm -rf *.fls *.ilg *.nav *.snm *.toc *.idx *.lof *.lot *.synctex.gz *.aux *.fdb_latexmk *.fls *.log *.out > /dev/null" | redraw!
-autocmd BufWritePost *.tex silent! execute "!sudo pkill -HUP mupdf > /dev/null" | redraw!
-
-" mutt
-highlight ColorColumn ctermbg=gray
-autocmd BufRead,BufNewFile /tmp/neomutt* let g:goyo_width=80
-autocmd BufRead,BufNewFile /tmp/neomutt* :Goyo
-autocmd BufRead,BufNewFile /tmp/neomutt* map ZZ :Goyo\|x!<CR>
-autocmd BufRead,BufNewFile /tmp/neomutt* map ZQ :Goyo\|q!<CR>
-
-" Automatically deletes all trailing whitespace and newlines at end of file on save.
-autocmd BufWritePre * %s/\s\+$//e
-autocmd BufWritepre * %s/\n\+\%$//e
diff --git a/.vimrc b/.vimrc
new file mode 120000
index 0000000..25b6a3b
--- /dev/null
+++ b/.vimrc
@@ -0,0 +1 @@
+.config/nvim/init.vim
\ No newline at end of file
diff --git a/.xinitrc b/.xinitrc
index 2a2f58d..fbef376 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -10,6 +10,7 @@ xrandr --auto
 xset b off&
 
 # Lock screen
+xset -dpms
 xset s 3600&
 xautolock -time 60 -locker slock&
 
@@ -17,7 +18,7 @@ xautolock -time 60 -locker slock&
 dwmblocks&
 nm-applet --sm-disable&
 dunst -config&
-browser-x&
+#browser-x&
 QT_SCALE_FACTOR=1.5 keepassxc &
 /usr/local/bin/st -e /bin/sh -c "tmux new-session -s BASE -n HOME '/bin/zsh'\; split-window -h 'cpumhz'\; split-window 'htop'\; new-window -n MAIL 'neomutt'\; new-window -n MUSIC 'cmus'"&
 sudo /usr/bin/rdate -s ntp.task.gda.pl && sudo /sbin/hwclock --systohc
diff --git a/.zshrc b/.zshrc
index 1d0db2a..e3d6382 100644
--- a/.zshrc
+++ b/.zshrc
@@ -30,7 +30,7 @@ source $ZSH/oh-my-zsh.sh
 [ ! -d $CONFIG/zsh ] && { mkdir -p $CONFIG/zsh ; cd $CONFIG/zsh ; git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ; git clone https://github.com/zsh-users/zsh-autosuggestions.git }
 [ -d $CONFIG/zsh ] && source $CONFIG/zsh/zsh-autosuggestions/zsh-autosuggestions.plugin.zsh &>> /dev/null
 [ -d $CONFIG/zsh ] && source $CONFIG/zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh &>> /dev/null
-[ ! -f $HOME/.password ] && source $HOME/.password
+[ -f $HOME/.password ] && source $HOME/.password
 [ ! -d $CONFIG/fzf ] && git clone https://github.com/junegunn/fzf.git $HOME/.config/fzf
 [ -f $CONFIG/fzf/shell/key-bindings.zsh ] && source $HOME/.config/fzf/shell/key-bindings.zsh
 [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
@@ -52,12 +52,12 @@ export FZF_DEFAULT_OPTS='--height 40% --layout=reverse'
 export EIX_LIMIT_COMPACT=0
 export TERMINAL="st"
 export QT_SCALE_FACTOR=1.5
-export VISUAL='emacs'
-export EDITOR='emacs -nw'
-alias svm="sudo vim /etc/portage/make.conf"
-alias svr="sudo vim /etc/portage/repos.conf"
-alias svp="sudo vim /etc/portage/package.use"
-alias sva="sudo vim /etc/portage/package.accept_keywords"
+export VISUAL='nvim'
+export EDITOR='nvim'
+alias svm="sudo nvim /etc/portage/make.conf"
+alias svr="sudo nvim /etc/portage/repos.conf"
+alias svp="sudo nvim /etc/portage/package.use"
+alias sva="sudo nvim /etc/portage/package.accept_keywords"
 alias emerge="sudo emerge"
 alias channel-check='sudo iwlist wlan0 scan | egrep -i "essid|frequency"'
 alias grep="grep --color=always"
@@ -72,7 +72,7 @@ alias pl="setxkbmap pl"
 alias graphic-card="glxinfo|egrep 'OpenGL vendor|OpenGL renderer'"
 alias mylaptop-components="inxi -Fxz"
 alias r="ranger"
-alias v="vim"
+alias v="nvim"
 alias feh="feh --scale-down"
 alias changefont="figlet"
 alias gmaster="git checkout master"
@@ -95,10 +95,10 @@ alias vpnch="sudo /root/.local/bin/protonvpn c --cc CH"
 alias vpnd="sudo /root/.local/bin/protonvpn d"
 alias tv="~/MEGA/tv/tv.sh"
 alias newswork="newsboat --url=$HOME/.config/newsboat/urlswork"
-alias vim="vim -p"
+alias vim="nvim -p"
 alias denpl="trans en:pl"
 alias dplen="trans pl:en"
-alias notes="vim $HOME/git/notes/index.md"
+alias notes="nvim $HOME/git/notes/index.md"
 alias mgr="cd $HOME/Documents/Collage/Magisterka-Marcin/Semestr1/"
 alias mpv="__NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0 __GLX_VENDOR_LIBRARY_NAME=nvidia __GL_SYNC_TO_VBLANK=0 mpv --vo=x11 --hwdec=no --ytdl-raw-options="yes-playlist=" --ytdl-format='bestvideo[ext=mp4][height<=?1080]+bestaudio[ext=m4a]' --no-resume-playback"
 alias aria2c="aria2c --seed-time=0 --disable-ipv6 --max-upload-limit=1k"