add some stuff

5 files changed, 53 insertions, 11 deletions

diff --git a/flake.lock b/flake.lock
index ce53ae9..2a4a03d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1685721552,
-        "narHash": "sha256-ifvq/zlO7lck8q+YkC5uom/h8/MVdMcQEldOL3cDQW0=",
+        "lastModified": 1686724286,
+        "narHash": "sha256-TREhlFfPlaOisADxKotzVqHpHwQE1JLeDBqgw7ke5PM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "29519461834c08395b35f840811faf8c23e3b61c",
+        "rev": "75b24cc557d4947ab46691142863e5a5db5c3f78",
         "type": "github"
       },
       "original": {
@@ -38,11 +38,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1685655444,
-        "narHash": "sha256-6EujQNAeaUkWvpEZZcVF8qSfQrNVWFNNGbUJxv/A5a8=",
+        "lastModified": 1686592866,
+        "narHash": "sha256-riGg89eWhXJcPNrQGcSwTEEm7CGxWC06oSX44hajeMw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "e635192892f5abbc2289eaac3a73cdb249abaefd",
+        "rev": "0eeebd64de89e4163f4d3cf34ffe925a5cf67a05",
         "type": "github"
       },
       "original": {
diff --git a/home.nix b/home.nix
index a503174..0c28630 100644
--- a/home.nix
+++ b/home.nix
@@ -53,7 +53,7 @@
       set-option -g default-shell ${pkgs.bashInteractive}/bin/bash
       set -s set-clipboard on
       set -g default-terminal "xterm-256color"
-      set-option -sa terminal-overrides ",xterm-256color:RGB"
+      set -as terminal-overrides ',xterm*:RGB'
       set-option -g focus-events on
       set-option -sg escape-time 10
 
@@ -81,6 +81,7 @@
   programs.bash = {
     enable = true;
     bashrcExtra = ''
+      [[ -f ~/.cache/wal/sequences ]] && (cat ~/.cache/wal/sequences &)
       unset LD_PRELOAD
       if [ -e '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh' ]; then
         . '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh'
@@ -92,6 +93,8 @@
       export COLORTERM=truecolor
     '';
     shellAliases = {
+      e = "kakup ";
+      es = "kakup .";
       k9s = "k9s";
       k = "kubectl ";
       d = "docker ";
@@ -112,6 +115,8 @@
     };
   };
 
+  programs.nushell.enable = true;
+
   programs.git = {
     enable = true;
     userName = "Mike Vink";
diff --git a/home/packages.nix b/home/packages.nix
index 5c59693..8f59d86 100644
--- a/home/packages.nix
+++ b/home/packages.nix
@@ -39,7 +39,8 @@
       argocd
       parallel
       bc
-      glibc
+      sxiv
+      nushell
     ]
     ++ (import ../shell-scripts.nix {inherit pkgs config;});
   mike-extra-packages = with pkgs; [
diff --git a/shell-scripts/kakup b/shell-scripts/kakup
index 3e45d29..2806d12 100755
--- a/shell-scripts/kakup
+++ b/shell-scripts/kakup
@@ -7,6 +7,7 @@ session-or-client() {
             pushd $project
             export name=${PWD#$HOME/}
             export name=${name//\//-}
+            export name=${name#-}
             export server=kaks@$name
             export client=kakc@$name
 
@@ -45,11 +46,30 @@ is-bare() {
     popd >/dev/null 2>&1
 }
 
+search() {
+    if tty -s
+    then
+        fd -d1 "." -t d $HOME $HOME/projects | fzf -1
+    else
+        output=$(mktemp -d /tmp/kakup.XXXXXXXX)/fifo
+        mkfifo ${output}
+        st -e bash -c "fd -d1 '.' -t d $HOME $HOME/projects | fzf -1 | tee ${output} >/dev/null 2>&1" &
+        cat ${output}
+        rm -r $(dirname ${output})
+    fi
+}
+
 case "${@}" in
     "")		client="$(pwd | session-or-client)" ;;
-    .)  	client="$(fd -d1 "." -t d $HOME $HOME/projects | fzf -1 | is-bare | session-or-client)" ;;
+    .)  	client="$(search | is-bare | session-or-client)" ;;
     *)		client="$(echo "${@}" | session-or-client)" ;;
 esac
 
-echo "client: $client"
-[[ $client ]] && tmux attach -t "$client"
+[[ ! -z "$client" ]] && {
+    if tty -s
+    then
+        tmux attach -t "$client"
+    else
+        st -e tmux attach -t "$client"
+    fi
+}
diff --git a/shell-scripts/set-bg b/shell-scripts/set-bg
new file mode 100644
index 0000000..ad04730
--- /dev/null
+++ b/shell-scripts/set-bg
@@ -0,0 +1,16 @@
+#!@bash@/bin/bash
+reload=0
+while getopts "r" opt; do
+  case "$opt" in
+    h|\?) exit 0 ;;
+    r)  reload=1 ;;
+  esac
+done
+if [ $reload -eq 1 ]; then
+    (cat ~/.cache/wal/sequences &)
+else
+    sxiv -tob ~/bg | parallel wal -i
+fi
+kak -l | parallel '<<< "colorscheme wal" kak -p {}'
+pgrep -x st | parallel kill
+st -e tmux attach