Merge remote-tracking branch 'origin/master'

2 files changed, 28 insertions, 9 deletions

diff --git a/user/emacs/.emacs.d/init.el b/user/emacs/.emacs.d/init.el
index f608d4cf..701156a3 100644
--- a/user/emacs/.emacs.d/init.el
+++ b/user/emacs/.emacs.d/init.el
@@ -17,6 +17,22 @@
   (setq use-package-expand-minimally t))
 (setq use-package-always-demand (daemonp))
 
+(defvar ap/path-configured nil)
+(when (and (eq system-type 'darwin)
+           (not ap/path-configured))
+  (setq exec-path
+        (delete-dups
+         (append
+          (parse-colon-path
+           (elt (split-string-and-unquote
+                 (with-output-to-string
+                   (with-current-buffer standard-output
+                     (call-process "/usr/libexec/path_helper" nil t nil "-s")))
+                 "[=;]")
+                1))
+          exec-path))
+        ap/path-configured t))
+
 ;;; Customize
 
 (setq custom-file "~/.emacs.d/custom.el")
diff --git a/user/settings/nixos.nix b/user/settings/nixos.nix
index de415b55..79f9ca93 100644
--- a/user/settings/nixos.nix
+++ b/user/settings/nixos.nix
@@ -6,14 +6,17 @@
     ./nixpkgs.nix
   ];
 
-  programs.zsh.shellAliases = {
-    nor = "nixos-rebuild";
-    snor = "sudo nixos-rebuild";
-    nors = "nixos-rebuild switch";
-    snors = "sudo nixos-rebuild switch";
-    norb = "nixos-rebuild boot";
-    snorb = "sudo nixos-rebuild boot";
-    norr = "nixos-rebuild switch --rollback";
-    snorr = "sudo nixos-rebuild switch --rollback";
+  programs.zsh = {
+    enableGlobalCompInit = false;
+    shellAliases = {
+      nor = "nixos-rebuild";
+      snor = "sudo nixos-rebuild";
+      nors = "nixos-rebuild switch";
+      snors = "sudo nixos-rebuild switch";
+      norb = "nixos-rebuild boot";
+      snorb = "sudo nixos-rebuild boot";
+      norr = "nixos-rebuild switch --rollback";
+      snorr = "sudo nixos-rebuild switch --rollback";
+    };
   };
 }