Move fish config to shared

2024-07-15 12:16:09 -05:00
parent eda64c4482
commit b08d50f4c2
7 changed files with 73 additions and 14 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -158,11 +158,19 @@
    },
    "nixpkgs-unstable": {
      "locked": {
+<<<<<<< HEAD
        "lastModified": 1720957393,
        "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=",
        "owner": "nixos",
        "repo": "nixpkgs",
        "rev": "693bc46d169f5af9c992095736e82c3488bf7dbb",
+=======
+        "lastModified": 1720768451,
+        "narHash": "sha256-EYekUHJE2gxeo2pM/zM9Wlqw1Uw2XTJXOSAO79ksc4Y=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "7e7c39ea35c5cdd002cd4588b03a3fb9ece6fad9",
+>>>>>>> 53d356d (Move fish config to shared)
        "type": "github"
      },
      "original": {