diff options
Diffstat (limited to 'tv')
| -rw-r--r-- | tv/2configs/htop.nix | 67 | ||||
| -rw-r--r-- | tv/2configs/vim.nix | 27 |
2 files changed, 50 insertions, 44 deletions
diff --git a/tv/2configs/htop.nix b/tv/2configs/htop.nix index 409df2516..5d7e0272b 100644 --- a/tv/2configs/htop.nix +++ b/tv/2configs/htop.nix @@ -4,37 +4,40 @@ with import <stockholm/lib>; { nixpkgs.config.packageOverrides = super: { - htop = pkgs.concat "htop" [ - super.htop - (pkgs.writeDashBin "htop" '' - export HTOPRC=${pkgs.writeText "htoprc" '' - fields=0 48 17 18 38 39 40 2 46 47 49 1 - sort_key=46 - sort_direction=1 - hide_threads=0 - hide_kernel_threads=1 - hide_userland_threads=0 - shadow_other_users=1 - show_thread_names=1 - show_program_path=1 - highlight_base_name=1 - highlight_megabytes=1 - highlight_threads=1 - tree_view=1 - header_margin=1 - detailed_cpu_time=0 - cpu_count_from_zero=0 - update_process_names=0 - account_guest_in_cpu_meter=1 - color_scheme=0 - delay=15 - left_meters=LeftCPUs2 RightCPUs2 Memory Swap - left_meter_modes=1 1 1 1 - right_meters=Uptime Tasks LoadAverage Battery - right_meter_modes=2 2 2 2 - ''} - exec ${super.htop}/bin/htop "$@" - '') - ]; + htop = pkgs.symlinkJoin { + name = "htop"; + paths = [ + super.htop + (pkgs.writeDashBin "htop" '' + export HTOPRC=${pkgs.writeText "htoprc" '' + fields=0 48 17 18 38 39 40 2 46 47 49 1 + sort_key=46 + sort_direction=1 + hide_threads=0 + hide_kernel_threads=1 + hide_userland_threads=0 + shadow_other_users=1 + show_thread_names=1 + show_program_path=1 + highlight_base_name=1 + highlight_megabytes=1 + highlight_threads=1 + tree_view=1 + header_margin=1 + detailed_cpu_time=0 + cpu_count_from_zero=0 + update_process_names=0 + account_guest_in_cpu_meter=1 + color_scheme=0 + delay=15 + left_meters=LeftCPUs2 RightCPUs2 Memory Swap + left_meter_modes=1 1 1 1 + right_meters=Uptime Tasks LoadAverage Battery + right_meter_modes=2 2 2 2 + ''} + exec ${super.htop}/bin/htop "$@" + '') + ]; + }; }; } diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix index b534c3f42..93ed46dc8 100644 --- a/tv/2configs/vim.nix +++ b/tv/2configs/vim.nix @@ -297,18 +297,21 @@ let { alldirs = attrValues dirs ++ map dirOf (attrValues files); in unique (sort lessThan alldirs); - vim-wrapper = pkgs.concat "vim" [ - pkgs.vim_configurable - (pkgs.writeDashBin "vim" '' - set -efu - (umask 0077; exec ${pkgs.coreutils}/bin/mkdir -p ${toString mkdirs}) - if test $# = 0 && test -e "$PWD/.ctrlpignore"; then - set -- +CtrlP - fi - # vim-orgmode needs Python, thus vim_configurable instead of just vim - exec ${pkgs.vim_configurable}/bin/vim "$@" - '') - ]; + vim-wrapper = pkgs.symlinkJoin { + name = "vim"; + paths = [ + pkgs.vim_configurable + (pkgs.writeDashBin "vim" '' + set -efu + (umask 0077; exec ${pkgs.coreutils}/bin/mkdir -p ${toString mkdirs}) + if test $# = 0 && test -e "$PWD/.ctrlpignore"; then + set -- +CtrlP + fi + # vim-orgmode needs Python, thus vim_configurable instead of just vim + exec ${pkgs.vim_configurable}/bin/vim "$@" + '') + ]; + }; vimrc = pkgs.writeText "vimrc" '' set nocompatible |