summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Vink <mike.vink@stater.nl>2023-05-30 17:45:49 +0000
committerMike Vink <mike.vink@stater.nl>2023-05-30 17:45:49 +0000
commit7f8f04956ab410a33168fd6ac827e5d362d9a82b (patch)
tree8cca7270cdc7cceafe11030c5ab4b9b2038fbd6b
parentcf285a41b214137f3651c0aa093fffad6805301b (diff)
update editor config
-rw-r--r--home/neovim.nix6
-rw-r--r--home/packages.nix1
-rwxr-xr-xshell-scripts/kakup9
3 files changed, 13 insertions, 3 deletions
diff --git a/home/neovim.nix b/home/neovim.nix
index 5872a52..1fbbf40 100644
--- a/home/neovim.nix
+++ b/home/neovim.nix
@@ -28,10 +28,14 @@
editorconfig = {
enable = true;
settings = {
- "*.{fnl,rkt,nix,md,hcl,tf,py,cpp,qml,js,txt,json,html,lua,yaml,yml,bash,sh,go}" = {
+ "*" = {
trim_trailing_whitespace = true;
insert_final_newline = true;
};
+ "*.yaml" = {
+ indent_style = "space";
+ indent_size = 2;
+ };
};
};
diff --git a/home/packages.nix b/home/packages.nix
index bf02389..f908ebf 100644
--- a/home/packages.nix
+++ b/home/packages.nix
@@ -18,6 +18,7 @@
dasel
initool
nnn
+ python311Packages.editorconfig
# shell tools
bashInteractive
k9s
diff --git a/shell-scripts/kakup b/shell-scripts/kakup
index c015d95..bb4a051 100755
--- a/shell-scripts/kakup
+++ b/shell-scripts/kakup
@@ -20,10 +20,15 @@ session-or-client() {
tmux new-window -n $client kak -c $name
fi
popd
- } </dev/stdin >debug 2>&1
+ } </dev/stdin >/dev/null 2>&1
echo $client
}
-client="$(fd -d1 "." -t d $HOME $HOME/projects | fzf -1 | session-or-client)"
+case "${@}" in
+ "") client="$(pwd | session-or-client)" ;;
+ .) client="$(fd -d1 "." -t d $HOME $HOME/projects | fzf -1 | session-or-client)" ;;
+ *) client="$(echo "${@}" | session-or-client)" ;;
+esac
+
echo "client: $client"
[[ $client ]] && tmux attach -t "$client"