From 472e49d5f45c9193d4d2f707b5e833dbf7cbbea0 Mon Sep 17 00:00:00 2001
From: Chris Cochrun <chris@tfcconnection.org>
Date: Wed, 25 Aug 2021 05:47:44 -0500
Subject: [PATCH] updates

---
 awesome/bling           |  2 +-
 awesome/init.fnl        |  6 ------
 awesome/keybindings.fnl | 22 ++++++++++++++++++++--
 awesome/rules.fnl       |  6 ++----
 sway/config             | 10 +++++-----
 5 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/awesome/bling b/awesome/bling
index ae211c2..048cf41 160000
--- a/awesome/bling
+++ b/awesome/bling
@@ -1 +1 @@
-Subproject commit ae211c2cae257a19cf2aed3faeb76959ad714da9
+Subproject commit 048cf41e0aa5a391948d62e6168d6e54279cf627
diff --git a/awesome/init.fnl b/awesome/init.fnl
index 5bf1fcd..ad44287 100644
--- a/awesome/init.fnl
+++ b/awesome/init.fnl
@@ -51,12 +51,6 @@
 (local bling (require "bling"))
 (local awestore (require "awestore"))
 
-(local anim-y (awestore.tweened 1100 { :duration 200 :easing awestore.easing.cubic_in_out }))
-
-(local agenda-scratch (bling.module.scratchpad:new {
-                                                    :command ""
-                                                    :rule [:name "*Org Agenda(a)*"]}))
-
 ;; This is used later as the default terminal and editor to run.
 (var terminal "alacritty")
 (var editor (or (os.getenv "EDITOR") "emacsclient"))
diff --git a/awesome/keybindings.fnl b/awesome/keybindings.fnl
index 1ee0710..3c63ea8 100644
--- a/awesome/keybindings.fnl
+++ b/awesome/keybindings.fnl
@@ -3,6 +3,8 @@
 (local beautiful (require "beautiful"))
 (local hotkeys_popup (require "awful.hotkeys_popup"))
 
+(local bling (require "bling"))
+(local awestore (require "awestore"))
 
 (local terminal "alacritty")
 (local modkey "Mod4")
@@ -10,6 +12,21 @@
 (local ctrl "Control")
 (local alt "Mod1")
 
+;; adding an org-agenda scratchpad
+(local anim-y (awestore.tweened 1100 { :duration 200 :easing awestore.easing.cubic_in_out }))
+(local anim-x (awestore.tweened 1920 { :duration 200 :easing awestore.easing.cubic_in_out }))
+
+(local agenda-scratch (bling.module.scratchpad:new {
+                                                    :command "emacsclient -e '(chris/org-agenda)'"
+                                                    :rule [:name "*Org Agenda(a)*"]
+                                                    :sticky true
+                                                    :autoclose true
+                                                    :floating true
+                                                    :geometry {:height 900 :width 1200}
+                                                    :reapply true
+                                                    :dont_focus_before_close true
+                                                    :awestore {:x anim-x :y anim-y}}))
+
 (fn get-volume [?callback]
     (let [cb (or ?callback (fn [] nil))]
       (awful.spawn.easy_async_with_shell "pamixer --get-volume-human" cb)))
@@ -130,10 +147,11 @@
                                 {:description "launch dired in new emacs frame" :group "apps" })
                      (awful.key [ modkey shift ] "d" (fn [] (awful.spawn "dolphin"))
                                 {:description "launch dolphin file browser" :group "apps" })
-                     (awful.key [ modkey ] "x" (fn [] (awful.spawn "emacsclient -c -e '(org-capture)'"))
+                     (awful.key [ modkey ] "x" (fn [] (awful.spawn "emacsclient -c -e '(org-capture)'"
+                                                                   {:floating true :placement awful.placement.centered :class "org-agenda" :instance "org-agenda"}))
                                 {:description "launch scratchpad in new emacs frame" :group "apps" })
                      (awful.key [ modkey ] "'" (fn [] (awful.spawn "emacsclient -e '(chris/org-agenda)'"
-                                                                   {:name "*Org Agenda(a)*" :floating true :placement awful.placement.centered :class "org-agenda" :instance "org-agenda"}))
+                                                                   {:floating true :placement awful.placement.centered :class "org-agenda" :instance "org-agenda"}))
                                 {:description "launch org-agenda in new emacs frame" :group "apps" })
                      (awful.key [ modkey alt ] "m" (fn [] (awful.spawn "emacsclient -c -e '(org-roam-capture)'"))
                                 {:description "launch org-roam-capture in new emacs frame" :group "apps" })
diff --git a/awesome/rules.fnl b/awesome/rules.fnl
index 586681a..e852fef 100644
--- a/awesome/rules.fnl
+++ b/awesome/rules.fnl
@@ -130,8 +130,6 @@
                             :floating true
                             :raise true
                             :screen 1
-                            :width (dpi 900)
-                            :height (dpi 600)
                             :placement (+ awful.placement.no_offscreen awful.placement.centered)
                             }
                }
@@ -147,8 +145,8 @@
                             :raise true
                             :ontop true
                             :screen awful.screen.preferred
-                            :width (dpi 600)
-                            :height (dpi 200)
+                            ;; :width (dpi 600)
+                            ;; :height (dpi 200)
                             :placement awful.placement.centered
                             }
                }
diff --git a/sway/config b/sway/config
index 2985a87..9dfdce2 100644
--- a/sway/config
+++ b/sway/config
@@ -232,11 +232,11 @@ bindsym $mod+o mode "$mode_launcher"
 bindsym $mod+Ctrl+m exec makoctl dismiss -a
 
 mode "$mode_launcher" {
-     bindsym e exec emacsclient -c -a emacs &&mode "default"
-     bindsym b exec qutebrowser &&mode "default"
-     bindsym a exec emacsclient -c -e '(chris/org-agenda)' &&mode "default"
-     bindsym m exec emacsclient -c -e '(mu4e)' &&mode "default"
-     bindsym Shift+d exec dolphin &&mode "default"
+     bindsym e exec emacsclient -c -a emacs
+     bindsym b exec qutebrowser
+     bindsym a exec emacsclient -e '(chris/org-agenda)'
+     bindsym m exec emacsclient -c -e '(mu4e)'
+     bindsym Shift+d exec dolphin
      bindsym Return mode "default"
      bindsym Escape mode "default"
 }