hosts | upstream changes python3Full -> python313

hosts/pi-server/default.nix

@@ -8,7 +8,7 @@ let
       setuptools
       requests
     ];
-  python-with-my-packages = pkgs.python3Full.withPackages my-python-packages;
+  python-with-my-packages = pkgs.python313.withPackages my-python-packages;
 in {
   nix = {
     settings = {
@@ -146,7 +146,7 @@ in {
 
   environment.systemPackages = with pkgs; [
     # python-with-my-packages
-    python3Full
+    python313
     aspell
     aspellDicts.en
     base16-schemes

hosts/server/default.nix

@@ -8,7 +8,7 @@ let
       setuptools
       requests
     ];
-  python-with-my-packages = pkgs.python3Full.withPackages my-python-packages;
+  python-with-my-packages = pkgs.python313.withPackages my-python-packages;
 in {
   nix = {
     settings = {

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
@@ -11,7 +17,7 @@ let
       requests
       setuptools
     ];
-  python-with-my-packages = pkgs.python3Full.withPackages my-python-packages;
+  python-with-my-packages = pkgs.python313.withPackages my-python-packages;
 in {
   nix = {
     settings = {
@@ -56,18 +62,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];
     };
   };
@@ -95,13 +104,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;
       };
@@ -114,11 +126,13 @@ in {
     sudo.enable = false;
     doas = {
       enable = true;
-      extraRules = [{
+      extraRules = [
+        {
           users = ["don"];
           keepEnv = true;
           noPass = true;
-      }];
+        }
+      ];
     };
   };
 
@@ -144,8 +158,8 @@ in {
       package = pkgs.mlocate;
     };
     logind = {
-      lidSwitchDocked = "ignore";
+      # lidSwitchDocked = "ignore";
-      lidSwitchExternalPower = "ignore";
+      # lidSwitchExternalPower = "ignore";
       settings = {
         Login = {
           HandleLidSwitchDocked = "ignore";
@@ -215,8 +229,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"
         ];
@@ -302,7 +315,6 @@ in {
     # toot
     udiskie
     wireplumber
-    wlsunset
     xdg-utils
     xfce.thunar
     xsane
@@ -363,6 +375,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";
 }