From c72de1d239aac325155fc840cd226309435538de Mon Sep 17 00:00:00 2001
From: yuzu-eva <stevenhu@web.de>
Date: Fri, 26 May 2023 11:20:50 +0200
Subject: using vim-tmux-navigator; some other updates

---
 .config/nvim/lua/user/keymaps.lua | 6 ------
 1 file changed, 6 deletions(-)

(limited to '.config/nvim/lua/user/keymaps.lua')

diff --git a/.config/nvim/lua/user/keymaps.lua b/.config/nvim/lua/user/keymaps.lua
index 59c323c..b174f65 100644
--- a/.config/nvim/lua/user/keymaps.lua
+++ b/.config/nvim/lua/user/keymaps.lua
@@ -8,12 +8,6 @@ keymap('n', '<leader>Q', ':bufdo bdelete<CR>')
 -- Allow gf to open non-existant files
 keymap('n', 'gf', ':edit <cfile><CR>')
 
--- Quick navigation between splits
-keymap('n', '<c-h>', '<c-w>h')
-keymap('n', '<c-j>', '<c-w>j')
-keymap('n', '<c-k>', '<c-w>k')
-keymap('n', '<c-l>', '<c-w>l')
-
 -- Open the current file in the default program
 keymap('n', '<leader>x', ':!xdg-open %<CR><CR>')
 
-- 
cgit v1.2.3


From b423014b0e51a8324e7ff0fb925d7e7c4000cd45 Mon Sep 17 00:00:00 2001
From: yuzu-eva <stevenhu@web.de>
Date: Mon, 30 Oct 2023 14:11:13 +0100
Subject: update for new system

---
 .config/neofetch/config.conf                | 30 ++++++++---------
 .config/nvim/init.lua                       |  1 +
 .config/nvim/lua/user/keymaps.lua           |  8 +++++
 .config/nvim/lua/user/options.lua           | 49 +++++++++++++--------------
 .config/nvim/lua/user/plugins.lua           |  1 -
 .config/nvim/lua/user/plugins/lspconfig.lua | 51 +++++++++++------------------
 .config/nvim/plugin/packer_compiled.lua     | 41 ++++++++++-------------
 .config/shell/aliasrc                       | 31 ++++++++++++------
 .config/x11/xinitrc                         | 16 ++++-----
 9 files changed, 116 insertions(+), 112 deletions(-)

(limited to '.config/nvim/lua/user/keymaps.lua')

diff --git a/.config/neofetch/config.conf b/.config/neofetch/config.conf
index a3c25ce..342ef76 100644
--- a/.config/neofetch/config.conf
+++ b/.config/neofetch/config.conf
@@ -4,19 +4,19 @@ print_info() {
     info title
     # prin "\n \n " "$(curl wttr.in/?0?q?T | awk '/°(C|F)/ {printf $(NF-1) $(NF) " ("a")"} /,/ {a=$0}')"
     prin "${cl9}┌────────────────────────────────────────────────────┐"
-    info "\n \n  " distro
-    info "\n \n  " model
-    info "\n \n  " kernel
-    info "\n \n  " uptime
-    info "\n \n  " packages
-    info "\n \n  " shell
-    info "\n \n  " resolution
-    info "\n \n  " wm
-    info "\n \n  " term
-    info "\n \n  " cpu
-    info "\n \n  " gpu
-    info "\n \n  " memory
-    info "\n \n  " disk
+    info "\n \n OS" distro
+    info "\n \n Host" model
+    info "\n \n Kernel" kernel
+    info "\n \n Uptime" uptime
+    info "\n \n Packages" packages
+    info "\n \n Shell" shell
+    info "\n \n Screens" resolution
+    info "\n \n WM" wm
+    info "\n \n Terminal" term
+    info "\n \n CPU" cpu
+    info "\n \n GPU" gpu
+    info "\n \n Memory" memory
+    info "\n \n " disk
     prin "${cl9}└─────────────────────────────────── $(color 1) $(color 2) $(color 3) $(color 4) $(color 5) $(color 6) $(color 7) $(color 8) ${cl9}┘"
     prin "\n"
 }
@@ -388,7 +388,7 @@ disk_show=('/' '/home' '/dev/sda1' '/dev/sdb1')
 # none:   'Disk: 74G / 118G (66%)'
 #         'Disk: 74G / 118G (66%)'
 #         'Disk: 74G / 118G (66%)'
-disk_subtitle="none"
+disk_subtitle="dir"
 
 # Disk percent.
 # Show/Hide disk percent.
@@ -537,7 +537,7 @@ underline_char="-"
 # Example:
 # separator="->":   'Shell-> bash'
 # separator=" =":   'WM = dwm'
-separator=" "
+separator=":"
 
 
 # Color Blocks
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index f71bdb7..49556fb 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -10,5 +10,6 @@ require('user.options')
 require('user.plugins')
 require('user.keymaps')
 require('user.misc')
+-- require('user.dvorak')
 
 --vim: nospell
diff --git a/.config/nvim/lua/user/keymaps.lua b/.config/nvim/lua/user/keymaps.lua
index b174f65..777d099 100644
--- a/.config/nvim/lua/user/keymaps.lua
+++ b/.config/nvim/lua/user/keymaps.lua
@@ -2,6 +2,7 @@ local keymap = require 'lib.utils'.keymap
 
 vim.g.mapleader = ' '
 vim.g.maplocalleader = ' '
+vim.g.tmux_navigator_no_mappings=1
 
 keymap('n', '<leader>Q', ':bufdo bdelete<CR>')
 
@@ -23,3 +24,10 @@ keymap('i', 'jj', '<Esc>')
 keymap('n', '<leader>cd', ':cd %:p:h<CR>:pwd<CR>')
 
 keymap('n', '<leader>E', ':EslintFixAll<CR>')
