Neovim things

24 files changed, 127 insertions, 22 deletions

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.3
index 1b7e47b..1b7e47b 100644
--- 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.3
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.3
index efb9cf4..efb9cf4 100644
--- 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.3
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.3
index 6af5d28..6af5d28 100644
--- 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.3
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.3
index d69f888..d69f888 100644
--- 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.3
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.3
index 2ba9595..2ba9595 100644
--- 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.3
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.3
index 4c3ec36..4c3ec36 100644
--- 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.3
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.3
index b92acbb..ff772cc 100644
--- 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.3
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.3
index 74f7307..dec253a 100644
--- 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.3
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', '<leader>sl', ':source vim_session.vim<cr>', silentnoremap)
 --  "<SID>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
diff --git a/bin/bin b/bin/bin
deleted file mode 120000
index 8402b35..0000000
--- a/bin/bin
+++ /dev/null
@@ -1 +0,0 @@
-/home/jakob/_code/dotfiles/bin
\ No newline at end of file
diff --git a/bin/brightness-popup.sh b/bin/brightness-popup.sh
index 3c3ad98..7a60f61 100755
--- a/bin/brightness-popup.sh
+++ b/bin/brightness-popup.sh
@@ -17,4 +17,5 @@ BRIGHTNESS=${brightnessperc%.*}
 #                         --hint string:image-path:video-display boolean:transient:true \
 #                                int:has-percentage:$BRIGHTNESS \
 #                         --replaces-process "brightness-popup")
-notify-send.py "Brightness" "$BRIGHTNESS%" --hint boolean:transient:true int:value:$BRIGHTNESS --replaces-process "brightness-popup"
+#notify-send.py "Brightness" "$BRIGHTNESS%" --hint boolean:transient:true int:value:$BRIGHTNESS --replaces-process "brightness-popup"
+echo $BRIGHTNESS > $2
diff --git a/bin/devcontainer b/bin/devcontainer
new file mode 100755
index 0000000..6a48b6f
--- /dev/null
+++ b/bin/devcontainer
@@ -0,0 +1,84 @@
+#!/bin/bash
+
+if ! [ -x "$(command -v jq)" ]; then
+    printf "\x1B[31m[ERROR] jq is not installed.\x1B[0m\n"
+    exit 1
+fi
+OPTIND=1
+VERBOSE=0
+
+while getopts "v" opt; do
+    case ${opt} in
+        v ) VERBOSE=1 ;;
+    esac
+done
+
+debug() {
+    if [ $VERBOSE == 1 ]; then
+        printf "\x1B[33m[DEBUG] ${1}\x1B[0m\n"
+    fi
+}
+
+WORKSPACE=${1:-`pwd`}
+CURRENT_DIR=${PWD##*/}
+echo "Using workspace ${WORKSPACE}"
+
+CONFIG_DIR=./.devcontainer
+debug "CONFIG_DIR: ${CONFIG_DIR}"
+CONFIG_FILE=devcontainer.json
+debug "CONFIG_FILE: ${CONFIG_FILE}"
+if ! [ -e "$CONFIG_DIR/$CONFIG_FILE" ]; then
+    echo "Folder contains no devcontainer configuration"
+    exit
+fi
+
+CONFIG=$(cat $CONFIG_DIR/$CONFIG_FILE | grep -v //)
+debug "CONFIG: \n${CONFIG}"
+
+cd $CONFIG_DIR
+
+DOCKER_FILE=$(echo $CONFIG | jq -r .dockerFile)
+if [ "$DOCKER_FILE" == "null" ]; then 
+    DOCKER_FILE=$(echo $CONFIG | jq -r .build.dockerfile)
+fi
+DOCKER_FILE=$(readlink -f $DOCKER_FILE)
+debug "DOCKER_FILE: ${DOCKER_FILE}"
+if ! [ -e $DOCKER_FILE ]; then
+    echo "Can not find dockerfile ${DOCKER_FILE}"
+    exit
+fi
+
+NAME=$(echo $CONFIG | jq -r .name)
+debug "NAME: ${NAME}"
+
+REMOTE_USER=$(echo $CONFIG | jq -r .remoteUser)
+debug "REMOTE_USER: ${REMOTE_USER}"
+if ! [ "$REMOTE_USER" == "null" ]; then
+    REMOTE_USER="-u ${REMOTE_USER}"
+fi
+
+ARGS=$(echo $CONFIG | jq -r '.build.args | to_entries? | map("--build-arg \(.key)=\"\(.value)\"")? | join(" ")')
+debug "ARGS: ${ARGS}"
+
+SHELL=$(echo $CONFIG | jq -r '.settings."terminal.integrated.shell.linux"')
+debug "SHELL: ${SHELL}"
+
+PORTS=$(echo $CONFIG | jq -r '.forwardPorts | map("-p \(.):\(.)")? | join(" ")')
+debug "PORTS: ${PORTS}"
+
+ENVS=$(echo $CONFIG | jq -r '.remoteEnv | to_entries? | map("-e \(.key)=\(.value)")? | join(" ")')
+debug "ENVS: ${ENVS}"
+
+WORK_DIR="/workspace"
+debug "WORK_DIR: ${WORK_DIR}"
+
+MOUNT="${MOUNT} --mount type=bind,source=${WORKSPACE},target=${WORK_DIR}"
+debug "MOUNT: ${MOUNT}"
+
+echo "Building and starting container"
+set -x
+DOCKER_IMAGE_HASH=$(docker build -t devcontainer -f $DOCKER_FILE $ARGS .)
+debug "DOCKER_IMAGE_HASH: ${DOCKER_IMAGE_HASH}"
+
+#docker run -it $REMOTE_USER $PORTS $ENVS $MOUNT -w $WORK_DIR $DOCKER_IMAGE_HASH $SHELL
+docker run -it $PORTS $ENVS $MOUNT -w $WORK_DIR devcontainer $SHELL
diff --git a/bin/tt b/bin/tt
deleted file mode 120000
index bba9035..0000000
--- a/bin/tt
+++ /dev/null
@@ -1 +0,0 @@
-/home/jakob/_code/timetracker/tt
\ No newline at end of file
diff --git a/bin/watchsql b/bin/watchsql
deleted file mode 120000
index af05887..0000000
--- a/bin/watchsql
+++ /dev/null
@@ -1 +0,0 @@
-/home/jakob/_code/watchsql/watchsql
\ No newline at end of file
diff --git a/bin/watchsql-basic b/bin/watchsql-basic
deleted file mode 120000
index 9590071..0000000
--- a/bin/watchsql-basic
+++ /dev/null
@@ -1 +0,0 @@
-/home/jakob/_code/watchsql/watchsql-basic.py
\ No newline at end of file
diff --git a/linux/tmux.conf b/linux/tmux.conf
index f7b696b..f10801d 100644
--- a/linux/tmux.conf
+++ b/linux/tmux.conf
@@ -1,10 +1,10 @@
 # -- general -------------------------------------------------------------------
-set -g default-terminal "xterm-256color"
+#set -g default-terminal "xterm-256color"
 #set -g default-terminal "screen-256color"
 set -as terminal-overrides ",*:U8=0"
 set -s escape-time 10 # faster command sequences
 set -s focus-events on
-set-option -sa terminal-overrides ',rxvt-256color:RGB'
+#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"