Split hoem into home and laptop

flake.nix

@@ -39,18 +39,28 @@
         unambig-path = unambig-path.packages.${system}.unambig-path;
         inherit pkgs xdg-runtime-dir;
       };
+      mkLaptop = {system, pkgs} : import ./laptop.nix {
+        inherit pkgs xdg-runtime-dir;
+      };
+      mkMac = {system, pkgs, laptop} : import ./mac.nix {
+        emacs = laptop.programs.emacs.package;
+        inherit pkgs xdg-runtime-dir;
+      };
     in {
       homeConfigurations."xenia" =
         let
           system = "aarch64-darwin";
           pkgs = mkPkgs system;
           home = mkHome { inherit system pkgs; };
+          laptop = mkLaptop { inherit system pkgs; };
+          mac = mkMac { inherit system pkgs laptop; };
         in home-manager.lib.homeManagerConfiguration {
           inherit pkgs;
 
           modules = [
             home
-            ( import ./mac.nix { emacs = home.programs.emacs.package; inherit pkgs xdg-runtime-dir; } )
+            laptop
+            mac
           ];
       };
 

home.nix

@@ -1,7 +1,6 @@
 { pkgs, xdg-runtime-dir, kak-pkg, unispect, ansi-utils, unambig-path }:
 
 let
-  alacritty = import ./alacritty/alacritty.nix pkgs;
   kak = import ./kak.nix { kak = kak-pkg; inherit pkgs; };
 
   extras = import ./extras.nix pkgs;
@@ -47,9 +46,6 @@ in rec {
 
     # # Other stuff
     kak-lsp
-    discord-canary
-    # libreoffice-bin
-    fira-code ibm-plex
     # nix-tree
   ];
 
@@ -60,19 +56,8 @@ in rec {
   # Let Home Manager install and manage itself.
   programs.home-manager.enable = true;
 
-  programs.alacritty = alacritty;
   programs.kakoune = kak;
 
-  programs.emacs = {
-    package = pkgs.emacs;
-    enable = true;
-    extraPackages = epkgs: with epkgs; [
-      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;
-  };
-
   programs.zsh = {
     enable = true;
     package = pkgs.zsh;

laptop.nix

@@ -0,0 +1,24 @@
+{ pkgs, xdg-runtime-dir }:
+
+let
+  alacritty = import ./alacritty/alacritty.nix pkgs;
+in rec {
+  home.packages = with pkgs; [
+    discord-canary
+    # libreoffice-bin
+    fira-code ibm-plex
+  ];
+
+  programs.alacritty = alacritty;
+
+  programs.emacs = {
+    package = pkgs.emacs;
+    enable = true;
+    extraPackages = epkgs: with epkgs; [
+      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;
+  };
+
+}