From f1f46c9865b041d6444ed0a7959c766de19c1a70 Mon Sep 17 00:00:00 2001
From: Greg Burd <greg@burd.me>
Date: Mon, 25 Sep 2023 16:10:03 -0400
Subject: [PATCH] fixes

---
 home/gburd/floki.nix                  | 4 ++--
 nixos/_mixins/users/gburd/default.nix | 2 +-
 nixos/_mixins/users/nixos/default.nix | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/home/gburd/floki.nix b/home/gburd/floki.nix
index c745a57..9921dd5 100644
--- a/home/gburd/floki.nix
+++ b/home/gburd/floki.nix
@@ -1,7 +1,7 @@
-{ config, pkgs, username, ... }:
+{ config, pkgs, username, desktop, ... }:
 {
   imports = [
-    ../services/keybase.nix
+    ../_mixins/services/keybase.nix
 
     # TODO remove/migrate away from user mixins
     ./_mixins
diff --git a/nixos/_mixins/users/gburd/default.nix b/nixos/_mixins/users/gburd/default.nix
index 04be37a..b4cfd15 100644
--- a/nixos/_mixins/users/gburd/default.nix
+++ b/nixos/_mixins/users/gburd/default.nix
@@ -1,4 +1,4 @@
-{ config, desktop, hostname, lib, pkgs, ... }:
+{ config, desktop, hostname, inputs, lib, pkgs, ... }:
 let
   ifTheyExist = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups;
 in
diff --git a/nixos/_mixins/users/nixos/default.nix b/nixos/_mixins/users/nixos/default.nix
index edd5330..d624aa4 100644
--- a/nixos/_mixins/users/nixos/default.nix
+++ b/nixos/_mixins/users/nixos/default.nix
@@ -64,8 +64,8 @@ let
       sudo nixos-install --no-root-password --flake ".#$TARGET_HOST"
 
       # Rsync nix-config to the target install and set the remote origin to SSH.
-      rsync -a --delete "$HOME/ws/" "/mnt/home/$TARGET_USER/Zero/"
-      pushd "/mnt/home/$TARGET_USER/Zero/nix-config"
+      rsync -a --delete "$HOME/ws/" "/mnt/home/$TARGET_USER/gburd/"
+      pushd "/mnt/home/$TARGET_USER/gburd/nix-config"
       git remote set-url origin git@github.com:gburd/nix-config.git
       popd