Split home-manager and system config

configs/dev.nix

@@ -1,13 +0,0 @@
-{ config, lib, pkgs, ... }:
-{
-  home-manager.users.froidmpa = {pkgs, config, ...}: {
-    nixpkgs.config.allowUnfree = true;
-    home.packages = with pkgs; [
-      jdk11
-      jetbrains.idea-ultimate
-      maven
-      sbt
-      geckodriver
-    ];
-  };
-}

configs/home-dev.nix

@@ -0,0 +1,11 @@
+{ config, lib, pkgs, ... }:
+{
+  nixpkgs.config.allowUnfree = true;
+  home.packages = with pkgs; [
+    jdk11
+    jetbrains.idea-ultimate
+    maven
+    sbt
+    geckodriver
+  ];
+}

configs/user.nix

@@ -1,17 +0,0 @@
-{ config, pkgs, ... }:
-{
-  imports = [
-    <home-manager/nixos>
-  ];
-
-  home-manager.users.froidmpa = {pkgs, config, ...}: {
-    imports = [
-      ./cli.nix
-      ./xmonad.nix
-      ./gui.nix
-    ];
-  };
-
-  system.stateVersion = "19.09";
-}
-

hosts/nixos-desktop/configuration.nix

@@ -1,15 +1,23 @@
 { config, lib, pkgs, ... }:
 {
   imports = [
+    <home-manager/nixos>
     ./hardware-configuration.nix
     ../../configs/system.nix
-    ../../configs/user.nix
     ../../configs/network.nix
     ../../configs/virtualisation.nix
-    ../../configs/dev.nix
     ../../configs/games.nix
   ];
 
+   home-manager.users.froidmpa = {pkgs, config, ...}: {
+     imports = [
+       ../../configs/home-cli.nix
+       ../../configs/home-xmonad.nix
+       ../../configs/home-gui.nix
+       ../../configs/home-dev.nix
+     ];
+   };
+
   fileSystems."/home/froidmpa/Nextcloud" = {
     device = "/dev/disk/by-uuid/a4ba8b21-ea33-4487-b6f6-9bb7470a0acb";
     fsType = "ext4";
@@ -36,4 +44,5 @@
   services.sshd.enable = true;
   environment.systemPackages = with pkgs; [
   ];
+  system.stateVersion = "19.09";
 }

hosts/work-laptop/configuration.nix

@@ -1,11 +1,10 @@
 { config, lib, pkgs, ... }:
 {
   imports = [
+    <home-manager/nixos>
     ./hardware-configuration.nix
     ../../configs/system.nix
     ../../configs/network.nix
-    ../../configs/user.nix
-    ../../configs/dev.nix
     ../../configs/virtualisation.nix
   ];
 
@@ -54,8 +53,11 @@
   services.blueman.enable = true;
 
   home-manager.users.froidmpa = {pkgs, config, ...}: {
-    home.packages = with pkgs; [
+    imports = [
-      slack-dark
+      ../../configs/home-cli.nix
+      ../../configs/home-xmonad.nix
+      ../../configs/home-gui.nix
+      ../../configs/home-dev.nix
     ];
     services.network-manager-applet.enable = true;
     services.blueman-applet.enable = true;
@@ -111,5 +113,7 @@
       automount_opts = "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s";
     in ["${automount_opts},credentials=/etc/nixos/smb-secrets"];
   };
+
+  system.stateVersion = "19.09";
 }