From adf1cc7ca655aa8af6a518cf957eec639b9fc8ed Mon Sep 17 00:00:00 2001
From: mjallen18 <matt.l.jallen@gmail.com>
Date: Fri, 5 Dec 2025 09:35:01 -0600
Subject: [PATCH] yubi

---
 flake.lock                                |  2 +-
 flake.nix                                 | 10 +++-------
 modules/nixos/security/common/default.nix |  8 +++++---
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/flake.lock b/flake.lock
index e9c1680..549ca43 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1060,7 +1060,7 @@
         "flake-compat": "flake-compat_5",
         "nixos-images": "nixos-images",
         "nixpkgs": [
-          "nixpkgs"
+          "nixpkgs-stable"
         ]
       },
       "locked": {
diff --git a/flake.nix b/flake.nix
index a6643b1..825cb61 100644
--- a/flake.nix
+++ b/flake.nix
@@ -48,7 +48,7 @@
 
     nixos-raspberrypi = {
       url = "github:mjallen18/nixos-raspberrypi";
-      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.nixpkgs.follows = "nixpkgs-stable";
     };
 
     jovian.url = "github:Jovian-Experiments/Jovian-NixOS";
@@ -205,9 +205,7 @@
           #                      Pi4                             #
           # ######################################################
           pi4 = {
-            specialArgs = {
-              nixpkgs = inputs.nixpkgs-stable;
-            };
+            channelName = "nixpkgs-stable";
             modules = with inputs; [
               disko.nixosModules.disko
               nixos-raspberrypi.nixosModules.raspberry-pi-4.base
@@ -223,9 +221,7 @@
           #                      Pi5                             #
           # ######################################################
           pi5 = {
-            # specialArgs = {
-            #   nixpkgs = inputs.nixpkgs-stable;
-            # };
+            channelName = "nixpkgs-stable";
             modules = with inputs; [
               disko.nixosModules.disko
               nixos-raspberrypi.nixosModules.raspberry-pi-5.base
diff --git a/modules/nixos/security/common/default.nix b/modules/nixos/security/common/default.nix
index 083e2ae..98c5556 100644
--- a/modules/nixos/security/common/default.nix
+++ b/modules/nixos/security/common/default.nix
@@ -1,4 +1,7 @@
-{ lib, pkgs, ... }:
+{ config, namespace, lib, pkgs, ... }:
+let
+  hasGui = config.${namespace}.desktop.hyprland.enable || config.${namespace}.desktop.gnome.enable || config.${namespace}.desktop.cosmic.enable;
+in
 {
   security = {
     rtkit.enable = lib.mkDefault true;
@@ -39,8 +42,7 @@
     libsecret
     yubikey-manager
     yubikey-personalization
-    yubioath-flutter
-  ];
+  ] ++ (if hasGui then [ yubioath-flutter ] else [ ]);
 
   services = {
     yubikey-agent.enable = true;