From 98b0ebdd51e74b60a22333b28808094876795d84 Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Sat, 30 Mar 2024 07:50:23 -0500
Subject: [PATCH 1/4] Beefcake hosts?

---
 nixos/beefcake.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/nixos/beefcake.nix b/nixos/beefcake.nix
index b1c25af..2f448f9 100644
--- a/nixos/beefcake.nix
+++ b/nixos/beefcake.nix
@@ -163,6 +163,13 @@ sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00
           User = "daniel"; # might have to run as me for git ssh access to the repo
         };
       };
+
+      networking = {
+        extraHosts = ''
+          ::1 nix.h.lyte.dev
+          127.0.0.1 nix.h.lyte.dev
+        '';
+      };
     }
     {
       services.headscale = {

From 1c0e1e04dcd759de6100758d4ed1bc71450624ca Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Sat, 30 Mar 2024 08:05:13 -0500
Subject: [PATCH 2/4] Sway for thablet

---
 modules/nixos/sway.nix | 2 +-
 nixos/thablet.nix      | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/nixos/sway.nix b/modules/nixos/sway.nix
index 49ae6bb..c196488 100644
--- a/modules/nixos/sway.nix
+++ b/modules/nixos/sway.nix
@@ -30,7 +30,7 @@
   };
 
   # I'm currently leaning Plasma since 6.0 released, so we use that pinentry
-  programs.gnupg.agent.pinentryPackage = pkgs.pinentry-qt;
+  # programs.gnupg.agent.pinentryPackage = pkgs.pinentry-qt;
 
   services.dbus.enable = true;
 
diff --git a/nixos/thablet.nix b/nixos/thablet.nix
index 91184fa..2699a67 100644
--- a/nixos/thablet.nix
+++ b/nixos/thablet.nix
@@ -15,6 +15,7 @@
     desktop-usage
     fonts
     # gnome
+    sway
     kde-plasma
     wifi
     flanfam
@@ -23,7 +24,7 @@
 
   home-manager.users.daniel = {
     imports = with outputs.homeManagerModules; [
-      linux-desktop
+      sway
     ];
   };
 

From 98551750da127dbee144d6eee3c4795b65f0c9b2 Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Sat, 30 Mar 2024 08:09:21 -0500
Subject: [PATCH 3/4] Pinentry

---
 modules/nixos/kde-plasma.nix | 2 ++
 modules/nixos/sway.nix       | 2 +-
 nixos/thablet.nix            | 1 -
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/nixos/kde-plasma.nix b/modules/nixos/kde-plasma.nix
index 08e272f..e200d1c 100644
--- a/modules/nixos/kde-plasma.nix
+++ b/modules/nixos/kde-plasma.nix
@@ -35,6 +35,8 @@
     #   style = "adwaita-dark";
   };
 
+  programs.gnupg.agent.pinentryPackage = lib.mkForce pkgs.pinentry-qt;
+
   programs.dconf.enable = true;
 
   services.dbus.enable = true;
diff --git a/modules/nixos/sway.nix b/modules/nixos/sway.nix
index c196488..eb7a77e 100644
--- a/modules/nixos/sway.nix
+++ b/modules/nixos/sway.nix
@@ -30,7 +30,7 @@
   };
 
   # I'm currently leaning Plasma since 6.0 released, so we use that pinentry
-  # programs.gnupg.agent.pinentryPackage = pkgs.pinentry-qt;
+  # programs.gnupg.agent.pinentryPackage = pkgs.pinen;
 
   services.dbus.enable = true;
 
diff --git a/nixos/thablet.nix b/nixos/thablet.nix
index 2699a67..db47e58 100644
--- a/nixos/thablet.nix
+++ b/nixos/thablet.nix
@@ -15,7 +15,6 @@
     desktop-usage
     fonts
     # gnome
-    sway
     kde-plasma
     wifi
     flanfam

From 038badd1a952e491bc92bade05313f56074f99c3 Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Sat, 30 Mar 2024 15:43:19 -0500
Subject: [PATCH 4/4] Thinker to plasma

---
 nixos/thinker.nix | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/nixos/thinker.nix b/nixos/thinker.nix
index 48ed09a..ab0389e 100644
--- a/nixos/thinker.nix
+++ b/nixos/thinker.nix
@@ -14,7 +14,8 @@
     inputs.hardware.nixosModules.common-pc-laptop-ssd
     desktop-usage
     podman
-    gnome
+    # gnome
+    kde-plasma
     postgres
     wifi
   ];
@@ -23,10 +24,15 @@
     systemPackages = with pkgs; [
       spotify
       discord
-      obs-studio
-      variety # wallpaper switcher that I use with GNOME
-      sops
       slack
+      godot_4
+      fractal
+      prismlauncher
+      variety
+      radeontop
+      sops
+      obs-studio
+      xh
     ];
   };
 
@@ -51,7 +57,7 @@
       sway
       pass
       firefox-no-tabs
-      wallpaper-manager
+      # wallpaper-manager
       # sway-laptop
       # hyprland
     ];
@@ -59,6 +65,8 @@
     home = {
       stateVersion = "24.05";
     };
+
+    services.mako.enable = lib.mkForce false; # don't use mako when using plasma
   };
 
   swapDevices = [