Commit b092b3e3f636

Vincent Demeester <vincent@sbr.pm>
2018-11-23 17:57:58
machines: update some configuration to use profiles modules
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
main
1 parent 52ba373
Changed files (7)
machine
carthage.nix
honshu.nix
kerkouane.nix
massimo.nix
shikoku.nix
wakasu.nix
modules
module-list.nix
machine/carthage.nix
@@ -3,11 +3,12 @@
     ../hardware-configuration.nix
     ../networking.nix # generated at runtime by nixos-infect
     ../profiles/server.nix
-    ../profiles/gitconfig.nix
-    ../profiles/users.nix
-    ../profiles/syncthing.nix
   ];
 
+  profiles.ssh.enable = true;
+  profiles.git.enable = true;
+  profiles.syncthing.enable = true;
+
   boot.cleanTmpDir = true;
   boot.loader.grub.enable = true;
   networking.firewall.allowPing = true;
machine/honshu.nix
@@ -6,13 +6,15 @@
     ../hardware-configuration.nix
     ../hardware/dell-latitude-e6540.nix
     ../profiles/server.nix
-    ../profiles/dev.nix
-    ../profiles/avahi.nix
-    ../profiles/containerd.nix
-    ../profiles/syncthing.nix
     ../location/home.nix
   ];
 
+  profiles.ssh.enable = true;
+  profiles.dev.enable = true;
+  profiles.containerd.enable = true;
+  profiles.avahi.enable = true;
+  profiles.syncthing.enable = true;
+
   time.timeZone = "Europe/Paris";
 
   services = {
machine/kerkouane.nix
@@ -3,11 +3,12 @@
     ../hardware-configuration.nix
     ../networking.nix # generated at runtime by nixos-infect
     ../profiles/server.nix
-    ../profiles/gitconfig.nix
-    ../profiles/users.nix
     ../profiles/wireguard.server.nix
   ];
 
+  profiles.ssh.enable = true;
+  profiles.git.enable = true;
+
   boot.cleanTmpDir = true;
   boot.loader.grub.enable = true;
   networking.firewall.allowPing = true;
machine/massimo.nix
@@ -1,11 +1,12 @@
 { config, pkgs, ... }: {
   imports = [
     ../hardware-configuration.nix
-    ../profiles/server.nix
-    ../profiles/gitconfig.nix
-    ../profiles/users.nix
+    ../profiles/server.ni
   ];
 
+  profiles.ssh.enable = true;
+  profiles.git.enable = true;
+
   boot.cleanTmpDir = true;
   networking.firewall.allowPing = true;
   programs.fish.enable = true;
machine/shikoku.nix
@@ -3,7 +3,6 @@
 {
   imports = [ # Include the results of the hardware scan.
     ../hardware-configuration.nix
-    ../profiles/dev.nix
     ../profiles/gaming.nix
     ../location/home.nix
   ];
@@ -14,6 +13,7 @@
   profiles.containerd.enable = true;
   profiles.virtualization.enable = true;
   profiles.ssh.enable = true;
+  profiles.dev.enable = true;
   
   time.timeZone = "Europe/Paris";
machine/wakasu.nix
@@ -4,7 +4,6 @@
   imports =
     [ # Include the results of the hardware scan.
     ../hardware-configuration.nix
-    ../profiles/dev.nix
     ../location/home.nix
     ../hardware/lenovo-p50.nix
   ];
@@ -14,6 +13,7 @@
   profiles.containerd.enable = true;
   profiles.virtualization.enable = true;
   profiles.ssh.enable = true;
+  profiles.dev.enable = true;
 
   # Move elsewhere
   programs.podman = {
modules/module-list.nix
@@ -7,7 +7,9 @@
     ./profiles/fish.nix
     ./profiles/containerd.nix
     ./profiles/desktop.nix
+    ./profiles/dev.nix
     ./profiles/docker.nix
+    ./profiles/git.nix
     ./profiles/i18n.nix
     ./profiles/laptop.nix
     ./profiles/nix-config.nix