...

diff --git a/stow/i3/.config/i3/config b/stow/i3/.config/i3/config
index 93ebd0eb8740f4744060f134065d522c83ea823e..12e5bde8d0db066e859267323d51f54fa5f3ee29 100644 (file)
--- a/stow/i3/.config/i3/config
+++ b/stow/i3/.config/i3/config
@@ -59,6 +59,7 @@ floating_modifier $mod
 bindsym $mod+Return exec ~/.bin/sensible-terminal.sh
 bindsym $mod+Shift+d exec /usr/bin/dolphin
 bindsym $mod+Shift+f exec firefox
+bindsym $mod+space exec "DISPLAY=:0 setxkbmap -query | grep 'layout:.*us' && setxkbmap de || setxkbmap us"
 # start a terminal
 # use hefault and hope for the best. ... # bindsym $mod+Return exec /usr/bin/gnome-terminal
 
@@ -78,8 +79,6 @@ bindsym $mod+h focus left
 bindsym $mod+j focus down
 bindsym $mod+k focus up
 bindsym $mod+l focus right
-bindsym Control+space focus right
-bindsym Control+Shift+space focus left
 bindsym Mod1+Tab focus right
 bindsym Mod1+Shift+Tab focus left
 
@@ -119,7 +118,7 @@ bindsym $mod+e layout toggle split
 bindsym $mod+Shift+space floating toggle
 
 # change focus between tiling / floating windows
-bindsym $mod+space focus mode_toggle
+bindsym alt+Shift focus mode_toggle
 
 # focus the parent container
 bindsym $mod+a focus parent
@@ -245,3 +244,8 @@ client.unfocused            #1b1b1b   #2a2a2a   #999999   #9FA0FF
 client.focused_inactive     #1b1b1b   #353535   #f0f0f0   #9FA0FF
 Client.urgent               #d64937   #444444   #000000   #d64937
 client.background           #1b1b1b   #353535   #f0f0f0   #9FA0FF
+
+
+
+for_window [window_role="About"] floating enable
+for_window [class="vlc"] floating enable

diff --git a/stow/nvim/.config/nvim/after/plugin/lspsetup.lua b/stow/nvim/.config/nvim/after/plugin/lspsetup.lua
index 367011f7173d3bbf849aa7fdbbf61556947d0aa2..3f87ecd331f222b83075d70569e2ac45fc6ddaa8 100644 (file)
--- a/stow/nvim/.config/nvim/after/plugin/lspsetup.lua
+++ b/stow/nvim/.config/nvim/after/plugin/lspsetup.lua
@@ -1,7 +1,7 @@
 local lsp = require('lsp-zero')
 
 lsp.preset('recommended')
-lsp.configure('sumneko_lua', {
+lsp.configure('lua_ls', {
     settings = {
         Lua = {
             diagnostics = {
@@ -11,18 +11,32 @@ lsp.configure('sumneko_lua', {
     }
 })
 
-lsp.on_attach = function (_, bufnr)
-    local options = { buffer = bufnr, remap = false }
-    vim.keymap.set ("n", "K", vim.lsp.buf.hover, options) -- buffer=0 -> only in current buffer
-    vim.keymap.set ("n", "gd", vim.lsp.buf.definition, options) -- goto definition
-    vim.keymap.set ("n", "gT", vim.lsp.buf.type_definition, options) -- goto typedefinition
-    vim.keymap.set ("n", "gi", vim.lsp.buf.implementation, options) -- goto implementation
-    vim.keymap.set ("n", "dj", vim.diagnostic.goto_next, options) -- goto dignostic next
-    vim.keymap.set ("n", "dk", vim.diagnostic.goto_prev, options) -- goto diognostic prev
-    vim.keymap.set ("n", "dl", "<cmd>Telescope diagnostic", options) -- goto list failure
-    vim.keymap.set ("n", "<leader>r", vim.lsp.buf.rename, options)
-    vim.keymap.set ("n", "<leader>f", vim.lsp.buf.code_action, options)
-end
+
+lsp.on_attach(function(client, bufnr)
+  lsp.default_keymaps({buffer = bufnr})
+     vim.keymap.set ("n", "<leader>r", vim.lsp.buf.rename, options)
+     vim.keymap.set ("n", "<leader>f", vim.lsp.buf.code_action, options)
+end)
+
+lsp.set_sign_icons({
+  error = '✘',
+  warn = '▲',
+  hint = '⚑',
+  info = '»'
+})
+-- lsp.on_attach = function (_, bufnr)
+--     print "attached"
+--     local options = { buffer = bufnr, remap = false }
+--     vim.keymap.set ("n", "K", vim.lsp.buf.hover, options) -- buffer=0 -> only in current buffer
+--     vim.keymap.set ("n", "gd", vim.lsp.buf.definition, options) -- goto definition
+--     vim.keymap.set ("n", "gT", vim.lsp.buf.type_definition, options) -- goto typedefinition
+--     vim.keymap.set ("n", "gi", vim.lsp.buf.implementation, options) -- goto implementation
+--     vim.keymap.set ("n", "dj", vim.diagnostic.goto_next, options) -- goto dignostic next
+--     vim.keymap.set ("n", "dk", vim.diagnostic.goto_prev, options) -- goto diognostic prev
+--     vim.keymap.set ("n", "dl", "<cmd>Telescope diagnostic", options) -- goto list failure
+--     vim.keymap.set ("n", "<leader>r", vim.lsp.buf.rename, options)
+--     vim.keymap.set ("n", "<leader>f", vim.lsp.buf.code_action, options)
+-- end
 
 local cmp = require('cmp')
 local cmp_select = {behavior = cmp.SelectBehavior.Select}
@@ -41,6 +55,7 @@ cmp.setup({
     experimental = { ghost_text = true },
 });
 
+vim.diagnostic.config( { virtual_text = true } )
+
 lsp.setup()
 
-vim.diagnostic.config( { virtual_text = true } )

diff --git a/stow/oh-my-zsh/.oh-my-zsh b/stow/oh-my-zsh/.oh-my-zsh
index 72732a224e886933df6b64a49ec6f5e94c884612..bd5ebba834c53e730671d9d24d93eb98b812a579 160000 (submodule)
--- a/stow/oh-my-zsh/.oh-my-zsh
+++ b/stow/oh-my-zsh/.oh-my-zsh
@@ -1 +1 @@
-Subproject commit 72732a224e886933df6b64a49ec6f5e94c884612
+Subproject commit bd5ebba834c53e730671d9d24d93eb98b812a579