summaryrefslogtreecommitdiffstats
path: root/tv/2configs/base.nix
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2015-11-05 11:10:14 +0100
committermakefu <github@syntax-fehler.de>2015-11-05 11:10:14 +0100
commit625cfe81a09e3d9d19311188d80387292962ac72 (patch)
tree25d1d0807715bbaec23862a21554f32e0417ce71 /tv/2configs/base.nix
parent8995bdd5fc7ea8ef54b4e30ceb50825ba23054ba (diff)
parent1ddbdddc696316986b07376a7fc5e33aaf228e89 (diff)
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'tv/2configs/base.nix')
-rw-r--r--tv/2configs/base.nix14
1 files changed, 2 insertions, 12 deletions
diff --git a/tv/2configs/base.nix b/tv/2configs/base.nix
index 0a8dbdcc2..41159690d 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;