Merge remote-tracking branch 'origin/master'
Alan Pearce alan@alanpearce.eu
Mon, 11 Nov 2019 11:20:43 +0100
3 files changed, 28 insertions(+), 10 deletions(-)
M system/settings/programs/shell.nix → system/settings/programs/shell.nix
@@ -3,7 +3,6 @@ { programs.zsh = { enable = true; promptInit = ""; - enableGlobalCompInit = false; }; programs.bash.enableCompletion = true; }
M user/emacs/.emacs.d/init.el → user/emacs/.emacs.d/init.el
@@ -17,6 +17,22 @@ (require 'use-package) (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")
M user/settings/nixos.nix → user/settings/nixos.nix
@@ -6,14 +6,17 @@ ./nix.nix ./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"; + }; }; }