Merge branch 'master' of gitlab.com:chriscochrun/dotfiles
This commit is contained in:
commit
8520db7ac6
|
@ -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"))
|
||||
|
|
|
@ -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" })
|
||||
|
|
|
@ -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
|
||||
}
|
||||
}
|
||||
|
|
10
sway/config
10
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"
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue