diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2016-12-12 23:38:53 +0100 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2016-12-12 23:38:53 +0100 |
| commit | d24886a64849ca0a3b85a835ede37e75f3484058 (patch) | |
| tree | 03da581c94c9fc58c8bbcb8e6b54789521aa9514 /modules/examples | |
| parent | 2af32bbcfe1ac7dcecf40dfb7d7f8ca747308755 (diff) | |
add enable option for programs.tmux
Diffstat (limited to 'modules/examples')
| -rw-r--r-- | modules/examples/lnl.nix | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/modules/examples/lnl.nix b/modules/examples/lnl.nix index c8552ed..9301f0c 100644 --- a/modules/examples/lnl.nix +++ b/modules/examples/lnl.nix @@ -1,8 +1,7 @@ { config, lib, pkgs, ... }: { environment.systemPackages = - [ pkgs.lnl.zsh - pkgs.lnl.tmux + [ pkgs.lnl.tmux pkgs.lnl.vim pkgs.curl @@ -24,7 +23,8 @@ system.defaults.global.InitialKeyRepeat = 10; system.defaults.global.KeyRepeat = 1; - programs.tmux.loginShell = "${pkgs.lnl.zsh}/bin/zsh -l"; + programs.tmux.enable = true; + programs.tmux.loginShell = "${config.programs.zsh.shell} -l"; programs.tmux.enableSensible = true; programs.tmux.enableMouse = true; programs.tmux.enableFzf = true; @@ -38,7 +38,6 @@ ''; programs.zsh.enable = true; - programs.zsh.shell = "${pkgs.lnl.zsh}/bin/zsh"; programs.zsh.shellInit = '' export NIX_PATH=nixpkgs=$HOME/.nix-defexpr/nixpkgs:darwin=$HOME/.nix-defexpr/darwin:darwin-config=$HOME/.nixpkgs/darwin-config.nix:$HOME/.nix-defexpr/channels_root @@ -121,15 +120,6 @@ nixpkgs.config.allowUnfree = true; nixpkgs.config.packageOverrides = self: { - 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 ]; } '' |