From 942b91f428872658d68d136389ccebf5345e4f74 Mon Sep 17 00:00:00 2001
From: Alex <alexmat2on@protonmail.com>
Date: Mon, 29 Jul 2024 22:06:38 -0400
Subject: [PATCH] hosts

---
 config/hosts/nixos76/default.nix  | 85 ++++++++++++++++---------------
 config/hosts/thelio76/default.nix | 72 +++++++++++++++++++-------
 2 files changed, 100 insertions(+), 57 deletions(-)

diff --git a/config/hosts/nixos76/default.nix b/config/hosts/nixos76/default.nix
index 8a70a1c..c795f92 100644
--- a/config/hosts/nixos76/default.nix
+++ b/config/hosts/nixos76/default.nix
@@ -36,56 +36,61 @@
     '';
   };
 
-  fileSystems = {
-    "/" = {
-      device = "/dev/disk/by-uuid/6d62467a-ccc1-44ed-a1cc-f473b3962c64";
-      fsType = "ext4";
-    };
+  fileSystems =
+    let
+      externalPrefix = "/media/external";
+      homePrefix = "/home/alex";
+    in
+    {
+      "/" = {
+        device = "/dev/disk/by-uuid/6d62467a-ccc1-44ed-a1cc-f473b3962c64";
+        fsType = "ext4";
+      };
 
-    "/boot" = {
-      device = "/dev/disk/by-uuid/2330-1A62";
-      fsType = "vfat";
-    };
+      "/boot" = {
+        device = "/dev/disk/by-uuid/2330-1A62";
+        fsType = "vfat";
+      };
 
-    "/media/external" = {
-      device = "/dev/mapper/externaldrive";
-    };
+      externalPrefix = {
+        device = "/dev/mapper/externaldrive";
+      };
 
-    "/home/alex/Documents" = {
-      device = "/media/external/Documents";
-      options = [ "bind" ];
-    };
+      "${homePrefix}/Documents" = {
+        device = "${externalPrefix}/Documents";
+        options = [ "bind" ];
+      };
 
-    "/home/alex/Games" = {
-      device = "/media/external/Games";
-      options = [ "bind" ];
-    };
+      "${homePrefix}/Games" = {
+        device = "${externalPrefix}/Games";
+        options = [ "bind" ];
+      };
 
-    "/home/alex/Git" = {
-      device = "/media/external/Git";
-      options = [ "bind" ];
-    };
+      "${homePrefix}/Git" = {
+        device = "${externalPrefix}/Git";
+        options = [ "bind" ];
+      };
 
-    "/home/alex/Lutris" = {
-      device = "/media/external/Lutris";
-      options = [ "bind" ];
-    };
+      "${homePrefix}/Lutris" = {
+        device = "${externalPrefix}/Lutris";
+        options = [ "bind" ];
+      };
 
-    "/home/alex/Music" = {
-      device = "/media/external/Music";
-      options = [ "bind" ];
-    };
+      "${homePrefix}/Music" = {
+        device = "${externalPrefix}/Music";
+        options = [ "bind" ];
+      };
 
-    "/home/alex/Pictures" = {
-      device = "/media/external/Pictures";
-      options = [ "bind" ];
-    };
+      "${homePrefix}/Pictures" = {
+        device = "${externalPrefix}/Pictures";
+        options = [ "bind" ];
+      };
 
-    "/home/alex/Videos" = {
-      device = "/media/external/Videos";
-      options = [ "bind" ];
+      "${homePrefix}/Videos" = {
+        device = "${externalPrefix}/Videos";
+        options = [ "bind" ];
+      };
     };
-  };
 
   swapDevices =
     [{ device = "/dev/disk/by-uuid/fda4f9fe-383f-477c-b2a2-c07f7efcc161"; }];
diff --git a/config/hosts/thelio76/default.nix b/config/hosts/thelio76/default.nix
index b03524f..2541617 100644
--- a/config/hosts/thelio76/default.nix
+++ b/config/hosts/thelio76/default.nix
@@ -38,27 +38,65 @@
     '';
   };
 
-  fileSystems = {
-    "/" = {
-      device = "/dev/disk/by-uuid/5b17c208-6c1b-4317-b59c-6596b1857f1f";
-      fsType = "ext4";
-    };
+  fileSystems =
+    let
+      externalPrefix = "/media/external";
+      homePrefix = "/home/alex";
+    in
+    {
+      "/" = {
+        device = "/dev/disk/by-uuid/5b17c208-6c1b-4317-b59c-6596b1857f1f";
+        fsType = "ext4";
+      };
 
-    "/boot" = {
-      device = "/dev/disk/by-uuid/EB52-074B";
-      fsType = "vfat";
-    };
+      "/boot" = {
+        device = "/dev/disk/by-uuid/EB52-074B";
+        fsType = "vfat";
+      };
 
-    "/run/media/alex/External" = {
-      device = "/dev/disk/by-uuid/5057a0e6-649f-487f-a17c-11e379f9af19";
-      fsType = "auto";
-    };
+      "/media/external" = {
+        # device = "/dev/disk/by-uuid/5057a0e6-649f-487f-a17c-11e379f9af19";
+        device = "/dev/mapper/luks-9870176e-53f3-493e-94d8-560994fa8f35";
+        # fsType = "auto";
+      };
 
-    "/home/alex/Documents" = {
-      device = "/run/media/alex/External/Documents";
-      options = [ "bind" ];
+      "${homePrefix}/Documents" = {
+        device = "${externalPrefix}/Documents";
+        options = [ "bind" "x-gvfs-hide" ];
+      };
+
+      "/home/alex/Games" = {
+        # depends = [ "/run/media/alex/External" ];
+        device = "${externalPrefix}/Games";
+        # fsType = "none";
+        options = [ "bind" "x-gvfs-hide" ];
+      };
+
+      #"${homePrefix}/Git" = {
+      #  device = "${externalPrefix}/Git";
+      #  options = [ "bind" ];
+      #};
+
+      "${homePrefix}/Lutris" = {
+        device = "${externalPrefix}/Lutris";
+        options = [ "bind" "x-gvfs-hide" ];
+      };
+
+      # "${homePrefix}/Music" = {
+      #   device = "${externalPrefix}/Music";
+      #   options = [ "bind" "x-gvfs-hide" ];
+      # };
+
+      "${homePrefix}/Pictures" = {
+        device = "${externalPrefix}/Pictures";
+        options = [ "bind" "x-gvfs-hide" ];
+      };
+
+      "${homePrefix}/Videos" = {
+        device = "${externalPrefix}/Videos";
+        options = [ "bind" "x-gvfs-hide" ];
+      };
     };
-  };
 
   swapDevices =
     [{ device = "/dev/disk/by-uuid/19de8142-e695-4425-a8cc-27e062204882"; }];