From 0024a2ca7918be83ad812b02348cb49dd2ff2d57 Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Fri, 21 Sep 2018 17:49:51 +0200
Subject: Add basic automatix config

Extract desktop-specific settings that are shared by asterix and obelix into desktop role.
---
 configuration.nix | 53 +++++------------------------------------------------
 1 file changed, 5 insertions(+), 48 deletions(-)

(limited to 'configuration.nix')

diff --git a/configuration.nix b/configuration.nix
index 3a4be5b..fef5b26 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -5,20 +5,10 @@
 
   imports = [
     ./host/current.nix
+    ./conf/common.nix
     ./conf/fish.nix
   ];
 
-  fileSystems."/".options = [ "noatime" "nodiratime" "discard" ];
-
-  sound.enable = true;
-  hardware = {
-    opengl.driSupport32Bit = true;
-    pulseaudio = {
-      enable       = true;
-      support32Bit = true;
-    };
-  };
-
   i18n = {
     consoleKeyMap = "de";
     defaultLocale = "en_US.UTF-8";
@@ -36,49 +26,16 @@
     };
   };
 
-  services = {
-    openssh = {
-      enable = true;
-    };
-
-    journald = {
-      extraConfig = ''Storage=volatile'';
-    };
-
-    openvpn.servers = {
-      KIT = {
-        config = import ./conf/vpn/kit.ovpn.nix;
-        autoStart = false;
-      };
-    };
-
-    xserver = {
-      enable = true;
-      layout = "de";
-      xkbOptions = "caps:escape";
-
-      displayManager.slim = {
-        enable = true;
-        autoLogin = true;
-        defaultUser = "common";
-      };
-
-      desktopManager.default = "none";
-    };
-  };
-
-  users.extraUsers.common = {
-    isNormalUser = true;
-    uid          = 1000;
-    extraGroups  = [ "wheel" ];
-    shell        = pkgs.fish;
+  services.openssh = {
+    enable = true;
+    permitRootLogin = "no";
   };
 
   environment = {
     systemPackages = let
       custom_vim  = import ./pkgs/vim/vim.nix pkgs;
     in with pkgs; [
-      hdparm ntfs3g psmisc htop fish git silver-searcher custom_vim
+      psmisc htop fish git silver-searcher custom_vim
     ];
 
     shellAliases = {
-- 
cgit v1.2.3