Merge pull request #109 from darkone-linux/108-fix-imprimantes

#108 Fixes impression et scan

Author: camini

.gitignore

@@ -8,4 +8,5 @@ result- # Generated by nix fast build
 *.qcow2
 iso
 __pycache__/
-./docs/_site
+./docs/_site
+.idea

modules/default/printing.nix

@@ -1,48 +1,71 @@
-{ lib, config, pkgs, ... }:
-
 {
+  lib,
+  config,
+  pkgs,
+  ...
+}:
 
+{
   options.glf.printing.enable = lib.mkOption {
     description = "Enable GLF printing configurations.";
     type = lib.types.bool;
     default = true;
   };
 
-  config = lib.mkIf config.glf.printing.enable (let
-    allUsers = builtins.attrNames config.users.users;
-    normalUsers = builtins.filter (user: config.users.users.${user}.isNormalUser == true) allUsers;
-  in {
-    # Configure printer
-    services.printing = {
-      enable = true;
-      startWhenNeeded = true;
-      drivers = with pkgs; [
-        gutenprint
-        hplip
-        samsung-unified-linux-driver
-        splix
-        brlaser
-        brgenml1lpr
-        cnijfilter2
-      ];
-    };
+  config = lib.mkIf config.glf.printing.enable (
+    let
+      allUsers = builtins.attrNames config.users.users;
+      normalUsers = builtins.filter (user: config.users.users.${user}.isNormalUser) allUsers;
+    in
+    {
 
-    # Enable autodiscovery
-    services.avahi = {
-      enable = true;
-      nssmdns4 = true;
-      openFirewall = true;
-    };
+      # Configure printer
+      services.printing = {
+        enable = true;
+        startWhenNeeded = true;
+        drivers = with pkgs; [
+          brgenml1cupswrapper
+          brgenml1lpr
+          brlaser
+          cnijfilter2
+          epkowa
+          gutenprint
+          gutenprintBin
+          hplip
+          hplipWithPlugin
+          samsung-unified-linux-driver
+          splix
+        ];
+      };
 
-    # Scanner support
-    hardware.sane = {
-      enable = true;
-      extraBackends = with pkgs; [ sane-airscan epkowa ];
-    };
+      # To install printers manually
+      programs.system-config-printer.enable = true;
 
-    # Add all users to group scanner and lp
-    users.groups.scanner.members = normalUsers;
-    users.groups.lp.members = normalUsers;
-  });
+      # Enable autodiscovery
+      services.avahi = {
+        enable = true;
+        nssmdns4 = true;
+        openFirewall = true;
+      };
+
+      # systemd.services.cups-browsed.enable = false;
+      hardware.sane = {
+        enable = true;
+        extraBackends = with pkgs; [
+          hplipWithPlugin
+          sane-airscan
+          epkowa
+          utsushi
+        ];
+      };
+      services.udev.packages = with pkgs; [
+        sane-airscan
+        utsushi
+      ];
 
+      # add all users to group scanner and lp
+      users.groups.scanner.members = normalUsers;
+      users.groups.lp.members = normalUsers;
+    }
+  );
 }

patches/calamares-nixos-extensions/modules/nixos/main.py

@@ -550,7 +550,7 @@ def run():
     # Setup user
     if gs.value("username") is not None:
         fullname = gs.value("fullname")
-        groups = ["networkmanager", "wheel"]
+        groups = ["networkmanager", "wheel", "scanner", "lp", "disk"]
 
         cfg += cfgusers
         catenate(variables, "username", gs.value("username"))