user consolidation, add printer stuff, etc

flake.lock

@@ -37,11 +37,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1781129616,
+        "lastModified": 1781305496,
-        "narHash": "sha256-Hl0Pz/QIKpePSU7SdK3BMe5VNmUhFvfWyg57GyawxzE=",
+        "narHash": "sha256-g8Vv4Qfc7n+lgov97REu3X6BeJtvYY0hlSUZR1GrGQQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "7dbd305f8b81050f223f00bcfbc8a6b74e048806",
+        "rev": "c87a39aa979acc4848016d2220c6238390d84779",
         "type": "github"
       },
       "original": {
@@ -97,11 +97,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1781128692,
+        "lastModified": 1781311622,
-        "narHash": "sha256-iuGytEi9CDa0PKF4e4xprZwNkHh9HxQR9RQXoCdCXO0=",
+        "narHash": "sha256-bIxBnkQQbwOe+h635mQvKAZXIACRJB/vPi0mVWj+sYI=",
         "owner": "cynicsketch",
         "repo": "nix-mineral",
-        "rev": "d0fdf558f4d3237f153ae99a85a67694e9267e89",
+        "rev": "37ac0c67245dc4b2abe5726a766672284f2de4e9",
         "type": "github"
       },
       "original": {
@@ -115,11 +115,11 @@
         "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-        "lastModified": 1781020964,
+        "lastModified": 1781168557,
-        "narHash": "sha256-fS7xTi2j2iso5Hj7RNZLv/acDlCT+fgMVkVk40A7Uco=",
+        "narHash": "sha256-LOnLQ2tpYF9gqIDDr3+j3DbpJJr/QCH6zPRT2GzEUOE=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "32c2cd9e46286c4eced3dc6b613c659126bf3cca",
+        "rev": "6358ff76821101c178e3ab4919a62799bfe3652e",
         "type": "github"
       },
       "original": {
@@ -207,11 +207,11 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1780749050,
+        "lastModified": 1781074563,
-        "narHash": "sha256-3av0pIjlOWQ6rDbNOmpUSvbNnJkGORQKKjb4LtCZsIY=",
+        "narHash": "sha256-md8WlXOlfnIeHeOScMTTHFyf2d6iaTwPl2apR5EQ3P4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a799d3e3886da994fa307f817a6bc705ae538eeb",
+        "rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca",
         "type": "github"
       },
       "original": {

flake.nix

@@ -97,7 +97,8 @@
         ./modules/sys/stateversion.nix
         ./modules/sys/sysctl.nix
         ./modules/sys/time.nix
-        ./modules/sys/users.nix
+        ./modules/sys/users/k3t.nix
+
         ./modules/sys/vm.nix
 
         ./hosts/TheBlackBox/configuration.nix
@@ -109,6 +110,50 @@
           home-manager.users.k3t = ./home/desktop.nix;
         }
       ];
