From 8dd2a143acc743275ff30d3536008180b4e17c15 Mon Sep 17 00:00:00 2001 From: ItsDrike Date: Wed, 19 Jun 2024 19:05:50 +0200 Subject: [PATCH 1/3] Fix indent --- hosts/voyager/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/voyager/default.nix b/hosts/voyager/default.nix index e9d1316..acf4cb0 100644 --- a/hosts/voyager/default.nix +++ b/hosts/voyager/default.nix @@ -93,7 +93,7 @@ security = { auditd = { enable = true; - autoPrune.enable = true; + autoPrune.enable = true; }; }; From bb1915e3dd2dfa185d3958d46b526f2f969b52b3 Mon Sep 17 00:00:00 2001 From: ItsDrike Date: Wed, 19 Jun 2024 19:22:02 +0200 Subject: [PATCH 2/3] Add support for hplip (HP printers) --- hosts/voyager/default.nix | 5 ++++- options/workstation/default.nix | 4 ++++ system/roles/workstation/services/printing.nix | 5 ++++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/hosts/voyager/default.nix b/hosts/voyager/default.nix index acf4cb0..7dafa3a 100644 --- a/hosts/voyager/default.nix +++ b/hosts/voyager/default.nix @@ -98,7 +98,10 @@ }; workstation = { - printing.enable = true; + printing = { + enable = true; + hplip.enable = true; + }; }; home-manager = { diff --git a/options/workstation/default.nix b/options/workstation/default.nix index 05c4c70..d47b613 100644 --- a/options/workstation/default.nix +++ b/options/workstation/default.nix @@ -11,6 +11,10 @@ in Also adds some drivers for common printers. ''; + + hplip.enable = mkEnableOption '' + HP printing support using hplip software. + ''; }; }; } diff --git a/system/roles/workstation/services/printing.nix b/system/roles/workstation/services/printing.nix index 9460c12..4f459f7 100644 --- a/system/roles/workstation/services/printing.nix +++ b/system/roles/workstation/services/printing.nix @@ -1,5 +1,5 @@ { pkgs, lib, config, ...}: let - inherit (lib) mkIf; + inherit (lib) mkIf optional; deviceType = config.myOptions.device.roles.type; acceptedTypes = ["laptop" "desktop"]; @@ -26,5 +26,8 @@ in { openFirewall = true; }; }; + + environment.systemPackages = optional cfg.hplip.enable pkgs.hplip; + myOptions.system.impermanence.home.extraDirectories = optional cfg.hplip.enable ".hplip"; }; } From c916fd31b47b9bca08c55d14b2ca51220ac3fff6 Mon Sep 17 00:00:00 2001 From: ItsDrike Date: Wed, 19 Jun 2024 19:23:36 +0200 Subject: [PATCH 3/3] Fix indentation --- hosts/voyager/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/hosts/voyager/default.nix b/hosts/voyager/default.nix index 7dafa3a..990e772 100644 --- a/hosts/voyager/default.nix +++ b/hosts/voyager/default.nix @@ -83,7 +83,7 @@ device = { roles = { type = "laptop"; - virtual-machine = false; + virtual-machine = false; }; cpu.type = "amd"; gpu.type = "amd"; @@ -110,18 +110,18 @@ git = { userName = "ItsDrike"; - userEmail = "itsdrike@protonmail.com"; - signing = { - enable = true; + userEmail = "itsdrike@protonmail.com"; + signing = { + enable = true; key = "FA2745890B7048C0"; - }; + }; }; wms.hyprland = { enable = true; - monitor = [ - "eDP-1, 1920x1080@60, 0x0, 1" - ]; + monitor = [ + "eDP-1, 1920x1080@60, 0x0, 1" + ]; }; programs = {