Change structure, add scanner deps and fix configurations

modules/system/nixos/graphics/cuda.nix

@@ -24,13 +24,5 @@ in
       nccl
     ];
 
-    environment.variables = {
-      CUDA_PATH = "${pkgs.cudatoolkit}";
-      LD_LIBRARY_PATH = "${pkgs.linuxPackages.nvidia_x11}/lib:$LD_LIBRARY_PATH";
-      EXTRA_LDFLAGS = "-L/lib -L${pkgs.linuxPackages.nvidia_x11}/lib";
-      EXTRA_CCFLAGS = "-I/usr/include";
-    };
-
   };
-
 }

modules/system/nixos/networks/manager.nix

@@ -1,15 +0,0 @@
-{ lib, config, ... }:
-with lib;
-let
-  cfg = config.os.networks.manager;
-in
-{
-  options.os.networks.manager = {
-    enable = mkEnableOption "System networks manager service";
-  };
-  config = mkIf cfg.enable {
-
-    networking.networkmanager.enable = true;
-
-  };
-}

modules/system/nixos/networks/networking.nix

@@ -1,11 +1,11 @@
 { lib, config, ... }:
 with lib;
 let
-  cfg = config.os.networks.dns;
+  cfg = config.os.networking;
 in
 {
-  options.os.networks.dns = {
-    enable = mkEnableOption "System dns service";
+  options.os.networking = {
+    enable = mkEnableOption "System networks manager service";
   };
   config = mkIf cfg.enable {
 
@@ -17,5 +17,7 @@ in
       openFirewall = true;
     };
 
+    networking.networkmanager.enable = true;
+
   };
 }

modules/system/nixos/networks/printing.nix

@@ -1,4 +1,5 @@
 {
+  pkgs,
   lib,
   config,
   ...
@@ -6,6 +7,8 @@
 with lib;
 let
   cfg = config.os.networks.printing;
+  all = builtins.attrNames config.users.users;
+  users = builtins.filter (user: config.users.users.${user}.isNormalUser == true) all;
 in
 {
   options.os.networks.printing = {
@@ -15,7 +18,17 @@ in
 
     services.printing = {
       enable = true;
+      startWhenNeeded = true;
+      drivers = with pkgs; [ hplip ];
     };
 
+    hardware.sane = {
+      enable = true;
+      extraBackends = with pkgs; [ sane-airscan ];
+    };
+
+    users.groups.lp.members = users;
+    users.groups.scanner.members = users;
+
   };
 }

modules/system/nixos/shells/gnome.nix

@@ -1,45 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}:
-with lib;
-let
-  cfg = config.os.gnome.shell;
-in
-{
-  options.os.gnome.shell = {
-    enable = mkEnableOption "System gnome shell service";
-  };
-  config = mkIf cfg.enable {
-
-    services.displayManager.gdm.enable = true;
-    services.desktopManager.gnome.enable = true;
-
-    services.gnome.games.enable = false;
-    services.gnome.core-apps.enable = false;
-    services.gnome.core-developer-tools.enable = false;
-
-    environment = {
-
-      gnome.excludePackages = with pkgs; [
-        gnome-tour
-        gnome-user-docs
-      ];
-
-      systemPackages = with pkgs; [
-
-        # Gnome terminal
-        ghostty
-
-        # Gnome Extensions
-        gnomeExtensions.paperwm
-        gnomeExtensions.app-hider
-        gnomeExtensions.dash-to-dock
-
-      ];
-    };
-
-  };
-}

modules/system/nixos/shells/shell.nix

@@ -33,10 +33,10 @@ in
       systemPackages =
         with pkgs;
         [ nautilus ]
-        ++ [ ptyxis ]
         ++ [
           loupe
           papers
+          simple-scan
         ];
     };
 

modules/system/nixos/virtualisations/podman.nix

@@ -7,6 +7,8 @@
 with lib;
 let
   cfg = config.os.virtualisation.podman;
+  all = builtins.attrNames config.users.users;
+  users = builtins.filter (user: config.users.users.${user}.isNormalUser == true) all;
 in
 {
   options.os.virtualisation.podman = {
@@ -30,5 +32,7 @@ in
       ];
     };
 
+    users.groups.podman.members = users;
+
   };
 }