From 70a13db93bf0e071a34b39004b38bceee69d7271 Mon Sep 17 00:00:00 2001 From: William Carroll Date: Wed, 3 Aug 2022 13:18:58 -0700 Subject: fix(wpcarro/emacs): Fix load order for ava, tarasco Looks like the everything after the `window-manager-init` call doesn't run. Change-Id: Ib5d81c5f079152bda658d213a39c07276b4ef6e6 Reviewed-on: https://cl.tvl.fyi/c/depot/+/6036 Reviewed-by: wpcarro Autosubmit: wpcarro Tested-by: BuildkiteCI --- users/wpcarro/nixos/ava/ava.el | 18 ++++++++++-------- users/wpcarro/nixos/tarasco/tarasco.el | 18 ++++++++++-------- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/users/wpcarro/nixos/ava/ava.el b/users/wpcarro/nixos/ava/ava.el index e4537c4c17..3f2b302f8c 100644 --- a/users/wpcarro/nixos/ava/ava.el +++ b/users/wpcarro/nixos/ava/ava.el @@ -2,13 +2,21 @@ ;; Dependencies ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +(require 'bookmark) (require 'display) (require 'window-manager) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Monitor Configuration +;; Configuration ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +(bookmark-install-kbd + (make-bookmark :label "hadrian" + :path (f-join tvl-depot-path "/hadrian") + :kbd "h")) + +(add-to-list 'ssh-hosts "wpcarro@tarasco") + (display-register primary :output "HDMI-1" :primary t @@ -47,11 +55,5 @@ :kbd "h" :display display-secondary))) +;; I *think* this needs to be the last statement in this file. (window-manager-init :init-hook #'display-arrange-main) - -(bookmark-install-kbd - (make-bookmark :label "hadrian" - :path (f-join tvl-depot-path "/hadrian") - :kbd "h")) - -(add-to-list 'ssh-hosts "wpcarro@tarasco") diff --git a/users/wpcarro/nixos/tarasco/tarasco.el b/users/wpcarro/nixos/tarasco/tarasco.el index c1ecd4409c..bd2528fd8d 100644 --- a/users/wpcarro/nixos/tarasco/tarasco.el +++ b/users/wpcarro/nixos/tarasco/tarasco.el @@ -2,13 +2,21 @@ ;; Dependencies ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +(require 'bookmark) (require 'display) (require 'window-manager) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Monitor Configuration +;; Configuration ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +(bookmark-install-kbd + (make-bookmark :label "hadrian" + :path (f-join tvl-depot-path "/hadrian") + :kbd "h")) + +(add-to-list 'ssh-hosts "wpcarro@ava") + (display-register primary :output "HDMI-1" :primary t @@ -47,11 +55,5 @@ :kbd "h" :display display-secondary))) +;; I *think* this needs to be the last statement in this file. (window-manager-init :init-hook #'display-arrange-main) - -(bookmark-install-kbd - (make-bookmark :label "hadrian" - :path (f-join tvl-depot-path "/hadrian") - :kbd "h")) - -(add-to-list 'ssh-hosts "wpcarro@ava") -- cgit 1.4.1