Add small configs

8 files changed, 45 insertions, 31 deletions

diff --git a/Common/foot/foot.ini b/Common/foot/foot.ini
index 710c0dc..6959986 100644
--- a/Common/foot/foot.ini
+++ b/Common/foot/foot.ini
@@ -2,6 +2,7 @@
 
 # shell=$SHELL (if set, otherwise user's default shell from /etc/passwd)
 # term=foot (or xterm-256color if built with -Dterminfo=disabled)
+term=xterm-256color
 # login-shell=no
 
 # app-id=foot
@@ -69,24 +70,26 @@ pad=0x0 center                            # optionally append 'center'
 [colors]
 alpha=1
 
-background=eeeeee
-foreground=0E1116
-regular0=24292f
-regular1=cf222e
-regular2=116329
-regular3=4d2d00
-regular4=0969da
-regular5=8250df
-regular6=1b7c83
-regular7=6e7781
-bright0=57606a
-bright1=a40e26
-bright2=1a7f37
-bright3=633c01
-bright4=218bff
-bright5=a475f9
-bright6=3192aa
-bright7=8c959f
+background= eeeeee
+foreground= 000000
+
+regular0  = 24292f
+regular1  = cf222e
+regular2  = 116329
+regular3  = 4d2d00
+regular4  = 0969da
+regular5  = 8250df
+regular6  = 1b7c83
+regular7  = 6e7781
+
+bright0   = 57606a
+bright1   = a40e26
+bright2   = 00d700
+bright3   = fcfc62
+bright4   = 0000ff
+bright5   = a475f9
+bright6   = 3192aa
+bright7   = 8c959f
 
 # foreground=dcdccc
 # background=111111
diff --git a/Common/nvim/ftplugin/java.lua b/Common/nvim/ftplugin/java.lua
index 9a7e0f0..77d3d50 100644
--- a/Common/nvim/ftplugin/java.lua
+++ b/Common/nvim/ftplugin/java.lua
@@ -44,7 +44,7 @@ local config = {
     }
 }
 
-require("jdtls").start_or_attach(config)
+--require("jdtls").start_or_attach(config)
 
 local current_buff = vim.api.nvim_get_current_buf
 -- After the language server attaches to the current buffer
@@ -93,4 +93,4 @@ local java_on_attach = function(client, bufnr)
     --vim.api.nvim_command [[autocmd BufWritePre <buffer> lua vim.lsp.buf.formatting_seq_sync()]]
 end
 
-java_on_attach(nil, current_buff)
+-- java_on_attach(nil, current_buff)
diff --git a/Common/nvim/lua/basic.lua b/Common/nvim/lua/basic.lua
index e731da8..57088dc 100755
--- a/Common/nvim/lua/basic.lua
+++ b/Common/nvim/lua/basic.lua
@@ -96,6 +96,7 @@ vim.cmd [[ highlight ColorColumn ctermbg=16 ]]
 
 -- Colorscheme
 -- default
+vim.cmd [[ colorscheme morning ]]
 
 -- Workaround for gutter color
 vim.cmd [[
@@ -175,7 +176,7 @@ map('n', '<leader>h', ':bprevious<cr>', silentnoremap)
 -- Tab commands
 map('n', '<leader>tn',  ':tabnew<cr>', silentnoremap)
 map('n', '<leader>to',  ':tabonly<cr>', silentnoremap)
-map('n', '<leader>tc',  ':tabclose<cr>', silentnoremap)
+--map('n', '<leader>tc',  ':tabclose<cr>', silentnoremap)
 map('n', '<leader>tm',  ':tabmove', silentnoremap)
 map('n', '<leader>t<leader>', ':tabnext', silentnoremap)
 
diff --git a/Common/nvim/lua/plugins.lua b/Common/nvim/lua/plugins.lua
index 3077560..26f217f 100755
--- a/Common/nvim/lua/plugins.lua
+++ b/Common/nvim/lua/plugins.lua
@@ -80,6 +80,7 @@ return require('packer').startup(function(use)
         ]]
         map("n", ";", ":Files<cr>", silentnoremap)
         map("n", "<leader>;", ":Rg<cr>", silentnoremap)
+        map("n", "<leader><leader>;", ":BLines<cr>", silentnoremap)
       end,
   }
 
