diff options
| author | makefu <github@syntax-fehler.de> | 2018-05-03 18:45:55 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2018-05-03 18:45:55 +0200 |
| commit | 8156ab92378422d36d0af55c8d4b3b5742f4305c (patch) | |
| tree | fcbcb08991681dcd24a88d7a9bac7f22840df575 /jeschli/1systems | |
| parent | 45377068c0bfbb009b7cbe41dbca97dd44c9c955 (diff) | |
| parent | 28d6704a0d617ca7d379b836ab9fdd4d6a0be868 (diff) | |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'jeschli/1systems')
| -rw-r--r-- | jeschli/1systems/bln/config.nix | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/jeschli/1systems/bln/config.nix b/jeschli/1systems/bln/config.nix index c9a7a34e2..531f753c5 100644 --- a/jeschli/1systems/bln/config.nix +++ b/jeschli/1systems/bln/config.nix @@ -1,13 +1,15 @@ { config, lib, pkgs, ... }: # bln config file { - imports = - [ <stockholm/jeschli> - <stockholm/jeschli/2configs/virtualbox.nix> - <stockholm/jeschli/2configs/urxvt.nix> - <stockholm/jeschli/2configs/emacs.nix> - ./hardware-configuration.nix - ]; + imports = [ + ./hardware-configuration.nix + <stockholm/jeschli> + <stockholm/jeschli/2configs/virtualbox.nix> + <stockholm/jeschli/2configs/urxvt.nix> + <stockholm/jeschli/2configs/emacs.nix> + <stockholm/jeschli/2configs/xdg.nix> + <stockholm/jeschli/2configs/xserver> + ]; boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; @@ -91,14 +93,14 @@ services.printing.drivers = [ pkgs.postscript-lexmark ]; # Enable the X11 windowing system. - services.xserver.enable = true; +# services.xserver.enable = true; services.xserver.videoDrivers = [ "nvidia" ]; - services.xserver.windowManager.xmonad.enable = true; - services.xserver.windowManager.xmonad.enableContribAndExtras = true; - services.xserver.displayManager.sddm.enable = true; - services.xserver.dpi = 100; - fonts.fontconfig.dpi = 100; +# services.xserver.windowManager.xmonad.enable = true; +# services.xserver.windowManager.xmonad.enableContribAndExtras = true; +# services.xserver.displayManager.sddm.enable = true; +# services.xserver.dpi = 100; +# fonts.fontconfig.dpi = 100; users.extraUsers.jeschli = { isNormalUser = true; |