From 59987ac080c05739dc7d65f1972bdff6d802bf62 Mon Sep 17 00:00:00 2001
From: Mars <mars@pupbrained.xyz>
Date: Wed, 14 Aug 2024 01:39:04 -0400
Subject: [PATCH] stuff and also things perhaps

---
 flake.lock                                    | 34 +++++++++----------
 flake.nix                                     |  3 +-
 .../aarch64-darwin/marshall@canis/default.nix |  5 +++
 modules/home/shell/fish.nix                   | 11 +++++-
 systems/aarch64-darwin/canis/default.nix      |  6 ++++
 5 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/flake.lock b/flake.lock
index b551d1e..3d9b648 100644
--- a/flake.lock
+++ b/flake.lock
@@ -97,11 +97,11 @@
         "yafas": "yafas"
       },
       "locked": {
-        "lastModified": 1723489118,
-        "narHash": "sha256-UCsoBuUTLHcwv4e9RzVZ1yzgQZHFs49yPx4FXuOSR2s=",
+        "lastModified": 1723531925,
+        "narHash": "sha256-QPETOkVNZwm3Zx0FRfkrPWScbc46I5QwIOdBmByYtKg=",
         "owner": "chaotic-cx",
         "repo": "nyx",
-        "rev": "54148c6f5370689f50a069db3e7497ae4714004a",
+        "rev": "b8b1c616f8b869af7bce3179ad423e3d45b0d079",
         "type": "github"
       },
       "original": {
@@ -217,11 +217,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1723525014,
-        "narHash": "sha256-hW/uF5yIJ0rEDfeZbsY3FX8HS+Nx+FZ+zgzxKPi38mY=",
+        "lastModified": 1723612799,
+        "narHash": "sha256-geqgrVgd7Hbxz2q4Htb/BW4Y9A1F/I3HDogi9UfNG+Y=",
         "ref": "refs/heads/main",
-        "rev": "40d6599358cd66ee3b7f7b19452e8e2a9d9b2e97",
-        "revCount": 3,
+        "rev": "37129faa8379c5e138c7caa46625e5fec0c6719a",
+        "revCount": 15,
         "type": "git",
         "url": "https://git.pupbrained.xyz/pupbrained/nixmacs.git"
       },
@@ -783,11 +783,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1723488592,
-        "narHash": "sha256-nPYQrQD8rldLIhrz6px0YHGB4WwIaWLdmBtWsMgLLNI=",
+        "lastModified": 1723579231,
+        "narHash": "sha256-PL9C3aOetj+TS+vXvNhh7q5bm3g70oakg+iSu5eQBUQ=",
         "ref": "refs/heads/main",
-        "rev": "77cf651825c2afac69e3a827ff910a62c73e1218",
-        "revCount": 5083,
+        "rev": "3b4aabe04c7756fb0a70d78b6f0e701228f46345",
+        "revCount": 5087,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/hyprwm/Hyprland"
@@ -1222,11 +1222,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1723175592,
-        "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=",
+        "lastModified": 1723362943,
+        "narHash": "sha256-dFZRVSgmJkyM0bkPpaYRtG/kRMRTorUIDj8BxoOt1T4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b",
+        "rev": "a58bc8ad779655e790115244571758e8de055e3d",
         "type": "github"
       },
       "original": {
@@ -1318,11 +1318,11 @@
     },
     "nixpkgs_8": {
       "locked": {
-        "lastModified": 1723175592,
-        "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=",
+        "lastModified": 1723362943,
+        "narHash": "sha256-dFZRVSgmJkyM0bkPpaYRtG/kRMRTorUIDj8BxoOt1T4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b",
+        "rev": "a58bc8ad779655e790115244571758e8de055e3d",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 5b10e68..fd8fa0d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,5 +1,4 @@
 # Do not modify! This file is generated.
-
 {
   inputs = {
     agenix.url = "github:ryantm/agenix";
@@ -44,4 +43,4 @@
     treefmt-nix.url = "github:numtide/treefmt-nix";
   };
   outputs = inputs: inputs.flakegen ./flake.in.nix inputs;
-}
\ No newline at end of file
+}
diff --git a/homes/aarch64-darwin/marshall@canis/default.nix b/homes/aarch64-darwin/marshall@canis/default.nix
index e5a7f2e..9a87dcd 100644
--- a/homes/aarch64-darwin/marshall@canis/default.nix
+++ b/homes/aarch64-darwin/marshall@canis/default.nix
@@ -71,6 +71,11 @@
     tealdeer.enable = false;
     wezterm.extraConfig = builtins.readFile ./wezterm.lua;
 
+    emacs = {
+      enable = true;
+      package = inputs.emacs.packages.${pkgs.system}.default;
+    };
+
     git = {
       extraConfig.credential.helper = "osxkeychain";
       signing.key = "874E22DF2F9DFCB5";
diff --git a/modules/home/shell/fish.nix b/modules/home/shell/fish.nix
index 8a7ce35..3a6e1dd 100644
--- a/modules/home/shell/fish.nix
+++ b/modules/home/shell/fish.nix
@@ -13,6 +13,15 @@ with pkgs; {
 
       plugins =
         [
+          {
+            name = "git-abbr";
+            src = fetchFromGitHub {
+              owner = "pupbrained";
+              repo = "fish-git-abbr";
+              rev = "faa3d2581b800c45960e8cd5087ff09acb936b85";
+              hash = "sha256-8gxqYGN9XIlX1cZovX6r5zo8C8hOrsYIVN39oVGbWv0=";
+            };
+          }
           {
             name = "replay.fish";
             src = fetchFromGitHub {
@@ -59,7 +68,7 @@ with pkgs; {
             };
           }
         ]
-        ++ (mkFishPlugins ["autopair" "bass" "colored-man-pages" "done" "fifc" "git-abbr" "forgit" "grc"]);
+        ++ (mkFishPlugins ["autopair" "bass" "colored-man-pages" "done" "fifc" "forgit" "grc"]);
 
       shellAliases = {
         cat = "${bat}/bin/bat";
diff --git a/systems/aarch64-darwin/canis/default.nix b/systems/aarch64-darwin/canis/default.nix
index b698efc..563a410 100644
--- a/systems/aarch64-darwin/canis/default.nix
+++ b/systems/aarch64-darwin/canis/default.nix
@@ -73,6 +73,12 @@
 
   services = {
     nix-daemon.enable = true;
+
+    emacs = {
+      enable = true;
+      package = inputs.emacs.packages.${pkgs.system}.default;
+    };
+
     skhd = {
       enable = true;
       package = pkgs.skhd;