summaryrefslogtreecommitdiff
path: root/configuration.nix
diff options
context:
space:
mode:
Diffstat (limited to 'configuration.nix')
-rw-r--r--configuration.nix12
1 files changed, 5 insertions, 7 deletions
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