mostly fix up stateVersions

nix/home-manager/profiles/common.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }: {
+{ pkgs, lib, ... }: {
   # TODO: re-enable this with the appropriate version?
   # programs.home-manager.enable = true;
   # programs.home-manager.path = https://github.com/rycee/home-manager/archive/445c0b1482c38172a9f8294ee16a7ca7462388e5.tar.gz;
@@ -83,6 +83,4 @@
       usbutils
       pciutils
     ]);
-
-  home.stateVersion = "22.05";
 }

nix/home-manager/profiles/sway-desktop.nix

@@ -1,18 +1,19 @@
-{
+{ pkgs
-  pkgs,
+, config
-  config,
+, lib
-  lib,
+, # packages',
-  # packages',
+  repoFlakeInputs'
-  repoFlakeInputs',
+, ...
-  ...
+}:
-}: let
+let
-  inherit (import ../lib.nix {}) mkSimpleTrayService;
+  inherit (import ../lib.nix { }) mkSimpleTrayService;
 
   lockCmd = "${pkgs.swaylock}/bin/swaylock -efF --color '#000000'";
   displayOffCmd = "${pkgs.sway}/bin/swaymsg 'output * power off'";
   displayOnCmd = "${pkgs.sway}/bin/swaymsg 'output * power on'";
   swapOutputWorkspaces = ../../../scripts/sway-swapoutputworkspaces.sh;
-in {
+in
+{
   imports = [
     ../profiles/wayland-desktop.nix
     ../programs/waybar.nix
@@ -103,12 +104,14 @@ in {
     systemd.enable = true;
     xwayland = true;
 
-    config = let
+    config =
+      let
         modifier = "Mod4";
         inherit (config.wayland.windowManager.sway.config) left right up down;
-    in {
+      in
+      {
         inherit modifier;
-      bars = [];
+        bars = [ ];
 
         input = {
           "type:keyboard" =
@@ -116,7 +119,7 @@ in {
               xkb_layout = config.home.keyboard.layout;
               xkb_variant = config.home.keyboard.variant;
             }
-          // lib.attrsets.optionalAttrs (builtins.length (config.home.keyboard.options or []) > 0) {
+            // lib.attrsets.optionalAttrs (builtins.length (config.home.keyboard.options or [ ]) > 0) {
               xkb_options = builtins.concatStringsSep "," config.home.keyboard.options;
             };
 
@@ -195,6 +198,7 @@ in {
           childBorder = lib.mkForce "#ffa500";
         };
 
+        window.titlebar = false;
         window.border = 4;
 
         # this maps to focus_on_window_activation

nix/os/devices/steveej-t14/pkg.nix

@@ -4,7 +4,12 @@
 , nodeFlake
 , ...
 }: {
+  system.stateVersion = "23.05";
+  home-manager.users.root = _: {
+    home.stateVersion = "22.05";
+  };
   home-manager.users.steveej = _: {
+    home.stateVersion = "22.05";
     imports = [
       ../../../home-manager/configuration/graphical-fullblown.nix
 
@@ -103,5 +108,4 @@
   #   # };
   # };
 
-  system.stateVersion = "23.05";
 }

nix/os/devices/steveej-t14/user.nix

@@ -8,7 +8,7 @@ let
   inherit (pkgs.callPackage ../../lib/default.nix { }) mkUser;
 in
 {
-  users.extraUsers.steveej2 = mkUser {
+  users.users.steveej2 = mkUser {
     uid = 1001;
     openssh.authorizedKeys.keys = keys.users.steveej.openssh;
     hashedPasswordFile = config.sops.secrets.sharedUsers-steveej.path;

nix/os/devices/steveej-x13s/configuration.nix

@@ -55,6 +55,7 @@
     nodeFlake.inputs.home-manager.nixosModules.home-manager
 
     ../../snippets/sway-desktop.nix
+    ../../snippets/timezone.nix
     # ../../snippets/radicale.nix
   ];
 
@@ -82,6 +83,9 @@
   ];
 
   system.stateVersion = "23.11";
+  home-manager.users.root = _: {
+    home.stateVersion = "23.11";
+  };
   home-manager.users.steveej = _: {
     home.stateVersion = "23.11";
 
@@ -89,6 +93,9 @@
       ../../../home-manager/configuration/graphical-fullblown.nix
     ];
 
+    # seems to be broke on install
+    programs.chromium.enable = lib.mkForce false;
+
     home.sessionVariables = { };
 
     home.packages = with pkgs; [

nix/os/devices/steveej-x13s/flake.nix

@@ -30,6 +30,7 @@
       targetPlatform = "aarch64-linux";
       buildPlatform = "x86_64-linux";
       nodeName = "steveej-x13s";
+      repoFlake = get-flake ../../../..;
 
       mkNixosConfiguration = { extraModules ? [ ], ... } @ attrs:
         nixpkgs.lib.nixosSystem (
@@ -38,15 +39,14 @@
             {
               specialArgs = (import ./default.nix {
                 system = targetPlatform;
-                inherit nodeName;
+                inherit nodeName repoFlake;
 
-                repoFlake = get-flake ../../../..;
                 nodeFlake = self;
               }).meta.nodeSpecialArgs.${nodeName};
 
               modules =
                 [
-                  ({ repoFlake, ... }: repoFlake.nixosModules.hardware-x13s)
+                  repoFlake.nixosModules.hardware-x13s
 
                   ./configuration.nix
                 ]

nix/os/snippets/sway-desktop.nix

@@ -65,12 +65,13 @@ in
 
   security.pam.services.getty.enableGnomeKeyring = true;
   services.gnome.gnome-keyring.enable = true;
+
   # autologin steveej on tty1
+  # TODO: make user configurable
   systemd.services."autovt@tty1".description = "Autologin at the TTY1";
   systemd.services."autovt@tty1".after = [ "systemd-logind.service" ]; # without it user session not started and xorg can't be run from this tty
   systemd.services."autovt@tty1".wantedBy = [ "multi-user.target" ];
-  systemd.services."autovt@tty1".serviceConfig =
+  systemd.services."autovt@tty1".serviceConfig = {
-    {
     ExecStart = [
       "" # override upstream default with an empty ExecStart
       "@${pkgs.utillinux}/sbin/agetty agetty --login-program ${pkgs.shadow}/bin/login --autologin steveej --noclear %I $TERM"
@@ -84,7 +85,7 @@ in
     fi
   '';
 
-  home-manager.users.${homeUser} = _: {
+  home-manager.users."${homeUser}" = _: {
     imports = [
       ../../home-manager/profiles/sway-desktop.nix
     ];

nix/os/snippets/timezone.nix

@@ -1,7 +1,7 @@
 { lib, ... }:
 
 let
-  passwords = import ../../../variables/passwords.crypt.nix;
+  passwords = import ../../variables/passwords.crypt.nix;
 
 in
 {