pop-os: Switch to herbstluftwm

1 files changed, 147 insertions, 60 deletions

diff --git a/oni/home/config/pop-os.scm b/oni/home/config/pop-os.scm
index ebe479d..6ecbc25 100644
--- a/oni/home/config/pop-os.scm
+++ b/oni/home/config/pop-os.scm
@@ -42,19 +42,23 @@
 		        #:select (home-environment-service))
   #:use-module ((oni home services flameshot)
                 #:select (home-flameshot-service-type))
+  #:use-module (oni home services herbstluftwm)
   #:use-module ((oni home services mail)
                 #:select (home-mbsync-service-type))
-  #:use-module ((oni home services stumpwm)
-                #:select (home-stumpwm-service-type
-                          home-stumpwm-configuration
-                          home-stumpwm-gaps-service-type
-                          home-stumpwm-gaps-configuration
-                          home-stumpwm-stumptray-service-type
-                          home-stumpwm-stumptray-configuration
-                          home-stumpwm-playerctl-service-type
-                          home-stumpwm-playerctl-configuration
-                          home-stumpwm-pamixer-service-type
-                          home-stumpwm-pamixer-configuration))
+  #:use-module (oni home services polybar)
+  #:use-module (oni home services rofi)
+  ;; #:use-module ((oni home services stumpwm)
+  ;;               #:select (home-stumpwm-service-type
+  ;;                         home-stumpwm-configuration
+  ;;                         home-stumpwm-gaps-service-type
+  ;;                         home-stumpwm-gaps-configuration
+  ;;                         home-stumpwm-stumptray-service-type
+  ;;                         home-stumpwm-stumptray-configuration
+  ;;                         home-stumpwm-playerctl-service-type
+  ;;                         home-stumpwm-playerctl-configuration
+  ;;                         home-stumpwm-pamixer-service-type
+  ;;                         home-stumpwm-pamixer-configuration))
+  #:use-module (oni home services xdisorg)
   #:use-module (oni home services zsh)
   #:use-module ((oni packages emacs)
                 #:select (emacs-php-ts-mode
@@ -94,8 +98,10 @@
   #:use-module ((oni packages fonts)
                 #:select (font-comfortaa
                           font-annotation-mono))
