From 8b87b06972fdca2f2ee5e04de5020cc9661f1400 Mon Sep 17 00:00:00 2001
From: Paul-Henri Froidmont <git.contact-57n2p@froidmont.org>
Date: Wed, 30 Sep 2020 23:15:51 +0200
Subject: [PATCH] Split home-manager and system config

---
 configs/dev.nix                         | 13 -------------
 configs/{cli.nix => home-cli.nix}       |  0
 configs/home-dev.nix                    | 11 +++++++++++
 configs/{gui.nix => home-gui.nix}       |  0
 configs/{xmonad.nix => home-xmonad.nix} |  0
 configs/user.nix                        | 17 -----------------
 hosts/nixos-desktop/configuration.nix   | 13 +++++++++++--
 hosts/work-laptop/configuration.nix     | 12 ++++++++----
 8 files changed, 30 insertions(+), 36 deletions(-)
 delete mode 100644 configs/dev.nix
 rename configs/{cli.nix => home-cli.nix} (100%)
 create mode 100644 configs/home-dev.nix
 rename configs/{gui.nix => home-gui.nix} (100%)
 rename configs/{xmonad.nix => home-xmonad.nix} (100%)
 delete mode 100644 configs/user.nix

diff --git a/configs/dev.nix b/configs/dev.nix
deleted file mode 100644
index 71399d0..0000000
--- a/configs/dev.nix
+++ /dev/null
@@ -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
-    ];
-  };
-}
diff --git a/configs/cli.nix b/configs/home-cli.nix
similarity index 100%
rename from configs/cli.nix
rename to configs/home-cli.nix
diff --git a/configs/home-dev.nix b/configs/home-dev.nix
new file mode 100644
index 0000000..202c7a2
--- /dev/null
+++ b/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
+  ];
+}
diff --git a/configs/gui.nix b/configs/home-gui.nix
similarity index 100%
rename from configs/gui.nix
rename to configs/home-gui.nix
diff --git a/configs/xmonad.nix b/configs/home-xmonad.nix
similarity index 100%
rename from configs/xmonad.nix
rename to configs/home-xmonad.nix
diff --git a/configs/user.nix b/configs/user.nix
deleted file mode 100644
index 8c6e6eb..0000000
--- a/configs/user.nix
+++ /dev/null
@@ -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";
-}
-
diff --git a/hosts/nixos-desktop/configuration.nix b/hosts/nixos-desktop/configuration.nix
index b8aa8e6..da5804f 100644
--- a/hosts/nixos-desktop/configuration.nix
+++ b/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";
 }
diff --git a/hosts/work-laptop/configuration.nix b/hosts/work-laptop/configuration.nix
index 3518c18..dbfbc6d 100644
--- a/hosts/work-laptop/configuration.nix
+++ b/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; [
-      slack-dark
+    imports = [
+      ../../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";
 }