switch to exwm on chaman

9 files changed, 51 insertions, 43 deletions

diff --git a/.config/gtk-3.0/settings.ini b/.config/gtk-3.0/settings.ini
index e66a916..472627d 100644
--- a/.config/gtk-3.0/settings.ini
+++ b/.config/gtk-3.0/settings.ini
@@ -1,11 +1,11 @@
 [Settings]
-gtk-icon-theme-name = elementary Xfce darker
+# gtk-icon-theme-name = elementary Xfce darker
 # gtk-theme-name = Adwaita
 
-gtk-theme-name = Greybird
+# gtk-theme-name = Greybird
 # gtk-theme-name = Arc-Darker
 # gtk-theme-name = Numix-ArchBlue
 
-gtk-font-name = Roboto 10
+# gtk-font-name = Roboto 10
 # gtk-font-name = Source Code Variable Medium 10
 # gtk-key-theme-name = Emacs
diff --git a/.config/guix/manifest/chaman.scm b/.config/guix/manifest/chaman.scm
index b312573..5ba14c6 100644
--- a/.config/guix/manifest/chaman.scm
+++ b/.config/guix/manifest/chaman.scm
@@ -1,7 +1,9 @@
 (specifications->manifest
-  '("audacity"
+  '("alsa-utils"
+    "audacity"
     "bash-completion"
     "cvs"
+    "dunst"
     "emacs"
     "emacs-alert"
     "emacs-async"
@@ -13,6 +15,7 @@
     "emacs-dash"
     "emacs-debbugs"
     "emacs-diff-hl"
+    "emacs-dmenu"
     "emacs-doom-themes"
     "emacs-ebdb"
     "emacs-emmet-mode"
@@ -22,6 +25,8 @@
     "emacs-eshell-up"
     "emacs-exec-path-from-shell"
     "emacs-expand-region"
+    "emacs-exwm"
+    "emacs-exwm-edit"
     "emacs-flycheck"
     "emacs-geiser"
     ;; "emacs-gnus-harvest"
@@ -74,20 +79,24 @@
     "hunspell"
     "hunspell-dict-en-ca"
     "hunspell-dict-en-us"
-    ;; "icecat"
+    "icecat"
     "inkscape"
     "isync"
     "mpv"
     "msmtp"
     "ncdu"
     "notmuch"
+    "openjdk"
     "openssh"
     "openssl"
     "password-store"
     "pinentry-emacs"
     "poppler"                           ; for 'pdffonts'
+    "rofi"
+    "rofi-pass"
     "rsync"
     "rtv"
+    "rxvt-unicode"
     "screen"
     "setxkbmap"
     ;; "texlive"
@@ -98,4 +107,6 @@
     ;; "xkbcomp"
     "xmodmap"
     "xrdb"
+    "xset"
+    "xsetroot"
     "youtube-dl"))
diff --git a/.config/guix/system/chaman.scm b/.config/guix/system/chaman.scm
index 4e016f5..831d9eb 100644
--- a/.config/guix/system/chaman.scm
+++ b/.config/guix/system/chaman.scm
@@ -1,4 +1,6 @@
 (use-modules (gnu)
+             (gnu packages certs)       ; for nss-certs
+             (gnu packages emacs-xyz)   ; for exwm
              (gnu packages linux))      ; for powertop
 (use-service-modules admin desktop mail networking pm ssh xorg)
 
