@@ -2,9 +2,10 @@ ;;; init --- user init file (setq inhibit-startup-echo-area-message "alan")
 (setq inhibit-startup-screen t
       initial-scratch-message ""
-      initial-major-mode 'text-mode
+      initial-major-mode 'fundamental-mode
       package-enable-at-startup nil
-      evil-want-keybinding nil)
+      evil-want-keybinding nil
+      frame-inhibit-implied-resize t)
 
 (package-initialize)
 
@@ -211,7 +212,7 @@ (bury-buffer))      "Save and bury buffer" :color blue)
     ("q" nil "cancel" :color blue))
   :hook (magit-diff-visit-file . (lambda ()
-                                   (when smerge-mode
+                                   (when (bound-and-true-p smerge-mode)
                                      (unpackaged/smerge-hydra/body)))))
 
 (use-package swiper
@@ -617,7 +618,7 @@ (use-package eshell-toggle
   :after projectile
   :commands (eshell-toggle)
-  :general ("C-`" . eshell-toggle)
+  :general ("C-`" #'eshell-toggle)
   :config (setq eshell-toggle-use-projectile-root t))
 
 (use-package esh-autosuggest
@@ -706,12 +707,11 @@ (general-add-hook 'after-save-hook                                       #'executable-make-buffer-file-executable-if-script-p :append :local)))
 
 (add-to-list 'auto-mode-alist '("\\.env\\'" . conf-unix-mode))
-(use-package sh-script
-  :mode (("\\.zsh\\'" . shell-script-mode)
-         ("zshenv\\'" . shell-script-mode)
-         ("zshrc\\'"  . shell-script-mode))
-  :config (setq sh-shell-file "/usr/bin/env zsh"
-                sh-basic-offset 2))
+(add-to-list 'auto-mode-alist '("\\.zsh\\'" . shell-script-mode))
+(add-to-list 'auto-mode-alist '("zshenv\\'" . shell-script-mode))
+(add-to-list 'auto-mode-alist '("zshrc\\'"  . shell-script-mode))
+(setq sh-shell-file "/usr/bin/env zsh"
+      sh-basic-offset 2)
 
 (add-hook 'shell-mode-hook 'ansi-color-for-comint-mode-on)