summaryrefslogtreecommitdiff
path: root/nixpkgs
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2023-07-15 21:21:12 +0200
committerAlex Auvolat <alex@adnab.me>2023-07-15 21:21:12 +0200
commit4fdfa0b7a6f4e2a8e29961a9b8c5dd4d88c34fa0 (patch)
treeecc97a221d656be48b47977a1adebe7c1352235e /nixpkgs
parentbbd454dd95450452e9f1d732b8f2fe039ada9362 (diff)
downloaduser-config-4fdfa0b7a6f4e2a8e29961a9b8c5dd4d88c34fa0.tar.gz
user-config-4fdfa0b7a6f4e2a8e29961a9b8c5dd4d88c34fa0.zip
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)
Diffstat (limited to 'nixpkgs')
-rw-r--r--nixpkgs/Makefile2
-rw-r--r--nixpkgs/common.nix2
2 files changed, 3 insertions, 1 deletions
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;