archachatina: move to wayland

archachatina.nix

@@ -3,7 +3,8 @@
 {
   imports =
     [
-      ./common.nix
+      # ./common.nix
+      ./common-headless.nix ./sway.nix
       ./large-sw.nix
       ./uefi.nix
       ./fstrim.nix
@@ -91,6 +92,7 @@
   # };
 
   #boot.kernelPackages = pkgs.lib.mkOverride 10 pkgs.linuxPackages_latest;
+  # boot.kernelPackages = pkgs.lib.mkOverride 10 pkgs.linuxPackages;
 
   services.xserver = {
     videoDrivers = [ "amdgpu" ];

sway.nix

@@ -0,0 +1,139 @@
+{ config, pkgs, ... }:
+
+{
+  # programs.ibus.enable = true;
+  # programs.ibus.plugins = [ pkgs.ibus-anthy pkgs.mozc ];
+  i18n.inputMethod = {
+    enabled = "fcitx";
+    fcitx.engines = with pkgs.fcitx-engines; [ mozc anthy table-other m17n ];
+  };
+
+  environment.systemPackages = with pkgs; with gnome3; [
+    i3status
+    rofi
+    rofi-pass
+    feh
+    gnome_keyring
+    networkmanagerapplet
+    nautilus # in closure of gnome-terminal anyhow
+    # colord
+    evince
+    # xdotool
+    pavucontrol
+    dconf-editor
+
+    # gnome3 core packages
+    desktop_file_utils shared_mime_info
+    glib gtk3
+    glib_networking gvfs dconf
+    gnome_settings_daemon
+    gnome_themes_standard defaultIconTheme
+    hicolor_icon_theme
+    gnome-terminal
+
+    # for QT_QPA_PLATFORM=wayland
+    qt5.qtwayland
+  ];
+
+  fonts = {
+    enableDefaultFonts = false;
+    fonts = with pkgs; [
+      xorg.fontbhlucidatypewriter100dpi
+      xorg.fontbhlucidatypewriter75dpi
+      dejavu_fonts
+      freefont_ttf
+      gyre-fonts # TrueType substitutes for standard PostScript fonts
+      liberation_ttf
+      xorg.fontbh100dpi
+      xorg.fontmiscmisc
+      xorg.fontcursormisc
+      # unifont
+
+      wqy_microhei
+      inconsolata
+      dejavu_fonts
+      ipafont
+      ipaexfont
+      ubuntu_font_family
+      source-code-pro
+      fira fira-mono fira-code
+      noto-fonts-emoji
+      noto-fonts-cjk
+
+      cantarell_fonts # from gnome3 module
+    ];
+  };
+
+  programs.sway-beta = {
+    enable = true;
+
+    extraSessionCommands = ''
+      if [ ! "$DBUS_SESSION_BUS_ADDRESS" ]; then
+        exec ${pkgs.dbus}/bin/dbus-run-session "$0" "$@"
+      fi
+      export DBUS_SESSION_BUS_ADDRESS
+
+      export SDL_VIDEODRIVER=wayland
+      export QT_QPA_PLATFORM=wayland
+      export QT_WAYLAND_DISABLE_WINDOWDECORATION=1
+
+      # Fix for some Java AWT applications (e.g. Android Studio),
+      # use this if they aren't displayed properly:
+      # export _JAVA_AWT_WM_NONREPARENTING=1
+
+      export XDG_DATA_DIRS=/run/current-system/sw/share/''${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS
+      export $(${pkgs.gnome3.gnome_keyring}/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh,gpg)
+      export XDG_CURRENT_DESKTOP=X-Generic
+      for m in xsettings; do
+        ${pkgs.gnome3.gnome_settings_daemon}/libexec/gsd-$m &
+      done
+    '';
+  };
+
+  users.extraUsers.gebner.extraGroups = [ "input" "tty" "audio" "video" ];
+
+    # layout = "us";
+    # xkbVariant = "altgr-intl";
+    # xkbOptions = "caps:ctrl_modifier";
+
+  services.dbus.packages = with pkgs; [ mako gnome3.gcr ];
+  services.udev.packages = [ pkgs.gnome3.gnome_settings_daemon ];
+
+  # copied from gnome3 module
+  security.polkit.enable = true;
+  services.udisks2.enable = true;
+  services.accounts-daemon.enable = true;
+  services.geoclue2.enable = true;
+  services.gnome3.at-spi2-core.enable = true;
+  services.gnome3.gnome-keyring.enable = true;
+  services.gnome3.gvfs.enable = true;
+  services.gnome3.seahorse.enable = true;
+  services.gnome3.sushi.enable = true;
+  services.telepathy.enable = true;
+  networking.networkmanager.enable = true;
+  services.upower.enable = config.powerManagement.enable;
+  programs.dconf.enable = true;
+  services.flatpak.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
+  # Needed for themes and backgrounds
+  environment.pathsToLink = [ "/share" ];
+  environment.variables.GIO_EXTRA_MODULES = with pkgs.gnome3; [
+    "${pkgs.lib.getLib dconf}/lib/gio/modules"
+    "${glib_networking.out}/lib/gio/modules"
+    "${gvfs}/lib/gio/modules" ];
+
+  hardware.bluetooth = {
+    enable = true;
+    package = pkgs.bluezFull;
+  };
+
+  hardware.pulseaudio = {
+    enable = true;
+    zeroconf.discovery.enable = true;
+    daemon.config = {
+      flat-volumes = "no";
+    };
+    package = pkgs.pulseaudioFull;
+    extraModules = [ pkgs.pulseaudio-modules-bt ];
+  };
+
+}