modules: restructure (#487)

* seth: remove unused pkgs

* modules: restructure

from archetypes back to profiles
make less actual modules for everything
use lib.mkDefault like it's supposed to
move mixins out of server

* nixos/resolved: use modern options

1 files changed, 6 insertions, 18 deletions

diff --git a/modules/nixos/desktop/programs.nix b/modules/nixos/desktop/programs.nix
index 01a9928..2830943 100644
--- a/modules/nixos/desktop/programs.nix
+++ b/modules/nixos/desktop/programs.nix
@@ -4,29 +4,17 @@
   pkgs,
   ...
 }:
-let
-  cfg = config.desktop.defaultPrograms;
-in
 {
-  options.desktop.defaultPrograms = {
-    enable = lib.mkEnableOption "default desktop programs" // {
-      default = config.desktop.enable;
-      defaultText = lib.literalExpression "config.desktop.enable";
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    environment.systemPackages = with pkgs; [
-      wl-clipboard
-      xclip
+  config = lib.mkIf config.desktop.enable {
+    environment.systemPackages = [
+      pkgs.wl-clipboard
     ];
 
     programs = {
-      chromium.enable = true;
-      firefox.enable = true;
-      xwayland.enable = true;
+      chromium.enable = lib.mkDefault true;
+      firefox.enable = lib.mkDefault true;
     };
 
-    xdg.portal.enable = true;
+    xdg.portal.enable = lib.mkDefault true;
   };
 }