fixup

27 files changed, 13 insertions, 55 deletions

diff --git a/mut/bin/checkout b/mut/bin/checkout
index 95f28c8..9619085 100644..100755
--- a/mut/bin/checkout
+++ b/mut/bin/checkout
@@ -1,4 +1,4 @@
-#!@bash@/bin/bash
+#!/bin/sh
 error () {
     echo "$1"
     exit 1
diff --git a/mut/bin/compile b/mut/bin/compile
index 04c0586..7208b36 100755
--- a/mut/bin/compile
+++ b/mut/bin/compile
@@ -1,4 +1,4 @@
-#!@bash@/bin/bash
+#!/bin/sh
 echo " Compiliiing ${@}"
 
 error () {
diff --git a/mut/bin/filter-ansi b/mut/bin/filter-ansi
index 369f9fd..a45092e 100755
--- a/mut/bin/filter-ansi
+++ b/mut/bin/filter-ansi
@@ -1,2 +1,2 @@
-# #!@bash@/bin/bash
+#!/bin/sh
 cat -u - | sed -u -E -e 's/\x1b\[[0-9;]*[mGKHF]|\r//g'
diff --git a/mut/bin/get-sshables b/mut/bin/get-sshables
index f67c23c..fa88f7c 100755
--- a/mut/bin/get-sshables
+++ b/mut/bin/get-sshables
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 set -euxo pipefail
 [[ -d ~/sshables ]] || mkdir -p ~/sshables
 
diff --git a/mut/bin/kakup b/mut/bin/kakup
index af1a520..02f61c3 100755
--- a/mut/bin/kakup
+++ b/mut/bin/kakup
@@ -1,4 +1,4 @@
-#!@bash@/bin/bash
+#!/bin/sh
 session-or-client() {
         {
             project="$(cat -)"
diff --git a/mut/bin/kubeconfig-merge b/mut/bin/kubeconfig-merge
index 73d3ac1..2567b60 100644..100755
--- a/mut/bin/kubeconfig-merge
+++ b/mut/bin/kubeconfig-merge
@@ -1,3 +1,3 @@
-#!@bash@/bin/bash
+#!/bin/sh
 cp $HOME/.kube/config /tmp/.kube_config
 KUBECONFIG=$1:/tmp/.kube_config kubectl config view --flatten > $HOME/.kube/config
diff --git a/mut/bin/lfub b/mut/bin/lfub
index 9012f50..9012f50 100644..100755
--- a/mut/bin/lfub
+++ b/mut/bin/lfub
diff --git a/mut/bin/mailsync b/mut/bin/mailsync
index 426e5b7..426e5b7 100644..100755
--- a/mut/bin/mailsync
+++ b/mut/bin/mailsync
diff --git a/mut/bin/maimpick b/mut/bin/maimpick
index 5de26c1..5de26c1 100644..100755
--- a/mut/bin/maimpick
+++ b/mut/bin/maimpick
diff --git a/mut/bin/news b/mut/bin/news
index 097582b..7e302b9 100755
--- a/mut/bin/news
+++ b/mut/bin/news
@@ -1,4 +1,4 @@
-#!@bash@/bin/bash
+#!/bin/sh
 cat <(cat ~/.config/newsboat/urls) <(for url in $(env | grep NEWSBOAT_URL_); do
     printf '%s\n' ${url#NEWSBOAT_URL_*=}
 done) > ~/.newsboat-urls
diff --git a/mut/bin/nixup b/mut/bin/nixup
index afbe4b1..537f3bb 100755
--- a/mut/bin/nixup
+++ b/mut/bin/nixup
@@ -1,4 +1,4 @@
-#!@bash@/bin/bash
+#!/bin/sh
 case "${@}" in
     bootstrap-store)
         [[ -d ${HOME}/nix ]] || {
diff --git a/mut/bin/notmuch-hook b/mut/bin/notmuch-hook
index da376b6..da376b6 100644..100755
--- a/mut/bin/notmuch-hook
+++ b/mut/bin/notmuch-hook
diff --git a/mut/bin/openfile b/mut/bin/openfile
index 0f60b10..0f60b10 100644..100755
--- a/mut/bin/openfile
+++ b/mut/bin/openfile
diff --git a/mut/bin/pass-ansible-vault-client b/mut/bin/pass-ansible-vault-client
index 8b8d026..8d1f9a2 100755
--- a/mut/bin/pass-ansible-vault-client
+++ b/mut/bin/pass-ansible-vault-client
@@ -1,4 +1,4 @@
-#!@bash@/bin/bash
+#!/bin/sh
 VAULT_ID=""
 while [[ $# -gt 0 ]]; do
     case $1 in
diff --git a/mut/bin/sb-battery b/mut/bin/sb-battery
index aeb7413..aeb7413 100644..100755
--- a/mut/bin/sb-battery
+++ b/mut/bin/sb-battery
diff --git a/mut/bin/sb-clock b/mut/bin/sb-clock
index ba9e43d..ba9e43d 100644..100755
--- a/mut/bin/sb-clock
+++ b/mut/bin/sb-clock
diff --git a/mut/bin/sb-internet b/mut/bin/sb-internet
index 225d376..225d376 100644..100755
--- a/mut/bin/sb-internet
+++ b/mut/bin/sb-internet
diff --git a/mut/bin/sb-mailbox b/mut/bin/sb-mailbox
index ab1669e..ab1669e 100644..100755
--- a/mut/bin/sb-mailbox
+++ b/mut/bin/sb-mailbox
diff --git a/mut/bin/sb-nettraf b/mut/bin/sb-nettraf
index 06b3c49..06b3c49 100644..100755
--- a/mut/bin/sb-nettraf
+++ b/mut/bin/sb-nettraf
diff --git a/mut/bin/sb-news b/mut/bin/sb-news
index a155c0a..a155c0a 100644..100755
--- a/mut/bin/sb-news
+++ b/mut/bin/sb-news
diff --git a/mut/bin/set-bg b/mut/bin/set-bg
deleted file mode 100644
index bede726..0000000
--- a/mut/bin/set-bg
+++ /dev/null
@@ -1,15 +0,0 @@
-#!@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 &)
-    wal -R
-else
-    sxiv -tob ~/bg | parallel wal -i
-fi
-kak -l | parallel '<<< "colorscheme wal" kak -p {}'
diff --git a/mut/bin/spectrwmbar b/mut/bin/spectrwmbar
index a106b01..a106b01 100644..100755
--- a/mut/bin/spectrwmbar
+++ b/mut/bin/spectrwmbar
diff --git a/mut/bin/terragrunt b/mut/bin/terragrunt
index 38918e8..cd6f259 100755
--- a/mut/bin/terragrunt
+++ b/mut/bin/terragrunt
@@ -1,4 +1,4 @@
-#!@bash@/bin/bash
+#!/bin/sh
 TERRAGRUNT_ARGS=()
 CONTEXT=""
 ENV=""
diff --git a/mut/bin/tmux-normal-mode b/mut/bin/tmux-normal-mode
deleted file mode 100644
index 5730017..0000000
--- a/mut/bin/tmux-normal-mode
+++ /dev/null
@@ -1,28 +0,0 @@
-      # Make our own copy-mode with Kakoune!
-      #        cursor_y=$(tmux display-message -t "''${pane_id}" -p "#{cursor_y}") ;\
-      #        cursor_x=$(tmux display-message -t "''${pane_id}" -p "#{cursor_x}") ;\
-      #        pane_height=$(tmux display-message -t "''${pane_id}" -p "#{pane_height}") ;\
-      #        line_count="$(wc -l "$file" |awk "{print \$1}")" ;\
-      #        sel_line=$(( line_count - ( pane_height - cursor_y ) + 1 )) ;\
-      #        printf "sel = %s\n" "$line_count" >>/tmp/debug.log ;\
-      #        cursor="''${sel_line}.''${cursor_x},''${sel_line}.''${cursor_x}" ;\
-      #        printf "cursor = %s\n" "$cursor" >>/tmp/debug.log
-
-kakoune_session="$(tmux display-message -p "#{window_name}" | sed "s/kakc@//")"
-dispatch_name="dispatch://$(tmux display-message -p "#{pane_start_command}")"
-case "${@}" in
-    '')
-        output=$(mktemp -d /tmp/kak-tmux.XXXXXXXX)/fifo
-        mkfifo ${output}
-        ( tmux capture-pane -S '-' -E '-' -J -e -p -t $TMUX_PANE | filter-ansi >${output} & )
-        tmux new-window -t kaks@$kakoune_session -n "$dispatch_name" -d "
-            kak -c '$kakoune_session' -e \"edit -fifo ${output} '${dispatch_name}';\
-                   set-option buffer readonly true ;\
-                   set-option window filetype dispatch ;\
-                   hook -always -once buffer BufCloseFifo .* %{ nop %sh{ rm -r $(dirname ${output}) } }\""
-        tmux swap-pane -s kaks@$kakoune_session:"$dispatch_name".0 -t :
-        ;;
-    --quit)
-        tmux break-pane -t kaks@$kakoune_session -a -d -n "$dispatch_name"
-        ;;
-esac
diff --git a/mut/bin/transadd b/mut/bin/transadd
index a598fad..a598fad 100644..100755
--- a/mut/bin/transadd
+++ b/mut/bin/transadd
diff --git a/profiles/core/home.nix b/profiles/core/home.nix
index 4399fe9..01fa525 100644
--- a/profiles/core/home.nix
+++ b/profiles/core/home.nix
@@ -6,10 +6,11 @@
 }: {
   hm = {
     fonts.fontconfig.enable = true;
+    home.file.".local/bin".source = config.lib.meta.mkMutableSymlink /mut/bin;
     xdg = {
       enable = true;
       configFile = with config.lib.meta; {
-        "emacs/init.el".source = mkMutableSymlink ./emacs/init.el;
+        "emacs/init.el".source = mkMutableSymlink /mut/emacs/init.el;
       };
       mimeApps = {
         enable = true;
diff --git a/profiles/station/neovim.nix b/profiles/station/neovim.nix
index afe85dd..8796b88 100644
--- a/profiles/station/neovim.nix
+++ b/profiles/station/neovim.nix
@@ -7,7 +7,7 @@
   hm = {
     xdg = {
       configFile = with config.lib.meta; {
-        "nvim".source = mkMutableSymlink ../neovim;
+        "nvim".source = mkMutableSymlink /mut/neovim;
       };
     };