From 73a9f4660f4008f75418b14161b783ff19b4a3b3 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Thu, 26 Nov 2020 17:58:22 +0100
Subject: [PATCH] archachatina: switch to i3

---
 archachatina.nix    | 8 ++++----
 common-gui.nix      | 8 ++++++++
 common-headless.nix | 1 +
 i3.nix              | 6 ++----
 sway.nix            | 6 ------
 5 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/archachatina.nix b/archachatina.nix
index 9072d84..0f7551a 100644
--- a/archachatina.nix
+++ b/archachatina.nix
@@ -4,12 +4,12 @@
   imports =
     [
       ./common-headless.nix
-      ./sway.nix
-      # ./i3.nix
+      # ./sway.nix
+      ./i3.nix
       ./large-sw.nix
       ./uefi.nix
       ./fstrim.nix
-      ./qemu-user.nix
+      # ./qemu-user.nix
       ./atmega.nix
       ./v4l2loopback.nix
       ./huion.nix
@@ -103,7 +103,7 @@
 
   #boot.kernelPackages = pkgs.lib.mkOverride 10 pkgs.linuxPackages_latest;
   # boot.kernelPackages = pkgs.lib.mkOverride 10 pkgs.linuxPackages;
-  boot.kernelPackages = pkgs.lib.mkOverride 10 pkgs.linuxPackages_5_8;
+  # boot.kernelPackages = pkgs.lib.mkOverride 10 pkgs.linuxPackages_5_8;
 
   services.xserver = {
     videoDrivers = [ "amdgpu" ];
diff --git a/common-gui.nix b/common-gui.nix
index f72e5db..18eefa2 100644
--- a/common-gui.nix
+++ b/common-gui.nix
@@ -54,6 +54,14 @@
     ];
   };
 
+  environment.systemPackages = [
+    (pkgs.writeScriptBin "gsd-xsettings"
+      ''
+        #!/bin/sh
+        exec ${pkgs.gnome3.gnome-settings-daemon}/libexec/gsd-xsettings "$@"
+      '')
+  ];
+
   # prevent satanic torture
   programs.qt5ct.enable = true;
 
diff --git a/common-headless.nix b/common-headless.nix
index 8f681df..211f6cb 100644
--- a/common-headless.nix
+++ b/common-headless.nix
@@ -16,6 +16,7 @@
   nix.extraOptions = ''
     auto-optimise-store = true
     binary-caches-parallel-connections = 10
+    experimental-features = flakes nix-command
   '';
 
   networking.networkmanager.enable = true;
diff --git a/i3.nix b/i3.nix
index 8267263..5d0b218 100644
--- a/i3.nix
+++ b/i3.nix
@@ -20,7 +20,7 @@
     evince
     arandr
     xss-lock i3lock i3lock-color
-    # xdotool
+    xdotool
     scrot
     pavucontrol
     dconf-editor
@@ -59,9 +59,6 @@
           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)
           export XDG_CURRENT_DESKTOP=X-Generic
-          for m in xsettings; do
-            ${pkgs.gnome3.gnome_settings_daemon}/libexec/gsd-$m &
-          done
           i3 &
           waitPID=$!
         '';
@@ -75,6 +72,7 @@
     xkbOptions = "caps:ctrl_modifier";
   };
 
+  services.dbus.socketActivated = true;
   services.dbus.packages = with pkgs; [ dunst ];
 
 }
diff --git a/sway.nix b/sway.nix
index a420820..1f1c744 100644
--- a/sway.nix
+++ b/sway.nix
@@ -35,12 +35,6 @@
     qt5.qtwayland
 
     wdisplays
-
-    (pkgs.writeScriptBin "gsd-xsettings"
-      ''
-        #!/bin/sh
-        exec ${pkgs.gnome3.gnome-settings-daemon}/libexec/gsd-xsettings "$@"
-      '')
   ];
 
   nixpkgs.config.packageOverrides = pkgs: with pkgs; {