nixos: make desktop stuff mixins

3 files changed, 61 insertions, 0 deletions

diff --git a/modules/nixos/defaults/default.nix b/modules/nixos/defaults/default.nix
index 2e16af8..85dfbe6 100644
--- a/modules/nixos/defaults/default.nix
+++ b/modules/nixos/defaults/default.nix
@@ -1,6 +1,9 @@
 { lib, ... }:
+
 {
   imports = [
+    ./desktop-programs.nix
+    ./fonts.nix
     ./nix.nix
     ./programs.nix
     ./security.nix
diff --git a/modules/nixos/defaults/desktop-programs.nix b/modules/nixos/defaults/desktop-programs.nix
new file mode 100644
index 0000000..3c8499d
--- /dev/null
+++ b/modules/nixos/defaults/desktop-programs.nix
@@ -0,0 +1,26 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+{
+  config = lib.mkMerge [
+    {
+      services.xserver = {
+        excludePackages = [ pkgs.xterm ];
+      };
+    }
+
+    (lib.mkIf config.services.xserver.enable {
+      environment.systemPackages = [
+        pkgs.wl-clipboard
+      ];
+
+      programs = {
+        chromium.enable = lib.mkDefault true;
+      };
+    })
+  ];
+}
diff --git a/modules/nixos/defaults/fonts.nix b/modules/nixos/defaults/fonts.nix
new file mode 100644
index 0000000..5aa644e
--- /dev/null
+++ b/modules/nixos/defaults/fonts.nix
@@ -0,0 +1,32 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+{
+  config = lib.mkIf config.services.xserver.enable {
+    fonts = {
+      enableDefaultPackages = true;
+
+      packages = with pkgs; [
+        noto-fonts
+        noto-fonts-color-emoji
+        noto-fonts-cjk-sans
+
+        nerd-fonts.hack
+      ];
+
+      fontconfig = {
+        enable = true;
+        defaultFonts = lib.mkDefault {
+          serif = [ "Noto Serif" ];
+          sansSerif = [ "Noto Sans" ];
+          emoji = [ "Noto Color Emoji" ];
+          monospace = [ "Hack Nerd Font" ];
+        };
+      };
+    };
+  };
+}