formating

home/work/citrix.nix

@@ -1,10 +1,19 @@
-{ lib, config, pkgs, inputs, outputs, home-manager, ... }:
+{
-with lib;
+  lib,
-let cfg = config.roles.citrix;
+  config,
+  pkgs,
+  inputs,
+  outputs,
+  home-manager,
+  ...
+}:
+with lib; let
+  cfg = config.roles.citrix;
 in {
   options.roles.citrix = {enable = lib.mkEnableOption "citrix tools";};
   config = mkIf cfg.enable {
     home-manager.users.don.home.packages = with pkgs; [citrix_workspace];
+    nixpkgs.config.permittedInsecurePackages = ["libsoup-2.74.3"];
     # home-manager.users.don.home.packages = with pkgs;
     #   [ citrix_workspace_24_11_0 ];
     home-manager.users.don.home.file."ICAClient" = {

hosts/book/default.nix

@@ -1,4 +1,11 @@
-{ inputs, outputs, lib, config, pkgs, ... }: {
+{
+  inputs,
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
   imports = [
     inputs.nixos-hardware.nixosModules.google-pixelbook
     ./hardware-configuration.nix

hosts/workstation/default.nix

@@ -1,5 +1,11 @@
-{ inputs, outputs, lib, config, pkgs, ... }:
+{
-let
+  inputs,
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: let
   my-python-packages = python-packages:
     with python-packages; [
       # pipx
@@ -15,7 +21,7 @@ let
 in {
   nix = {
     settings = {
-      experimental-features = [ "nix-command" "flakes" ];
+      # experimental-features = ["nix-command" "flakes"];
       warn-dirty = false;
       auto-optimise-store = true;
       trusted-users = ["root" "don"];
@@ -54,18 +60,21 @@ in {
     useDHCP = false;
     firewall = {
       enable = true;
-      trustedInterfaces =
+      trustedInterfaces = ["tailscale0"]; # always allow traffic from your Tailscale network
-        [ "tailscale0" ]; # always allow traffic from your Tailscale network
       checkReversePath = "loose";
       allowedUDPPorts = [config.services.tailscale.port];
-      allowedTCPPortRanges = [{
+      allowedTCPPortRanges = [
+        {
           from = 1714;
           to = 1764;
-      }];
+        }
-      allowedUDPPortRanges = [{
+      ];
+      allowedUDPPortRanges = [
+        {
           from = 1714;
           to = 1764;
-      }];
+        }
+      ];
       allowedTCPPorts = [22];
     };
   };
@@ -93,13 +102,16 @@ in {
     kernelParams = ["consoleblank=60" "mem_sleep_default=deep"];
     # extraModulePackages = [config.boot.kernelPackages.ddcci-driver];
     # kernelModules = ["i2c-dev" "ddcci_backlight"];
-    loader = if (pkgs.hostPlatform != lib.mkDefault "aarch64-linux") then {
+    loader =
+      if (pkgs.hostPlatform != lib.mkDefault "aarch64-linux")
+      then {
         systemd-boot = {enable = true;};
         efi = {
           canTouchEfiVariables = true;
           efiSysMountPoint = "/boot";
         };
-    } else {
+      }
+      else {
         grub.enable = false;
         generic-extlinux-compatible.enable = true;
       };
@@ -112,11 +124,13 @@ in {
     sudo.enable = false;
     doas = {
       enable = true;
-      extraRules = [{
+      extraRules = [
+        {
           users = ["don"];
           keepEnv = true;
           noPass = true;
-      }];
+        }
+      ];
     };
   };
 
@@ -207,8 +221,7 @@ in {
         isNormalUser = true;
         initialPassword = "changeme";
         description = "Don Harper";
-        extraGroups =
+        extraGroups = ["networkmanager" "wheel" "scanner" "lp" "video" "mlocate" "disk"];
-          [ "networkmanager" "wheel" "scanner" "lp" "video" "mlocate" "disk" ];
         openssh.authorizedKeys.keys = [
           "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINd8AdVbQQ/Fmw+b9mI8EMYqIoRkwmSwAOtmlte3incL don@loki"
         ];
@@ -223,10 +236,14 @@ in {
   };
 
   # Allow unfree packages
-  nixpkgs.config.allowUnfree = true;
+  nixpkgs = {
-  nixpkgs.config.allowUnfreePredicate = true;
+    config = {
-  nixpkgs.config.permittedInsecurePackages =
+      allowUnfree = true;
-    [ "libxml2-2.13.8" "libsoup-2.74.3" ];
+      allowUnfreePredicate = true;
+      permittedInsecurePackages = ["libsoup-2.74.3"];
+      allowInsecurePredicate = pkg: builtins.elem (lib.getName pkg) ["broadcom-sta"];
+    };
+  };
 
   fonts.packages = with pkgs; [
     anonymousPro
@@ -350,6 +367,5 @@ in {
     "x-scheme-handler/about" = "org.qutebrowser.qutebrowser.desktop";
     "x-scheme-handler/unknown" = "org.qutebrowser.qutebrowser.desktop";
   };
-  environment.sessionVariables.DEFAULT_BROWSER =
+  environment.sessionVariables.DEFAULT_BROWSER = "${pkgs.qutebrowser}/bin/qutebrowser";
-    "${pkgs.qutebrowser}/bin/qutebrowser";
 }