From 186fb9d017fce5ad71af3cc584a09d35835d0296 Mon Sep 17 00:00:00 2001
From: dadada <dadada@dadada.li>
Date: Mon, 28 Dec 2020 19:38:36 +0100
Subject: [PATCH] Fixup

---
 hosts/gorgon/default.nix            |  2 +-
 hosts/ifrit/default.nix             | 10 ++------
 modules/networking.nix              |  6 -----
 modules/profiles/base/default.nix   | 38 ++++++-----------------------
 modules/profiles/laptop/default.nix | 34 ++++++++++++++++++++++++++
 modules/update.nix                  |  2 --
 6 files changed, 44 insertions(+), 48 deletions(-)
 create mode 100644 modules/profiles/laptop/default.nix

diff --git a/hosts/gorgon/default.nix b/hosts/gorgon/default.nix
index 14ad060..5e84315 100644
--- a/hosts/gorgon/default.nix
+++ b/hosts/gorgon/default.nix
@@ -4,7 +4,7 @@ let
 in
 {
   imports = (lib.attrValues this.modules) ++ [
-    ../../modules/profiles/base
+    ../../modules/profiles/laptop
     <nixos-hardware/lenovo/thinkpad/t14s/amd/gen1>
   ];
 
diff --git a/hosts/ifrit/default.nix b/hosts/ifrit/default.nix
index 8b57580..1c45848 100644
--- a/hosts/ifrit/default.nix
+++ b/hosts/ifrit/default.nix
@@ -11,7 +11,6 @@ let
   keys = ../../pkgs/keys/keys;
 in {
   imports = (lib.attrValues this.modules) ++ [
-    ../../modules/profiles/base
     <nixpkgs/nixos/modules/profiles/minimal.nix>
   ];
 
@@ -134,17 +133,12 @@ in {
     isNormalUser = true;
   };
 
-  services.ddclient = {
-    enable = true;
-    configFile = /var/lib/dyndns/config;
-  };
-
   services.avahi = {
-    enable = true;
+    enable = false;
     publish = {
       enable = true;
       addresses = true;
-      workstation = true;
+      workstation = false;
     };
   };
 }
diff --git a/modules/networking.nix b/modules/networking.nix
index 1ee5f07..090386e 100644
--- a/modules/networking.nix
+++ b/modules/networking.nix
@@ -5,11 +5,6 @@ let
 in {
   options.dadada.networking = {
     useLocalResolver = mkEnableOption "Enable local caching name server";
-    domain = mkOption {
-      type = with types; nullOr str;
-      description = "Network domain name";
-      default = null;
-    };
     wanInterfaces = mkOption {
       type = with types; listOf str;
       description = "WAN network interfaces";
@@ -24,7 +19,6 @@ in {
   };
 
   config = {
-    networking.domain = cfg.domain;
     networking.resolvconf.useLocalResolver = mkIf cfg.useLocalResolver true;
     services.unbound = mkIf cfg.useLocalResolver {
       enable = true;
diff --git a/modules/profiles/base/default.nix b/modules/profiles/base/default.nix
index b0b2e40..ad0b5df 100644
--- a/modules/profiles/base/default.nix
+++ b/modules/profiles/base/default.nix
@@ -3,37 +3,13 @@ with lib;
 {
   imports = import ../../module-list.nix;
 
-  config = {
-    dadada = {
-      autoUpgrade.enable = mkDefault true;
-      networking = {
-        useLocalResolver = mkDefault true;
-        domain = mkDefault "dadada.li";
-      };
-    };
+  networking.domain = mkDefault "dadada.li";
+  dadada.autoUpgrade = mkDefault true;
 
-    i18n.defaultLocale = mkDefault "en_US.UTF-8";
-    console = {
-      font = mkDefault "Lat2-Terminus16";
-      keyMap = mkDefault "us";
-    };
-
-    fonts.fonts = mkDefault (with pkgs; [
-      source-code-pro
-    ]);
-
-    time.timeZone = mkDefault "Europe/Berlin";
-
-    programs.zsh = mkDefault {
-      enable = true;
-      autosuggestions.enable = true;
-      enableCompletion = true;
-      histSize = 100000;
-      vteIntegration = true;
-      syntaxHighlighting = {
-        enable = true;
-        highlighters = [ "main" "brackets" "pattern" "cursor" "root" "line" ];
-      };
-    };
+  i18n.defaultLocale = mkDefault "en_US.UTF-8";
+  console = mkDefault {
+    font = "Lat2-Terminus16";
+    keyMap = "us";
   };
+
 }
diff --git a/modules/profiles/laptop/default.nix b/modules/profiles/laptop/default.nix
new file mode 100644
index 0000000..65192fc
--- /dev/null
+++ b/modules/profiles/laptop/default.nix
@@ -0,0 +1,34 @@
+{ config, pkgs, lib, ... }:
+with lib;
+{
+  imports = import ../../module-list.nix ++ [
+    ../base
+  ];
+
+  dadada = {
+    networking = {
+      useLocalResolver = mkDefault true;
+      domain = mkDefault "dadada.li";
+    };
+  };
+
+  services.fwupd.enable = true;
+
+  fonts.fonts = mkDefault (with pkgs; [
+    source-code-pro
+  ]);
+
+  time.timeZone = mkDefault "Europe/Berlin";
+
+  programs.zsh = mkDefault {
+    enable = true;
+    autosuggestions.enable = true;
+    enableCompletion = true;
+    histSize = 100000;
+    vteIntegration = true;
+    syntaxHighlighting = {
+      enable = true;
+      highlighters = [ "main" "brackets" "pattern" "cursor" "root" "line" ];
+    };
+  };
+}
diff --git a/modules/update.nix b/modules/update.nix
index b22840c..8f40380 100644
--- a/modules/update.nix
+++ b/modules/update.nix
@@ -10,8 +10,6 @@ in {
   };
 
   config = mkIf cfg.enable {
-    services.fwupd.enable = true;
-
     nix = {
       autoOptimiseStore = true;
       useSandbox = true;