From 24d36645f6f1db0594fc36bf306489e6dd4b2c80 Mon Sep 17 00:00:00 2001
From: Tyrel Souza <tyrelsouza@gmail.com>
Date: Fri, 7 Apr 2023 11:46:30 -0400
Subject: [PATCH] fix vimv and ebook

---
 home/bin/vimv                | 20 +++++++++++++-------
 home/config/fish/config.fish |  3 ++-
 hosts/_common/home.nix       |  4 ++++
 hosts/ts-tl-mbp/flake.nix    |  3 +++
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/home/bin/vimv b/home/bin/vimv
index ee8cf03..74844fc 100755
--- a/home/bin/vimv
+++ b/home/bin/vimv
@@ -1,17 +1,18 @@
-#!/bin/bash
+#!/usr/bin/env bash
+set -eu
 
 # Lists the current directory's files in Vim, so you can edit it and save to rename them
 # USAGE: vimv [file1 file2]
 # https://github.com/thameera/vimv
 
-declare -r FILENAMES_FILE="$(mktemp --tmpdir vimv.XXX)"
+declare -r FILENAMES_FILE=$(mktemp "${TMPDIR:-/tmp}/vimv.XXX")
 
 trap '{ rm -f "${FILENAMES_FILE}" ; }' EXIT
 
 if [ $# -ne 0 ]; then
     src=( "$@" )
 else
-    IFS=$'\r\n' GLOBIGNORE='*' command eval  'src=($(/bin/ls))'
+    IFS=$'\r\n' GLOBIGNORE='*' command eval 'src=($(ls))'
 fi
 
 for ((i=0;i<${#src[@]};++i)); do
@@ -20,18 +21,23 @@ done
 
 ${EDITOR:-vi} "${FILENAMES_FILE}"
 
-IFS=$'\r\n' GLOBIGNORE='*' command eval  'dest=($(cat "${FILENAMES_FILE}"))'
+IFS=$'\r\n' GLOBIGNORE='*' command eval 'dest=($(cat "${FILENAMES_FILE}"))'
 
-count=0
+if (( ${#src[@]} != ${#dest[@]} )); then
+    echo "WARN: Number of files changed. Did you delete a line by accident? Aborting.." >&2
+    exit 1
+fi
+
+declare -i count=0
 for ((i=0;i<${#src[@]};++i)); do
     if [ "${src[i]}" != "${dest[i]}" ]; then
-        mkdir -p "`dirname "${dest[i]}"`"
+        mkdir -p "$(dirname "${dest[i]}")"
         if git ls-files --error-unmatch "${src[i]}" > /dev/null 2>&1; then
             git mv "${src[i]}" "${dest[i]}"
         else
             mv "${src[i]}" "${dest[i]}"
         fi
-        ((count++))
+        ((++count))
     fi
 done
 
diff --git a/home/config/fish/config.fish b/home/config/fish/config.fish
index 37f74d8..f094746 100644
--- a/home/config/fish/config.fish
+++ b/home/config/fish/config.fish
@@ -11,6 +11,7 @@ if status is-interactive
     source ~/.config/fish/shell_funcs.fish
     source ~/.config/fish/shell_aliases.fish
     source ~/.config/fish/everquote.fish
-    source "$HOME/.cargo/env"
 
+
+    set PATH $PATH ~/.cargo/bin
 end
diff --git a/hosts/_common/home.nix b/hosts/_common/home.nix
index 26f46e4..b7c4fc2 100644
--- a/hosts/_common/home.nix
+++ b/hosts/_common/home.nix
@@ -9,6 +9,7 @@
       # Terminals
       bat
       ctags
+      dosbox
       exa
       fzf
       fd
@@ -36,5 +37,8 @@
 
       };
     };
+    nixpkgs.config = {
+      allowUnfree = true;
+    };
 
 }
diff --git a/hosts/ts-tl-mbp/flake.nix b/hosts/ts-tl-mbp/flake.nix
index 52383aa..d207e75 100644
--- a/hosts/ts-tl-mbp/flake.nix
+++ b/hosts/ts-tl-mbp/flake.nix
@@ -21,6 +21,9 @@
 	      ../_common/fonts.nix
       ];
     };
+    nixpkgs.config = {
+      allowUnfree = true;
+    };
   };
 
 }