j conflicts resolve. dirty commit
This commit is contained in:
parent
aaf3968791
commit
4f2bf83ff9
@ -1,13 +1,15 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
# bln config file
|
# bln config file
|
||||||
{
|
{
|
||||||
imports =
|
imports = [
|
||||||
[ <stockholm/jeschli>
|
./hardware-configuration.nix
|
||||||
<stockholm/jeschli/2configs/virtualbox.nix>
|
<stockholm/jeschli>
|
||||||
<stockholm/jeschli/2configs/urxvt.nix>
|
<stockholm/jeschli/2configs/virtualbox.nix>
|
||||||
<stockholm/jeschli/2configs/emacs.nix>
|
<stockholm/jeschli/2configs/urxvt.nix>
|
||||||
./hardware-configuration.nix
|
<stockholm/jeschli/2configs/emacs.nix>
|
||||||
];
|
<stockholm/jeschli/2configs/xdg.nix>
|
||||||
|
<stockholm/jeschli/2configs/xserver>
|
||||||
|
];
|
||||||
|
|
||||||
boot.loader.systemd-boot.enable = true;
|
boot.loader.systemd-boot.enable = true;
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
boot.loader.efi.canTouchEfiVariables = true;
|
||||||
@ -91,18 +93,11 @@
|
|||||||
services.printing.drivers = [ pkgs.postscript-lexmark ];
|
services.printing.drivers = [ pkgs.postscript-lexmark ];
|
||||||
|
|
||||||
# Enable the X11 windowing system.
|
# Enable the X11 windowing system.
|
||||||
services.xserver.enable = true;
|
|
||||||
services.xserver.videoDrivers = [ "nvidia" ];
|
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 = {
|
users.extraUsers.jeschli = {
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
extraGroups = ["docker" "vboxusers"];
|
extraGroups = ["docker" "vboxusers" "audio"];
|
||||||
uid = 1000;
|
uid = 1000;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -30,4 +30,6 @@
|
|||||||
|
|
||||||
nix.maxJobs = lib.mkDefault 8;
|
nix.maxJobs = lib.mkDefault 8;
|
||||||
powerManagement.cpuFreqGovernor = "powersave";
|
powerManagement.cpuFreqGovernor = "powersave";
|
||||||
|
|
||||||
|
hardware.pulseaudio.enable = true;
|
||||||
}
|
}
|
||||||
|
@ -3,6 +3,10 @@
|
|||||||
with import <stockholm/lib>;
|
with import <stockholm/lib>;
|
||||||
|
|
||||||
pkgs.writeText "Xresources" /* xdefaults */ ''
|
pkgs.writeText "Xresources" /* xdefaults */ ''
|
||||||
|
Xcursor.theme: aero-large-drop
|
||||||
|
Xcursor.size: 128
|
||||||
|
Xft.dpi: 144
|
||||||
|
|
||||||
URxvt*cutchars: "\\`\"'&()*,;<=>?@[]^{|}‘’"
|
URxvt*cutchars: "\\`\"'&()*,;<=>?@[]^{|}‘’"
|
||||||
URxvt*eightBitInput: false
|
URxvt*eightBitInput: false
|
||||||
URxvt*font: -*-clean-*-*-*-*-*-*-*-*-*-*-iso10646-1
|
URxvt*font: -*-clean-*-*-*-*-*-*-*-*-*-*-iso10646-1
|
||||||
|
@ -43,6 +43,8 @@ in {
|
|||||||
enable = true;
|
enable = true;
|
||||||
display = 11;
|
display = 11;
|
||||||
tty = 11;
|
tty = 11;
|
||||||
|
|
||||||
|
dpi = 200;
|
||||||
|
|
||||||
synaptics = {
|
synaptics = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
Loading…
Reference in New Issue
Block a user