migrate scripts into nix

4 files changed, 33 insertions, 5 deletions

diff --git a/home.nix b/home.nix
index 5230399..3e52d11 100644
--- a/home.nix
+++ b/home.nix
@@ -9,7 +9,6 @@
   imports = [
     ./programs
     ./services
-    # ./scripts
     ./x
     ./mail.nix
   ];
@@ -55,13 +54,16 @@
     fd
     du-dust
     jq
+    stylish-haskell
+    libnotify
+    inotify-tools
 
     # meta
     nixpkgs-review
     nixpkgs-fmt
     nix-prefetch-scripts
 
-  ];
+  ] ++ (import ./scripts { inherit pkgs; });
 
   xdg = {
     userDirs = {
diff --git a/programs/readline.nix b/programs/readline.nix
index be43ace..e7b7b33 100644
--- a/programs/readline.nix
+++ b/programs/readline.nix
@@ -7,7 +7,7 @@
   programs.readline = {
     enable = true;
     bindings = {
-      "\\C-o" = ''"$HOME/scripts/tmux-fzf.sh\n"'';
+      "\\C-o" = ''tmux-fzf\n'';
       "\\t" = "menu-complete";
       "\\e[Z" = "menu-complete-backward";
     };
diff --git a/programs/tmux.nix b/programs/tmux.nix
index 58369da..30483aa 100644
--- a/programs/tmux.nix
+++ b/programs/tmux.nix
@@ -15,7 +15,7 @@
       unbind-key C-b
       bind-key C-a send-prefix
 
-      bind r source-file ~/.tmux.conf
+      bind r source-file ~/.config/tmux/tmux.conf
 
       set-option -g default-terminal xterm-256color-italic
       set escape-time 20
@@ -79,7 +79,7 @@
       set -g status-left-length 100
       set -g status-left  "#[fg=colour15]#(date +"%H%M") #[fg=colour8]hrs    "
       set -ag status-left "#[fg=colour15]#(date +"%d/%m")#[fg=colour8] #(date +"%Y")    "
-      set -ag status-left "#[fg=colour7]#(~/scripts/bat -q)#[fg=colour12]"
+      set -ag status-left "#[fg=colour7]#(bat -q)#[fg=colour12]"
     '';
   };
 }
diff --git a/scripts/default.nix b/scripts/default.nix
index a6e5936..35ed43e 100644
--- a/scripts/default.nix
+++ b/scripts/default.nix
@@ -36,11 +36,37 @@ let
   # battery script
   battery = import ./battery.nix pkgs;
 
+  # fzf script to switch between tmux sessions
+  tmux-fzf = pkgs.writeScriptBin "tmux-fzf" ''
+    tbin() {
+      ${pkgs.tmux}/bin/tmux "$@"
+    }
+    fbin() {
+      ${pkgs.fzf}/bin/fzf "$@"
+    }
+
+    __fzf() {
+        fbin --cycle --height 7 --reverse
+    }
+
+    __list_to_fzf() {
+        fbin ls -F "#{session_name}" | fzf
+    }
+
+    if [ -n "$TMUX" ]; then
+        tbin switch-client -t "$(__list_to_fzf)"
+    else
+        tbin a -t "$(tbin ls -F "#{session_name}" | fbin)"
+    fi
+  '';
+
 in
 [
   webcam
   git-set-desc
+  git-new-repo
   record
   uploader
   battery
+  tmux-fzf
 ]