From 4fdfa0b7a6f4e2a8e29961a9b8c5dd4d88c34fa0 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Sat, 15 Jul 2023 21:21:12 +0200
Subject: cascading solutions to problems:

- home manager didn't work, now works using nix run
- allows us to update sxrc from this repo
- so that we can use custom keymap
  (using paths in nix store to xkcbomp from nixpkgs, and to custom-fr
  from this repo)
---
 nixpkgs/Makefile   | 2 +-
 nixpkgs/common.nix | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'nixpkgs')

diff --git a/nixpkgs/Makefile b/nixpkgs/Makefile
index 4b3becf..2eb8d4a 100644
--- a/nixpkgs/Makefile
+++ b/nixpkgs/Makefile
@@ -1,3 +1,3 @@
 all:
 	nixfmt `hostname`.nix
-	home-manager switch -f `hostname`.nix
+	nix run home-manager/release-23.05 -- switch -f `hostname`.nix
diff --git a/nixpkgs/common.nix b/nixpkgs/common.nix
index b0adf33..a52062c 100644
--- a/nixpkgs/common.nix
+++ b/nixpkgs/common.nix
@@ -48,7 +48,9 @@
   home.file = {
     ".vim/coc-settings.json".source = ../vim/coc-settings.json;
     ".config/tmux/tmux.conf".source = ../tmux/tmux.conf;
+    ".config/sx/sxrc".executable = true;
     ".config/sx/sxrc".text = ''
+      ${pkgs.xorg.xkbcomp}/bin/xkbcomp ${../xkb/symbols/custom-fr} $DISPLAY
       icewm-session
     '';
     ".config/icewm/preferences".source = ../icewm/preferences;
-- 
cgit v1.2.3