bin: clean up & update some scripts

.config/shell/functions

@@ -31,6 +31,7 @@ rr() { mv "$@" /tmp }
 
 alias j='jrnl'
 jn() { jrnl -to today "$@" | bat --style=plain --pager="less +G" }
+alias jnc='jn -contains'
 
 # like "which", but shows contents if it resolves to a file
 wh() {
@@ -378,44 +379,6 @@ function zipdiff() {
 	diff -W200 -y <(unzip -vql $1 | sort -k8) <(unzip -vql $2 | sort -k8) #--suppress-common-lines
 }
 
-# PROJECTS
-
-pdiff() {
-	diff -r $1 $2 -x .git -x .idea -x .gradle
-}
-
-genssh() {
-	mkdir -p ~/.ssh
-	test -f ~/.ssh/id_rsa.pub || ssh-keygen -t rsa -b 4096 -f ~/.ssh/id_rsa -q -N ""
-	cat ~/.ssh/id_rsa.pub
-	if test "$OSTYPE" = "cygwin"
-	then cat ~/.ssh/id_rsa.pub>/dev/clipboard
-	else xclip -sel clip 2>/dev/null < ~/.ssh/id_rsa.pub
-	fi && echo "SSH Public key copied to clipboard" || return 0
-}
-
-createproject() {
-	mkcd $1
-
-	echo 'plugins {
-	kotlin("jvm") version "1.3.41"
-	application
-	id("com.github.johnrengelman.shadow") version "5.1.0"
-	id("com.github.ben-manes.versions") version "0.21.0"
-}
-
-sourceSets {
-	main {
-		java.srcDir("src/main")
-		resources.srcDir("src/resources")
-	}
-	test {
-		java.srcDir("src/test")
-	}
-}' > build.gradle.kts
-
-}
-
 # SWAP
 alias memstat='free -h | awk '"'"'NR==2 {printf "Free memory:\t %s/%s\t(%d%)\n",$7,$2,$7*100/$2} NR==3 {if($2 != "0B") printf "Used swap:\t%s/%s\t(%d%)\n",$3,$2,$2*100/$3}'"'"
 

.config/shell/git

@@ -20,7 +20,7 @@ git() {
       yadm "$@"
       return
       ;;
-    $XDG_CONFIG_HOME*)
+    $XDG_CONFIG_HOME*|$HOME/.local*)
       if ! command git rev-parse --show-toplevel &>/dev/null; then
         export LAST_YADM="$PWD"
         yadm "$@"

.local/bin/scripts/genssh

@@ -0,0 +1,11 @@
+#!/bin/sh
+keys="$HOME/.ssh/keys"
+name="${1:-id_rsa}"
+mkdir -p "$keys"
+test -f "$keys/$name.pub" || ssh-keygen -t rsa -b 4096 -f "$keys/$name" -q -N ""
+cat "$keys/$name.pub"
+if test "$OSTYPE" = "cygwin"
+then cat "$keys/$name.pub">/dev/clipboard
+else xclip -sel clip 2>/dev/null <"$keys/$name.pub"
+fi && echo "SSH Public key copied to clipboard" || return 0
+

.local/bin/scripts/pdiff

@@ -0,0 +1,2 @@
+#!/bin/sh
+diff -r $1 $2 -x .git -x .idea -x .gradle -x build -x cmake_build -x dist_newstyle

.local/bin/scripts/update-keyboard-layout

@@ -8,7 +8,8 @@ esac
 echo "Keyboard layout update to $id($ACTION) at $(date)" >>/tmp/scripts.log
 export XAUTHORITY="/run/user/1000/Xauthority" DISPLAY=:0
 # setxkbmap "$id" #nodeadkeys
-test $(xkblayout-state print '%C') -gt 1 && $(dirname $(dirname $0))/xkblayout-state set $id
+xkbstate="$(dirname $(dirname $0))/xkblayout-state"
+test "$(xkbstate print %C)" -gt 1 && xkbstate set $id
 # Swap semicolon and colon - https://unix.stackexchange.com/questions/615799/swap-semicolon-colon-to-p-unexpected-cause-semicolon-colon-affected-by-cpas-lock
 # test "$id" = "eu" && xmodmap -e 'keysym semicolon = colon semicolon colon semicolon'
 test "$id" = "1" && xmodmap -e 'keysym semicolon = colon semicolon colon semicolon' || setxkbmap de nodeadkeys