From 11f1f35f421fbe1a12ac6237104ed2a7ade5841f Mon Sep 17 00:00:00 2001
From: Alexander Sieg <alexander.sieg@cyberus-technology.de>
Date: Tue, 26 Nov 2024 09:35:39 +0100
Subject: [PATCH] fish: remove vendored direnv comp and update aliases

---
 home/shell/direnv.fish | 33 ---------------------------------
 home/shell/fish.nix    |  5 ++---
 2 files changed, 2 insertions(+), 36 deletions(-)
 delete mode 100644 home/shell/direnv.fish

diff --git a/home/shell/direnv.fish b/home/shell/direnv.fish
deleted file mode 100644
index 5c81191d..00000000
--- a/home/shell/direnv.fish
+++ /dev/null
@@ -1,33 +0,0 @@
-set -l commands allow permit grant block deny revoke edit exec fetchurl help hook prune reload status stdlib version
-
-set -l with_file allow permit grant block deny revoke edit
-
-complete -c direnv -f
-
-complete -c direnv -n "not __fish_seen_subcommand_from $commands" \
-    -a "allow permit grant" -d "Grants direnv permission to load the given .envrc or .env file"
-complete -c direnv -n "not __fish_seen_subcommand_from $commands" \
-    -a "block deny revoke" -d "Revokes the authorization of a given .envrc or .env file"
-complete -c direnv -n "not __fish_seen_subcommand_from $commands" \
-    -a edit -d "Opens PATH_TO_RC or the current .envrc or .env into an \$EDITOR and allow the file to be loaded afterwards"
-complete -c direnv -n "not __fish_seen_subcommand_from $commands" \
-    -a exec -d "Executes a command after loading the first .envrc or .env found in DIR"
-complete -c direnv -n "not __fish_seen_subcommand_from $commands" \
-    -a fetchurl -d "Fetches a given URL into direnv's CAS"
-complete -c direnv -n "not __fish_seen_subcommand_from $commands" \
-    -a help -d "show help"
-complete -c direnv -n "not __fish_seen_subcommand_from $commands" \
-    -a hook -d "Used to setup the shell hook"
-complete -c direnv -n "not __fish_seen_subcommand_from $commands" \
-    -a prune -d "removes old allowed files"
-complete -c direnv -n "not __fish_seen_subcommand_from $commands" \
-    -a reload -d "triggers an env reload"
-complete -c direnv -n "not __fish_seen_subcommand_from $commands" \
-    -a status -d "prints some debug status information"
-complete -c direnv -n "not __fish_seen_subcommand_from $commands" \
-    -a stdlib -d "Displays the stdlib available in the .envrc execution context"
-complete -c direnv -n "not __fish_seen_subcommand_from $commands" \
-    -a version -d "prints the version or checks that direnv is older than VERSION_AT_LEAST"
-
-
-complete -c direnv -n "__fish_seen_subcommand_from $with_file" -F
diff --git a/home/shell/fish.nix b/home/shell/fish.nix
index e1f52a37..30fd2158 100644
--- a/home/shell/fish.nix
+++ b/home/shell/fish.nix
@@ -4,7 +4,7 @@
     enable = true;
     shellAliases = {
       ssh = "TERM=xterm-256color command ssh";
-      journal = ''nvim +"Neorg journal today"'';
+      cat = "${pkgs.bat}";
     };
 
     shellAbbrs = {
@@ -12,6 +12,7 @@
       s = "git s";
       d = "git diff";
       ds = "git diff --cached";
+      sl = "git sl";
       "dotdot" = {
         regex = "^\\.\\.+$";
         function = "multicd";
@@ -79,7 +80,6 @@
     functions =
       {
         fish_greeting.body = "";
-        cat.body = "${pkgs.bat}/bin/bat $argv";
         sops = {
           description = "sops wrapper to extract age key from 1password";
           body = ''
@@ -135,5 +135,4 @@
       }
     ];
   };
-  xdg.configFile."fish/completions/direnv.fish".source = ./direnv.fish;
 }