move most configurations to modules

5 files changed, 165 insertions, 0 deletions

diff --git a/modules/desktop/audio.nix b/modules/desktop/audio.nix
new file mode 100644
index 0000000..cbfbf55
--- /dev/null
+++ b/modules/desktop/audio.nix
@@ -0,0 +1,23 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  cfg = config.desktop.audio;
+  inherit (lib) mkEnableOption mkIf;
+in {
+  options.desktop.audio.enable = mkEnableOption "enable audio support";
+
+  config = mkIf cfg.enable {
+    services = {
+      pipewire = {
+        enable = true;
+        wireplumber.enable = true;
+        alsa.enable = true;
+        jack.enable = true;
+        pulse.enable = true;
+      };
+    };
+    hardware.pulseaudio.enable = false;
+  };
+}
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
new file mode 100644
index 0000000..e4c08fb
--- /dev/null
+++ b/modules/desktop/default.nix
@@ -0,0 +1,39 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  cfg = config.desktop;
+  inherit (lib) mkDefault mkEnableOption mkIf;
+in {
+  imports = [
+    ./audio.nix
+    ./fonts.nix
+    ./gnome
+    ./plasma
+  ];
+
+  options.desktop.enable = mkEnableOption "desktop module";
+
+  config = mkIf cfg.enable {
+    nixos.enable = true;
+
+    desktop = {
+      audio.enable = mkDefault true;
+      fonts.enable = mkDefault true;
+    };
+
+    environment = {
+      noXlibs = lib.mkForce false;
+      systemPackages = with pkgs; [pinentry-curses wl-clipboard xclip];
+    };
+    programs = {
+      dconf.enable = true;
+      firefox.enable = true;
+      xwayland.enable = true;
+    };
+    services.xserver.enable = true;
+    xdg.portal.enable = true;
+  };
+}
diff --git a/modules/desktop/fonts.nix b/modules/desktop/fonts.nix
new file mode 100644
index 0000000..8470568
--- /dev/null
+++ b/modules/desktop/fonts.nix
@@ -0,0 +1,33 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: let
+  cfg = config.desktop.fonts;
+  inherit (lib) mkEnableOption mkIf;
+in {
+  options.desktop.fonts.enable = mkEnableOption "enable default fonts";
+
+  config = mkIf cfg.enable {
+    fonts = {
+      enableDefaultFonts = true;
+      fonts = with pkgs; [
+        corefonts
+        fira-code
+        (nerdfonts.override {fonts = ["FiraCode"];})
+        noto-fonts
+        noto-fonts-extra
+        noto-fonts-emoji
+        noto-fonts-cjk-sans
+      ];
+
+      fontconfig.defaultFonts = {
+        serif = ["Noto Serif"];
+        sansSerif = ["Noto Sans"];
+        emoji = ["Noto Color Emoji"];
+        monospace = ["Fira Code"];
+      };
+    };
+  };
+}
diff --git a/modules/desktop/gnome/default.nix b/modules/desktop/gnome/default.nix
new file mode 100644
index 0000000..55b53f5
--- /dev/null
+++ b/modules/desktop/gnome/default.nix
@@ -0,0 +1,38 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: let
+  cfg = config.desktop.gnome;
+  inherit (lib) mkEnableOption mkIf;
+in {
+  options.desktop.gnome.enable = mkEnableOption "enable gnome";
+
+  config = mkIf cfg.enable {
+    desktop.enable = true;
+
+    environment = {
+      gnome.excludePackages = with pkgs; [
+        epiphany
+        gnome-tour
+      ];
+      systemPackages = with pkgs; [
+        adw-gtk3
+        blackbox-terminal
+        pinentry-gnome
+        pinentry-gnome
+      ];
+    };
+
+    services.xserver = {
+      displayManager.gdm = {
+        enable = true;
+        wayland = lib.mkForce true;
+      };
+      desktopManager.gnome.enable = true;
+    };
+
+    programs.gnupg.agent.pinentryFlavor = "gnome3";
+  };
+}
diff --git a/modules/desktop/plasma/default.nix b/modules/desktop/plasma/default.nix
new file mode 100644
index 0000000..7434f52
--- /dev/null
+++ b/modules/desktop/plasma/default.nix
@@ -0,0 +1,32 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  cfg = config.desktop.plasma;
+  inherit (lib) mkEnableOption mkIf;
+in {
+  options.desktop.plasma.enable = mkEnableOption "enable plasma";
+
+  config = mkIf cfg.enable {
+    desktop.enable = true;
+
+    environment.systemPackages = with pkgs; [pinentry-qt];
+
+    services.xserver = {
+      displayManager.sddm.enable = true;
+      desktopManager.plasma5 = {
+        enable = true;
+        excludePackages = with pkgs.libsForQt5; [
+          khelpcenter
+          plasma-browser-integration
+          print-manager
+        ];
+        useQtScaling = true;
+      };
+    };
+
+    programs.gnupg.agent.pinentryFlavor = "qt";
+  };
+}