summaryrefslogtreecommitdiff
path: root/configuration.nix
diff options
context:
space:
mode:
authorAdrian Kummerlaender2018-09-23 12:27:40 +0200
committerAdrian Kummerlaender2018-09-23 12:27:40 +0200
commit34b73e34e2d6a280264421663c7bce326c68f897 (patch)
tree2a36319ac54965b38f74094673f5f4efcc37e413 /configuration.nix
parent325e80caaaaa202a71bc1111d3e19a92d99e7ada (diff)
downloadnixos_system-34b73e34e2d6a280264421663c7bce326c68f897.tar
nixos_system-34b73e34e2d6a280264421663c7bce326c68f897.tar.gz
nixos_system-34b73e34e2d6a280264421663c7bce326c68f897.tar.bz2
nixos_system-34b73e34e2d6a280264421663c7bce326c68f897.tar.lz
nixos_system-34b73e34e2d6a280264421663c7bce326c68f897.tar.xz
nixos_system-34b73e34e2d6a280264421663c7bce326c68f897.tar.zst
nixos_system-34b73e34e2d6a280264421663c7bce326c68f897.zip
Restructure host config, derivations
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