From 34b73e34e2d6a280264421663c7bce326c68f897 Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Sun, 23 Sep 2018 12:27:40 +0200
Subject: Restructure host config, derivations

---
 configuration.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'configuration.nix')

diff --git a/configuration.nix b/configuration.nix
index 82e83a6..fda8323 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -5,8 +5,9 @@
 
   imports = [
     ./host/current.nix
-    ./conf/common.nix
-    ./conf/fish.nix
+    ./host/software/vim.nix
+    ./host/software/fish.nix
+    ./user/common.nix
   ];
 
   i18n = {
@@ -33,10 +34,8 @@
   };
 
   environment = {
-    systemPackages = let
-      custom_vim  = import ./pkgs/vim/vim.nix pkgs;
-    in with pkgs; [
-      psmisc htop fish git silver-searcher custom_vim
+    systemPackages = with pkgs; [
+      psmisc htop git silver-searcher
     ];
 
     shellAliases = {
@@ -44,7 +43,6 @@
     };
 
     shellInit = ''
-      export TERM=xterm
       export LC_NUMERIC=de_DE.UTF8
       export LC_TIME=de_DE.UTF8
       export LC_MONETARY=de_DE.UTF8
-- 
cgit v1.2.3