makefu/stockholm
1
0
Fork 0
Code Issues Pull requests Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'ni/master'

Browse source
This commit is contained in:
lassulus 2017-06-27 15:17:13 +02:00
parent 10b6ac4026 74429f245d
commit 2f4557882d
7 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
tv/1systems/cd.nix
View file

@ -25,7 +25,6 @@ with import <stockholm/lib>;
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
htop
iftop iftop
iotop iotop
iptables iptables

1
tv/1systems/wu.nix
View file

@ -31,7 +31,6 @@ with import <stockholm/lib>;
get get
gnupg1compat gnupg1compat
haskellPackages.hledger haskellPackages.hledger
htop
jq jq
mkpasswd mkpasswd
netcat netcat

1
tv/1systems/xu.nix
View file

@ -34,7 +34,6 @@ with import <stockholm/lib>;
file file
gnupg1compat gnupg1compat
haskellPackages.hledger haskellPackages.hledger
htop
jq jq
krebszones krebszones
mkpasswd mkpasswd

1
tv/1systems/zu.nix
View file

@ -36,7 +36,6 @@ with import <stockholm/lib>;
file file
gnupg1compat gnupg1compat
haskellPackages.hledger haskellPackages.hledger
htop
jq jq
mkpasswd mkpasswd
netcat netcat

3
tv/2configs/default.nix
View file

@ -158,9 +158,10 @@ with import <stockholm/lib>;
{ {
environment.systemPackages = [ environment.systemPackages = [
pkgs.get pkgs.get
pkgs.htop
pkgs.krebspaste pkgs.krebspaste
pkgs.ovh-zone
pkgs.nix-prefetch-scripts pkgs.nix-prefetch-scripts
pkgs.ovh-zone
pkgs.push pkgs.push
]; ];
} }

2
tv/2configs/htop.nix
View file

@ -7,7 +7,6 @@ with import <stockholm/lib>;
htop = pkgs.symlinkJoin { htop = pkgs.symlinkJoin {
name = "htop"; name = "htop";
paths = [ paths = [
super.htop
(pkgs.writeDashBin "htop" '' (pkgs.writeDashBin "htop" ''
export HTOPRC=${pkgs.writeText "htoprc" '' export HTOPRC=${pkgs.writeText "htoprc" ''
fields=0 48 17 18 38 39 40 2 46 47 49 1 fields=0 48 17 18 38 39 40 2 46 47 49 1
@ -37,6 +36,7 @@ with import <stockholm/lib>;
''} ''}
exec ${super.htop}/bin/htop "$@" exec ${super.htop}/bin/htop "$@"
'') '')
super.htop
]; ];
}; };
}; };

2
tv/2configs/vim.nix
View file

@ -300,7 +300,6 @@ let {
vim-wrapper = pkgs.symlinkJoin { vim-wrapper = pkgs.symlinkJoin {
name = "vim"; name = "vim";
paths = [ paths = [
pkgs.vim_configurable
(pkgs.writeDashBin "vim" '' (pkgs.writeDashBin "vim" ''
set -efu set -efu
(umask 0077; exec ${pkgs.coreutils}/bin/mkdir -p ${toString mkdirs}) (umask 0077; exec ${pkgs.coreutils}/bin/mkdir -p ${toString mkdirs})
@ -310,6 +309,7 @@ let {
# vim-orgmode needs Python, thus vim_configurable instead of just vim # vim-orgmode needs Python, thus vim_configurable instead of just vim
exec ${pkgs.vim_configurable}/bin/vim "$@" exec ${pkgs.vim_configurable}/bin/vim "$@"
'') '')
pkgs.vim_configurable
]; ];
}; };