From d0ac22c2115a4f665216d61f44e1d42f1d5b64f4 Mon Sep 17 00:00:00 2001
From: mjallen18 <matt.l.jallen@gmail.com>
Date: Tue, 29 Jul 2025 19:34:07 -0500
Subject: [PATCH] bcachefs

---
 modules/nixos/boot/default.nix                |  2 +
 systems/x86_64-linux/desktop/filesystems.nix  | 13 +--
 .../desktop/hyprland-settings.ori             | 97 -------------------
 3 files changed, 5 insertions(+), 107 deletions(-)
 delete mode 100644 systems/x86_64-linux/desktop/hyprland-settings.ori

diff --git a/modules/nixos/boot/default.nix b/modules/nixos/boot/default.nix
index 688ebf4..37fb27c 100644
--- a/modules/nixos/boot/default.nix
+++ b/modules/nixos/boot/default.nix
@@ -24,6 +24,8 @@ in
         fixBinary = false;
       };
     };
+
+    supportedFilesystems = [ "bcachefs" ];
   };
 
   zramSwap.enable = true;
diff --git a/systems/x86_64-linux/desktop/filesystems.nix b/systems/x86_64-linux/desktop/filesystems.nix
index d27b4db..c94ebd2 100755
--- a/systems/x86_64-linux/desktop/filesystems.nix
+++ b/systems/x86_64-linux/desktop/filesystems.nix
@@ -22,17 +22,10 @@ let
 in
 {
   fileSystems = {
-    "/media/matt/Steam" = {
-      device = "/dev/disk/by-id/nvme-Samsung_SSD_980_PRO_2TB_S6B0NL0W232824B-part1";
+    "/media/matt/data" = {
+      device = "/dev/disk/by-uuid/f851d21e-27b3-4353-aa19-590d244db6e5";
+      fsType = "bcachefs";
       options = [
-        "subvol=steam"
-        "noatime"
-      ] ++ defaultLocalOptions;
-    };
-    "/media/matt/Heroic" = {
-      device = "/dev/disk/by-id/nvme-Samsung_SSD_980_PRO_2TB_S6B0NL0W232824B-part1";
-      options = [
-        "subvol=heroic"
         "noatime"
       ] ++ defaultLocalOptions;
     };
diff --git a/systems/x86_64-linux/desktop/hyprland-settings.ori b/systems/x86_64-linux/desktop/hyprland-settings.ori
deleted file mode 100644
index 1fafe9b..0000000
--- a/systems/x86_64-linux/desktop/hyprland-settings.ori
+++ /dev/null
@@ -1,97 +0,0 @@
-# let
-#   theme = import ../../modules/nixos/hyprland/theme.nix;
-#   defaultOpacity = theme.waybar.defaultOpacity;
-#   defaultBorderRadius = theme.waybar.defaultBorderRadius;
-#   defaultCenterOptions = theme.waybar.defaultCenterOptions;
-#   borderLeft = theme.waybar.borderLeft;
-#   borderRight = theme.waybar.borderRight;
-
-#   # Displays
-#   displayLeft = {
-#     input = "DP-1";
-#     resolution = "3840x2160";
-#     refreshRate = "240.00000";
-#   };
-#   displayRight = {
-#     input = "DP-2";
-#     resolution = "3840x2160";
-#     refreshRate = "240.00000";
-#   };
-# in
-# {
-#   primaryDisplay = displayLeft;
-#   networkInterface = "wlp9s0";
-
-#   wallpaper = [
-#     "${displayLeft.input}, /run/wallpaper.jpg"
-#     "${displayRight.input}, /run/wallpaper.jpg"
-#   ];
-
-#   monitor = [
-#     "${displayLeft.input},${displayLeft.resolution}@${displayLeft.refreshRate},0x0,1,bitdepth,10,cm,hdr,sdrbrightness,1.2,sdrsaturation,0.98"
-#     "${displayRight.input},${displayRight.resolution}@${displayRight.refreshRate},3840x0,1,bitdepth,10,cm,hdr,sdrbrightness,1.5,sdrsaturation,0.98"
-#   ];
-  
-#   workspace = [
-#     "name:firefox, monitor:${displayRight.input}, default:false, special, class:(.*firefox.*)"
-#     "name:discord, monitor:${displayRight.input}, default:true, special, title:(.*vesktop.*), title:(.*Apple Music.*)"
-#     "name:steam, monitor:${displayLeft.input}, default:false, special, class:(.*[Ss]team.*)"
-#   ];
-
-#   windowRule = [
-#     "size 2160 7680, tag:horizonrdp"
-#   ];
-
-#   extraConfig = ''
-#     exec-once = nm-applet
-#     exec-once = [silent] firefox
-#     exec-once = [silent] vesktop
-#     exec-once = [silent] chromium --app="https://music.apple.com"
-#     exec-once = [silent] steam
-#   '';
-
-#   waybar = {
-
-#     layer = "bottom";
-
-#     modules-right = [
-#       "tray"
-#       "custom/lights"
-#       "temperature"
-#       "temperature#gpu"
-#       "keyboard-state#capslock"
-#       "keyboard-state#numlock"
-#       "wireplumber#sink"
-#       "wireplumber#source"
-#       "bluetooth"
-#       "network"
-#       "idle_inhibitor"
-#       "clock"
-#       "custom/weather"
-#     ];
-    
-#     extraModules = {
-#       "custom/lights" = {
-#         tooltip = false;
-#         exec = "waybar-hass --get_light light.living_room_lights";
-#         interval = "once";
-#         format = "{text}";#"󱉓";
-#         on-click = "waybar-hass --toggle_light light.living_room_lights";
-#         return-type = "json";
-#       };
-#     };
-
-#     extraModulesStyle = ''
-#       #custom-lights {
-#         color: ${theme.nord.frost.nord8};
-#         background-color: ${theme.nord.polarNight.nord0};
-#         ${defaultOpacity}
-#         ${borderLeft}
-#       }
-
-#       #custom-lights:hover {
-#         background: ${theme.nord.polarNight.nord3};
-#       }
-#     '';
-#   };
-# }
\ No newline at end of file