Move home-manager files to home/, rename some of the files

flake.nix

@@ -36,7 +36,7 @@
       xdg-runtime-dir = "/tmp/xdg-rt";
 
       mkPkgs = system: import nixpkgs { system = system; config.allowUnfree = true; };
-      mkHome = {username, home-dir, prompt-color, system, pkgs} : import ./home.nix {
+      mkHome = {username, home-dir, prompt-color, system, pkgs} : import ./home/common.nix {
         inherit username home-dir prompt-color pkgs xdg-runtime-dir;
 
         kak-pkg = kak.packages.${system}.kak;
@@ -44,10 +44,10 @@
         ansi-utils = ansi-utils.packages.${system};
         unambig-path = unambig-path.packages.${system}.unambig-path;
       };
-      mkLaptop = {system, pkgs} : import ./laptop.nix {
+      mkLaptop = {system, pkgs} : import ./home/graphical.nix {
         inherit pkgs xdg-runtime-dir;
       };
-      mkMac = {system, pkgs, laptop} : import ./mac.nix {
+      mkMac = {system, pkgs, laptop} : import ./home/mac.nix {
         emacs = laptop.programs.emacs.package;
         inherit pkgs xdg-runtime-dir;
       };
@@ -56,7 +56,7 @@
         inherit system pkgs;
       };
     in {
-      homeConfigurations."xenia" =
+      homeConfigurations."xenia@Joe-Bidens-MacBook-Pro.local" =
         let
           system = "aarch64-darwin";
           pkgs = mkPkgs system;

home/common.nix

@@ -100,7 +100,7 @@ in rec {
           echo -en "%{\033[0m%} ";
         )'
       ''
-      + builtins.readFile ./dotfiles/zshrc;
+      + builtins.readFile ../dotfiles/zshrc;
   };
 
   programs.direnv = {

home/graphical.nix

@@ -18,7 +18,7 @@ in rec {
       vterm bind-key rust-mode lsp-mode company meow agda2-mode haskell-mode
       terraform-mode nix-mode insert-kaomoji
     ];
-    extraConfig = builtins.readFile ./dotfiles/init.el;
+    extraConfig = builtins.readFile ../dotfiles/init.el;
   };
 
 }

home/kak.nix

@@ -96,5 +96,5 @@ in
     };
   };
 
-  extraConfig = kak-lsp-config-line + "\n" + builtins.readFile ./dotfiles/kakrc ;
+  extraConfig = kak-lsp-config-line + "\n" + builtins.readFile ../dotfiles/kakrc ;
 }