Reformat files using ‘guix-pretty-print-buffer’

4 files changed, 56 insertions, 120 deletions

diff --git a/oni/home/config/common.scm b/oni/home/config/common.scm
index f41b826..3593a11 100644
--- a/oni/home/config/common.scm
+++ b/oni/home/config/common.scm
@@ -55,9 +55,12 @@
                ((mod4 k) . "hersbtclient close")
                ((mod4 mod1 k) . "herbstclient remove")
                ((mod4 Return) . "herbstclient spawn kitty")
-               ((mod4 t) . "herbstclient spawn hlwm-run-or-raise \"\\(URxvt\\|Hyper\\|kitty\\)\" kitty")
-               ((mod4 b) . "herbstclient spawn hlwm-run-or-raise \"\\(Conkeror\\|[Ff]irefox\\|Chromium\\|Next\\|qutebrowser\\)\" firefox")
-               ((mod4 e) . "herbstclient spawn hlwm-run-or-raise Emacs emacsclient --create-frame")
+               ((mod4 t)
+                . "herbstclient spawn hlwm-run-or-raise \"\\(URxvt\\|Hyper\\|kitty\\)\" kitty")
+               ((mod4 b)
+                . "herbstclient spawn hlwm-run-or-raise \"\\(Conkeror\\|[Ff]irefox\\|Chromium\\|Next\\|qutebrowser\\)\" firefox")
+               ((mod4 e)
+                . "herbstclient spawn hlwm-run-or-raise Emacs emacsclient --create-frame")
                ((control mod1 l) . "herbstclient spawn i3lock --color=000000")
                ((mod4 x) . "herbstclient spawn hlwm-switch-tags")
                ((mod4 shift b) . "herbstclient shift left")
@@ -76,7 +79,8 @@
                ((mod4 f) . "herbstclient cycle_layout 1 vertical max")
                ((mod4 m) . "herbstclient fullscreen toggle")
                ((mod4 p) . "herbstclient pseudotile toggle")
-               ((mod4 space) . "herbstclient or , and . compare tags.focus.curframe_wcount = 2 . cycle_layout +1 vertical horizontal max vertical grid , cycle_layout +1")
+               ((mod4 space)
+                . "herbstclient or , and . compare tags.focus.curframe_wcount = 2 . cycle_layout +1 vertical horizontal max vertical grid , cycle_layout +1")
                ((mod4 BackSpace) . "herbstclient cycle_monitor")
                ((mod4 u) . "herbstclient jumpto urgent")
                ((mod4 c)
@@ -107,9 +111,9 @@
             (extra '("remove Mod5 = ISO_Level3_Shift"
                      "keycode 108 = Alt_L"
                      "add Mod1 = Alt_L"
-		     "remove mod4 = Super_R"
-		     "keycode 134 = Hyper_R"
-		     "add mod3 = Hyper_R")))))
+		             "remove mod4 = Super_R"
+		             "keycode 134 = Hyper_R"
+		             "add mod3 = Hyper_R")))))
 
 (define home-openssh-service
   (service home-openssh-service-type
@@ -188,7 +192,8 @@ LocalForward 19999 localhost:19999"))
                (map . "alt+0 close_window")
                ;; Find any "View build log messages" from guix and open the
                ;; build log in Emacs.
-               (map . "ctrl+shift+g kitten hints --type=regex --regex=\\\"View build log at '([^']+)'\\.\\\" --program=\\\"emacsclient\\\"")
+               (map
+                . "ctrl+shift+g kitten hints --type=regex --regex=\\\"View build log at '([^']+)'\\.\\\" --program=\\\"emacsclient\\\"")
                (map . "alt+o next_window"))))))
 
 (define home-channels-service
@@ -334,7 +339,8 @@ LocalForward 19999 localhost:19999"))
                    (".zsh/functions/unzip"
                     ,(local-file "../../../zsh/.zsh/functions/unzip"))
                    (".zsh/functions/x-copy-region-as-kill"
-                    ,(local-file "../../../zsh/.zsh/functions/x-copy-region-as-kill"))
+                    ,(local-file
+                      "../../../zsh/.zsh/functions/x-copy-region-as-kill"))
                    (".zsh/functions/x-kill-region"
                     ,(local-file "../../../zsh/.zsh/functions/x-kill-region"))
                    (".zsh/functions/x-yank"
diff --git a/oni/home/config/data.scm b/oni/home/config/data.scm
index 860d4c5..2738f64 100644
--- a/oni/home/config/data.scm
+++ b/oni/home/config/data.scm
@@ -36,7 +36,6 @@
                           home-emacs-org-caldav-service-type
                           home-emacs-envrc-configuration))
   #:use-module (oni home services environment)
-  ;; #:use-module (oni home services herbstluftwm)
   #:use-module (oni home services kdeconnect)
   #:use-module ((oni home services mail)
                 #:select (home-mbsync-service-type))
@@ -48,7 +47,6 @@
   #:use-module (oni home services sawfish)
   #:use-module (oni home services syncthing)
   #:use-module (oni home services unclutter)
-  ;; #:use-module (oni home services xbindkeys)
   #:use-module ((oni home services xdisorg)
                 #:select (home-xss-lock-service-type))
   #:use-module (oni home services xsession)
@@ -95,7 +93,6 @@
                           emacs-oni-python
                           emacs-oni-yaml
                           emacs-oni-gnus))
-  ;; #:use-module (oni packages hlwm-run-or-raise)
   #:use-module (oni packages pick-random-wallpaper)
   #:use-module (oni packages sawfish)
   #:use-module (oni packages shutdown-rofi))
