j conflicts resolve. dirty commit

This commit is contained in:
jeschli 2018-05-04 16:51:08 +02:00
parent aaf3968791
commit 4f2bf83ff9
4 changed files with 18 additions and 15 deletions

View File

@ -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,18 +93,11 @@
services.printing.drivers = [ pkgs.postscript-lexmark ];
# Enable the X11 windowing system.
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;
users.extraUsers.jeschli = {
isNormalUser = true;
extraGroups = ["docker" "vboxusers"];
extraGroups = ["docker" "vboxusers" "audio"];
uid = 1000;
};

View File

@ -30,4 +30,6 @@
nix.maxJobs = lib.mkDefault 8;
powerManagement.cpuFreqGovernor = "powersave";
hardware.pulseaudio.enable = true;
}

View File

@ -3,6 +3,10 @@
with import <stockholm/lib>;
pkgs.writeText "Xresources" /* xdefaults */ ''
Xcursor.theme: aero-large-drop
Xcursor.size: 128
Xft.dpi: 144
URxvt*cutchars: "\\`\"'&()*,;<=>?@[]^{|}"
URxvt*eightBitInput: false
URxvt*font: -*-clean-*-*-*-*-*-*-*-*-*-*-iso10646-1

View File

@ -43,6 +43,8 @@ in {
enable = true;
display = 11;
tty = 11;
dpi = 200;
synaptics = {
enable = true;