all repos — nixfiles @ 5a179b4410a8b5c0e00f47c2b3798c8d9f62d8d1

System and user configuration, managed by nix and home-manager

Move darwin configuration to user

Alan Pearce
commit

5a179b4410a8b5c0e00f47c2b3798c8d9f62d8d1

parent

5d1e8a4c28b6f72b6e8d6f8df2794f2cce9bc75c

1 file changed, 0 insertions(+), 47 deletions(-)

changed files
M system/trillian.nixsystem/trillian.nix
@@ -21,16 +21,6 @@ "127.0.0.1"
]; }; - # List packages installed in system profile. To search by name, run: - # $ nix-env -qaP | grep wget - environment.systemPackages = with pkgs; - [ - mosh - aspell - aspellDicts.en - darwin-zsh-completions - ]; - # Use a custom configuration.nix location. # $ darwin-rebuild switch -I darwin-config=$HOME/.config/nixpkgs/darwin/configuration.nix # environment.darwinConfig = "$HOME/.config/nixpkgs/darwin/configuration.nix";
@@ -44,11 +34,6 @@ services.activate-system.enable = true;
# programs.nix-index.enable = true; - programs.vim = { - enable = true; - enableSensible = true; - }; - programs.zsh.enable = true; programs.zsh.enableBashCompletion = true;
@@ -68,38 +53,6 @@ };
nix.daemonNiceLevel = 10; nix.daemonIONice = true; - nixpkgs.overlays = [ - (self: super: { - darwin-zsh-completions = super.runCommandNoCC "darwin-zsh-completions-0.0.0" - { preferLocalBuild = true; } - '' - mkdir -p $out/share/zsh/site-functions - cat <<-'EOF' > $out/share/zsh/site-functions/_darwin-rebuild - #compdef darwin-rebuild - #autoload - _nix-common-options - local -a _1st_arguments - _1st_arguments=( - 'switch:Build, activate, and update the current generation'\ - 'build:Build without activating or updating the current generation'\ - 'check:Build and run the activation sanity checks'\ - 'changelog:Show most recent entries in the changelog'\ - ) - _arguments \ - '--list-generations[Print a list of all generations in the active profile]'\ - '--rollback[Roll back to the previous configuration]'\ - {--switch-generation,-G}'[Activate specified generation]'\ - '(--profile-name -p)'{--profile-name,-p}'[Profile to use to track current and previous system configurations]:Profile:_nix_profiles'\ - '1:: :->subcmds' && return 0 - case $state in - subcmds) - _describe -t commands 'darwin-rebuild subcommands' _1st_arguments - ;; - esac - EOF - ''; - }) - ]; # Used for backwards compatibility, please read the changelog before changing. # $ darwin-rebuild changelog system.stateVersion = 4;