From 12d4f463674fc1da45ffa6575decce38ee764406 Mon Sep 17 00:00:00 2001
From: Alex Davies <traverse.da@gmail.com>
Date: Sun, 15 Sep 2024 07:33:51 -0300
Subject: [PATCH] Fixed printers for regular users

---
 nixos/configuration.nix       | 8 ++++++++
 nixos/family.nix              | 6 +++---
 nixos/kde-desktop.nix         | 1 +
 nixos/misc/wifi-multiplex.nix | 4 +---
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 5cb1982..3112240 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -186,6 +186,14 @@
   programs.nix-ld.libraries = with pkgs; [
   ];
 
+  #Create ldpadmin group for printer access
+  services.printing.extraFilesConf = ''
+    SystemGroup root wheel lpadmin
+  '';
+  users.groups = {
+    lpadmin = { };
+  };
+
   # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
   system.stateVersion = "23.05";
 }
diff --git a/nixos/family.nix b/nixos/family.nix
index 4b733f8..13c40f1 100644
--- a/nixos/family.nix
+++ b/nixos/family.nix
@@ -12,15 +12,15 @@ in
   users.users = {
     gwen = {
       isNormalUser = true;
-      extraGroups = [ "networkManager" ];
+      extraGroups = [ "networkManager" "lpadmin" ];
     };
     ingrid = {
       isNormalUser = true;
-      extraGroups = [ "networkManager" ];
+      extraGroups = [ "networkManager" "lpadmin" ];
     };
     bill = {
       isNormalUser = true;
-      extraGroups = [ "networkManager" ];
+      extraGroups = [ "networkManager" "lpadmin" ];
     };
     logic11 = {
       isNormalUser = true;
diff --git a/nixos/kde-desktop.nix b/nixos/kde-desktop.nix
index c63d101..4eebafd 100644
--- a/nixos/kde-desktop.nix
+++ b/nixos/kde-desktop.nix
@@ -3,6 +3,7 @@
 {
   imports = [
     ./misc/dslr-webcam.nix
+    ./misc/wifi-multiplex.nix
   ];
   # Enable the KDE Desktop Environment.
   services.xserver.enable = true;
diff --git a/nixos/misc/wifi-multiplex.nix b/nixos/misc/wifi-multiplex.nix
index 813c827..6b92b1f 100644
--- a/nixos/misc/wifi-multiplex.nix
+++ b/nixos/misc/wifi-multiplex.nix
@@ -1,10 +1,8 @@
-
 { pkgs, lib, ... }:
 
 let
   wifiUdevRule = ''
-    ACTION=="add", SUBSYSTEM=="net", ENV{DEVTYPE}=="wlan",  ENV{ID_NET_NAME_MAC}=="", RUN+="/bin/sh -c '${pkgs.iw}/bin/iw dev %k interface add %k_ap type station'"
-
+    ACTION=="add", SUBSYSTEM=="net", ENV{DEVTYPE}=="wlan", KERNEL!="virt_", RUN+="${pkgs.iw}/bin/iw dev %k interface add virt_%k_ap type station"
   '';
 in
 {