Update nixos config

PierreR · Sep 12, 2016 · 642156d · 642156d
1 parent 7a863db
commit 642156d
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 18 deletions.
diff --git a/.fehbg b/.fehbg
diff --git a/etc/nixos/configuration.nix b/etc/nixos/configuration.nix
@@ -11,6 +11,7 @@
       ./hardware-configuration.nix
     ];
 
+  boot.loader.timeout = 2;
   # Use the GRUB 2 boot loader.
   boot.loader.grub.enable = true;
   boot.loader.grub.version = 2;
@@ -136,19 +137,53 @@
     uid = 1000;
   };
 
+  security.sudo.wheelNeedsPassword = false;
+
+  virtualisation.docker.enable = true;
+  virtualisation.docker.extraOptions = "--insecure-registry docker.cirb.lan --insecure-registry docker.sandbox.srv.cirb.lan";
+  virtualisation.virtualbox.guest.enable = true;
+
+  fileSystems."/vbox/shared" = {
+     fsType = "vboxsf";
+     device = "shared";
+     options = [ "rw" ];
+  };
+
+  fileSystems."/vbox/notebook" = {
+     fsType = "vboxsf";
+     device = "notebook";
+     options = [ "rw" ];
+  };
+
   programs.bash.enableCompletion = true;
   programs.bash.shellAliases = {
     du = " du -h" ;
     df = " df -h" ;
+    ls = " ls --color=tty";
     la = " ls -lah" ;
     ag = "ag --color-line-number=2" ;
     vim = "nvim" ;
     build = "./build/build.sh" ;
     see = "./bin/check_role.sh" ;
   };
+  programs.bash.interactiveShellInit = ''
+    shopt -s autocd
+    shopt -s histappend
+
+    function presources () {
+        puppetresources -p . -o $1 --hiera ./tests/hiera.yaml --pdbfile tests/facts.yaml ''${@:2}
+    }
+
+    export HISTCONTROL=ignoreboth
+
+    #. $(autojump-share)/autojump.bash
+  '';
   programs.bash.shellInit = ''
     shopt -s autocd
 
+    function sshi () {
+    	ssh -A -i ~/.ssh/alhazen_rsa alhazen@$1
+    }
     function presources () {
         puppetresources -p . -o "$1" --hiera ./tests/hiera.yaml --pdbfile tests/facts.yaml ''${@:2}
     }
@@ -166,23 +201,6 @@
       fi
     fi
   '';
-  security.sudo.wheelNeedsPassword = false;
-
-  virtualisation.docker.enable = true;
-  virtualisation.docker.extraOptions = "--insecure-registry docker.cirb.lan --insecure-registry docker.sandbox.srv.cirb.lan";
-  virtualisation.virtualbox.guest.enable = true;
-
-  fileSystems."/vbox/shared" = {
-     fsType = "vboxsf";
-     device = "shared";
-     options = [ "rw" ];
-  };
-
-  fileSystems."/vbox/notebook" = {
-     fsType = "vboxsf";
-     device = "notebook";
-     options = [ "rw" ];
-  };
 
   # The NixOS release to be compatible with for stateful data such as databases.
   system.stateVersion = "16.03";