@@ -118,7 +115,6 @@
             (list (specification->package+output "font-fantasque-sans")
                   (specification->package+output "font-comic-neue")
                   font-dosis
-                  ;; hlwm-run-or-raise
                   pick-random-wallpaper
                   shutdown-rofi
                   emacs-sawfish
@@ -177,7 +173,6 @@
     home-rofi-default-service
     home-dunst-default-service
     home-redshift-service
-    ;; home-xbindkeys-service
     home-guile-service
     home-xmodmap-service
     home-openssh-service
@@ -195,74 +190,6 @@
                  "xrandr --auto\n"
                  "xrandr --dpi 96\n")))))
 
-    ;; (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-sawfish-service-type)
 
     (service home-polybar-service-type
diff --git a/oni/home/config/pop-os.scm b/oni/home/config/pop-os.scm
index 9f9201b..b8b6c21 100644
--- a/oni/home/config/pop-os.scm
+++ b/oni/home/config/pop-os.scm
@@ -37,17 +37,6 @@
                 #:select (home-mbsync-service-type))
   #: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 packages emacs)
   #:use-module ((oni packages emacs-config)
@@ -85,8 +74,6 @@
                 #:select (font-comfortaa
                           font-annotation-mono))
   #:use-module (oni packages hlwm-run-or-raise)
-  ;; #:use-module ((oni packages stumpwm)
-  ;;               #:select (stumpwm+swank))
   #:use-module (oni packages shutdown-rofi))
 
 (define-record-type* <home-module> home-module
@@ -139,24 +126,32 @@
                            ((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=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=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")
+                           ("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")
+                           ("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.7375:1 (clients max:0) (clients vertical:0))))
+                           (dev split horizontal:0.7375:1 (clients max:0)
+                                (clients vertical:0))))
                         (extra
                          (list
                           (mixed-text-file
@@ -175,19 +170,25 @@
                                (mixed-text-file
                                 "sxhkdrc-playerctl"
                                 "XF86AudioPlay\n"
-                                "    herbstclient spawn " playerctl "/bin/playerctl play-pause\n"
+                                "    herbstclient spawn " playerctl
+                                "/bin/playerctl play-pause\n"
                                 "XF86AudioNext\n"
-                                "    herbstclient spawn " playerctl "/bin/playerctl next\n"
+                                "    herbstclient spawn " playerctl
+                                "/bin/playerctl next\n"
                                 "XF86AudioPrev\n"
-                                "    herbstclient spawn " playerctl "/bin/playerctl prev\n")
+                                "    herbstclient spawn " playerctl
+                                "/bin/playerctl prev\n")
                                (mixed-text-file
                                 "sxhkdrc-pamixer"
                                 "XF86AudioRaiseVolume\n"
-                                "    herbstclient spawn " pamixer "/bin/pamixer --increase 10\n"
+                                "    herbstclient spawn " pamixer
+                                "/bin/pamixer --increase 10\n"
                                 "XF86AudioLowerVolume\n"
-                                "    herbstclient spawn " pamixer "/bin/pamixer --decrease 10\n"
+                                "    herbstclient spawn " pamixer
+                                "/bin/pamixer --decrease 10\n"
                                 "XF86AudioMute\n"
-                                "    herbstclient spawn " pamixer "/bin/pamixer --toggle-mute\n")))))
+                                "    herbstclient spawn " pamixer
+                                "/bin/pamixer --toggle-mute\n")))))
 
               (service home-polybar-service-type
                        (home-polybar-configuration
@@ -195,10 +196,10 @@
 
 (define* (home-modules->home-environment #:rest modules)
   (home-environment
-    (packages
-     (apply append (map home-module-packages modules)))
-    (services
-     (apply append (map home-module-services modules)))))
+   (packages
+    (apply append (map home-module-packages modules)))
+   (services
+    (apply append (map home-module-services modules)))))
 
 (home-modules->home-environment
  oni-home-herbstluftwm-configuration
diff --git a/oni/home/config/rincewind.scm b/oni/home/config/rincewind.scm
index 57289eb..1f9a9b3 100644
--- a/oni/home/config/rincewind.scm
+++ b/oni/home/config/rincewind.scm
@@ -440,12 +440,13 @@
               (db-file "~/.local/share/mpd/mpd.db")
               (state-file "~/.local/share/mpd/mpdstate")
               (audio-outputs
-               (list (make <home-mpd-audio-output> #:type "pulse" #:name "MPD Pulse")
-                     (make <home-mpd-audio-output>
-                       #:type "fifo"
-                       #:name "Visualizer"
-                       #:path "/tmp/mpd.fifo"
-                       #:format "44100:16:2")))))
+               (list
+                (make <home-mpd-audio-output> #:type "pulse" #:name "MPD Pulse")
+                (make <home-mpd-audio-output>
+                  #:type "fifo"
+                  #:name "Visualizer"
+                  #:path "/tmp/mpd.fifo"
+                  #:format "44100:16:2")))))
     (service home-mpc-update-service-type)
     (service home-mpd-notify-service-type)
     (service home-mpdscrobble-service-type)
@@ -525,7 +526,8 @@
                '(("extensions.pocket.enabled" #f)
                  ("view_source.editor.args" "--no-wait")
                  ("view_source.editor.external" #t)
-                 ("view_source.editor.path" "/home/chelys/.guix-home/profile/bin/emacsclient")
+                 ("view_source.editor.path"
+                  "/home/chelys/.guix-home/profile/bin/emacsclient")
                  ;; Visual modifications. Don't let websites pick the colors or
                  ;; the fonts, use mine instead.
                  ("browser.display.document_color_use" 2)