feat(nvim): bump version

.gitignore

@@ -26,6 +26,7 @@ zsh/*
 !tmux
 tmux/*
 !tmux/tmux.conf
+!tmux/tmux-new-project
 !tmux/tmux-sessionizer
 !tmux/tmux-ggclone
 !tmux/tmux-ssher

git/config

@@ -5,8 +5,6 @@
 	autocrlf = input
 	excludesfile = ~/.config/git/gitignore
 	editor = nvim
-[init]
-	defaultBranch = master
 [include]
 	path = ~/.config/git/alias
 [include]
@@ -14,3 +12,5 @@
 [includeIf "gitdir:~/Desktop/git/git.aflabs.org/"]
 	path = ~/.config/git/aflabs
 
+[init]
+	defaultBranch = main

nvim

@@ -1 +1 @@
-Subproject commit b087eaa1ef08ad47fe3ea639151b3ae21d1e61c0
+Subproject commit b2fe47460500090114c967da48d617ce84b8b64a

tmux/tmux-ggclone

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+source "$XDG_CONFIG_HOME/zsh/scripts.zsh"
+
 if [[ $# -eq 1 ]]; then
     selected=$1
 else
@@ -11,5 +13,4 @@ if [[ -z $selected ]]; then
 fi
 
 ggman clone "$selected"
-find -L $GGROOT -mindepth 1 -maxdepth 5 -type d -name .git -prune | xargs -n 1 dirname > "$GGROOT/compiled"
+ggcompile
-

tmux/tmux-new-project

@@ -0,0 +1,50 @@
+#!/usr/bin/env bash
+
+if [[ -z ${NAME:+x} ]]; then
+    echo "missing name"
+    sleep 2
+    exit 1
+fi
+
+source "$XDG_CONFIG_HOME/zsh/scripts.zsh"
+
+read -p "name: " project_name
+
+if [[ -z $project_name ]]; then
+    exit 0
+fi
+
+if [[ -d "$GGROOT/no-remote/$project_name" ]]; then
+    exit 0
+fi
+
+project="$GGROOT/no-remote/$project_name"
+git init $project
+echo "# $project_name" >>"$project/README.md"
+
+gitignore_template=$(
+    find "$GGROOT"/github.com/github/gitignore/*.gitignore -exec basename {} \; \
+        | sed 's/\(.*\)\.gitignore/\1/' \
+        | fzf --cycle --bind 'tab:toggle-up,btab:toggle-down'
+)
+
+if ! [[ -z $gitignore_template ]]; then
+    gitignore="$GGROOT/github.com/github/gitignore/$gitignore_template.gitignore"
+    echo "$gitignore"
+    echo "$project/.gitignore"
+    cat "$gitignore" >>"$project/.gitignore"
+fi
+
+license_template=$(
+    find "$GGROOT"/git.janezic.dev/janezicmatej/license/*.license -exec basename {} \; \
+        | sed 's/\(.*\)\.license/\1/' \
+        | fzf --cycle --bind 'tab:toggle-up,btab:toggle-down'
+)
+
+if ! [[ -z $license_template ]]; then
+    license="$GGROOT/git.janezic.dev/janezicmatej/license/$license_template.license"
+    export YEAR="$(date '+%Y')"
+    envsubst <"$license" >"$project/LICENSE"
+fi
+
+ggcompile

tmux/tmux.conf

@@ -37,4 +37,4 @@ bind-key F run-shell "tmux neww ~/.config/tmux/tmux-ssher"
 bind-key T run-shell "tmux neww ~/.config/tmux/tmux-sessionizer ~/temp"
 bind-key R run-shell "tmux neww ~/.config/tmux/tmux-sessionizer ~"
 bind-key G run-shell "tmux neww ~/.config/tmux/tmux-ggclone"
-
+bind-key N run-shell "tmux neww ~/.config/tmux/tmux-new-project"

zsh/.zshenv

@@ -45,3 +45,5 @@ export GPG_TTY=$TTY
 export USER_UID=$(id -u)
 export USER_GID=$(id -g)
 
+# name
+export NAME="Matej Janežič"

zsh/aliases.zsh

@@ -1,9 +1,8 @@
-alias s="ssh"
 alias z="exec zsh"
 alias t="tmux a || tmux new-session -s $(whoami) -c ~"
 alias n=nvim_ve
 # alias vim=nvim_ve
-alias ssh-hosts="grep -P \"^Host ([^*]+)$\" $HOME/.ssh/config | sed 's/Host //'"
+alias s="ssh-menu"
 
 # navigation
 alias cdgit="cd $GGROOT"

zsh/scripts.zsh

@@ -1,6 +1,5 @@
-
 function nvim_ve {
-  if [[ -e "$VIRTUAL_ENV" && -f "$VIRTUAL_ENV/bin/activate" ]]; then
+    if [[ -e $VIRTUAL_ENV && -f "$VIRTUAL_ENV/bin/activate" ]]; then
         source "$VIRTUAL_ENV/bin/activate"
         command nvim $@
         deactivate
@@ -35,11 +34,10 @@ function afm {
         VER=$(echo "$RES" | jq '.[] | select(.name | contains("'"$2"'")).version')
         # OP=$(echo "$RES" | jq '.[] | select(.name | contains("'"$2"'")).requirement?[0][0]')
         # echo "$2""$(echo "$OP" | tr -d '"')""$(echo "$VER" | tr -d '"')"
-    echo "$2""==""$(echo "$VER" | tr -d '"')"
+        echo "${2}==$(echo "$VER" | tr -d '"')"
     fi
 }
 
-
 function nukepip {
     pip uninstall $(pip freeze) -y
     pip install -r $(pyenv root)/default-packages
@@ -89,7 +87,6 @@ function dps {
     fi
 }
 
-
 function get_dump {
     if [[ -z $1 ]]; then
         echo "provide ssh host"
@@ -112,7 +109,8 @@ function get_dump {
 }
 
 function ggcompile {
-  find -L $GGROOT -mindepth 1 -maxdepth 5 -type d -name .git  -prune | xargs -n 1 dirname > "$GGROOT/compiled"
+    find -L "$GGROOT" -mindepth 1 -maxdepth 5 -type d -name .git -prune \
+        -exec dirname {} \; >"$GGROOT/compiled"
 }
 
 function tssh {
@@ -123,3 +121,18 @@ function tssh {
 
     ssh -t "$@" "command -v tmux && (tmux a || tmux new-session -s gorazd -c ~) || bash"
 }
+
+function ssh-menu {
+    selected=$(
+        grep 'Host .*' ~/.ssh/config \
+            | grep -v '*' \
+            | sed 's/Host \(.*\)/\1/' \
+            | fzf --cycle --bind 'tab:toggle-up,btab:toggle-down'
+    )
+
+    if [[ -z $selected ]]; then
+        return
+    fi
+
+    ssh "$selected"
+}