From 6d9d2078a68b0af09b47a504540a5c0cd3321dc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?=
 <geoffrey@frogeye.fr>
Date: Sun, 5 Nov 2023 21:36:11 +0100
Subject: [PATCH] nix: Make it work with standalone hm on Arch

---
 config/nix/hm/common.nix  |  5 +++++
 config/nix/hm/desktop.nix | 10 ++++++++++
 config/nix/hm/style.nix   |  5 ++++-
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/config/nix/hm/common.nix b/config/nix/hm/common.nix
index 7b0bdbb..e1de2bd 100644
--- a/config/nix/hm/common.nix
+++ b/config/nix/hm/common.nix
@@ -3,6 +3,7 @@
 
   programs = {
     home-manager.enable = true;
+    bash.enable = true; # Just in case the default shell is not ZSH, so we still have the variables
     zsh = {
       enable = true;
       enableAutosuggestions = true;
@@ -54,6 +55,10 @@
   };
   home = {
     stateVersion = "23.05";
+    language = {
+      base = "en_US.UTF-8";
+      time = "en_DK.UTF-8";
+    };
     packages = with pkgs; [
       # dotfiles dependencies
       coreutils
diff --git a/config/nix/hm/desktop.nix b/config/nix/hm/desktop.nix
index 778ac39..d1d136a 100644
--- a/config/nix/hm/desktop.nix
+++ b/config/nix/hm/desktop.nix
@@ -1,7 +1,9 @@
 { pkgs, config, lib, ... }:
 {
   xsession = {
+    enable = true;
     windowManager = {
+      command = "${config.xsession.windowManager.i3.package}/bin/i3";
       i3 = {
         enable = true;
         config =
@@ -437,6 +439,14 @@
   };
 
   home = {
+    file = {
+      ".xinitrc" = {
+        source = pkgs.writeShellScript "xinitrc" ''
+          ${pkgs.xorg.xrdb}/bin/xrdb ${config.xresources.path}
+          ${config.xsession.windowManager.command}
+        '';
+      };
+    };
     packages = with pkgs; [
       # remote
       tigervnc
diff --git a/config/nix/hm/style.nix b/config/nix/hm/style.nix
index 22162a6..06456ed 100644
--- a/config/nix/hm/style.nix
+++ b/config/nix/hm/style.nix
@@ -27,5 +27,8 @@ in
   };
 
   # Fix https://nix-community.github.io/home-manager/index.html#_why_do_i_get_an_error_message_about_literal_ca_desrt_dconf_literal_or_literal_dconf_service_literal
-  home.packages = [ pkgs.dconf ];
+  # home.packages = [ pkgs.dconf ];
+  dconf.enable = false; # Otherwise standalone home-manager complains it can't find /etc/dbus-1/session.conf on Arch.
+  # Symlinking it to /usr/share/dbus-1/session.conf goes further but not much.
+
 }