@@ -168,6 +169,13 @@ return require('packer').startup(function(use)
   }
   use { 'smithbm2316/centerpad.nvim' }
 
+  -- Color preview
+  use {
+    'lilydjwg/colorizer',
+    config = function()
+    end,
+  }
+
   -- packer.nvim
   -- Automatically set up your configuration after cloning packer.nvim
   -- Put this at the end after all plugins
diff --git a/Common/nvim/nvim b/Common/nvim/nvim
deleted file mode 120000
index 3b8a801..0000000
--- a/Common/nvim/nvim
+++ /dev/null
@@ -1 +0,0 @@
-/home/jakob/_code/dotfiles/Common/nvim
\ No newline at end of file
diff --git a/Common/sway/config b/Common/sway/config
index 31aed6a..c5c59b9 100644
--- a/Common/sway/config
+++ b/Common/sway/config
@@ -57,7 +57,6 @@ bindswitch lid:off output $laptop enable
 
 # kill focused window
 bindsym $Mod+Shift+q kill
-bindsym Mod1+q kill
 bindsym Mod1+F4 kill
 
 # core applications
@@ -103,8 +102,8 @@ bindsym $Mod+Shift+c reload
 bindsym $Mod+Shift+Return exec /home/jakob/.local/bin/tt-g
 
 # Keyboard layout
-bindsym $Mod+Shift+F1 exec "swaymsg input 1:1:AT_Translated_Set_2_keyboard xkb_layout no"
-bindsym $Mod+Shift+F2 exec "swaymsg input 1:1:AT_Translated_Set_2_keyboard xkb_layout us"
+bindsym $Mod+Shift+Space input "1:1:AT_Translated_Set_2_keyboard" xkb_switch_layout next
+
 
 ###########          Workspace Bindings          ###############
 
diff --git a/Common/sway/keyboard b/Common/sway/keyboard
index 935ef70..6b2c442 100644
--- a/Common/sway/keyboard
+++ b/Common/sway/keyboard
@@ -1,5 +1,5 @@
 input "type:keyboard" {
-  xkb_layout us
+  xkb_layout us,no
   repeat_delay 300
   repeat_rate 40
   xkb_capslock disabled
diff --git a/linux/tmux.conf b/linux/tmux.conf
index f10801d..d4f8a7d 100644
--- a/linux/tmux.conf
+++ b/linux/tmux.conf
@@ -1,10 +1,14 @@
 # -- general -------------------------------------------------------------------
 #set -g default-terminal "xterm-256color"
 #set -g default-terminal "screen-256color"
-set -as terminal-overrides ",*:U8=0"
+set -g default-terminal "xterm-256color"
+
+#set -as terminal-overrides ",*:U8=0"
+#set-option -sa terminal-overrides ',xterm-256color:RGB'
+set-option -ga terminal-overrides ",xterm-256color:Tc"
+
 set -s escape-time 10 # faster command sequences
 set -s focus-events on
-#set-option -sa terminal-overrides ',rxvt-256color:RGB'
 
 #run-shell "powerline-daemon -q"
 #source "/usr/local/lib/python3.7/site-packages/powerline/bindings/tmux/powerline.conf"
@@ -23,8 +27,8 @@ set -g status-interval 10     # redraw status line every 10 seconds
 
 set-option -g default-shell /usr/bin/zsh
 
-set-option -g display-panes-active-colour colour33
-set-option -g display-panes-colour colour166
+#set-option -g display-panes-active-colour colour33
+#set-option -g display-panes-colour colour166
 
 # activity
 set -g monitor-activity on
@@ -67,7 +71,7 @@ set -g visual-bell on
 set -g bell-action any
 
 # Scroll in shell
-set -g terminal-overrides 'xterm*:smcup@:rmcup@'
+#set -g terminal-overrides 'xterm*:smcup@:rmcup@'
 #set -wg xterm-keys       1
 set -g mouse on
 #set-option -s set-clipboard off