refactor to one single config per box

nixos/boxes/foureighty/default.nix

@@ -49,12 +49,16 @@
   fonts.fontconfig.enable = true;
   home-manager.users.cyryl = {...}: {
     imports = [
-      ./home.nix
+      ../../home-common.nix
+      ../../programs/git.nix
+      ../../gui.nix
     ];
     home.stateVersion = config.system.stateVersion;
 
     nixpkgs.overlays = config.nixpkgs.overlays;
     nixpkgs.config = config.nixpkgs.config;
+
+    home.file.".config/i3/status.toml".source = ../../../.config/i3/status-double-bat.toml;
   };
 
   imports = [
@@ -66,8 +70,8 @@
     ../../zerotier.nix
     ../../distributed-builds.nix
     ../../libvirt.nix
-    ../../gnome/system.nix
     ../../backups.nix
+    ../../gnome
   ];
 
 

nixos/boxes/foureighty/home.nix

@@ -1,12 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  home.file.".config/i3/status.toml".source = ../../../.config/i3/status-double-bat.toml;
-
-  imports = [
-    ../../home-common.nix
-    ../../programs/git.nix
-    ../../gui.nix
-    ../../gnome/home.nix
-  ];
-}

nixos/boxes/skinnyv/home.nix

@@ -6,6 +6,5 @@
     ../../home-common.nix
     ../../programs/git.nix
     ../../gui.nix
-    ../../i3/home.nix
   ];
 }

nixos/gnome/default.nix

@@ -0,0 +1,12 @@
+{ config, pkgs, ... }:
+{
+  imports = [
+    ./system.nix
+  ];
+
+  home-manager.users.cyryl = {...}: {
+    imports = [
+      ./home.nix
+    ];
+  };
+}

nixos/i3/system.nix

@@ -11,7 +11,11 @@
       allowAnyUser = true;
     };
 
-    dbus.packages = with pkgs; [ gnome2.GConf gnome3.dconf ];
+    dbus = {
+      packages = with pkgs; [ gnome2.GConf gnome3.dconf ];
+      socketActivated = true;
+    };
+
     fractalart.enable = true;
     colord.enable = true;
     xserver.windowManager.i3.enable = true;

nixos/sway/system.nix

@@ -1,6 +1,7 @@
 { config, pkgs, ... }:
 {
   services.dbus.packages = with pkgs; [ gnome2.GConf gnome3.dconf ];
+  services.dbus.socketActivated = true;
   programs.sway.enable = true;
   systemd.defaultUnit = "graphical.target";
 }