-  #:use-module ((oni packages stumpwm)
-                #:select (stumpwm+swank)))
+  #:use-module (oni packages hlwm-run-or-raise)
+  ;; #:use-module ((oni packages stumpwm)
+  ;;               #:select (stumpwm+swank))
+  #:use-module (oni packages shutdown-rofi))
 
 (home-environment
  (packages (list (specification->package+output "glibc-locales")
@@ -143,12 +149,17 @@
                  hunspell
                  hunspell-dict-en-ca
                  emacs-dired-git-info
-                 emacs-oni-elfeed))
+                 emacs-oni-elfeed
+
+                 hlwm-run-or-raise
+                 shutdown-rofi))
  (services (list home-channels-service
                  home-dunst-default-service
 		         home-environment-service
                  home-kitty-service
-		         (service home-emacs-service-type
+		         home-rofi-default-service
+
+                 (service home-emacs-service-type
 		                  (home-emacs-configuration
                            (helpful-configuration
                             (home-emacs-helpful-configuration
@@ -169,52 +180,128 @@
                               "(require 'oni-gui)\n"
                               "(provide 'oni-gnus)\n"
                               "(add-to-list 'auto-mode-alist '(\"\\.vue$\" . web-mode))\n")))))
-         (service home-emacs-org-journal-service-type)
-		 (service home-wakatime-service-type
-		          (home-wakatime-configuration
-		           (api-url "https://waka.ryuslash.org/api")
-		           (exclude '("^COMMIT_EDITMSG$"
-		    	              "^TAG_EDITMSG$"))))
-         (service home-emacs-vterm-service-type
-            (home-emacs-vterm-configuration
-             (buffer-name-string "*vterm* %s")))
+                 (service home-emacs-org-journal-service-type)
+		         (service home-wakatime-service-type
+		                  (home-wakatime-configuration
+		                   (api-url "https://waka.ryuslash.org/api")
+		                   (exclude '("^COMMIT_EDITMSG$"
+		    	                      "^TAG_EDITMSG$"))))
+                 (service home-emacs-vterm-service-type
+                          (home-emacs-vterm-configuration
+                           (buffer-name-string "*vterm* %s")))
+
+                 home-zsh-service
+
+                 ;; This has to be the first extension because it needs to be added to the
+                 ;; configuration last.
+                 (service home-zsh-syntax-highlighting-service-type)
+                 (service home-zsh-autosuggestions-service-type)
+                 (service home-zsh-contextual-abbrevs-service-type)
+                 (service home-zsh-atuin-service-type
+                          (home-zsh-atuin-configuration
+                           (inline-height 20)
+                           (filter-mode 'directory)
+                           (history-filter
+                            '("^ +"))
+                           (enter-accept #t)))
 
-         home-zsh-service
+                 ;; (service home-stumpwm-service-type
+                 ;;          (home-stumpwm-configuration
+                 ;;           (package stumpwm+swank)
+                 ;;           (locker-program "/usr/bin/i3lock")
+                 ;;           (configurations
+                 ;;            (list (local-file "../services/stumpwm/stumpwm.lisp")
+                 ;;                  (local-file "../services/stumpwm/pop-os-config.lisp")))))
+                 ;; (service home-stumpwm-stumptray-service-type
+                 ;;          (home-stumpwm-stumptray-configuration
+                 ;;           (configurations
+                 ;;            (list (mixed-text-file "config-stumptray"
+                 ;;                                   "(require 'stumptray)\n"
+                 ;;                                   "(stumptray::stumptray)\n")))))
+                 ;; (service home-stumpwm-playerctl-service-type
+                 ;;          (home-stumpwm-playerctl-configuration
+                 ;;           (configurations
+                 ;;            (list (local-file "../services/stumpwm/playerctl.lisp")))))
+                 ;; (service home-stumpwm-pamixer-service-type
+                 ;;          (home-stumpwm-pamixer-configuration
+                 ;;           (configurations
+                 ;;            (list (local-file "../services/stumpwm/pamixer.lisp")))))
 
-         ;; This has to be the first extension because it needs to be added to the
-         ;; configuration last.
-         (service home-zsh-syntax-highlighting-service-type)
-         (service home-zsh-autosuggestions-service-type)
-         (service home-zsh-contextual-abbrevs-service-type)
-         (service home-zsh-atuin-service-type
-                  (home-zsh-atuin-configuration
-                   (inline-height 20)
-                   (filter-mode 'directory)
-                   (history-filter
-                    '("^ +"))
-                   (enter-accept #t)))
+                 (service home-flameshot-service-type)
+                 (service home-mbsync-service-type)
 
-         (service home-stumpwm-service-type
-                  (home-stumpwm-configuration
-                   (package stumpwm+swank)
-                   (locker-program "/usr/bin/i3lock")
-                   (configurations
-                    (list (local-file "../services/stumpwm/stumpwm.lisp")
-                          (local-file "../services/stumpwm/pop-os-config.lisp")))))
-         (service home-stumpwm-stumptray-service-type
-                  (home-stumpwm-stumptray-configuration
-                   (configurations
-                    (list (mixed-text-file "config-stumptray"
-                                           "(require 'stumptray)\n"
-                                           "(stumptray::stumptray)\n")))))
-         (service home-stumpwm-playerctl-service-type
-                  (home-stumpwm-playerctl-configuration
-                   (configurations
-                    (list (local-file "../services/stumpwm/playerctl.lisp")))))
-         (service home-stumpwm-pamixer-service-type
-                  (home-stumpwm-pamixer-configuration
-                   (configurations
-                    (list (local-file "../services/stumpwm/pamixer.lisp")))))
+                 (service home-herbstluftwm-service-type
+                          (home-herbstluftwm-configuration
+                           (tags '(dev web game))
+                           (key-bindings
+                            '(("s-S-q" . "quit")
+                              ("s-S-e" . "reload")))
+                           (mouse-bindings
+                            '(("s-Button1" . "move")
+                              ("s-Button2" . "zoom")
+                              ("s-Button3" . "resize")))
+                           (settings
+                            '((default_frame_layout . 2)
+                              (frame_border_active_color . "#3d3d3d")
+                              (frame_border_normal_color . "#222222")
+                              (frame_bg_normal_color . "#111111")
+                              (frame_bg_active_color . "#263f1f")
+                              (frame_border_width . 0)
+                              (window_border_width . 2)
+                              (window_border_inner_width . 0)
+                              (window_border_normal_color . "#222222")
+                              (window_border_active_color . "#1f3f3f")
+                              (window_border_inner_color . "#111111")
+                              (always_show_frame . 0)
+                              (frame_gap . 30)
+                              (window_gap . 30)
+                              (frame_padding . -30)
+                              (frame_bg_transparent . 1)
+                              (smart_window_surroundings . 0)
+                              (smart_frame_surroundings . 0)
+                              (mouse_recenter_gap . 0)
+                              (swap_monitors_to_get_tag . 0)
+                              (update_dragged_clients . 1)
+                              (tree_style . "╾│ ├└╼─┐")))
+                           (attributes
+                            '(((theme tiling reset) . 1)
+                              ((theme floating reset) . 1)))
+                           (rules
+                            '(("focus=on")
+                              ("class=Emacs" "tag=dev" "index=01" "switchtag=on" "hook=emacs")
+                              ("class~'URxvt|kitty'" "tag=dev" "index=1" "switchtag=on" "hook=urxvt")
+                              ("class~'Conkeror|[Ff]irefox|Chromium'" "tag=web" "index=0" "switchtag=on")
+                              ("class=Pinentry" "pseudotile=on")
+                              ("class=Alsaplayer" "pseudotile=on")
+                              ("class=Gcr-prompter" "pseudotile=on")
+                              ("class=Steam" "title='Steam Login'" "pseudotile=on")
+                              ("class=Steam" "title~'Steam - News .*'" "pseudotile=on")
+                              ("class=" "title=Steam" "pseudotile=on")
+                              ("class=xfreerdp" "floating=on" "tag=work" "index=0" "switchtag=on")
+                              ("windowtype~'_NET_WM_WINDOW_TYPE_(DIALOG|UTILITY|SPLASH)'" "pseudotile=on")
+                              ("windowtype='_NET_WM_WINDOW_TYPE_DIALOG'" "focus=on")
+                              ("windowtype~'_NET_WM_WINDOW_TYPE_(NOTIFICATION|DOCK|DESKTOP)'" "manage=off")
+                              ("class=pinball.exe" "pseudotile=on")))
+                           (padding '(0 0 0 16 16))
+                           (layouts
+                            '((web clients max:0)
+                              (dev split horizontal:0.54:1 (clients max:0) (clients vertical:0))))
+                           (extra
+                            (list
+                             (mixed-text-file
+                              "autostart"
+                              "set_monitors 1920x1080+0+0\n"
+                              "focus_edge left\n"
+                              "keybind Mod4-apostrophe spawn dunstctl close\n"
+                              "keybind Mod4-quotedbl spawn dunstctl close-all\n"
+                              "keybind Mod4-Control-apostrophe spawn dunstctl history-pop\n"
+                              "keybind Mod4-Mod1-apostrophe spawn dunstctl context\n"
+                              "spawn pick-random-wallpaper\n")))))
 
-         (service home-flameshot-service-type)
-         (service home-mbsync-service-type))))
+                 (service home-sxhkd-service-type
+                          (home-sxhkd-configuration
+                           (configurations
+                            (list (local-file "sxhkdrc")))))
+                 (service home-polybar-service-type
+                          (home-polybar-configuration
+                           (bar "example"))))))