diff options
| author | Alejandro Soto <alejandro@34project.org> | 2023-05-29 00:53:05 -0600 |
|---|---|---|
| committer | Alejandro Soto <alejandro@34project.org> | 2023-05-29 00:53:05 -0600 |
| commit | 3eb118d309fadbeed76963ef2d956c8cbf2528e2 (patch) | |
| tree | 675d144e7bac4e5190a2f1f2eec82e5363e5355e | |
| parent | dc11ba42cbbf757238d34449a61dfcf0ee16c0df (diff) | |
| parent | c92dee7b00e6147ff91bab2f3113d1500f123ed9 (diff) | |
Merge branch '[lustrated]'
| -rw-r--r-- | home/desktop.nix | 4 | ||||
| -rw-r--r-- | home/i3-config.nix | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/home/desktop.nix b/home/desktop.nix index d3d9b8a..6b9dddf 100644 --- a/home/desktop.nix +++ b/home/desktop.nix @@ -57,9 +57,7 @@ with lib; { }; }; - xdg.configFile."i3/config".text = import ./i3-config.nix { - inherit (pkgs) i3lock-color xautolock; - inherit (pkgs.xorg) setxkbmap; + xdg.configFile."i3/config".text = pkgs.callPackage ./i3-config.nix { inherit (pkgs.local) st tmux-lift; i3status-rust = config.programs.i3status-rust.package; diff --git a/home/i3-config.nix b/home/i3-config.nix index 999745b..66dbfc7 100644 --- a/home/i3-config.nix +++ b/home/i3-config.nix @@ -1,4 +1,4 @@ -{ i3lock-color, i3status-rust, rofi, setxkbmap, st, tmux-lift, xautolock }: +{ i3lock-color, i3status-rust, rofi, st, tmux-lift, xautolock, xcalib, xorg }: '' # This file has been auto-generated by i3-config-wizard(1).# It will not be overwritten, so edit it as you like. # @@ -158,8 +158,9 @@ position top } - bindsym $mod+Shift+U exec ${setxkbmap}/bin/setxkbmap us - bindsym $mod+Shift+E exec ${setxkbmap}/bin/setxkbmap latam + bindsym $mod+Shift+U exec ${xorg.setxkbmap}/bin/setxkbmap us + bindsym $mod+Shift+E exec ${xorg.setxkbmap}/bin/setxkbmap latam + bindsym $mod+I exec ${xcalib}/bin/xcalib -invert -alter focus_follows_mouse no |