machines/common: put some of these files behind all/, indicating that they're expected to be used by *all* machines

2022-05-23 00:46:58 -07:00 · 2022-05-23 00:46:58 -07:00 · a12560c8b4
commit a12560c8b4
parent dc6f949c4d
7 changed files with 13 additions and 8 deletions
--- a/machines/common/all/default.nix
+++ b/machines/common/all/default.nix
@ -0,0 +1,9 @@
+{ ... }:
+
+{
+  imports = [
+    ./home-manager.nix
+    ./users.nix
+  ];
+}
+
--- a/machines/common/all/home-manager.nix
+++ b/machines/common/all/home-manager.nix
--- a/machines/common/all/users.nix
+++ b/machines/common/all/users.nix
--- a/machines/desko/default.nix
+++ b/machines/desko/default.nix
@ -1,8 +1,7 @@
 { home-manager, config, pkgs, lib, ... }:
 {
  imports = [
-    ./../common/home-manager.nix
-    ./../common/users.nix
+    ./../common/all
    ./../common/hardware.nix
    ./../common/gnome.nix
    ./fs.nix
--- a/machines/lappy/default.nix
+++ b/machines/lappy/default.nix
@ -1,8 +1,7 @@
 { home-manager, config, pkgs, lib, ... }:
 {
  imports = [
-    ./../common/home-manager.nix
-    ./../common/users.nix
+    ./../common/all
    ./../common/hardware.nix
    ./../common/gnome.nix
    ./fs.nix
--- a/machines/moby/default.nix
+++ b/machines/moby/default.nix
@ -1,8 +1,7 @@
 { home-manager, config, pkgs, lib, ... }:
 {
  imports = [
-    ./../common/home-manager.nix
-    ./../common/users.nix
+    ./../common/all
    ./../common/gnome.nix
  ];

--- a/machines/uninsane/default.nix
+++ b/machines/uninsane/default.nix
@ -2,8 +2,7 @@

 {
  imports = [
-    ./../common/users.nix
-    ./../common/home-manager.nix
+    ./../common/all
    ./fs.nix
    ./hardware.nix
    ./net.nix