rebuild

flake.nix

@@ -15,16 +15,42 @@
     "github:nix-community/neovim-nightly-overlay";
   outputs = { self, nixpkgs, xmonad-contrib, home-manager, ... }@inputs: {
     nixosConfigurations = {
-      eliasLaptop = nixpkgs.lib.nixosSystem {
+      eliasLaptop = nixpkgs.lib.nixosSystem rec {
         system = "x86_64-linux";
         modules = [
-          ./configuration.nix
+          ./machines/configuration-laptop.nix
           home-manager.nixosModules.home-manager
           {
             home-manager = {
               useGlobalPkgs = true;
               useUserPackages = true;
-              users.elias = import ./home/default.nix;
+              users.elias = import ./home/default-laptop.nix;
+            };
+            nixpkgs.overlays = [
+              (final: prev: {
+                xmobar = final.haskellPackages.callPackage
+                  ./home/programs/xmonad/src/xmobar/default.nix { };
+              })
+              inputs.neovim-nightly-overlay.overlay
+            ];
+          }
+        ] ++ xmonad-contrib.nixosModules ++ [
+          # `modernise` replaces the standard xmonad module and wrapper script
+          # with those from unstable. This is currently a necessary workaround to
+          # make Mod-q recompilation work.
+          xmonad-contrib.modernise."x86_64-linux"
+        ];
+      };
+      eliasDesktop = nixpkgs.lib.nixosSystem rec {
+        system = "x86_64-linux";
+        modules = [
+          ./machines/configuration-desktop.nix
+          home-manager.nixosModules.home-manager
+          {
+            home-manager = {
+              useGlobalPkgs = true;
+              useUserPackages = true;
+              users.elias = import ./home/default-desktop.nix;
             };
             nixpkgs.overlays = [
               (final: prev: {