+
+-- Change tmux-navigator keybinds
+keymap('n', '<C-h>', ':<C-U>TmuxNavigateLeft<cr>')
+keymap('n', '<C-j>', ':<C-U>TmuxNavigateDown<cr>')
+keymap('n', '<C-k>', ':<C-U>TmuxNavigateUp<cr>')
+keymap('n', '<C-l>', ':<C-U>TmuxNavigateRight<cr>')
+keymap('n', '<C-\\>', ':<C-U>TmuxNavigatePrevious<cr>')
diff --git a/.config/nvim/lua/user/options.lua b/.config/nvim/lua/user/options.lua
index 53fbe43..510485f 100644
--- a/.config/nvim/lua/user/options.lua
+++ b/.config/nvim/lua/user/options.lua
@@ -1,24 +1,25 @@
-vim.o.guicursor = 'a:block'
-vim.o.expandtab = true
-vim.o.shiftwidth = 4
-vim.o.tabstop = 4
-vim.o.signcolumn = 'yes:2'
-vim.o.relativenumber = true
-vim.o.number = true
-vim.o.termguicolors = true
-vim.o.ignorecase = true
-vim.o.smartcase = true
-vim.o.wildmode = 'longest:full,full'
-vim.o.wrap = false
-vim.o.scrolloff = 8
-vim.o.sidescrolloff = 8
-vim.o.cursorline = 1
-vim.o.splitright = 1
-vim.o.splitbelow = 1
-vim.o.clipboard = 'unnamedplus' -- Use Linux system clipboard
-vim.o.updatetime = 250          -- Decrease CursorHold delay
-vim.o.redrawtime = 10000        -- Allow more time for loading syntax
-vim.o.foldmethod = "expr"
-vim.o.foldlevelstart = 10
-vim.o.foldexpr = "nvim_treesitter#foldexpr()"
-vim.o.hlsearch = 0
+vim.o.guicursor='a:block'
+vim.o.expandtab=true
+vim.o.shiftwidth=4
+vim.o.softtabstop=4
+vim.o.tabstop=4
+vim.o.signcolumn='yes:2'
+vim.o.relativenumber=true
+vim.o.number=true
+vim.o.termguicolors=true
+vim.o.ignorecase=true
+vim.o.smartcase=true
+vim.o.wildmode='longest:full,full'
+vim.o.wrap=false
+vim.o.scrolloff=8
+vim.o.sidescrolloff=8
+vim.o.cursorline=true
+vim.o.splitright=true
+vim.o.splitbelow=true
+vim.o.clipboard='unnamedplus'
+vim.o.updatetime=250
+vim.o.redrawtime=10000
+vim.o.foldmethod="expr"
+vim.o.foldlevelstart=10
+vim.o.foldexpr="nvim_treesitter#foldexpr()"
+vim.o.hlsearch=false
diff --git a/.config/nvim/lua/user/plugins.lua b/.config/nvim/lua/user/plugins.lua
index 07f8f42..ae21e4f 100644
--- a/.config/nvim/lua/user/plugins.lua
+++ b/.config/nvim/lua/user/plugins.lua
@@ -3,7 +3,6 @@ require('packer').startup(function()
     use { 'tpope/vim-commentary' }
     use { 'tpope/vim-surround' }
     use { 'tpope/vim-eunuch' }
-    use { 'tpope/vim-sleuth' }
     use { 'christoomey/vim-tmux-navigator' }
 
     use {
diff --git a/.config/nvim/lua/user/plugins/lspconfig.lua b/.config/nvim/lua/user/plugins/lspconfig.lua
index 39f27c3..67d82a7 100644
--- a/.config/nvim/lua/user/plugins/lspconfig.lua
+++ b/.config/nvim/lua/user/plugins/lspconfig.lua
@@ -59,38 +59,27 @@ require 'lspconfig'.emmet_ls.setup {
     filetypes = { 'html', 'javascript', 'typescript', 'javascriptreact', 'typescriptreact', 'eruby' }
 }
 
-local runtime_path = vim.split(package.path, ';')
-table.insert(runtime_path, "lua/?.lua")
-table.insert(runtime_path, "lua/?/init.lua")
-require 'lspconfig'.lua_ls.setup {
-    on_attach = on_attach,
-    capabilities = capabilities,
-    flags = {
-        debounce_text_changes = 150,
-    },
-    cmd = { "/home/cafebabe/.local/share/lua-language-server/bin/lua-language-server", "-E", "/home/cafebabe/.local/share/lua-language-server/bin/main.lua" };
-    settings = {
-        Lua = {
-            runtime = {
-                -- Tell language server which version of lua is used.
-                version = 'LuaJIT',
-                -- Setup lua path
-                path = runtime_path,
-            },
-            diagnostics = {
-                -- Recognize globals
-                globals = { 'vim', 'use', 'parse' },
-            },
-            workspace = {
-                -- Make server aware of Neovim runtime files
-                library = vim.api.nvim_get_runtime_file("", true),
-            },
-            -- Do not send telemetry data
-            telemetry = {
-                enable = false,
-            },
+require'lspconfig'.lua_ls.setup {
+  on_init = function(client)
+    local path = client.workspace_folders[1].name
+    if not vim.loop.fs_stat(path..'/.luarc.json') and not vim.loop.fs_stat(path..'/.luarc.jsonc') then
+      client.config.settings = vim.tbl_deep_extend('force', client.config.settings.Lua, {
+        runtime = {
+          -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim)
+          version = 'LuaJIT'
         },
-    },
+        -- Make the server aware of Neovim runtime files
+        workspace = {
+          library = { vim.env.VIMRUNTIME }
+          -- or pull in all of 'runtimepath'. NOTE: this is a lot slower
+          -- library = vim.api.nvim_get_runtime_file("", true)
+        }
+      })
+
+      client.notify("workspace/didChangeConfiguration", { settings = client.config.settings })
+    end
+    return true
+  end
 }
 
 require 'lspconfig'.bashls.setup {
diff --git a/.config/nvim/plugin/packer_compiled.lua b/.config/nvim/plugin/packer_compiled.lua
index d97b824..a009beb 100644
--- a/.config/nvim/plugin/packer_compiled.lua
+++ b/.config/nvim/plugin/packer_compiled.lua
@@ -49,8 +49,8 @@ local function save_profiles(threshold)
 end
 
 time([[Luarocks path setup]], true)
-local package_path_str = "/home/cafebabe/.cache/nvim/packer_hererocks/2.1.1692616192/share/lua/5.1/?.lua;/home/cafebabe/.cache/nvim/packer_hererocks/2.1.1692616192/share/lua/5.1/?/init.lua;/home/cafebabe/.cache/nvim/packer_hererocks/2.1.1692616192/lib/luarocks/rocks-5.1/?.lua;/home/cafebabe/.cache/nvim/packer_hererocks/2.1.1692616192/lib/luarocks/rocks-5.1/?/init.lua"
-local install_cpath_pattern = "/home/cafebabe/.cache/nvim/packer_hererocks/2.1.1692616192/lib/lua/5.1/?.so"
+local package_path_str = "/home/cafebabe/.cache/nvim/packer_hererocks/2.1.1697887905/share/lua/5.1/?.lua;/home/cafebabe/.cache/nvim/packer_hererocks/2.1.1697887905/share/lua/5.1/?/init.lua;/home/cafebabe/.cache/nvim/packer_hererocks/2.1.1697887905/lib/luarocks/rocks-5.1/?.lua;/home/cafebabe/.cache/nvim/packer_hererocks/2.1.1697887905/lib/luarocks/rocks-5.1/?/init.lua"
+local install_cpath_pattern = "/home/cafebabe/.cache/nvim/packer_hererocks/2.1.1697887905/lib/lua/5.1/?.so"
 if not string.find(package.path, package_path_str, 1, true) then
   package.path = package.path .. ';' .. package_path_str
 end
@@ -229,11 +229,6 @@ _G.packer_plugins = {
     path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/vim-eunuch",
     url = "https://github.com/tpope/vim-eunuch"
   },
-  ["vim-sleuth"] = {
-    loaded = true,
-    path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/vim-sleuth",
-    url = "https://github.com/tpope/vim-sleuth"
-  },
   ["vim-surround"] = {
     loaded = true,
     path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/vim-surround",
@@ -247,14 +242,18 @@ _G.packer_plugins = {
 }
 
 time([[Defining packer_plugins]], false)
--- Config for: nvim-ts-autotag
-time([[Config for nvim-ts-autotag]], true)
-try_loadstring("\27LJ\2\n=\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\20nvim-ts-autotag\frequire\0", "config", "nvim-ts-autotag")
-time([[Config for nvim-ts-autotag]], false)
+-- Config for: nvim-autopairs
+time([[Config for nvim-autopairs]], true)
+try_loadstring("\27LJ\2\n<\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\19nvim-autopairs\frequire\0", "config", "nvim-autopairs")
+time([[Config for nvim-autopairs]], false)
 -- Config for: nvim-lspconfig
 time([[Config for nvim-lspconfig]], true)
 try_loadstring("\27LJ\2\n6\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\27user.plugins.lspconfig\frequire\0", "config", "nvim-lspconfig")
 time([[Config for nvim-lspconfig]], false)
+-- Config for: nvim-ts-autotag
+time([[Config for nvim-ts-autotag]], true)
+try_loadstring("\27LJ\2\n=\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\20nvim-ts-autotag\frequire\0", "config", "nvim-ts-autotag")
+time([[Config for nvim-ts-autotag]], false)
 -- Config for: lualine.nvim
 time([[Config for lualine.nvim]], true)
 try_loadstring("\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25user.plugins.lualine\frequire\0", "config", "lualine.nvim")
@@ -263,26 +262,22 @@ time([[Config for lualine.nvim]], false)
 time([[Config for nvim-tree.lua]], true)
 try_loadstring("\27LJ\2\n6\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\27user.plugins.nvim-tree\frequire\0", "config", "nvim-tree.lua")
 time([[Config for nvim-tree.lua]], false)
--- Config for: nvim-treesitter
-time([[Config for nvim-treesitter]], true)
-try_loadstring("\27LJ\2\n]\0\0\3\0\4\0\t6\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\0016\0\0\0'\2\3\0B\0\2\1K\0\1\0\28user.plugins.treesitter\nsetup\16spellsitter\frequire\0", "config", "nvim-treesitter")
-time([[Config for nvim-treesitter]], false)
--- Config for: nvim-cmp
-time([[Config for nvim-cmp]], true)
-try_loadstring("\27LJ\2\n0\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\21user.plugins.cmp\frequire\0", "config", "nvim-cmp")
-time([[Config for nvim-cmp]], false)
 -- Config for: LuaSnip
 time([[Config for LuaSnip]], true)
 try_loadstring("\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25user.plugins.luasnip\frequire\0", "config", "LuaSnip")
 time([[Config for LuaSnip]], false)
--- Config for: nvim-autopairs
-time([[Config for nvim-autopairs]], true)
-try_loadstring("\27LJ\2\n<\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\19nvim-autopairs\frequire\0", "config", "nvim-autopairs")
-time([[Config for nvim-autopairs]], false)
+-- Config for: nvim-treesitter
+time([[Config for nvim-treesitter]], true)
+try_loadstring("\27LJ\2\n]\0\0\3\0\4\0\t6\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\0016\0\0\0'\2\3\0B\0\2\1K\0\1\0\28user.plugins.treesitter\nsetup\16spellsitter\frequire\0", "config", "nvim-treesitter")
+time([[Config for nvim-treesitter]], false)
 -- Config for: telescope.nvim
 time([[Config for telescope.nvim]], true)
 try_loadstring("\27LJ\2\n6\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\27user.plugins.telescope\frequire\0", "config", "telescope.nvim")
 time([[Config for telescope.nvim]], false)
+-- Config for: nvim-cmp
+time([[Config for nvim-cmp]], true)
+try_loadstring("\27LJ\2\n0\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\21user.plugins.cmp\frequire\0", "config", "nvim-cmp")
+time([[Config for nvim-cmp]], false)
 -- Config for: dracula
 time([[Config for dracula]], true)
 try_loadstring("\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25user.plugins.dracula\frequire\0", "config", "dracula")
diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc
index abf8ebb..4358402 100644
--- a/.config/shell/aliasrc
+++ b/.config/shell/aliasrc
@@ -4,25 +4,24 @@
 alias reboot='sudo reboot'
 alias poweroff='sudo poweroff'
 alias refresh='. $ZDOTDIR/.zshrc'
+alias zzz='sudo zzz'
 alias fuck='sudo $(fc -Lln -1)'
 alias open='xdg-open'
-alias mutt='pushd ~/.mutt/attachments; mutt; popd'
+alias mutt='cd ~/.mutt/attachments; mutt; cd -'
 alias jpwine='LANG=ja_JP.UTF-8 WINEDEBUG=-all wine'
-alias emacsd='/usr/bin/emacs --daemon &'
+alias emacsd='/usr/local/bin/emacs --daemon &'
+alias em='emacsclient -c -a "emacs"'
 alias vi='$EDITOR'
 alias z='zathura'
 alias nnn='nnn -Hde'
 alias cn='clear;neofetch'
 alias ea='vi ~/.config/shell/aliasrc'
 alias ez='vi ~/.config/zsh/.zshrc'
-alias eq='equery'
 alias sr='su - root'
 alias cam='mpv --profile=low-latency --untimed /dev/video0'
 alias df='df -h'
 alias tma='tmux a -t'
-
-# need to sign hid-nintendo.ko with every kernel update
-alias signmod='sudo /usr/src/linux/scripts/sign-file sha512 /usr/src/linux/certs/signing_key.pem /usr/src/linux/certs/signing_key.x509'
+alias tmn='tmux new-session -s'
 
 # rename files in pwd in their current order to 4-digit numbers
 alias ofn='/bin/ls | cat -n | while read n f; do perl-rename "s/${f%.*}/$(printf "%04d" "$n")/" "$f"; done'
@@ -32,6 +31,7 @@ alias ofn='/bin/ls | cat -n | while read n f; do perl-rename "s/${f%.*}/$(printf
 
 # set my preferred keyboard options
 alias setkeys='xset r rate 250 30 && setxkbmap -layout us,us -variant dvorak, -option "ctrl:nocaps,lv3:rwin_switch,grp:alt_space_toggle"'
+alias setus='setxkbmap -layout us,us -option "ctrl:nocaps"'
 
 # pad numbers in filenames with zeros
 alias padz='perl-rename "s/\d+/sprintf(\"%02d\",$&)/e"'
@@ -81,9 +81,9 @@ alias rmdr='xrandr --auto --output HDMI-A-0 --mode 1920x1080 --primary'
 alias lmlr='xrandr --auto --output DisplayPort-2 --mode 640x480 --left-of HDMI-A-0'
 alias lmmr='xrandr --auto --output DisplayPort-2 --mode 800x600 --left-of HDMI-A-0'
 alias lmdr='xrandr --auto --output DisplayPort-2 --mode 1600x900 --left-of HDMI-A-0'
-alias mbl='sudo ddcutil --display 1 setvcp 10 0 && doas ddcutil --display 2 setvcp 10 0'
-alias mbm='sudo ddcutil --display 1 setvcp 10 50 && doas ddcutil --display 2 setvcp 10 50'
-alias mbh='sudo ddcutil --display 1 setvcp 10 80 && doas ddcutil --display 2 setvcp 10 80'
+alias mbl='sudo ddcutil --display 1 setvcp 10 0 && sudo ddcutil --display 2 setvcp 10 0'
+alias mbm='sudo ddcutil --display 1 setvcp 10 50 && sudo ddcutil --display 2 setvcp 10 50'
+alias mbh='sudo ddcutil --display 1 setvcp 10 80 && sudo ddcutil --display 2 setvcp 10 80'
 
 # function for timer and stopwatch
 timer() {
@@ -125,7 +125,7 @@ date-reverse() {
 
 # convert video files to webm
 mkwebm() {
-    ffmpeg -i "${1}" -c:v libvpx-vp9 -crf 1 -b:v 1M -c:a libvorbis "${1%.*}".webm
+    ffmpeg -i "${1}" -c:v libvpx-vp9 -crf 32 -b:v 300K -c:a libvorbis "${1%.*}".webm
 }
 
 ## GIT
@@ -143,3 +143,14 @@ alias push='git push origin'
 alias dfiles='/usr/bin/git --git-dir=$HOME/.dotfiles --work-tree=$HOME'
 alias dcomm='dfiles commit -m'
 alias dpush='dfiles push origin'
+
+# package manager
+alias pacin='sudo pacman -S'
+alias pacrm='sudo pacman -Rns'
+alias pacup='sudo pacman -Syu'
+alias pacsr='pacman -Ss'
+alias pacbr='pacman -Slq | fzf --preview "pacman -Si {}" --layout=reverse'
+alias yayin='yay -S'
+alias yayrm='yay -Rns'
+alias yayup='yay -Syu'
+alias yaysr='yay -Ss'
diff --git a/.config/x11/xinitrc b/.config/x11/xinitrc
index 5150125..b879037 100644
--- a/.config/x11/xinitrc
+++ b/.config/x11/xinitrc
@@ -4,23 +4,23 @@
 # 	eval $(dbus-launch --sh-syntax --exit-with-session)
 # fi
 
-eval "$(gpg-agent --daemon --allow-preset-passphrase)"
+# eval "$(gpg-agent --daemon --allow-preset-passphrase)"
 eval "$(ssh-agent)"
 
+xrandr --auto --output HDMI-A-0 --mode 1920x1080 --primary
+xrandr --auto --output DisplayPort-2 --mode 1600x900 --left-of HDMI-A-0
+
 xset r rate 200 20
 xset s off -dpms
 setxkbmap -layout us,us -variant dvorak, -option "ctrl:nocaps,lv3:rwin_switch,grp:alt_space_toggle"
-
-xrandr --auto --output HDMI-A-0 --mode 1920x1080 --primary
-xrandr --auto --output DisplayPort-2 --mode 1600x900 --left-of HDMI-A-0
+xrdb -merge ~/.Xresources
 
 ~/.local/bin/set-wallpaper &
 # /usr/bin/emacs --daemon &
 
+urxvtd -q -o -f &
 pipewire &
-otd-daemon &
-mpd &
 picom &
-statusbar &
+mpd &
 
-exec dwm
+exec i3
-- 
cgit v1.2.3


From fc808ae714f1e629081c5d5cfc240e3f444598f2 Mon Sep 17 00:00:00 2001
From: yuzu-eva <stevenhu@web.de>
Date: Wed, 22 Nov 2023 15:02:31 +0100
Subject: went back to vim

---
 .config/i3/config                            |   2 +-
 .config/i3status/config                      |   2 +-
 .config/nvim/ftplugin/javascript.vim         |   9 --
 .config/nvim/init.lua                        |  15 ---
 .config/nvim/lua/lib/utils.lua               |  22 -----
 .config/nvim/lua/user/keymaps.lua            |  33 -------
 .config/nvim/lua/user/misc.lua               |   6 --
 .config/nvim/lua/user/options.lua            |  25 -----
 .config/nvim/lua/user/plugins.lua            | 101 --------------------
 .config/nvim/lua/user/plugins/cmp.lua        |  73 --------------
 .config/nvim/lua/user/plugins/dracula.lua    |  13 ---
 .config/nvim/lua/user/plugins/lspconfig.lua  | 138 ---------------------------
 .config/nvim/lua/user/plugins/lualine.lua    |  64 -------------
 .config/nvim/lua/user/plugins/luasnip.lua    |   9 --
 .config/nvim/lua/user/plugins/nvim-tree.lua  |  13 ---
 .config/nvim/lua/user/plugins/telescope.lua  |  25 -----
 .config/nvim/lua/user/plugins/treesitter.lua |  31 ------
 .config/nvim/snippets/all.lua                |  23 -----
 .config/shell/aliasrc                        |   4 +-
 .config/shell/profile                        |   2 +-
 .config/x11/xinitrc                          |   2 +-
 .vim/vimrc                                   |  77 +++++++++++++++
 22 files changed, 83 insertions(+), 606 deletions(-)
 delete mode 100644 .config/nvim/ftplugin/javascript.vim
 delete mode 100644 .config/nvim/init.lua
 delete mode 100644 .config/nvim/lua/lib/utils.lua
 delete mode 100644 .config/nvim/lua/user/keymaps.lua
 delete mode 100644 .config/nvim/lua/user/misc.lua
 delete mode 100644 .config/nvim/lua/user/options.lua
 delete mode 100644 .config/nvim/lua/user/plugins.lua
 delete mode 100644 .config/nvim/lua/user/plugins/cmp.lua
 delete mode 100644 .config/nvim/lua/user/plugins/dracula.lua
 delete mode 100644 .config/nvim/lua/user/plugins/lspconfig.lua
 delete mode 100644 .config/nvim/lua/user/plugins/lualine.lua
 delete mode 100644 .config/nvim/lua/user/plugins/luasnip.lua
 delete mode 100644 .config/nvim/lua/user/plugins/nvim-tree.lua
 delete mode 100644 .config/nvim/lua/user/plugins/telescope.lua
 delete mode 100644 .config/nvim/lua/user/plugins/treesitter.lua
 delete mode 100644 .config/nvim/snippets/all.lua
 create mode 100644 .vim/vimrc

(limited to '.config/nvim/lua/user/keymaps.lua')

diff --git a/.config/i3/config b/.config/i3/config
index b740e24..9cff316 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -154,7 +154,7 @@ bindsym $mod+r mode "resize"
 # Start i3bar to display a workspace bar (plus the system information i3status
 # finds out, if available)
 bar {
-	font pango:Hack Nerd Font 10
+	font pango:Hack Nerd Font 9
         position top
         tray_output primary
         status_command i3status
diff --git a/.config/i3status/config b/.config/i3status/config
index 5e76340..22eba0c 100644
--- a/.config/i3status/config
+++ b/.config/i3status/config
@@ -24,7 +24,7 @@ ethernet enp39s0 {
 }
 
 disk "/" {
-        format = "root: %used"
+        format = "total: %used"
 }
 
 load {
diff --git a/.config/nvim/ftplugin/javascript.vim b/.config/nvim/ftplugin/javascript.vim
deleted file mode 100644
index 4ffe06d..0000000
--- a/.config/nvim/ftplugin/javascript.vim
+++ /dev/null
@@ -1,9 +0,0 @@
-setl nospell
-setl nowrap
-setl tabstop=2
-setl shiftwidth=2
-setl expandtab
-let b:vcm_tab_complete = 'javascript'
-let b:javascript_fold = 1
-let g:javascript_plugin_jsdoc = 1
-let g:jsx_ext_required = 0
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
deleted file mode 100644
index 49556fb..0000000
--- a/.config/nvim/init.lua
+++ /dev/null
@@ -1,15 +0,0 @@
---               __       _           _
---   ___   __ _ / _| ___ | |__   __ _| |__   ___
---  / __| / _' | |_ / _ \|  _ \ / _' |  _ \ / _ \
--- | |__ / (_| |  _|  __/| |_) / (_| | |_) |  __/
---  \___|\___._/_|  \___||____/\___._/____/ \___/
---
--- Personal vim configuration of cafebabe
-
-require('user.options')
-require('user.plugins')
-require('user.keymaps')
-require('user.misc')
--- require('user.dvorak')
-
---vim: nospell
diff --git a/.config/nvim/lua/lib/utils.lua b/.config/nvim/lua/lib/utils.lua
deleted file mode 100644
index 8abbabd..0000000
--- a/.config/nvim/lua/lib/utils.lua
+++ /dev/null
@@ -1,22 +0,0 @@
-local M = {}
-
-M.keymap = function(mode, lhs, rhs, opts)
-    vim.api.nvim_set_keymap(
-        mode,
-        lhs,
-        rhs,
-        vim.tbl_extend('keep', opts or {}, { noremap = true, silent = true })
-  )
-end
-
-M.buf_keymap = function(bufnr, mode, lhs, rhs, opts)
-    vim.api.nvim_buf_set_keymap(
-        bufnr,
-        mode,
-        lhs,
-        rhs,
-        vim.tbl_extend('keep', opts or {}, { noremap = true, silent = true })
-  )
-end
-
-return M
diff --git a/.config/nvim/lua/user/keymaps.lua b/.config/nvim/lua/user/keymaps.lua
deleted file mode 100644
index 777d099..0000000
--- a/.config/nvim/lua/user/keymaps.lua
+++ /dev/null
@@ -1,33 +0,0 @@
-local keymap = require 'lib.utils'.keymap
-
-vim.g.mapleader = ' '
-vim.g.maplocalleader = ' '
-vim.g.tmux_navigator_no_mappings=1
-
-keymap('n', '<leader>Q', ':bufdo bdelete<CR>')
-
--- Allow gf to open non-existant files
-keymap('n', 'gf', ':edit <cfile><CR>')
-
--- Open the current file in the default program
-keymap('n', '<leader>x', ':!xdg-open %<CR><CR>')
-
--- Resize with arrows
-keymap('n', '<C-Up>', ':resize +2<CR>')
-keymap('n', '<C-Down>', ':resize -2<CR>')
-keymap('n', '<C-Left>', ':vertical resize -2<CR>')
-keymap('n', '<C-Right>', ':vertical resize +2<CR>')
-
--- Quickly escape to normal mode
-keymap('i', 'jj', '<Esc>')
-
-keymap('n', '<leader>cd', ':cd %:p:h<CR>:pwd<CR>')
-
-keymap('n', '<leader>E', ':EslintFixAll<CR>')
-
--- Change tmux-navigator keybinds
-keymap('n', '<C-h>', ':<C-U>TmuxNavigateLeft<cr>')
-keymap('n', '<C-j>', ':<C-U>TmuxNavigateDown<cr>')
-keymap('n', '<C-k>', ':<C-U>TmuxNavigateUp<cr>')
-keymap('n', '<C-l>', ':<C-U>TmuxNavigateRight<cr>')
-keymap('n', '<C-\\>', ':<C-U>TmuxNavigatePrevious<cr>')
diff --git a/.config/nvim/lua/user/misc.lua b/.config/nvim/lua/user/misc.lua
deleted file mode 100644
index 88d47cf..0000000
--- a/.config/nvim/lua/user/misc.lua
+++ /dev/null
@@ -1,6 +0,0 @@
-vim.cmd [[
-    augroup Indentation
-        autocmd!
-        autocmd FileType html set inde=
-    augroup END
-]]
diff --git a/.config/nvim/lua/user/options.lua b/.config/nvim/lua/user/options.lua
deleted file mode 100644
index 510485f..0000000
--- a/.config/nvim/lua/user/options.lua
+++ /dev/null
@@ -1,25 +0,0 @@
-vim.o.guicursor='a:block'
-vim.o.expandtab=true
-vim.o.shiftwidth=4
-vim.o.softtabstop=4
-vim.o.tabstop=4
-vim.o.signcolumn='yes:2'
-vim.o.relativenumber=true
-vim.o.number=true
-vim.o.termguicolors=true
-vim.o.ignorecase=true
-vim.o.smartcase=true
-vim.o.wildmode='longest:full,full'
-vim.o.wrap=false
-vim.o.scrolloff=8
-vim.o.sidescrolloff=8
-vim.o.cursorline=true
-vim.o.splitright=true
-vim.o.splitbelow=true
-vim.o.clipboard='unnamedplus'
-vim.o.updatetime=250
-vim.o.redrawtime=10000
-vim.o.foldmethod="expr"
-vim.o.foldlevelstart=10
-vim.o.foldexpr="nvim_treesitter#foldexpr()"
-vim.o.hlsearch=false
diff --git a/.config/nvim/lua/user/plugins.lua b/.config/nvim/lua/user/plugins.lua
deleted file mode 100644
index ae21e4f..0000000
--- a/.config/nvim/lua/user/plugins.lua
+++ /dev/null
@@ -1,101 +0,0 @@
-require('packer').startup(function()
-    use { 'wbthomason/packer.nvim' } -- Let packer manage itself
-    use { 'tpope/vim-commentary' }
-    use { 'tpope/vim-surround' }
-    use { 'tpope/vim-eunuch' }
-    use { 'christoomey/vim-tmux-navigator' }
-
-    use {
-        'dracula/vim',
-        as = 'dracula',
-        config = function()
-            require('user.plugins.dracula')
-        end
-    }
-    use {
-        'windwp/nvim-autopairs',
-        config = function()
-            require('nvim-autopairs').setup()
-        end
-    }
-
-    use {
-        'windwp/nvim-ts-autotag',
-        config = function()
-            require('nvim-ts-autotag').setup()
-        end
-    }
-
-    use {
-        'kyazdani42/nvim-tree.lua',
-        requires = 'kyazdani42/nvim-web-devicons',
-        config = function()
-            require('user.plugins.nvim-tree')
-        end
-    }
-    use {
-        'nvim-treesitter/nvim-treesitter',
-        run = ':TSUpdate',
-        requires = {
-            'nvim-treesitter/playground',
-            'nvim-treesitter/nvim-treesitter-textobjects',
-            'lewis6991/spellsitter.nvim',
-            'JoosepAlviste/nvim-ts-context-commentstring',
-        },
-        config = function()
-            require('spellsitter').setup()
-            require('user.plugins.treesitter')
-        end
-    }
-
-    use {
-        'neovim/nvim-lspconfig',
-        requires = {
-            'b0o/schemastore.nvim',
-            'folke/lsp-colors.nvim',
-            'weilbith/nvim-code-action-menu',
-        },
-        config = function()
-            require('user.plugins.lspconfig')
-        end
-    }
-    use {
-        'hrsh7th/nvim-cmp',
-        requires = {
-            'hrsh7th/cmp-nvim-lsp',
-            'hrsh7th/cmp-buffer',
-            'jessarcher/cmp-path',
-            'hrsh7th/cmp-nvim-lua',
-            'L3MON4D3/LuaSnip',
-            'onsails/lspkind-nvim',
-            'hrsh7th/cmp-nvim-lsp-signature-help',
-        },
-        config = function()
-            require('user.plugins.cmp')
-        end
-    }
-    use {
-        'nvim-telescope/telescope.nvim',
-        requires = {
-            'nvim-lua/popup.nvim',
-            'nvim-lua/plenary.nvim',
-            'kyazdani42/nvim/nvim-web-devicons',
-        },
-        config = function()
-            require('user.plugins.telescope')
-        end
-    }
-    use {
-        'nvim-lualine/lualine.nvim',
-        requires = 'kyazdani42/nvim-web-devicons',
-        config = function()
-            require('user.plugins.lualine')
-        end
-    }
-    use {
-        'L3MON4D3/LuaSnip',
-        config = function()
-            require('user.plugins.luasnip')
-        end
-    }
-end)
diff --git a/.config/nvim/lua/user/plugins/cmp.lua b/.config/nvim/lua/user/plugins/cmp.lua
deleted file mode 100644
index 81cd2ee..0000000
--- a/.config/nvim/lua/user/plugins/cmp.lua
+++ /dev/null
@@ -1,73 +0,0 @@
-local has_words_before = function()
-    local line, col = unpack(vim.api.nvim_win_get_cursor(0))
-    return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match '%s' == nil
-end
-
-local luasnip = require 'luasnip'
-local cmp = require 'cmp'
-local lspkind = require 'lspkind'
-
--- Set completeopt to have a better completion experience
-vim.o.completeopt = 'menuone,longest,preview'
-
-cmp.setup({
-    experimental = {
-        ghost_text = true,
-    },
-    formatting = {
-        format = lspkind.cmp_format {
-            mode = 'symbol',
-            menu = {
-                nvim_lsp = '[LSP]',
-                nvim_lua = '[Lua]',
-                buffer = '[BUF]',
-            },
-        },
-    },
-    snippet = {
-        expand = function(args)
-            require('luasnip').lsp_expand(args.body)
-        end,
-    },
-    mapping = {
-        ['<C-p>'] = cmp.mapping.select_prev_item(),
-        ['<C-n>'] = cmp.mapping.select_next_item(),
-        ['<C-d>'] = cmp.mapping.scroll_docs(-4),
-        ['<C-r>'] = cmp.mapping.scroll_docs(4),
-        ['<C-Space>'] = cmp.mapping.complete(),
-        ['<C-e>'] = cmp.mapping.close(),
-        ['<CR>'] = cmp.mapping.confirm {
-            behavior = cmp.ConfirmBehavior.replace,
-            select = false,
-        },
-        ['<Tab>'] = cmp.mapping(function(fallback)
-            if luasnip.expand_or_jumpable() then
-                luasnip.expand_or_jump()
-            elseif cmp.visible() then
-                cmp.select_next_item()
-            elseif has_words_before() then
-                cmp.complete()
-            else
-                fallback()
-            end
-        end, { 'i', 's' }),
-        ['<S-Tab>'] = cmp.mapping(function(fallback)
-            if luasnip.jumpable(-1) then
-                luasnip.jump(-1)
-            elseif cmp.visible() then
-                cmp.select_prev_item()
-            else
-                fallback()
-            end
-
-        end, { 'i', 's' }),
-    },
-    sources = {
-        { name = 'nvim_lsp' },
-        { name = 'nvim_lsp_signature_help' },
-        { name = 'nvim_lua' },
-        { name = 'luasnip' },
-        { name = 'path' },
-        { name = 'buffer' },
-    },
-})
diff --git a/.config/nvim/lua/user/plugins/dracula.lua b/.config/nvim/lua/user/plugins/dracula.lua
deleted file mode 100644
index 77926a0..0000000
--- a/.config/nvim/lua/user/plugins/dracula.lua
+++ /dev/null
@@ -1,13 +0,0 @@
-vim.cmd([[
-    augroup DraculaOverrides
-        autocmd!
-        autocmd ColorScheme dracula highlight! link Pmenu DraculaBg
-        autocmd ColorScheme dracula highlight link NormalFloat DraculaBgLight
-        autocmd ColorScheme dracula highlight FloatBorder guifg=none guibg=none
-        autocmd ColorScheme dracula highlight DraculaBoundary guibg=none
-        autocmd ColorScheme dracula highlight DraculaDiffDelete ctermbg=none guibg=none
-        autocmd ColorScheme dracula highlight DraculaComment cterm=italic gui=italic
-        autocmd ColorScheme dracula highlight Normal guibg=none
-    augroup end
-    colorscheme dracula
-]])
diff --git a/.config/nvim/lua/user/plugins/lspconfig.lua b/.config/nvim/lua/user/plugins/lspconfig.lua
deleted file mode 100644
index 5685ce7..0000000
--- a/.config/nvim/lua/user/plugins/lspconfig.lua
+++ /dev/null
@@ -1,138 +0,0 @@
-local buf_option = vim.api.nvim_buf_set_option
-local buf_keymap = require 'lib.utils'.buf_keymap
-
-vim.diagnostic.config {
-    virtual_text = false,
-    severity_sort = true,
-    float = {
-        source = true,
-        focus = false,
-        format = function(diagnostic)
-            if diagnostic.user_data ~= nil and diagnostic.user_data.lsp.code ~= nil then
-                return string.format("%s: %s", diagnostic.user_data.lsp.code, diagnostic.message)
-            end
-            return diagnostic.message
-        end,
-    }
-}
-
-local on_attach = function(_, bufnr)
-    buf_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
-
-    buf_keymap(bufnr, 'n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<CR>')
-    buf_keymap(bufnr, 'n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>')
-    buf_keymap(bufnr, 'n', 'K', '<cmd>lua vim.lsp.buf.hover()<CR>')
-    buf_keymap(bufnr, 'n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>')
-    buf_keymap(bufnr, 'n', '<leader><C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>')
-    buf_keymap(bufnr, 'n', '<leader>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>')
-    buf_keymap(bufnr, 'n', '<leader>rn', '<cmd>lua vim.lsp.buf.rename()<CR>')
-    buf_keymap(bufnr, 'n', 'gr', ':Telescope lsp_references<CR>')
-
-    buf_keymap(bufnr, 'n', '<leader>ca', ':CodeActionMenu<CR>')
-    buf_keymap(bufnr, 'v', '<leader>ca', ':CodeActionMenu<CR>')
-
-    buf_keymap(bufnr, 'n', '<leader>d', '<cmd>lua vim.diagnostic.open_float()<CR>')
-    buf_keymap(bufnr, 'n', '[d', '<cmd>lua vim.diagnostic.goto_prev()<CR>')
-    buf_keymap(bufnr, 'n', ']d', '<cmd>lua vim.diagnostic.goto_next()<CR>')
-    buf_keymap(bufnr, 'n', '<leader>F', '<cmd>lua vim.lsp.buf.format { async = true }<CR>')
-
-    -- Autoformat on save doesn't work with server_capabilities, even
-    -- though it's the replacement for the deprecated resolved_capabilities.
-
-    -- if _.server_capabilities.document_formatting then
-    --     vim.api.nvim_command [[augroup Format]]
-    --     vim.api.nvim_command [[autocmd! * <buffer>]]
-    --     vim.api.nvim_command [[autocmd BufWritePre <buffer> lua vim.lsp.buf.formatting_seq_sync()]]
-    --     vim.api.nvim_command [[augroup END]]
-    -- end
-end
-
--- provide additional completion capabilities
-local capabilities = require('cmp_nvim_lsp').default_capabilities(vim.lsp.protocol.make_client_capabilities())
-
-require 'lspconfig'.emmet_ls.setup {
-    on_attach = on_attach,
-    capabilities = capabilities,
-    flags = {
-        debounce_text_changes = 150,
-    },
-    filetypes = { 'html', 'javascript', 'typescript', 'javascriptreact', 'typescriptreact', 'eruby' }
-}
-
--- require'lspconfig'.lua_ls.setup {
---   on_init = function(client)
---     local path = client.workspace_folders[1].name
---     if not vim.loop.fs_stat(path..'/.luarc.json') and not vim.loop.fs_stat(path..'/.luarc.jsonc') then
---       client.config.settings = vim.tbl_deep_extend('force', client.config.settings.Lua, {
---         runtime = {
---           -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim)
---           version = 'LuaJIT'
---         },
---         -- Make the server aware of Neovim runtime files
---         workspace = {
---           library = { vim.env.VIMRUNTIME }
---           -- or pull in all of 'runtimepath'. NOTE: this is a lot slower
---           -- library = vim.api.nvim_get_runtime_file("", true)
---         },
---         cmd = { "~/.emacs.d/.cache/lsp/lua-language-server/bin/lua-language-server" },
---       })
-
---       client.notify("workspace/didChangeConfiguration", { settings = client.config.settings })
---     end
---     return true
---   end
--- }
-
-require'lspconfig'.lua_ls.setup {
-    on_attach = on_attach,
-    capabilities = capabilities,
-    flags = {
-        debounce_text_changes = 150,
-    },
-    cmd = { "lua-language-server" },
-}
-
-require 'lspconfig'.bashls.setup {
-    on_attach = on_attach,
-    capabilities = capabilities,
-    flags = {
-        debounce_text_changes = 150,
-    },
-}
-
-require 'lspconfig'.pylsp.setup {
-    on_attach = on_attach,
-    capabilities = capabilities,
-    flags = {
-        debounce_text_changes = 150,
-    },
-}
-
-require 'lspconfig'.clangd.setup {
-    on_attach = on_attach,
-    capabilities = capabilities,
-    flags = {
-        debounce_text_changes = 150,
-    },
-    cmd = { "clangd" };
-}
-
--- require 'lspconfig'.solargraph.setup {
---     on_attach = on_attach,
---     capabilities = capabilities,
---     flags = {
---         debounce_text_changes = 150,
---     }
--- }
-
--- suppress error messages from lang servers
-vim.notify = function(msg, log_level, _)
-    if msg:match 'exit code' then
-        return
-    end
-    if log_level == vim.log.levels.ERROR then
-        vim.api.nvim_err_writeln(msg)
-    else
-        vim.api.nvim_echo({ { msg } }, true, {})
-    end
-end
diff --git a/.config/nvim/lua/user/plugins/lualine.lua b/.config/nvim/lua/user/plugins/lualine.lua
deleted file mode 100644
index 6ac5cee..0000000
--- a/.config/nvim/lua/user/plugins/lualine.lua
+++ /dev/null
@@ -1,64 +0,0 @@
--- local tabLineHl = vim.api.nvim_get_hl_by_name('TabLine', true)
--- local bg = '#' .. bit.tohex(tabLineHl.background, 6)
--- local fg = '#' .. bit.tohex(tabLineHl.foreground, 6)
-local fg = '#F8F8F2' -- DraculaFg
-local bg = '#21222C' -- DraculaBgDark
-local separator = '#424450' -- DraculaSubtle
--- local fg = '#' .. bit.tohex(vim.api.nvim_get_hl_by_name('DraculaFg', true).foreground, 6)
--- local bg = '#' .. bit.tohex(vim.api.nvim_get_hl_by_name('DraculaBgDark', true).background, 6)
--- local separator = '#' .. bit.tohex(vim.api.nvim_get_hl_by_name('DraculaSubtle', true).foreground, 6)
-
-require('lualine').setup {
-    options = {
-        component_separators = '',
-        section_separators = '▕',
-        theme = {
-        normal = {
-            a = { fg = fg, bg = bg },
-            b = { fg = fg, bg = bg },
-            c = { fg = fg, bg = bg },
-            x = { fg = fg, bg = bg },
-            y = { fg = fg, bg = bg },
-            z = { fg = fg, bg = bg },
-        },
-        inactive = { c = { fg = fg, bg = bg } },
-        },
-    },
-    sections = {
-        lualine_a = {
-        'mode',
-        { '"▏"', color = { fg = separator } },
-        },
-        lualine_b = {
-            'branch',
-            'diff',
-            { '"▕"', color = { fg = separator } },
-            '"🖧  " .. tostring(#vim.tbl_keys(vim.lsp.buf_get_clients()))',
-            { 'diagnostics', sources = { 'nvim_diagnostic' } },
-            { '"▏"', color = { fg = separator } },
-        },
-        lualine_c = { 'filename' },
-        lualine_x = {
-            'filetype',
-            'encoding',
-            'fileformat',
-        },
-        lualine_y = {
-            { '"▕"', color = { fg = separator } },
-            '(vim.bo.expandtab and "␠ " or "⇥ ") .. " " .. vim.bo.shiftwidth',
-            { '"▏"', color = { fg = separator } },
-        },
-        lualine_z = {
-            'location',
-            'progress',
-        },
-  },
-  -- tabline = {
-  --   lualine_a = {
-  --     {'buffers'}
-  --   },
-  --   lualine_z = {
-  --     {'tabs'}
-  --   }
-  -- }
-}
diff --git a/.config/nvim/lua/user/plugins/luasnip.lua b/.config/nvim/lua/user/plugins/luasnip.lua
deleted file mode 100644
index 2e7462a..0000000
--- a/.config/nvim/lua/user/plugins/luasnip.lua
+++ /dev/null
@@ -1,9 +0,0 @@
-local ls = require "luasnip"
-require("luasnip.loaders.from_lua").load({ paths = "~/.config/nvim/snippets" })
-
-ls.config.set_config {
-    history = true,
-    updateevents = 'TextChanged,TextChangedI',
-    enable_autosnippets = true,
-}
-
diff --git a/.config/nvim/lua/user/plugins/nvim-tree.lua b/.config/nvim/lua/user/plugins/nvim-tree.lua
deleted file mode 100644
index 3c425c5..0000000
--- a/.config/nvim/lua/user/plugins/nvim-tree.lua
+++ /dev/null
@@ -1,13 +0,0 @@
-require('nvim-tree').setup {
-    renderer = {
-        highlight_opened_files = "all",
-        group_empty = true,
-    },
-    git = {
-        ignore = false,
-    },
-}
-
-vim.cmd [[highlight NvimTreeIndentMarker guifg=#30323E]]
-
-vim.api.nvim_set_keymap('n', '<leader>n', ':NvimTreeFindFileToggle<CR>', { silent = true, noremap = true })
diff --git a/.config/nvim/lua/user/plugins/telescope.lua b/.config/nvim/lua/user/plugins/telescope.lua
deleted file mode 100644
index 5f7023f..0000000
--- a/.config/nvim/lua/user/plugins/telescope.lua
+++ /dev/null
@@ -1,25 +0,0 @@
-local telescope = require 'telescope'
-local actions = require 'telescope.actions'
-local keymap = require 'lib.utils'.keymap
-
-keymap('n', ';f', [[<cmd>lua require('telescope.builtin').find_files()<CR>]])
-keymap('n', ';r', [[<cmd>lua require('telescope.builtin').live_grep()<CR>]])
-keymap('n', ';b', [[<cmd>lua require('telescope.builtin').buffers()<CR>]])
-
-require('telescope').setup {
-    defaults = {
-        sorting_strategy = 'ascending',
-        mappings = {
-            i = {
-                ["<Esc>"] = actions.close,
-                ['<C-Down>'] = actions.cycle_history_next,
-                ['<C-Up>'] = actions.cycle_history_prev,
-            },
-        },
-        file_ignore_patterns = { 
-            '.git/',
-            'node_modules/',
-            'android/',
-        },
-    }
-}
diff --git a/.config/nvim/lua/user/plugins/treesitter.lua b/.config/nvim/lua/user/plugins/treesitter.lua
deleted file mode 100644
index 32c74ee..0000000
--- a/.config/nvim/lua/user/plugins/treesitter.lua
+++ /dev/null
@@ -1,31 +0,0 @@
-require('nvim-treesitter.configs').setup {
-    indent = {
-        enable = true,
-        disable = { 'html' },
-    },
-    highlight = {
-        enable = true,
-        disable = { 'NvimTree' },
-        additional_vim_regex_highlighting = true,
-    },
-    textobjects = {
-        select = {
-            enable = true,
-            lookahead = true,
-            keymaps = {
-                ['ia'] = '@parameter.inner',
-                -- ['aa'] = {
-                --   php = "" '@parameter.outer',
-
-                --   python = "(function_definition) @function",
-                --   cpp = "(function_definition) @function",
-                --   c = "(function_definition) @function",
-                --   java = "(method_declaration) @function",
-            -- },
-            },
-        },
-    },
-    context_commentstring = {
-        enable = true,
-    },
-}
diff --git a/.config/nvim/snippets/all.lua b/.config/nvim/snippets/all.lua
deleted file mode 100644
index 78c33db..0000000
--- a/.config/nvim/snippets/all.lua
+++ /dev/null
@@ -1,23 +0,0 @@
-return {
-    parse('sktn', '<!DOCTYPE html>\
-<html lang="en-US">\
-\
-<head>\
-    <title>Website Title</title>\
-    <meta charset="UTF-8">\
-    <meta name="viewport" content="width=devide-width,initial-scale=1">\
-    <link rel="stylesheet" href="">\
-</head>\
-\
-<body>\
-    <header>\
-        <h1>Header Text</h1>\
-    </header>\
-    <main>\
-        <p>Lorem ipsum bla, bla, bla...</p>\
-    </main>\
-</body>\
-<script src=""></script>\
-\
-</html>'),
-}
diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc
index 1004487..68e4818 100644
--- a/.config/shell/aliasrc
+++ b/.config/shell/aliasrc
@@ -30,8 +30,8 @@ alias ofn='/bin/ls | cat -n | while read n f; do rename "s/${f%.*}/$(printf "%04
 # alias freyr='docker run -it -v /media/hdd/music:/data freyr-dev'
 
 # set my preferred keyboard options
-alias setkeys='xset r rate 250 30 && setxkbmap -layout us,us -variant dvorak, -option "ctrl:nocaps,lv3:rwin_switch,grp:alt_space_toggle"'
-alias setus='setxkbmap -layout us,us -option "ctrl:nocaps"'
+alias setkeys='xset r rate 250 30 && setxkbmap -layout us,de -variant dvorak, -option "ctrl:nocaps,lv3:rwin_switch,grp:alt_space_toggle"'
+alias setus='setxkbmap -layout us -option "ctrl:nocaps"'
 
 # pad numbers in filenames with zeros
 alias padz='rename "s/\d+/sprintf(\"%02d\",$&)/e"'
diff --git a/.config/shell/profile b/.config/shell/profile
index 3b8d72b..a762e89 100644
--- a/.config/shell/profile
+++ b/.config/shell/profile
@@ -1,7 +1,7 @@
 umask 0077
 
 export _JAVA_AWT_WM_NONREPARENTING=1
-export EDITOR="nvim"
+export EDITOR="vim"
 export TERMINAL="st"
 export BROWSER="firefox"
 
diff --git a/.config/x11/xinitrc b/.config/x11/xinitrc
index 93065e5..3dd9c9a 100644
--- a/.config/x11/xinitrc
+++ b/.config/x11/xinitrc
@@ -12,7 +12,7 @@ xrandr --auto --output HDMI-A-0 --mode 1600x900 --left-of DisplayPort-2
 
 xset r rate 250 30
 xset s off -dpms
-setxkbmap -layout us,us -variant dvorak, -option "ctrl:nocaps,lv3:rwin_switch,grp:alt_space_toggle"
+setxkbmap -layout us,de -variant dvorak, -option "ctrl:nocaps,lv3:rwin_switch,grp:alt_space_toggle"
 xrdb -merge ~/.Xresources
 
 ~/.local/bin/set-wallpaper &
diff --git a/.vim/vimrc b/.vim/vimrc
new file mode 100644
index 0000000..bc71bcf
--- /dev/null
+++ b/.vim/vimrc
@@ -0,0 +1,77 @@
+filetype plugin indent on
+syntax enable
+set nocompatible
+set modeline
+set modelines=5
+set nobackup
+set nowritebackup
+set updatetime=300
+set hidden
+set noswapfile
+set laststatus=2
+set shortmess+=c
+
+let g:markdown_fenced_languages = ['javascript', 'js=javascript', 'json=javascript']
+
+let $RTP=split(&runtimepath, ',')[0]
+let $RC="$HOME/.vim/vimrc"
+
+call plug#begin()
+
+Plug 'dracula/vim', { 'as': 'dracula' }
+Plug 'tpope/vim-commentary'
+Plug 'tpope/vim-surround'
+
+call plug#end()
+
+colorscheme dracula
+
+hi Normal ctermbg=black
+
+set autoindent
+set smartindent
+set expandtab
+set tabstop=4
+set shiftwidth=4
+
+set number
+set relativenumber
+set showcmd
+set cmdheight=1
+set completeopt=menuone,noinsert,noselect
+set splitright
+set splitbelow
+set ignorecase
+set smartcase
+set showmatch
+set signcolumn=yes
+set incsearch
+set diffopt+=vertical
+
+" Use ^] to jump to tag under cursor
+" Use g^] for ambiguous tags
+" Use ^t to jump back up the tag stack
+command! MakeTags !ctags -R *
+
+let mapleader="\<space>"
+
+nmap <silent> <c-h> <c-w>h
+nmap <silent> <c-j> <c-w>j
+nmap <silent> <c-k> <c-w>k
+nmap <silent> <c-l> <c-w>l
+
+nmap <leader>Q :bufdo bdelete<CR>
+
+nmap <leader>ve :edit $MYVIMRC<CR>
+nmap <leader>vr :source $MYVIMRC <bar> :doautocmd BufRead<CR>
+
+nnoremap <leader>m :MaximizerToggle!<CR>
+nnoremap <leader>F :ALEFix<CR>
+nnoremap <leader>d :cd %:p:h<CR>:pwd<CR>
+
+vnoremap <c-c> "+y
+nnoremap <c-v> "+p
+
+map gf :edit <cfile><CR>
+
+nmap <leader>x :!xdg-open %<CR><CR>
-- 
cgit v1.2.3