From 2a3b37c39ed7004947bc3503119f086b57148765 Mon Sep 17 00:00:00 2001
From: Agatha Lovelace <agatha@technogothic.net>
Date: Sat, 18 Feb 2023 15:36:17 +0100
Subject: [PATCH] Add more utility packages; Add fish config

---
 common/default.nix             |  9 ++++++++-
 common/home_manager/common.nix | 19 ++++++++++++++++---
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/common/default.nix b/common/default.nix
index 8952f7e..8a83105 100644
--- a/common/default.nix
+++ b/common/default.nix
@@ -38,7 +38,14 @@
   environment.variables.COLORTERM = "truecolor";
 
   # Packages used on all systems
-  environment.systemPackages = with pkgs; [ git wget xclip killall ];
+  environment.systemPackages = with pkgs; [
+    git
+    wget
+    xclip
+    killall
+    rsync
+    sqlite
+  ];
 
   ## Locale/Timezone
 
diff --git a/common/home_manager/common.nix b/common/home_manager/common.nix
index 994635d..5716732 100644
--- a/common/home_manager/common.nix
+++ b/common/home_manager/common.nix
@@ -11,7 +11,17 @@ in {
     home.username = "agatha";
     home.homeDirectory = "/home/agatha";
     home.stateVersion = config.system.stateVersion;
-    home.packages = with pkgs; [ gnupg fzf btop bat ripgrep tealdeer ouch exa ];
+    home.packages = with pkgs; [
+      bat
+      btop
+      exa
+      fzf
+      gnupg
+      ouch
+      ripgrep
+      tealdeer
+      zoxide
+    ];
 
     programs = {
       home-manager.enable = true;
@@ -68,8 +78,11 @@ in {
 
       fish = {
         enable = true;
-        # interactiveShellInit = builtins.readFile (pkgs.fetchurl
-        #   "https://git.lain.faith/sorceress/dotfiles/raw/branch/mistress/.config/fish/config.fish");
+        interactiveShellInit = builtins.readFile (pkgs.fetchurl {
+          url =
+            "https://git.lain.faith/sorceress/dotfiles/raw/commit/80be649e9663e3db67041192c714329e20b10cc9/.config/fish/config.fish";
+          sha256 = "sha256-ZZCTXnRZfotksiJj7iVJnLz+XnWHTlIsZzv3gbbZoRQ=";
+        });
         plugins = [
           {
             name = "fzf";