From f853ed8e8f1f4da70dcb73ab2a3006fbda856d2c Mon Sep 17 00:00:00 2001
From: John Bowdre <john@bowdre.net>
Date: Wed, 26 Jul 2023 16:55:10 -0500
Subject: [PATCH] move home configs under /nix/home

---
 flake.nix                                                     | 2 +-
 nix/{common/home.nix => home/common.nix}                      | 0
 nix/{machines/penguin-duet/home.nix => home/penguin-duet.nix} | 2 +-
 nix/{machines/penguin-fw/home.nix => home/penguin-fw.nix}     | 4 ++--
 nix/lib/tmux.nix                                              | 2 +-
 nix/lib/vscode.nix                                            | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename nix/{common/home.nix => home/common.nix} (100%)
 rename nix/{machines/penguin-duet/home.nix => home/penguin-duet.nix} (91%)
 rename nix/{machines/penguin-fw/home.nix => home/penguin-fw.nix} (86%)

diff --git a/flake.nix b/flake.nix
index 4de476a..a00de21 100644
--- a/flake.nix
+++ b/flake.nix
@@ -47,7 +47,7 @@
           pkgs = nixpkgs.legacyPackages.x86_64-linux;
           extraSpecialArgs = { inherit inputs outputs; };
           modules = [
-            ./nix/machines/penguin-fw/home.nix
+            ./nix/home/penguin-fw.nix
             {
               home = {
                 username = "john";
diff --git a/nix/common/home.nix b/nix/home/common.nix
similarity index 100%
rename from nix/common/home.nix
rename to nix/home/common.nix
diff --git a/nix/machines/penguin-duet/home.nix b/nix/home/penguin-duet.nix
similarity index 91%
rename from nix/machines/penguin-duet/home.nix
rename to nix/home/penguin-duet.nix
index 7d9778d..122cb32 100644
--- a/nix/machines/penguin-duet/home.nix
+++ b/nix/home/penguin-duet.nix
@@ -1,6 +1,6 @@
 { pkgs, lib, config, ... }: {
   imports = [
-    ../../common/home.nix
+    ./home/common.nix
   ];
 
   nixpkgs.config = {
diff --git a/nix/machines/penguin-fw/home.nix b/nix/home/penguin-fw.nix
similarity index 86%
rename from nix/machines/penguin-fw/home.nix
rename to nix/home/penguin-fw.nix
index b4d7124..d75b34c 100644
--- a/nix/machines/penguin-fw/home.nix
+++ b/nix/home/penguin-fw.nix
@@ -1,7 +1,7 @@
 { pkgs, lib, config, ... }: {
   imports = [
-    ../../common/home.nix
-    ../../lib/vscode.nix
+    ./common.nix
+    ../lib/vscode.nix
   ];
 
   nixpkgs.config = {
diff --git a/nix/lib/tmux.nix b/nix/lib/tmux.nix
index 94b3828..79cb3e4 100644
--- a/nix/lib/tmux.nix
+++ b/nix/lib/tmux.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, ...}: {
+{ pkgs, lib, ... }: {
   programs.tmux = {
     enable = true;
     baseIndex = 1;
diff --git a/nix/lib/vscode.nix b/nix/lib/vscode.nix
index a2499b7..356c096 100644
--- a/nix/lib/vscode.nix
+++ b/nix/lib/vscode.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, config, ...}: {
+{ pkgs, lib, ... }: {
 
   nixpkgs.config = {
     allowUnfree = true;