From ae56946206235b8b6f30a184d29a41cc5dcc39ca Mon Sep 17 00:00:00 2001 From: "jakob.stendahl" Date: Mon, 24 Apr 2023 07:13:20 +0200 Subject: Neovim things --- Common/i3/config/i3/config | 6 +++++- Common/nvim/ftplugin/java.lua | 6 ++++++ .../org.eclipse.core.runtime/.contributions.2 | Bin 1637 -> 0 bytes .../org.eclipse.core.runtime/.contributions.3 | Bin 0 -> 1637 bytes .../org.eclipse.core.runtime/.contributors.2 | Bin 2002 -> 0 bytes .../org.eclipse.core.runtime/.contributors.3 | Bin 0 -> 2002 bytes .../config_linux/org.eclipse.core.runtime/.extraData.2 | Bin 24250 -> 0 bytes .../config_linux/org.eclipse.core.runtime/.extraData.3 | Bin 0 -> 24250 bytes .../config_linux/org.eclipse.core.runtime/.mainData.2 | Bin 81444 -> 0 bytes .../config_linux/org.eclipse.core.runtime/.mainData.3 | Bin 0 -> 81444 bytes .../org.eclipse.core.runtime/.manager/.fileTable.10 | 10 ++++++++++ .../org.eclipse.core.runtime/.manager/.fileTable.8 | 10 ---------- .../org.eclipse.core.runtime/.namespaces.2 | Bin 2242 -> 0 bytes .../org.eclipse.core.runtime/.namespaces.3 | Bin 0 -> 2242 bytes .../config_linux/org.eclipse.core.runtime/.orphans.2 | Bin 135 -> 0 bytes .../config_linux/org.eclipse.core.runtime/.orphans.3 | Bin 0 -> 135 bytes .../config_linux/org.eclipse.core.runtime/.table.2 | Bin 8856 -> 0 bytes .../config_linux/org.eclipse.core.runtime/.table.3 | Bin 0 -> 8856 bytes .../org.eclipse.osgi/.manager/.fileTable.2 | 4 ---- .../org.eclipse.osgi/.manager/.fileTable.4 | 4 ++++ .../config_linux/org.eclipse.osgi/framework.info.2 | Bin 338958 -> 0 bytes .../config_linux/org.eclipse.osgi/framework.info.3 | Bin 0 -> 338956 bytes Common/nvim/lua/basic.lua | 6 ++++++ Common/p10k.zsh | 2 ++ Common/zshrc | 6 ++++++ 25 files changed, 39 insertions(+), 15 deletions(-) delete mode 100644 Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.contributions.2 create mode 100644 Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.contributions.3 delete mode 100644 Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.contributors.2 create mode 100644 Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.contributors.3 delete mode 100644 Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.extraData.2 create mode 100644 Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.extraData.3 delete mode 100644 Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.mainData.2 create mode 100644 Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.mainData.3 create mode 100644 Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.manager/.fileTable.10 delete mode 100644 Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.manager/.fileTable.8 delete mode 100644 Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.namespaces.2 create mode 100644 Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.namespaces.3 delete mode 100644 Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.orphans.2 create mode 100644 Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.orphans.3 delete mode 100644 Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.table.2 create mode 100644 Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.table.3 delete mode 100644 Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.osgi/.manager/.fileTable.2 create mode 100644 Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.osgi/.manager/.fileTable.4 delete mode 100644 Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.osgi/framework.info.2 create mode 100644 Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.osgi/framework.info.3 (limited to 'Common') diff --git a/Common/i3/config/i3/config b/Common/i3/config/i3/config index 1b04fc2..a2b7df6 100644 --- a/Common/i3/config/i3/config +++ b/Common/i3/config/i3/config @@ -27,12 +27,16 @@ exec --no-startup-id xrandr --auto # Start nm-applet for network things :) exec --no-startup-id nm-applet +exec --no-startup-id blueman-applet exec --no-startup-id i3-battery-popup -n exec --no-startup-id deadd-notification-center # start a terminal bindsym $super+Return exec urxvt -bindsym $super+$alt+Return exec urxvt --name floating -e noemutt +bindsym $super+Alt+Return exec urxvt --name floating -e noemutt + +# Shortcut to tt gui +bindsym $super+Shift+Return exec /home/jakob/.local/bin/tt-g # start dmenu (a program launcher) bindsym $super+Shift+d exec i3-dmenu-desktop --dmenu="dmenu -i -fn 'Noto Sans:size=8'" diff --git a/Common/nvim/ftplugin/java.lua b/Common/nvim/ftplugin/java.lua index c8fbf91..9a7e0f0 100644 --- a/Common/nvim/ftplugin/java.lua +++ b/Common/nvim/ftplugin/java.lua @@ -1,6 +1,12 @@ vim.opt.tabstop = 4 vim.opt.expandtab = false +-- Solr +vim.opt.shiftwidth = 4 +vim.opt.tabstop = 8 +vim.opt.softtabstop = 4 +vim.opt.expandtab = false + local config = { cmd = { "java", diff --git a/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.contributions.2 b/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.contributions.2 deleted file mode 100644 index 1b7e47b..0000000 Binary files a/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.contributions.2 and /dev/null differ diff --git a/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.contributions.3 b/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.contributions.3 new file mode 100644 index 0000000..1b7e47b Binary files /dev/null and b/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.contributions.3 differ diff --git a/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.contributors.2 b/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.contributors.2 deleted file mode 100644 index efb9cf4..0000000 Binary files a/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.contributors.2 and /dev/null differ diff --git a/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.contributors.3 b/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.contributors.3 new file mode 100644 index 0000000..efb9cf4 Binary files /dev/null and b/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.contributors.3 differ diff --git a/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.extraData.2 b/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.extraData.2 deleted file mode 100644 index 6af5d28..0000000 Binary files a/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.extraData.2 and /dev/null differ diff --git a/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.extraData.3 b/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.extraData.3 new file mode 100644 index 0000000..6af5d28 Binary files /dev/null and b/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.extraData.3 differ diff --git a/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.mainData.2 b/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.mainData.2 deleted file mode 100644 index d69f888..0000000 Binary files a/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.mainData.2 and /dev/null differ diff --git a/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.mainData.3 b/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.mainData.3 new file mode 100644 index 0000000..d69f888 Binary files /dev/null and b/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.mainData.3 differ diff --git a/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.manager/.fileTable.10 b/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.manager/.fileTable.10 new file mode 100644 index 0000000..54940b3 --- /dev/null +++ b/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.manager/.fileTable.10 @@ -0,0 +1,10 @@ +#safe table +#Fri Apr 21 15:08:37 CEST 2023 +.orphans=3 +.mainData=3 +.contributors=3 +.namespaces=3 +.extraData=3 +.contributions=3 +.table=3 +.crce07e42f8.v1 diff --git a/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.manager/.fileTable.8 b/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.manager/.fileTable.8 deleted file mode 100644 index 62ef7e7..0000000 --- a/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.manager/.fileTable.8 +++ /dev/null @@ -1,10 +0,0 @@ -#safe table -#Wed Jun 22 15:46:32 CEST 2022 -.orphans=1 -.mainData=1 -.contributors=1 -.namespaces=1 -.extraData=1 -.contributions=1 -.table=1 -.crc54e8795a.v1 diff --git a/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.namespaces.2 b/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.namespaces.2 deleted file mode 100644 index 2ba9595..0000000 Binary files a/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.namespaces.2 and /dev/null differ diff --git a/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.namespaces.3 b/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.namespaces.3 new file mode 100644 index 0000000..2ba9595 Binary files /dev/null and b/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.namespaces.3 differ diff --git a/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.orphans.2 b/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.orphans.2 deleted file mode 100644 index 4c3ec36..0000000 Binary files a/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.orphans.2 and /dev/null differ diff --git a/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.orphans.3 b/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.orphans.3 new file mode 100644 index 0000000..4c3ec36 Binary files /dev/null and b/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.orphans.3 differ diff --git a/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.table.2 b/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.table.2 deleted file mode 100644 index b92acbb..0000000 Binary files a/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.table.2 and /dev/null differ diff --git a/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.table.3 b/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.table.3 new file mode 100644 index 0000000..ff772cc Binary files /dev/null and b/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.core.runtime/.table.3 differ diff --git a/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.osgi/.manager/.fileTable.2 b/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.osgi/.manager/.fileTable.2 deleted file mode 100644 index e498fc1..0000000 --- a/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.osgi/.manager/.fileTable.2 +++ /dev/null @@ -1,4 +0,0 @@ -#safe table -#Wed Jun 22 15:46:32 CEST 2022 -framework.info=1 -.crc6cf96597.v1 diff --git a/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.osgi/.manager/.fileTable.4 b/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.osgi/.manager/.fileTable.4 new file mode 100644 index 0000000..daa71fe --- /dev/null +++ b/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.osgi/.manager/.fileTable.4 @@ -0,0 +1,4 @@ +#safe table +#Fri Apr 21 15:05:41 CEST 2023 +framework.info=3 +.crc52cccb78.v1 diff --git a/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.osgi/framework.info.2 b/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.osgi/framework.info.2 deleted file mode 100644 index 74f7307..0000000 Binary files a/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.osgi/framework.info.2 and /dev/null differ diff --git a/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.osgi/framework.info.3 b/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.osgi/framework.info.3 new file mode 100644 index 0000000..dec253a Binary files /dev/null and b/Common/nvim/lsp/jdt-language-server/config_linux/org.eclipse.osgi/framework.info.3 differ diff --git a/Common/nvim/lua/basic.lua b/Common/nvim/lua/basic.lua index 0e030ec..e731da8 100755 --- a/Common/nvim/lua/basic.lua +++ b/Common/nvim/lua/basic.lua @@ -253,3 +253,9 @@ map('n', 'sl', ':source vim_session.vim', silentnoremap) -- "BufcloseCloseIt()", -- {bang = true} --) + + + + +-- This is to get rid of weird artifacts with text showing up inside buffer. +vim.opt.title = false diff --git a/Common/p10k.zsh b/Common/p10k.zsh index cff23b2..ccc6565 100644 --- a/Common/p10k.zsh +++ b/Common/p10k.zsh @@ -1632,3 +1632,5 @@ typeset -g POWERLEVEL9K_CONFIG_FILE=${${(%):-%x}:a} (( ${#p10k_config_opts} )) && setopt ${p10k_config_opts[@]} 'builtin' 'unset' 'p10k_config_opts' + +typeset -g ZLE_RPROMPT_INDENT=0 diff --git a/Common/zshrc b/Common/zshrc index beda6af..17ebc73 100644 --- a/Common/zshrc +++ b/Common/zshrc @@ -146,3 +146,9 @@ export EDITOR="vim" export GIT_AUTHOR_NAME="jakob.stendahl" export GIT_AUTHOR_EMAIL="jakob.stendahl@infomedia.dk" +# start only one ssh-agent and reuse the created one +# this is used for sway, althou keys added do not persist on reboot +if ! pgrep -u "$USER" ssh-agent > /dev/null; then + ssh-agent > "$XDG_RUNTIME_DIR/ssh-agent.env" +fi +source "$XDG_RUNTIME_DIR/ssh-agent.env" > /dev/null -- cgit v1.2.3