From 9389d2661a1298a9314134b2eb1172e1e5d1fe34 Mon Sep 17 00:00:00 2001
From: Alexander Kobjolke <me@failco.de>
Date: Sun, 4 Feb 2024 07:54:33 +0100
Subject: [PATCH] flake: Restructure home/

---
 flake.nix                               | 2 +-
 home/{ => alex}/cli.nix                 | 3 +--
 home/alex/home.nix                      | 2 +-
 home/{ => alex}/local/bin/kill-old-mosh | 0
 home/{ => alex}/local/bin/merge-pdf     | 0
 5 files changed, 3 insertions(+), 4 deletions(-)
 rename home/{ => alex}/cli.nix (97%)
 rename home/{ => alex}/local/bin/kill-old-mosh (100%)
 rename home/{ => alex}/local/bin/merge-pdf (100%)

diff --git a/flake.nix b/flake.nix
index 08d8915..25fae28 100644
--- a/flake.nix
+++ b/flake.nix
@@ -66,7 +66,7 @@
         {
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
-          home-manager.users.alex = import ./home/cli.nix;
+          home-manager.users.alex = import ./home/alex/cli.nix;
         }
       ];
     };
diff --git a/home/cli.nix b/home/alex/cli.nix
similarity index 97%
rename from home/cli.nix
rename to home/alex/cli.nix
index 4ac8f6f..fda3208 100644
--- a/home/cli.nix
+++ b/home/alex/cli.nix
@@ -10,8 +10,7 @@ let
 
   myEza = if builtins.hasAttr "eza" pkgs then "eza" else "exa";
 in {
-  imports =
-    [ ./alex/programs/neovim/default.nix ./alex/programs/emacs/default.nix ];
+  imports = [ ./programs/neovim/default.nix ./programs/emacs/default.nix ];
 
   programs.home-manager.enable = true;
   home = {
diff --git a/home/alex/home.nix b/home/alex/home.nix
index 8f350f4..77e01e6 100644
--- a/home/alex/home.nix
+++ b/home/alex/home.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 {
-  imports = [ ../cli.nix ];
+  imports = [ ./cli.nix ];
 
   home = {
     homeDirectory = "/home/alex";
diff --git a/home/local/bin/kill-old-mosh b/home/alex/local/bin/kill-old-mosh
similarity index 100%
rename from home/local/bin/kill-old-mosh
rename to home/alex/local/bin/kill-old-mosh
diff --git a/home/local/bin/merge-pdf b/home/alex/local/bin/merge-pdf
similarity index 100%
rename from home/local/bin/merge-pdf
rename to home/alex/local/bin/merge-pdf