From 3f17c7ee22ae0cab31e79ef17ce152464e202799 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Tue, 22 Aug 2023 16:06:20 -0600
Subject: [PATCH] Revert "[NixOS] Use git+file for relative paths"

This reverts commit ee0ae1a7d9c74251bb11bd55e0edf6007afe5cd9.
---
 nixos/flake.lock | 60 ++++++++++++++++++++++--------------------------
 nixos/flake.nix  |  8 +++----
 2 files changed, 32 insertions(+), 36 deletions(-)

diff --git a/nixos/flake.lock b/nixos/flake.lock
index 1ad78360..741416af 100644
--- a/nixos/flake.lock
+++ b/nixos/flake.lock
@@ -363,16 +363,14 @@
         ]
       },
       "locked": {
-        "dir": "dotfiles/config/taffybar",
-        "lastModified": 1692733498,
-        "narHash": "sha256-J/7IU7JNxdJrrvzCAYvMP7J4TUCbAAcz2eY0R8oJJ7M=",
-        "type": "git",
-        "url": "file:..?dir=dotfiles/config/taffybar"
+        "lastModified": 1,
+        "narHash": "sha256-6ajc7VyCOsoTb8Gxv0vDXnq+fW7jqgLRB7gbvuzM+ng=",
+        "path": "../dotfiles/config/taffybar",
+        "type": "path"
       },
       "original": {
-        "dir": "dotfiles/config/taffybar",
-        "type": "git",
-        "url": "file:..?dir=dotfiles/config/taffybar"
+        "path": "../dotfiles/config/taffybar",
+        "type": "path"
       }
     },
     "invokeai-src": {
@@ -853,16 +851,14 @@
         ]
       },
       "locked": {
-        "dir": "dotfiles/config/taffybar/taffybar",
-        "lastModified": 1692733498,
-        "narHash": "sha256-J/7IU7JNxdJrrvzCAYvMP7J4TUCbAAcz2eY0R8oJJ7M=",
-        "type": "git",
-        "url": "file:..?dir=dotfiles/config/taffybar/taffybar"
+        "lastModified": 1,
+        "narHash": "sha256-BlSP4JJ1pYvGtiuvYh7royLWoyC9xts6WS28c4KeIgQ=",
+        "path": "../dotfiles/config/taffybar/taffybar",
+        "type": "path"
       },
       "original": {
-        "dir": "dotfiles/config/taffybar/taffybar",
-        "type": "git",
-        "url": "file:..?dir=dotfiles/config/taffybar/taffybar"
+        "path": "../dotfiles/config/taffybar/taffybar",
+        "type": "path"
       }
     },
     "unstable": {
@@ -895,16 +891,14 @@
         "unstable": "unstable"
       },
       "locked": {
-        "dir": "/dotfiles/config/xmonad/xmonad",
-        "lastModified": 1692733498,
-        "narHash": "sha256-bpsMNACmbA7osOfAldVdBFB8J/j5Injd+SRLOF11OUI=",
-        "type": "git",
-        "url": "file:..?dir=/dotfiles/config/xmonad/xmonad"
+        "lastModified": 1,
+        "narHash": "sha256-dOrvPpypuNn/fAWY2XjMacpsAXEiMZ4Dll3Ot81iQL4=",
+        "path": "../dotfiles/config/xmonad/xmonad",
+        "type": "path"
       },
       "original": {
-        "dir": "/dotfiles/config/xmonad/xmonad",
-        "type": "git",
-        "url": "file:..?dir=/dotfiles/config/xmonad/xmonad"
+        "path": "../dotfiles/config/xmonad/xmonad",
+        "type": "path"
       }
     },
     "xmonad-contrib": {
@@ -923,16 +917,18 @@
         ]
       },
       "locked": {
-        "dir": "/dotfiles/config/xmonad/xmonad-contrib",
-        "lastModified": 1692733498,
-        "narHash": "sha256-bpsMNACmbA7osOfAldVdBFB8J/j5Injd+SRLOF11OUI=",
-        "type": "git",
-        "url": "file:..?dir=/dotfiles/config/xmonad/xmonad-contrib"
+        "lastModified": 1692232716,
+        "narHash": "sha256-MwbeBTfcf6vE7bQvha4ueg5zLZxBiU3678ESYrXD4lw=",
+        "owner": "IvanMalison",
+        "repo": "xmonad-contrib",
+        "rev": "b5ef6265b87338f30dc9fc055c86d1ec021527a7",
+        "type": "github"
       },
       "original": {
-        "dir": "/dotfiles/config/xmonad/xmonad-contrib",
-        "type": "git",
-        "url": "file:..?dir=/dotfiles/config/xmonad/xmonad-contrib"
+        "owner": "IvanMalison",
+        "ref": "withMyChanges",
+        "repo": "xmonad-contrib",
+        "type": "github"
       }
     }
   },
diff --git a/nixos/flake.nix b/nixos/flake.nix
index cc6a56f8..5fc83153 100644
--- a/nixos/flake.nix
+++ b/nixos/flake.nix
@@ -12,7 +12,7 @@
     };
 
     xmonad-contrib = {
-      url = "git+file:..?dir=/dotfiles/config/xmonad/xmonad-contrib";
+      url = "github:IvanMalison/xmonad-contrib/withMyChanges";
       inputs = {
         nixpkgs.follows = "nixpkgs";
         flake-utils.follows = "flake-utils";
@@ -22,7 +22,7 @@
     };
 
     xmonad = {
-      url = "git+file:..?dir=/dotfiles/config/xmonad/xmonad";
+      url = "path:../dotfiles/config/xmonad/xmonad";
       inputs = {
         nixpkgs.follows = "nixpkgs";
         flake-utils.follows = "flake-utils";
@@ -31,7 +31,7 @@
     };
 
     taffybar = {
-      url = "git+file:..?dir=dotfiles/config/taffybar/taffybar";
+      url = "path:../dotfiles/config/taffybar/taffybar";
       inputs = {
         nixpkgs.follows = "nixpkgs";
         flake-utils.follows = "flake-utils";
@@ -43,7 +43,7 @@
     };
 
     imalison-taffybar = {
-      url = "git+file:..?dir=dotfiles/config/taffybar";
+      url = "path:../dotfiles/config/taffybar";
       inputs = {
         nixpkgs.follows = "nixpkgs";
         flake-utils.follows = "flake-utils";