From 56456ab375dfedfeb7973d4f5cc01919bcf1361d Mon Sep 17 00:00:00 2001
From: Richie Cahill <Richie@tmmworkshop.com>
Date: Thu, 9 Jan 2025 21:46:59 -0500
Subject: [PATCH] moved dotfiles out of projects

---
 systems/bob/syncthing.nix               | 8 ++++++++
 systems/jeeves/syncthing.nix            | 8 ++++++++
 systems/rhapsody-in-green/syncthing.nix | 8 ++++++++
 users/gaming/home/global.nix            | 3 ---
 users/richie/home/cli/zsh.nix           | 7 ++-----
 users/richie/home/global.nix            | 2 +-
 6 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/systems/bob/syncthing.nix b/systems/bob/syncthing.nix
index d0091e8..ff9fc29 100644
--- a/systems/bob/syncthing.nix
+++ b/systems/bob/syncthing.nix
@@ -1,5 +1,13 @@
 {    
   services.syncthing.settings.folders = {
+    "dotfiles" = {
+      path = "/home/richie/dotfiles";
+      devices = [
+        "jeeves"
+        "rhapsody-in-green"
+      ];
+      fsWatcherEnabled = true;
+    };
     "important" = {
       id = "4ckma-gtshs"; # cspell:disable-line
       path = "/home/richie/important";
diff --git a/systems/jeeves/syncthing.nix b/systems/jeeves/syncthing.nix
index d9abbc9..6aeea86 100644
--- a/systems/jeeves/syncthing.nix
+++ b/systems/jeeves/syncthing.nix
@@ -5,6 +5,14 @@ in
   services.syncthing = {
     guiAddress = "192.168.90.40:8384";
     settings.folders = {
+      "dotfiles" = {
+        path = "/home/richie/dotfiles";
+        devices = [
+          "bob"
+          "rhapsody-in-green"
+        ];
+        fsWatcherEnabled = true;
+      };
       "bob_temp" = {
         path = "${vars.storage_syncthing}/bob_temp";
         devices = [
diff --git a/systems/rhapsody-in-green/syncthing.nix b/systems/rhapsody-in-green/syncthing.nix
index 1f61db9..6953760 100644
--- a/systems/rhapsody-in-green/syncthing.nix
+++ b/systems/rhapsody-in-green/syncthing.nix
@@ -1,5 +1,13 @@
 {    
   services.syncthing.settings.folders = {
+    "dotfiles" = {
+      path = "/home/richie/dotfiles";
+      devices = [
+        "jeeves"
+        "bob"
+      ];
+      fsWatcherEnabled = true;
+    };
     "notes" = {
       id = "l62ul-lpweo"; # cspell:disable-line
       path = "/home/richie/notes";
diff --git a/users/gaming/home/global.nix b/users/gaming/home/global.nix
index c403cde..e3dbf02 100644
--- a/users/gaming/home/global.nix
+++ b/users/gaming/home/global.nix
@@ -13,8 +13,5 @@
     username = "gaming";
     homeDirectory = "/home/${config.home.username}";
     stateVersion = "24.05";
-    sessionVariables = {
-      FLAKE = "$HOME/Projects/dotfiles";
-    };
   };
 }
diff --git a/users/richie/home/cli/zsh.nix b/users/richie/home/cli/zsh.nix
index 540fd92..4b6a5e9 100644
--- a/users/richie/home/cli/zsh.nix
+++ b/users/richie/home/cli/zsh.nix
@@ -18,17 +18,14 @@
       ];
     };
     shellAliases = {
-      "sgc" = "sudo git -C /root/dotfiles";
-
-      ## Utilities
       "lrt" = "eza --icons -lsnew";
       "ls" = "eza";
       "ll" = "eza --long --group";
       "la" = "eza --all";
 
       "rspace" = "'for f in *\ *; do mv \"$f\" \"\${f// /_}\"; done'";
-      "rebuild" = "sudo nixos-rebuild switch --flake /home/richie/projects/dotfiles#$HOST";
-      "nix-test" = "nixos-rebuild test --flake /home/richie/projects/dotfiles";
+      "rebuild" = "sudo nixos-rebuild switch --flake /home/richie/dotfiles#$HOST";
+      "nix-test" = "nixos-rebuild test --flake /home/richie/dotfiles";
     };
   };
 }
diff --git a/users/richie/home/global.nix b/users/richie/home/global.nix
index 4b6dae0..5c760e4 100644
--- a/users/richie/home/global.nix
+++ b/users/richie/home/global.nix
@@ -16,7 +16,7 @@
     homeDirectory = "/home/${config.home.username}";
     stateVersion = "24.05";
     sessionVariables = {
-      FLAKE = "$HOME/Projects/dotfiles";
+      FLAKE = "$HOME/dotfiles";
     };
   };
 }