Improve bash handling

hosts/lambda.nix

@@ -16,19 +16,14 @@ in {
 
   hardware.bluetooth.enable = false;
 
-  imports = [
+  imports = [ ../defaults.nix ../hardware-configuration.nix ];
-    ../defaults.nix
-    ../hardware-configuration.nix
-  ];
 
   fudo.common = {
     profile = "server";
     site = "seattle";
   };
 
-  fudo.slynk = {
+  fudo.slynk = { enable = true; };
-    enable = true;
-  };
 
   networking = {
     hostName = hostname;
@@ -56,8 +51,7 @@ in {
       extif0 = {
         useDHCP = false;
         macAddress = "02:50:f6:52:9f:9d";
-        ipv4.addresses = [
+        ipv4.addresses = [{
-          {
           address = host-internal-ip;
           prefixLength = 22;
         }
@@ -71,22 +65,17 @@ in {
       storageif0 = {
         useDHCP = false;
         macAddress = "02:65:d7:00:7d:1b";
-        ipv4.addresses = [
+        ipv4.addresses = [{
-          {
           address = host-storage-ip;
           prefixLength = 24;
-          }
+        }];
-        ];
       };
     };
   };
 
-  services = {
+  fudo.ipfs = {
-    ipfs = {
     enable = true;
-      apiAddress = "/ip4/${host-internal-ip}/tcp/5001";
+    users = [ "niten" ];
-      autoMount = true;
+    api-address = "/ip4/${host-internal-ip}/tcp/5001";
-      enableGC = true;
-    };
   };
 }

users/niten.nix

@@ -6,12 +6,34 @@ let
 
 in {
   programs = {
+    bash = {
+      enable = true;
+      shellAliases = {
+        ".." = "cd ..";
+        "..." = "cd ../..";
+        la = "ls -a";
+        ll = "ls -l";
+        lla = "ls -la";
+        rm = "rm --one-file-system --preserve-root";
+      };
+
+      extraInit = ''
+        case $TERM in
+          screen|xterm*|rxvt*)
+            shopt -s checkwinsize
+          ;;
+          *)
+            export LS_OPTIONS=""
+          ;;
+        esac
+      '';
+    };
+
     git = {
       enable = true;
       userName = name;
       userEmail = email;
     };
-
   };
 
   xresources.properties = {
@@ -51,5 +73,13 @@ in {
         '';
       };
     };
+
+    sessionVariables = {
+      EDITOR = "emacsclient -t";
+      ALTERNATE_EDITOR = "";
+
+      # Don't put duplicates or whitespace in bash history
+      HISTCONTROL = "ignoredups:ignorespace";
+    };
   };
 }