diff options
author | lassulus <lass@aidsballs.de> | 2015-11-01 20:01:53 +0100 |
---|---|---|
committer | lassulus <lass@aidsballs.de> | 2015-11-01 20:01:53 +0100 |
commit | 0c71d4261973ce5c68a08d75c18a1f9a4dadecc9 (patch) | |
tree | bbd813eb02323202b2632efb7396a055c73e922b /tv/2configs/base.nix | |
parent | 0ffbcc4c316c56b6b2c7b65a5d7d05dbb7cc9e75 (diff) | |
parent | d2ac2e0d0080e1b76d1d6249ab52231b72ae8ea9 (diff) |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'tv/2configs/base.nix')
-rw-r--r-- | tv/2configs/base.nix | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/tv/2configs/base.nix b/tv/2configs/base.nix index 0a8dbdcc..41159690 100644 --- a/tv/2configs/base.nix +++ b/tv/2configs/base.nix @@ -3,17 +3,13 @@ with builtins; with lib; -let - # "7.4.335" -> "74" - majmin = x: concatStrings (take 2 (splitString "." x)); -in - { krebs.enable = true; networking.hostName = config.krebs.build.host.name; imports = [ + ./vim.nix { # stockholm dependencies environment.systemPackages = with pkgs; [ @@ -107,10 +103,8 @@ in lAtr = "ls -lAtr"; # alias ll='ls -l' ls = "ls -h --color=auto --group-directories-first"; - # alias vim='vim -p' - # alias vi='vim' - # alias view='vim -R' dmesg = "dmesg -L --reltime"; + view = "vim -R"; }; programs.bash = { @@ -153,10 +147,6 @@ in } { - nixpkgs.config.packageOverrides = pkgs: { - nano = pkgs.vim; - }; - services.cron.enable = false; services.nscd.enable = false; services.ntp.enable = false; |