summaryrefslogtreecommitdiff
path: root/.config/guix
diff options
context:
space:
mode:
Diffstat (limited to '.config/guix')
-rw-r--r--.config/guix/modules/packages/packages.scm3
-rw-r--r--.config/guix/modules/services/xorg.scm22
2 files changed, 5 insertions, 20 deletions
diff --git a/.config/guix/modules/packages/packages.scm b/.config/guix/modules/packages/packages.scm
index 645c000..6922f4c 100644
--- a/.config/guix/modules/packages/packages.scm
+++ b/.config/guix/modules/packages/packages.scm
@@ -113,13 +113,14 @@
pavucontrol
picom
pulseaudio
+ setxkbmap
texlive
texlive-dvipng
xf86-input-libinput
xf86-video-fbdev
xinit
xinput
- xmodmap
+ xkbcomp
xorg-server
xrandr
xrdb
diff --git a/.config/guix/modules/services/xorg.scm b/.config/guix/modules/services/xorg.scm
index 070a360..c3e585f 100644
--- a/.config/guix/modules/services/xorg.scm
+++ b/.config/guix/modules/services/xorg.scm
@@ -35,25 +35,7 @@
(list
(simple-service 'dotfiles
home-files-service-type
- `((".Xmodmap"
- ,(plain-file "Xmodmap" "
-clear lock
-clear control
-clear mod1
-clear mod2
-clear mod3
-clear mod4
-clear mod5
-keycode 37 = Hyper_L
-keycode 66 = Control_L
-add control = Control_L Control_R
-add mod1 = Alt_L Alt_R Meta_L
-add mod2 = Num_Lock
-add mod3 = Hyper_L
-add mod4 = Super_L Super_R
-add mod5 = Mode_switch ISO_Level3_Shift
-"))
- (".Xresources"
+ `((".Xresources"
,(plain-file "Xresources" "
Nsxiv.window.background: #000000
Nsxiv.window.foreground: #FFFFFF
@@ -85,6 +67,8 @@ xset s 600
touchpad-defaults
xrandr-toggle
xkeyboard-auto &
+test -f ~/.xkb/symbols/rocker &&
+ xkbcomp -I$HOME/.xkb ~/.xkb/keymap/rocket $DISPLAY
exec emacs -mm"))
(".config/gtk-2.0/settings.ini"
,(plain-file "settings.ini" "