From b5205852ac22047e081535f45d0689b16aba641f Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Sat, 21 Apr 2018 19:38:27 +0200
Subject: Show nix-shell presence in fish, add ls alias

---
 conf/fish.nix     |  4 ++++
 configuration.nix | 16 +++++++++++-----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/conf/fish.nix b/conf/fish.nix
index 8684595..75af413 100644
--- a/conf/fish.nix
+++ b/conf/fish.nix
@@ -43,6 +43,10 @@
 
         echo -n -s 'λ ' "$__fish_prompt_cwd" (prompt_pwd) "$__fish_prompt_normal"
 
+        if test $IN_NIX_SHELL
+          echo -n -s ' (nix-shell)'
+        end
+
         if test $last_status -gt 0
           set_color $fish_color_cwd_root
           echo -n -s ' ● '
diff --git a/configuration.nix b/configuration.nix
index 1677d38..6c443ac 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -71,9 +71,15 @@
     shell        = pkgs.fish;
   };
 
-  environment.systemPackages = let
-    custom_vim = import ./pkgs/vim/vim.nix pkgs;
-  in with pkgs; [
-    ntfs3g htop fish custom_vim
-  ];
+  environment = {
+    systemPackages = let
+      custom_vim = import ./pkgs/vim/vim.nix pkgs;
+    in with pkgs; [
+      ntfs3g htop fish custom_vim
+    ];
+
+    shellAliases = {
+      "ls" = "ls --color --group-directories-first";
+    };
+  };
 }
-- 
cgit v1.2.3