emacs: Skip package.el entirely when using Nix

home/develop/emacs.nix

@@ -84,7 +84,7 @@
 
       # === CODE FORMATTING AND CLEANUP ===
       web-beautify            # Format and beautify web code (HTML/CSS/JS)
-      whitespace-cleanup-mode # Automatically clean up whitespace on save
+      ws-butler               # Automatically clean up whitespace on save
 
       # === PARENTHESES AND STRUCTURE EDITING ===
       paredit                 # Balanced parentheses editing for Lisp-like languages

home/develop/emacs/custom.el

@@ -15,6 +15,14 @@
 ;; Disable annoying bell
 (setq ring-bell-function 'ignore)
 
+;; Skip package.el entirely when using Nix
+(setq package-enable-at-startup nil)
+(setq package-archives nil)
+(when (and (boundp 'use-package-ensure-function)
+           (getenv "NIX_PROFILES"))
+  (setq use-package-ensure-function 'ignore)
+  (setq use-package-always-ensure nil))
+
 ;; -----------------------------------------------------------------------------
 ;; --- Editor Defaults
 ;; -----------------------------------------------------------------------------
@@ -387,11 +395,13 @@ frame if FRAME is nil, and to 1 if AMT is nil."
   (yas-global-mode 1))
 
 ;; Clean up whitespace
-(use-package whitespace-cleanup-mode
-  :diminish
+(use-package ws-butler
+  :ensure t
+  :diminish ws-butler-mode
   :config
-  (setq whitespace-cleanup-mode-only-if-initially-clean nil)
-  (global-whitespace-cleanup-mode))
+  (ws-butler-global-mode t)
+  ;; Keep whitespace before point when editing
+  (setq ws-butler-keep-whitespace-before-point t))
 
 ;; Rainbow delimiters
 (use-package rainbow-delimiters)