Adds key binding for loading shell in cwd

4 files changed, 48 insertions, 15 deletions

diff --git a/config/zsh/aliases/dev.zsh b/config/zsh/aliases/dev.zsh
index 1e6587f..05faae8 100644
--- a/config/zsh/aliases/dev.zsh
+++ b/config/zsh/aliases/dev.zsh
@@ -34,3 +34,40 @@ codi() {
     Codi $syntax" "$@"
 }
 
+
+# Npm run key binding
+p__run_npm_script() {
+  [[ ! -f "package.json" ]] && return 1;
+
+  local commands=$(node -e 'const pkg = require("./package.json"); Object.entries(pkg.scripts || {}).map(([key, value]) => console.log(`${key}\t\t  "${value}"`))');
+
+  local result=$(echo -e "$commands" | fzf | cut -f1);
+
+  [[ -z "$result" ]] && return 1;
+  yarn "$result";
+}
+
+zle -N p__run_npm_script;
+bindkey '^B' p__run_npm_script;
+
+
+
+# Load shell
+p__load_nix_shell_file() {
+  if [[ -f "./default.nix" ]]; then
+    echo "";
+    echo "ERR: default.nix already exists in directory";
+    zle send-break;
+    return 1;
+  fi;
+
+  local shells=$(ls ~/nixos/shell);
+  local selected=$(echo -e "$shells" | fzf);
+  [[ -z "$selected" ]] && return 1;
+  cp ~/nixos/shell/$selected ./default.nix;
+  zle send-break
+}
+
+zle -N p__load_nix_shell_file;
+bindkey '^N' p__load_nix_shell_file;
+
diff --git a/config/zsh/aliases/npm.zsh b/config/zsh/aliases/npm.zsh
index efc8ec7..8dc1e5e 100644
--- a/config/zsh/aliases/npm.zsh
+++ b/config/zsh/aliases/npm.zsh
@@ -4,17 +4,4 @@ alias nr="npm run";
 alias ns="npm start";
 alias nt="npm test";
 
-run_npm_script() {
-  [[ ! -f "package.json" ]] && return 1;
-
-  local commands=$(node -e 'const pkg = require("./package.json"); Object.entries(pkg.scripts || {}).map(([key, value]) => console.log(`${key}\t\t  "${value}"`))');
-
-  local result=$(echo -e "$commands" | fzf | cut -f1);
-
-  [[ -z "$result" ]] && return 1;
-  yarn "$result";
-}
-
-zle -N run_npm_script;
-bindkey '^B' run_npm_script;
-
+# NOTE: node run key moved to dev.zsh
diff --git a/config/zsh/aliases/system.zsh b/config/zsh/aliases/system.zsh
index 000629c..3252992 100644
--- a/config/zsh/aliases/system.zsh
+++ b/config/zsh/aliases/system.zsh
@@ -1,8 +1,17 @@
 
 # Pacman aliases
 
+alias update="sudo nixos-rebuild switch --upgrade";
 alias auto-remove="sudo nix-collect-garbage -d && nix-store --optimize";
 
+alias rebuild="sudo nixos-rebuild switch";
+alias list-gens="sudo nix-env --list-generations --profile /nix/var/nix/profiles/system";
+
+nix-rollback() {
+  [[ -z "$1" ]] && echo "Specify generation number: nix-rollback 330" && return 1;
+  sudo nixos-rebuild switch --rollback=$1;
+}
+
 #alias mirrorlist-refresh="sudo reflector --latest 200 --protocol http --protocol https --sort rate --save /etc/pacman.d/mirrorlist-arch"
 
 # Sandbox
diff --git a/config/zsh/paths.zsh b/config/zsh/paths.zsh
index ca2d3a0..d52250c 100644
--- a/config/zsh/paths.zsh
+++ b/config/zsh/paths.zsh
@@ -4,7 +4,7 @@ export PKG_CONFIG_PATH=/usr/lib/pkgconfig;
 
 # Local scripts
 export SCRIPTS_DIR="$HOME/scripts";
-export SCRIPTS_BINARY_DIR="$HOME/.bin";
+export SCRIPTS_BINARY_DIR="$SCRIPTS_DIR/bin";
 export COMMANDS_DIR="$HOME/scripts/commands";
 
 # Lang specific stuff