Fixup profiles

default.nix

@@ -1,7 +1,7 @@
 { pkgs ? import <nixpkgs> }:
 
 with pkgs;
-{
+rec {
   lib = import ./lib { inherit pkgs; };
   modules = import ./modules;
   hmModules = import ./modules/home;

hosts/ifrit/default.nix

@@ -7,19 +7,14 @@ let
     "media.local"
   ];
   backups = "/mnt/storage/backup";
-  this = import ../.. {};
-  keys = ../../pkgs/keys/keys;
 in {
-  imports = (lib.attrValues this.modules) ++ [
+  imports = [
-    <nixpkgs/nixos/modules/profiles/minimal.nix>
+    ../../modules/profiles/base
   ];
 
   dadada = {
     admin.enable = true;
     fileShare.enable = true;
-    admin.users = {
-      "dadada" = [ "${keys}/dadada.pub" ];
-    };
 
     vpnServer.enable = true;
     vpnServer.peers = {

modules/profiles/base/default.nix

@@ -1,10 +1,22 @@
 { config, pkgs, lib, ... }:
 with lib;
+let
+  dadadaKeys = ../../../pkgs/keys/keys;
+in
 {
   imports = import ../../module-list.nix;
 
   networking.domain = mkDefault "dadada.li";
-  dadada.autoUpgrade = mkDefault true;
+
+  dadada.admin.users = {
+    "dadada" = [ "${dadadaKeys}/dadada.pub" ];
+  };
+
+  #dadada.autoUpgrade = mkDefault true;
+
+  environment.noXlibs = mkDefault true;
+  documentation.enable = mkDefault false;
+  documentation.nixos.enable = mkDefault false;
 
   i18n.defaultLocale = mkDefault "en_US.UTF-8";
   console = mkDefault {

modules/profiles/laptop/default.nix

@@ -1,14 +1,13 @@
 { config, pkgs, lib, ... }:
 with lib;
 {
-  imports = import ../../module-list.nix ++ [
+  imports = [
     ../base
   ];
 
   dadada = {
     networking = {
       useLocalResolver = mkDefault true;
-      domain = mkDefault "dadada.li";
     };
   };
 
@@ -31,4 +30,8 @@ with lib;
       highlighters = [ "main" "brackets" "pattern" "cursor" "root" "line" ];
     };
   };
+
+  environment.noXlibs = false;
+  documentation.enable = true;
+  documentation.nixos.enable = true;
 }

modules/update.nix

@@ -3,10 +3,9 @@ with lib;
 let
   cfg = config.dadada.autoUpgrade;
 in {
-  options = {
+
-    dadada.autoUpgrade = {
+  options.dadada.autoUpgrade = {
-      enable = mkEnableOption "Enable automatic upgrades";
+    enable = mkEnableOption "Enable automatic upgrades";
-    };
   };
 
   config = mkIf cfg.enable {