diff options
| -rw-r--r-- | system/settings/programs/shell.nix | 1 | ||||
| -rw-r--r-- | user/emacs/.emacs.d/init.el | 16 | ||||
| -rw-r--r-- | user/settings/nixos.nix | 21 |
3 files changed, 28 insertions, 10 deletions
diff --git a/system/settings/programs/shell.nix b/system/settings/programs/shell.nix index 4dd65c4a..a8d4f56f 100644 --- a/system/settings/programs/shell.nix +++ b/system/settings/programs/shell.nix @@ -3,7 +3,6 @@ { programs.zsh = { enable = true; promptInit = ""; - enableGlobalCompInit = false; }; programs.bash.enableCompletion = true; } 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"; + }; }; } |