From d15faa1d151f5f2a92062471579ea7ba6ae7854a Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Fri, 18 Sep 2020 17:32:50 +0200
Subject: [PATCH] gnome3: fix build

---
 gnome3.nix | 99 ++++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 85 insertions(+), 14 deletions(-)

diff --git a/gnome3.nix b/gnome3.nix
index 5add3ab..2d9198b 100644
--- a/gnome3.nix
+++ b/gnome3.nix
@@ -1,30 +1,101 @@
 { config, pkgs, ... }:
 
 {
-  programs.ibus.enable = true;
-  programs.ibus.plugins = [ pkgs.ibus-anthy pkgs.mozc ];
+  imports = [
+    ./pulseaudio.nix
+  ];
+
+  i18n.inputMethod = {
+    enabled = "ibus";
+    ibus.engines = with pkgs.ibus-engines; [ mozc table-others m17n ];
+  };
 
   environment.systemPackages = with pkgs; [
-    xlibs.xwininfo # for gnome maximus extension
-    unzip
     gnome3.libgweather
+    gnome3.gnome-tweak-tool
+    pavucontrol
+    paprefs
   ];
 
   fonts = {
+    enableDefaultFonts = false;
+    fontconfig = {
+      allowBitmaps = false;
+    };
     fonts = with pkgs; [
-      inconsolata
-      dejavu_fonts
-      ipafont
+      xorg.fontbhlucidatypewriter100dpi
+      xorg.fontbhlucidatypewriter75dpi
+      freefont_ttf
+      gyre-fonts # TrueType substitutes for standard PostScript fonts
+      xorg.fontbh100dpi
+      xorg.fontmiscmisc
+      xorg.fontcursormisc
       unifont
+
+      noto-fonts-emoji
+      noto-fonts-cjk
+
+      cantarell_fonts # from gnome3 module
+
+      merriweather
+      merriweather-sans
+      open-sans
+      # libertine # breaks 
+
+      dejavu_fonts
+      liberation_ttf
       ubuntu_font_family
+
+      wqy_microhei
+      ipafont
+      ipaexfont
+      source-han-serif
+      source-han-sans
+
+      inconsolata
+      iosevka
+      fira fira-mono fira-code
+      source-code-pro
+
+      font-awesome_5
     ];
   };
 
-  services.xserver.enable = true;
-  services.xserver.displayManager.gdm.enable = true;
-  services.xserver.displayManager.desktopManagerHandlesLidAndPower = false;
-  services.xserver.desktopManager.gnome3.enable = true;
-  services.xserver.layout = "us";
-  services.xserver.xkbVariant = "altgr-intl";
-  services.xserver.xkbOptions = "caps:ctrl_modifier";
+  # prevent satanic torture
+  programs.qt5ct.enable = true;
+
+  hardware.uinput.enable = true;
+  users.extraUsers.gebner.extraGroups = [ "input" "tty" "audio" "video" "uinput" ];
+
+  hardware.bluetooth = {
+    enable = true;
+    package = pkgs.bluezFull;
+  };
+  services.blueman.enable = true;
+
+  programs.gnupg = {
+    agent.enable = true;
+    agent.pinentryFlavor = "gnome3";
+  };
+
+  services.xserver = {
+    enable = true;
+    libinput.enable = true;
+    displayManager.gdm.enable = true;
+    displayManager.defaultSession = "gnome";
+
+    desktopManager.gnome3 = {
+      enable = true;
+    };
+  };
+
+  # rust winit's wayland support is broken for input methods
+  environment.sessionVariables.WINIT_UNIX_BACKEND = "x11";
+
+  # services.xserver.enable = true;
+  # services.xserver.displayManager.gdm.enable = true;
+  # services.xserver.displayManager.desktopManagerHandlesLidAndPower = false;
+  # services.xserver.layout = "us";
+  # services.xserver.xkbVariant = "altgr-intl";
+  # services.xserver.xkbOptions = "caps:ctrl_modifier";
 }