Move setqs for win into cond block

diff --git a/eshell/alias b/eshell/alias
index 78ab70ee4fe95c0fc65b163dedd24d8052876f02..8ce9840baee03927c69b4a2de79fee06609b96e1 100644 (file)
--- a/eshell/alias
+++ b/eshell/alias
@@ -1 +1,2 @@
+alias qmk c:/QMK_MSYS/conemu/ConEmu64.exe
 alias weather clear -l && curl https://wttr.in

diff --git a/init.el b/init.el
index 9607c2c006e24eede8848f38ea6c4797ce8b0ba5..1c0a975398ceb42e490cf0aaac1d63ca3e8ae627 100644 (file)
--- a/init.el
+++ b/init.el
@@ -1,19 +1,25 @@
 ;; -*- lexical-binding: t; -*-
-;; SETUP FOR SHARED WINDOWS/WSL INIT
-(if (eq system-type 'windows-nt)
-    (progn (setq delete-by-moving-to-trash t)
-          (load (expand-file-name "win-defuns.el" user-emacs-directory))
-          (eshell-eval-command "alias qmk \"c:/QMK_MSYS/conemu/ConEmu64.exe\""))
-  nil)
 
-(load (expand-file-name "work-eqs.el" user-emacs-directory))
 (load (expand-file-name "package-config.el" user-emacs-directory))
+(load (expand-file-name "work-eqs.el" user-emacs-directory))
 (load (expand-file-name "setq-defaults.el" user-emacs-directory))
 (load (expand-file-name "defuns.el" user-emacs-directory))
 (load (expand-file-name "org-setup.el" user-emacs-directory))
 (load (expand-file-name "hooks-puts.el" user-emacs-directory))
 (load (expand-file-name "bindings.el" user-emacs-directory))
 
+;; SETUP FOR SHARED WINDOWS/WSL INIT
+(if (eq system-type 'windows-nt)
+    (progn (setq delete-by-moving-to-trash t
+                openwith-associations '(("\\.pdf\\'" "sumatrapdf" (file))
+                                        ("\\.xls\\'" "excel" (file))
+                                        ("\\.xlsx\\'" "excel" (file))
+                                        ("\\.doc\\'" "word" (file))
+                                        ("\\.docx\\'" "word" (file))
+                                        ("\\.adpro\\'" "PoductivitySuite" (file))))
+          (load (expand-file-name "win-defuns.el" user-emacs-directory)))
+  nil)
+
 (custom-set-variables
  ;; custom-set-variables was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.

diff --git a/package-config.el b/package-config.el
index 4beb12246a3433b7596a697e20c6a26454305893..07c5b56e79bbf245e9e77e8579afb6821d6eef90 100644 (file)
--- a/package-config.el
+++ b/package-config.el
@@ -46,13 +46,8 @@
 
 (use-package openwith
   :config
-  (openwith-mode t)
-  (setq openwith-associations '(("\\.pdf\\'" "sumatrapdf" (file))
-                               ("\\.xls\\'" "excel" (file))
-                               ("\\.xlsx\\'" "excel" (file))
-                               ("\\.doc\\'" "word" (file))
-                               ("\\.docx\\'" "word" (file))
-                               ("\\.adpro\\'" "PoductivitySuite" (file)))))
+  (openwith-mode t))
+
 (use-package s)
 
 (use-package dash)