+
+      "IdeaPad" = mkHost "x86_64-linux" [
+        ./modules/audio/base.nix
+        ./modules/audio/zeroconf.nix
+
+        ./modules/bluetooth/desktop.nix
+        ./modules/de/kde.nix
+        ./modules/desktop-common.nix
+        
+        ./modules/gui/apps/firefox.nix
+        ./modules/gui/apps/spicetify.nix
+        ./modules/gui/fonts.nix
+        ./modules/gui/services/flatpak.nix
+        ./modules/gui/services/kdeconnect.nix
+        ./modules/gui/services/kwallet.nix
+        ./modules/gui/services/xdg.nix
+        
+        ./modules/net/services/avahi.nix
+        ./modules/net/services/fail2ban.nix
+        ./modules/net/services/networkmanager.nix
+        ./modules/net/services/printing.nix
+        
+        ./modules/sys/compat.nix
+        ./modules/sys/firewall.nix
+        ./modules/sys/fs/btrfs.nix
+        ./modules/sys/hw/boot.nix
+        ./modules/sys/hw/cpu/intel.nix
+        ./modules/sys/hw/gpu/amd.nix
+        ./modules/sys/nix.nix
+        ./modules/sys/perf.nix
+        ./modules/sys/pkgs.nix
+        ./modules/sys/rc/openssh.nix
+        ./modules/sys/rc/sunshine.nix
+        ./modules/sys/security.nix
+        ./modules/sys/shell.nix
+        ./modules/sys/stateversion.nix
+        ./modules/sys/sysctl.nix
+        ./modules/sys/time.nix
+        ./modules/sys/users/k3t.nix
+        ./modules/sys/users/juliet.nix
+        ./modules/sys/vm.nix
+        ./hosts/IdeaPad/configuration.nix
+      ];
+
       "htpc" = mkHost "x86_64-linux" [
         ./modules/audio/base.nix
         ./modules/audio/zeroconf.nix
@@ -151,7 +196,7 @@
         ./modules/sys/stateversion.nix
         ./modules/sys/sysctl.nix
         ./modules/sys/time.nix
-        ./modules/sys/users.nix
+        ./modules/sys/users/k3t.nix
 
         ./hosts/htpc/configuration.nix
         spicetify-nix.nixosModules.spicetify
@@ -204,7 +249,7 @@
         ./modules/sys/stateversion.nix
         ./modules/sys/sysctl.nix
         ./modules/sys/time.nix
-        ./modules/sys/users.nix
+        ./modules/sys/users/k3t.nix
         ./modules/sys/vm.nix
 
         ./hosts/laptop/configuration.nix
@@ -260,7 +305,7 @@
         ./modules/sys/stateversion.nix
         ./modules/sys/sysctl.nix
         ./modules/sys/time.nix
-        ./modules/sys/users.nix
+        ./modules/sys/users/k3t.nix
         ./hosts/nixcloud/configuration.nix
         home-manager.nixosModules.home-manager
         {

modules/net/services/printing.nix

@@ -1,3 +1,21 @@
+{pkgs, ...}:
+
 {
-  services.printing.enable = true;
+  services.printing = {
+    enable = true;
+    drivers = with pkgs; [
+      cups-filters
+      cups-browsed
+      cups-bjnp
+      cups-pdf-to-pdf
+      gutenprint-bin
+      canon-cups-ufr2
+    ];
+  };
+  hardware.sane = {
+    enable = true;
+    extraBackends = [ pkgs.sane-airscan pkgs.sane-pixma ];
+  };
+  services.udev.packages = [ pkgs.sane-airscan pkgs.sane-pixma ];
+  services.ipp-usb.enable=true;
 }

modules/sys/hw/boot.nix

@@ -9,5 +9,6 @@
   boot.loader.limine.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
   boot.extraModulePackages = [ ];
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" "sr_mod" ];
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" "sr_mod" "v4l2loopback" "i915" "amdgpu" ];
-}
+  boot.kernelModules = [ "v4l2loopback" ];
+}

modules/sys/users.nix

@@ -1,9 +1,3 @@
 {
-  users.users.k3t = {
+
-    description = "Kai Moore";
-    isNormalUser = true;
-    extraGroups = [ "audio" "video" "bluetooth" "wheel" "input" "networkmanager" ];
-    initialPassword = "password";
-    linger = true;
-  };
 }

modules/sys/users/juliet.nix

@@ -0,0 +1,9 @@
+{
+  users.users.juliet = {
+    description = "Juliet";
+    isNormalUser = true;
+    extraGroups = [ "audio" "video" "bluetooth" "wheel" "input" "networkmanager" "scanner" "lp" ];
+    initialPassword = "password";
+    linger = true;
+  };
+}

modules/sys/users/k3t.nix

@@ -0,0 +1,9 @@
+{
+  users.users.k3t = {
+    description = "Kai Moore";
+    isNormalUser = true;
+    extraGroups = [ "audio" "video" "bluetooth" "wheel" "input" "networkmanager" "scanner" "lp" ];
+    initialPassword = "password";
+    linger = true;
+  };
+}