Activate zeus modes

home-manager/machines.nix

@@ -1,5 +1,31 @@
 let
   inherit (import (import ../nix/sources.nix).nixos-unstable { }) lib;
+  restrictedPages = [
+    "reddit.com"
+    "github.com"
+    "*.ccc.de"
+    "haskell.org"
+    "*.haskell.org"
+    "*.nixos.org"
+    "nixos.org"
+    "matrix.org"
+    "element.io"
+    "youtube.de"
+    "youtube.com"
+    "*.element.io"
+    "zeit.de"
+    "heise.de"
+    "spiegel.de"
+    "xkcd.com"
+    "smbc-comics.com"
+    "tagesschau.de"
+    "welt.de"
+    "ndr.de"
+    "ard.de"
+    "zdf.de"
+    "twitter.com"
+    "chaos.social"
+  ];
   makeConfig = hostName: imports:
     { ... }: {
       imports = imports ++ [ ./roles/default.nix ];
@@ -41,34 +67,6 @@ in
             };
           };
         };
-      tinkerPages = [
-        "reddit.com"
-        "github.com"
-        "*.ccc.de"
-        "haskell.org"
-        "*.haskell.org"
-        "*.nixos.org"
-        "nixos.org"
-        "matrix.org"
-        "element.io"
-        "youtube.de"
-        "youtube.com"
-        "*.element.io"
-      ];
-      leisurePages = [
-        "zeit.de"
-        "heise.de"
-        "spiegel.de"
-        "xkcd.com"
-        "smbc-comics.com"
-        "tagesschau.de"
-        "welt.de"
-        "ndr.de"
-        "ard.de"
-        "zdf.de"
-        "twitter.com"
-        "chaos.social"
-      ];
       apolloConfig = name: imports:
         makeConfig "apollo" (
           imports ++ [
@@ -118,25 +116,23 @@ in
         (install (p: [ p.discord ])) # For teaching
       ];
       research = apolloConfig "Research" [
-        (makeBlock (tinkerPages ++ leisurePages))
+        (makeBlock restrictedPages)
       ];
       gaming = apolloConfig "Gaming" (unrestricted ++ [ ./roles/games.nix ]);
     };
-  zeus = {
+  zeus =
-    default = makeConfig "zeus" [
+    let
+      all = [
         ./roles/accounting.nix
         ./roles/beets.nix
-      ./roles/chat.nix
         ./roles/daily-driver-programs.nix
         ./roles/desktop
-      ./roles/games.nix
         ./roles/git-sign.nix
         ./roles/hoogle.nix
         ./roles/hourly-maintenance.nix
         ./roles/kassandra.nix
         ./roles/khal.nix
         ./roles/khard.nix
-      ./roles/mail-client.nix
         ./roles/mail.nix
         ./roles/mpclient.nix
         ./roles/mpd.nix
@@ -152,6 +148,18 @@ in
         (makeAutostart "kassandra2")
         (makeAutostart "unlock-ssh")
       ];
+      orga = all ++ [
+        ./roles/mail-client.nix
+      ];
+      leisure = orga ++ [
+        ./roles/games.nix
+        ./roles/chat.nix
+      ];
+    in
+    {
+      research = makeConfig "zeus" all;
+      orga = makeConfig "zeus" orga;
+      leisure = makeConfig "zeus" leisure;
     };
   hera = {
     default = makeConfig "hera" [

nixos/machines/zeus/configuration.nix

@@ -38,7 +38,7 @@ in
     serviceConfig = {
       Type = "oneshot";
       User = "maralorn";
-      ExecStart = "/disk/volatile/maralorn/modes/default/activate";
+      ExecStart = "/disk/volatile/maralorn/modes/orga/activate";
     };
     wantedBy = [ "multi-user.target" ];
   };