From d2059a2845ae96efbe7cdb1999b8b21f36cace0c Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Mon, 29 Jul 2024 10:01:59 -0500
Subject: [PATCH] Unstable starts building

---
 modules/home-manager/default.nix |  2 +-
 modules/nixos/default.nix        | 10 +++++-----
 nixos/beefcake.nix               |  7 +++----
 nixos/dragon.nix                 |  3 ++-
 nixos/foxtrot.nix                | 11 ++++-------
 nixos/htpifour.nix               |  2 +-
 6 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
index 6f4342c..470b2c2 100644
--- a/modules/home-manager/default.nix
+++ b/modules/home-manager/default.nix
@@ -1190,7 +1190,7 @@
       age-plugin-yubikey
       bitwarden-cli
       oath-toolkit
-      bitwarden-desktop
+      # bitwarden-desktop
     ];
   };
 
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index 7a8ae8d..2089268 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -204,7 +204,7 @@
 
     nix = {
       nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry;
-      registry = lib.mapAttrs (_: value: {flake = value;}) flakeInputs;
+      # registry = lib.mapAttrs (_: value: {flake = value;}) flakeInputs;
 
       settings = {
         trusted-users = ["root" "daniel"];
@@ -280,7 +280,7 @@
       kubectl
       stern
       libresprite
-      logseq
+      # logseq
       audacity
       wol
       shellcheck
@@ -397,10 +397,10 @@
     xdg.portal.enable = true;
 
     hardware = {
-      opengl = {
+      graphics = {
         enable = true;
-        driSupport32Bit = true;
-        driSupport = true;
+        # driSupport32Bit = true;
+        # driSupport = true;
       };
     };
     environment = {
diff --git a/nixos/beefcake.nix b/nixos/beefcake.nix
index 0aedb8f..9a71bd7 100644
--- a/nixos/beefcake.nix
+++ b/nixos/beefcake.nix
@@ -15,6 +15,8 @@ sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00
   pkgs,
   ...
 }: {
+  system.stateVersion = "22.05";
+  home-manager.users.daniel.home.stateVersion = "24.05";
   networking.hostName = "beefcake";
 
   imports = [
@@ -470,7 +472,7 @@ sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00
       # stuff, too?) and get good transcoding performance
 
       # jellyfin hardware encoding
-      # hardware.opengl = {
+      # hardware.graphics = {
       #   enable = true;
       #   extraPackages = with pkgs; [
       #     intel-media-driver
@@ -1073,7 +1075,4 @@ sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00
       to = 27100;
     }
   ];
-
-  home-manager.users.daniel.home.stateVersion = "24.05";
-  system.stateVersion = "22.05";
 }
diff --git a/nixos/dragon.nix b/nixos/dragon.nix
index 6b7564f..cd8d211 100644
--- a/nixos/dragon.nix
+++ b/nixos/dragon.nix
@@ -5,9 +5,10 @@
   ...
 }: {
   system.stateVersion = "24.05";
+  home-manager.users.daniel.home.stateVersion = "24.05";
   networking.hostName = "dragon";
 
-  hardware.opengl.extraPackages = [
+  hardware.graphics.extraPackages = [
     # pkgs.rocmPackages.clr.icd
     pkgs.amdvlk
 
diff --git a/nixos/foxtrot.nix b/nixos/foxtrot.nix
index 641d7ff..892abc2 100644
--- a/nixos/foxtrot.nix
+++ b/nixos/foxtrot.nix
@@ -1,5 +1,8 @@
 {pkgs, ...}: {
+  system.stateVersion = "24.05";
+  home-manager.users.daniel.home.stateVersion = "24.11";
   networking.hostName = "foxtrot";
+
   imports = [
     {
       # laptop power management
@@ -33,9 +36,6 @@
 
   environment = {
     systemPackages = with pkgs; [
-      spotify
-      discord
-      slack
       godot_4
       fractal
       prismlauncher
@@ -51,7 +51,6 @@
 
   home-manager.users.daniel = {
     home = {
-      stateVersion = "24.05";
       pointerCursor = {
         size = 40;
       };
@@ -90,7 +89,7 @@
     # };
   };
 
-  hardware.opengl.extraPackages = [
+  hardware.graphics.extraPackages = [
     # pkgs.rocmPackages.clr.icd
     pkgs.amdvlk
 
@@ -204,6 +203,4 @@
     stardewValley
     7777
   ];
-
-  system.stateVersion = "24.05";
 }
diff --git a/nixos/htpifour.nix b/nixos/htpifour.nix
index 28887bb..4c19135 100644
--- a/nixos/htpifour.nix
+++ b/nixos/htpifour.nix
@@ -132,7 +132,7 @@
   #   };
   # };
 
-  hardware.opengl.driSupport32Bit = lib.mkForce false;
+  hardware.graphics.driSupport32Bit = lib.mkForce false;
 
   system.stateVersion = "24.05";
 }