profiles for doc, fish, and remove unused profiles

7 files changed, 19 insertions, 19 deletions

diff --git a/machines/nixos/x86_64-linux/do-rproxy/default.nix b/machines/nixos/x86_64-linux/do-rproxy/default.nix
index f3906a1..cba3ce5 100644
--- a/machines/nixos/x86_64-linux/do-rproxy/default.nix
+++ b/machines/nixos/x86_64-linux/do-rproxy/default.nix
@@ -22,18 +22,20 @@
     "${self}/profiles/home-manager.nix"
     "${self}/profiles/admin-user/user.nix"
     "${self}/profiles/admin-user/home-manager.nix"
-    "${self}/profiles/server.nix"
     "${self}/profiles/core/boot.nix"
     "${self}/profiles/core/locale.nix"
+    "${self}/profiles/core/docs.nix"
     "${self}/profiles/core/ssh.nix"
     "${self}/profiles/core/tools.nix"
     "${self}/profiles/core/security.nix"
     "${self}/profiles/core/users.nix"
     "${self}/profiles/core/motd.nix"
+    "${self}/profiles/nix/nix.nix"
     "${self}/profiles/nix/gc.nix"
     "${self}/profiles/network/networkd.nix"
     "${self}/profiles/network/firewall.nix"
     "${self}/profiles/services/podman.nix"
+    "${self}/profiles/programs/fish.nix"
   ];
 
   # do not use DHCP, as DigitalOcean provisions IPs using cloud-init
diff --git a/machines/nixos/x86_64-linux/synology-vm/default.nix b/machines/nixos/x86_64-linux/synology-vm/default.nix
index 4019bb0..67dbb56 100644
--- a/machines/nixos/x86_64-linux/synology-vm/default.nix
+++ b/machines/nixos/x86_64-linux/synology-vm/default.nix
@@ -35,18 +35,20 @@
     "${self}/profiles/home-manager.nix"
     "${self}/profiles/admin-user/user.nix"
     "${self}/profiles/admin-user/home-manager.nix"
-    "${self}/profiles/server.nix"
     "${self}/profiles/core/boot.nix"
     "${self}/profiles/core/locale.nix"
+    "${self}/profiles/core/docs.nix"
     "${self}/profiles/core/ssh.nix"
     "${self}/profiles/core/tools.nix"
     "${self}/profiles/core/security.nix"
     "${self}/profiles/core/users.nix"
     "${self}/profiles/core/motd.nix"
+    "${self}/profiles/nix/nix.nix"
     "${self}/profiles/nix/gc.nix"
     "${self}/profiles/network/networkd.nix"
     "${self}/profiles/network/firewall.nix"
     "${self}/profiles/services/podman.nix"
+    "${self}/profiles/programs/fish.nix"
     ./profiles/git-server.nix
   ];
 
diff --git a/profiles/core/docs.nix b/profiles/core/docs.nix
new file mode 100644
index 0000000..dcf38e6
--- /dev/null
+++ b/profiles/core/docs.nix
@@ -0,0 +1,5 @@
+{ lib, ... }:
+{
+  ## disable that slow "building man-cache" step
+  documentation.man.generateCaches = lib.mkForce false;
+}
diff --git a/profiles/core/users.nix b/profiles/core/users.nix
index e0d8662..da2c8ff 100644
--- a/profiles/core/users.nix
+++ b/profiles/core/users.nix
@@ -1,4 +1,8 @@
 { ... }:
 {
   users.mutableUsers = false;
+
+  users.users.root.openssh.authorizedKeys.keys = [
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINBkozy+X96u5ciX766bJ/AyQ3xm1tXZTIr5+4PVFZFi"
+  ];
 }
diff --git a/profiles/default.nix b/profiles/nix/nix.nix
index 6d0af84..f80c808 100644
--- a/profiles/default.nix
+++ b/profiles/nix/nix.nix
@@ -24,9 +24,4 @@
       ];
     };
   };
-
-  programs.fish.enable = true;
-
-  ## disable that slow "building man-cache" step
-  documentation.man.generateCaches = lib.mkForce false;
 }
diff --git a/profiles/programs/fish.nix b/profiles/programs/fish.nix
new file mode 100644
index 0000000..21fdf98
--- /dev/null
+++ b/profiles/programs/fish.nix
@@ -0,0 +1,4 @@
+{ ... }:
+{
+  programs.fish.enable = true;
+}
diff --git a/profiles/server.nix b/profiles/server.nix
deleted file mode 100644
index 37da0cc..0000000
--- a/profiles/server.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  ...
-}:
-{
-  imports = [
-    ./default.nix
-  ];
-
-  users.users.root.openssh.authorizedKeys.keys = [
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINBkozy+X96u5ciX766bJ/AyQ3xm1tXZTIr5+4PVFZFi"
-  ];
-}