diff options
| author | Mark Nipper <nipsy@bitgnome.net> | 2025-10-08 14:28:19 -0700 |
|---|---|---|
| committer | Mark Nipper <nipsy@bitgnome.net> | 2025-10-08 14:28:19 -0700 |
| commit | 1a67a3eeaac68a15516b36ddecdde83c76c99a52 (patch) | |
| tree | 5b18fb44a11fc7d4cbfcc496b09b8e9f2f8a3644 /hosts/caladan | |
| parent | 9c75409c9c2a5154eaf503026b97cf50dc2fa70e (diff) | |
| download | nix-1a67a3eeaac68a15516b36ddecdde83c76c99a52.tar nix-1a67a3eeaac68a15516b36ddecdde83c76c99a52.tar.gz nix-1a67a3eeaac68a15516b36ddecdde83c76c99a52.tar.bz2 nix-1a67a3eeaac68a15516b36ddecdde83c76c99a52.tar.lz nix-1a67a3eeaac68a15516b36ddecdde83c76c99a52.tar.xz nix-1a67a3eeaac68a15516b36ddecdde83c76c99a52.tar.zst nix-1a67a3eeaac68a15516b36ddecdde83c76c99a52.zip | |
Modularize printer configuration
Diffstat (limited to 'hosts/caladan')
| -rw-r--r-- | hosts/caladan/default.nix | 7 | ||||
| -rw-r--r-- | hosts/caladan/hardware-configuration.nix | 24 |
2 files changed, 1 insertions, 30 deletions
diff --git a/hosts/caladan/default.nix b/hosts/caladan/default.nix index c3aac81..3c8d962 100644 --- a/hosts/caladan/default.nix +++ b/hosts/caladan/default.nix @@ -74,6 +74,7 @@ ../common/optional/misc.nix ../common/optional/multimedia.nix ../common/optional/pipewire.nix + ../common/optional/printer.nix ../common/optional/sdr.nix ../common/optional/services/chrony.nix ../common/optional/services/openssh.nix @@ -178,12 +179,6 @@ systemd.services = { - "ensure-printers" = { - after = [ "network-online.target" ]; - preStart = "sleep 5"; - wants = [ "network-online.target" ]; - }; - "nftables-extra" = let rules_script = '' ${pkgs.nftables}/bin/nft insert rule inet nixos-fw input 'iifname "enp6s0" udp dport { 2456, 2457 } counter accept # Valheim dedicated server' ${pkgs.nftables}/bin/nft insert rule inet nixos-fw input 'iifname "enp6s0" udp dport 5121 counter accept # Neverwinter Nights Server' diff --git a/hosts/caladan/hardware-configuration.nix b/hosts/caladan/hardware-configuration.nix index 302606c..9325e99 100644 --- a/hosts/caladan/hardware-configuration.nix +++ b/hosts/caladan/hardware-configuration.nix @@ -47,29 +47,5 @@ #package = pkgs.master.mesa; #package32 = pkgs.master.pkgsi686Linux.mesa; }; - - #nvidia = let - # betaPkg = config.boot.kernelPackages.nvidiaPackages.beta; - # pkgAfterFbc = if builtins.hasAttr betaPkg.version pkgs.nvidia-patch-list.fbc then pkgs.nvidia-patch.patch-fbc betaPkg else betaPkg; - # finalPkg = if builtins.hasAttr betaPkg.version pkgs.nvidia-patch-list.nvenc then pkgs.nvidia-patch.patch-nvenc pkgAfterFbc else pkgAfterFbc; - #in { - # modesetting.enable = true; - # open = true; - # package = if finalPkg == betaPkg then betaPkg else finalPkg; - #}; - - printers = let - brother = "Brother_HL-L2340D"; - ip = "192.168.1.20"; - in { - ensureDefaultPrinter = brother; - ensurePrinters = [{ - name = brother; - deviceUri = "ipp://${ip}/ipp"; - model = "everywhere"; - description = lib.replaceStrings [ "_" ] [ " " ] brother; - location = "home"; - }]; - }; }; } |