mirrors/nix-darwin
1
0
Fork 0
mirror of https://github.com/LnL7/nix-darwin.git synced 2024-12-14 11:57:34 +00:00
Code Activity

add support for launchd nix-daemon service

Browse source
This commit is contained in:
Daiderd Jordan 2016-11-06 00:08:33 +01:00
parent cd49cc1ab3
commit 50081e675e
No known key found for this signature in database
GPG key ID: D02435D05B810C96
1 changed files with 34 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
config.nix
View file

@ -20,14 +20,15 @@ let
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
{ {
environment.systemPackages = environment.systemPackages =
[ pkgs.lnl.vim [ pkgs.lnl.zsh
pkgs.lnl.tmux
pkgs.lnl.vim
pkgs.curl pkgs.curl
pkgs.fzf pkgs.fzf
pkgs.gettext pkgs.gettext
pkgs.git pkgs.git
pkgs.jq pkgs.jq
pkgs.silver-searcher pkgs.silver-searcher
pkgs.tmux
pkgs.nix-repl pkgs.nix-repl
pkgs.nox pkgs.nox
@ -43,7 +44,7 @@ let
serviceConfig.ProcessType = "Background"; serviceConfig.ProcessType = "Background";
}; };
programs.tmux.loginShell = "${pkgs.zsh}/bin/zsh -l"; programs.tmux.loginShell = "${pkgs.lnl.zsh}/bin/zsh -l";
programs.tmux.enableSensible = true; programs.tmux.enableSensible = true;
programs.tmux.enableMouse = true; programs.tmux.enableMouse = true;
programs.tmux.enableVim = true; programs.tmux.enableVim = true;
@ -56,8 +57,8 @@ let
environment.shellAliases.l = "ls -lh"; environment.shellAliases.l = "ls -lh";
environment.shellAliases.ls = "ls -G"; environment.shellAliases.ls = "ls -G";
environment.shellAliases.tmux = "${pkgs.tmux}/bin/tmux"; environment.shellAliases.g = "git log --graph --oneline";
environment.shellAliases.zsh = "${pkgs.zsh}/bin/zsh"; environment.shellAliases.gd = "git diff --minimal -p";
environment.etc."tmux.conf".text = '' environment.etc."tmux.conf".text = ''
${config.programs.tmux.config} ${config.programs.tmux.config}
@ -90,8 +91,8 @@ let
case $1 in case $1 in
'build') nix-build --no-out-link '<nixpkgs>' -A nixdarwin.toplevel ;; 'build') nix-build --no-out-link '<nixpkgs>' -A nixdarwin.toplevel ;;
'repl') nix-repl "$HOME/.nixpkgs/config.nix" ;; 'repl') nix-repl "$HOME/.nixpkgs/config.nix" ;;
'shell') nix-shell '<nixpkgs>' -p nixdarwin.toplevel --run "${pkgs.zsh}/bin/zsh -l" ;; 'shell') nix-shell '<nixpkgs>' -p nixdarwin.toplevel --run "${pkgs.lnl.zsh}/bin/zsh -l" ;;
'switch') nix-env -f '<nixpkgs>' -iA nixdarwin.toplevel && nix-shell '<nixpkgs>' -A nixdarwin.toplevel --run 'sudo $out/activate' && exec ${pkgs.zsh}/bin/zsh -l ;; 'switch') nix-env -f '<nixpkgs>' -iA nixdarwin.toplevel && nix-shell '<nixpkgs>' -A nixdarwin.toplevel --run 'sudo $out/activate' && exec ${pkgs.lnl.zsh}/bin/zsh -l ;;
"") return 1 ;; "") return 1 ;;
esac esac
} }
@ -115,14 +116,6 @@ let
if [ -n "$__ETC_ZSHENV_SOURCED" ]; then return; fi if [ -n "$__ETC_ZSHENV_SOURCED" ]; then return; fi
export __ETC_ZSHENV_SOURCED=1 export __ETC_ZSHENV_SOURCED=1
# Read system-wide modifications.
if test -f /etc/zshenv.local; then
. /etc/zshenv.local
fi
export PATH=${config.environment.systemPath}''${PATH:+:$PATH}
typeset -U PATH
export NIX_PATH=nixpkgs=$HOME/.nix-defexpr/nixpkgs export NIX_PATH=nixpkgs=$HOME/.nix-defexpr/nixpkgs
# Set up secure multi-user builds: non-root users build through the # Set up secure multi-user builds: non-root users build through the
@ -131,6 +124,10 @@ let
export NIX_REMOTE=daemon export NIX_REMOTE=daemon
fi fi
# Read system-wide modifications.
if test -f /etc/zshenv.local; then
. /etc/zshenv.local
fi
''; '';
environment.etc."zshrc".text = '' environment.etc."zshrc".text = ''
@ -148,6 +145,9 @@ let
setopt HIST_IGNORE_DUPS SHARE_HISTORY HIST_FCNTL_LOCK setopt HIST_IGNORE_DUPS SHARE_HISTORY HIST_FCNTL_LOCK
export PATH=${config.environment.systemPath}''${PATH:+:$PATH}
typeset -U PATH
${config.system.build.setEnvironment} ${config.system.build.setEnvironment}
${config.system.build.setAliases} ${config.system.build.setAliases}
@ -166,6 +166,25 @@ in {
nixdarwin = eval.config.system.build; nixdarwin = eval.config.system.build;
lnl.zsh = pkgs.runCommand pkgs.zsh.name
{ buildInputs = [ pkgs.makeWrapper ]; }
''
source $stdenv/setup
mkdir -p $out/bin
makeWrapper "${pkgs.zsh}/bin/zsh" "$out/bin/zsh"
'';
lnl.tmux = pkgs.runCommand pkgs.tmux.name
{ buildInputs = [ pkgs.makeWrapper ]; }
''
source $stdenv/setup
mkdir -p $out/bin
makeWrapper "${pkgs.tmux}/bin/tmux" "$out/bin/tmux" \
--add-flags -f --add-flags "/run/current-system/etc/tmux.conf" \
'';
lnl.vim = pkgs.vim_configurable.customize { lnl.vim = pkgs.vim_configurable.customize {
name = "vim"; name = "vim";
vimrcConfig.customRC = '' vimrcConfig.customRC = ''