@@ -45,9 +47,9 @@
            '("wheel" "netdev" "audio" "video")))
          %base-user-accounts))
  (packages
-  (append
-   (list (specification->package "nss-certs"))
-   %base-packages))
+  (cons* nss-certs
+         emacs-exwm
+         %base-packages))
  (services
   (cons*
    (service xfce-desktop-service-type)
diff --git a/.config/profiles/chaman b/.config/profiles/chaman
index 974f109..3b78e7b 100644
--- a/.config/profiles/chaman
+++ b/.config/profiles/chaman
@@ -1 +1,16 @@
 export IS_GUIX_SYSTEM=true
+
+if [ -x "$(command -v xinput)" ]; then
+   xinput --set-prop "TPPS/2 IBM TrackPoint" 'libinput Accel Speed' -0.4
+fi
+
+setxkbmap \
+    -layout us,ir \
+    -option ctrl:nocaps \
+    -option grp:shifts_toggle
+
+xmodmap -e "keysym Menu = Super_R"
+
+xsetroot -cursor_name left_ptr
+xset r rate 200 45
+xset b off
diff --git a/.config/profiles/jirud b/.config/profiles/jirud
deleted file mode 100644
index d9112c3..0000000
--- a/.config/profiles/jirud
+++ /dev/null
@@ -1,16 +0,0 @@
-if [ -x "$(command -v xinput)" ]; then
-   xinput --set-prop "TPPS/2 IBM TrackPoint" 'libinput Accel Speed' -0.4
-fi
-
-export INFOPATH="$HOME/usr/local/share/info${INFOPATH:+:}$INFOPATH"
-
-setxkbmap \
-    -layout us,ir \
-    -option ctrl:nocaps \
-    -option grp:shifts_toggle
-
-xmodmap -e "keysym Menu = Super_R"
-
-xsetroot -cursor_name left_ptr
-xset r rate 200 45
-xset b off
diff --git a/.config/rofi/config b/.config/rofi/config
index 2536673..a2b343d 100644
--- a/.config/rofi/config
+++ b/.config/rofi/config
@@ -11,9 +11,4 @@ rofi.width: 600
 rofi.monitor: -1
 !rofi.lines: 10
 
-!rofi.theme: ~/usr/local/share/rofi/themes/Arc.rasi
-!rofi.theme: ~/usr/local/share/rofi/themes/Paper.rasi
-!rofi.theme: ~/usr/local/share/rofi/themes/sidebar.rasi
-
-!rofi.theme: ~/usr/local/share/rofi/themes/gruvbox-light.rasi
-rofi.theme: ~/usr/local/share/rofi/themes/gruvbox-light-hard.rasi
+rofi.theme: ~/.guix-profile/share/rofi/themes/gruvbox-light-hard.rasi
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 2228c31..6ead09b 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -122,7 +122,7 @@
 
 ;;; Initial setup
 
-(defvar b/exwm-p (string= (system-name) "jirud")
+(defvar b/exwm-p (string= (system-name) "chaman")
   "Whether or not we will be using `exwm'.")
 
 ;; keep ~/.emacs.d clean
diff --git a/.gtkrc-2.0 b/.gtkrc-2.0
index 5100d2c..59b1ab0 100644
--- a/.gtkrc-2.0
+++ b/.gtkrc-2.0
@@ -1,6 +1,6 @@
-gtk-theme-name="Greybird"
-gtk-icon-theme-name="elementary Xfce darker"
-gtk-font-name="Roboto 10"
+# gtk-theme-name="Xfce"
+# gtk-icon-theme-name="elementary Xfce darker"
+# gtk-font-name="Roboto 10"
 # gtk-font-name="Source Code Variable 10"
 gtk-menu-images=0
 # gtk-key-theme-name = "Emacs"
diff --git a/.xsession b/.xsession
index 4ca6c84..dbea518 100755
--- a/.xsession
+++ b/.xsession
@@ -1,10 +1,11 @@
-if [ "$(hostname)" = "jirud" ]; then
-    [ -f "/usr/lib/x86_64-linux-gnu/xfce4/notifyd/xfce4-notifyd" ] && /usr/lib/x86_64-linux-gnu/xfce4/notifyd/xfce4-notifyd &
-    [ -x "$(command -v light-locker)" ] && light-locker --lock-on-suspend &
-    [ -x "$(command -v pasystray)" ] && pasystray -a &
-    [ -x "$(command -v nm-applet)" ] && nm-applet &
-    [ -x "$(command -v compton)" ] && compton &
-    [ -x "$(command -v emacs)" ] && exec emacs -ib 0
-else
-    startxfce4
+if [ -f "$HOME/.xinitrc" ]; then
+	. "$HOME/.xinitrc"
 fi
+
+[ -f "/usr/lib/x86_64-linux-gnu/xfce4/notifyd/xfce4-notifyd" ] && /usr/lib/x86_64-linux-gnu/xfce4/notifyd/xfce4-notifyd &
+[ -x "$(command -v light-locker)" ] && light-locker --lock-on-suspend &
+[ -x "$(command -v pasystray)" ] && pasystray -a &
+[ -x "$(command -v nm-applet)" ] && nm-applet &
+[ -x "$(command -v compton)" ] && compton &
+[ -x "$(command -v dunst)" ] && dunst &
+[ -x "$(command -v emacs)" ] && exec exwm -ib 0