diff options
author | makefu <github@syntax-fehler.de> | 2017-12-08 13:33:48 +0100 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2017-12-08 13:33:48 +0100 |
commit | 3faa41106961e7a52e9400be23cdf10b64f4932c (patch) | |
tree | ccd6b4f1fea4b58484440da6f613ddbf55b3fe92 /lass/2configs/baseX.nix | |
parent | 04e6eeb7c8e2e3141293a84bc147265725208999 (diff) | |
parent | a9b72bd2901ca232eb7b6523c535c593a36521ef (diff) |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'lass/2configs/baseX.nix')
-rw-r--r-- | lass/2configs/baseX.nix | 40 |
1 files changed, 12 insertions, 28 deletions
diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix index 1638264d..32a9f66c 100644 --- a/lass/2configs/baseX.nix +++ b/lass/2configs/baseX.nix @@ -7,9 +7,9 @@ in { ./mpv.nix ./power-action.nix ./copyq.nix - ./xresources.nix ./livestream.nix ./dns-stuff.nix + ./urxvt.nix { hardware.pulseaudio = { enable = true; @@ -41,6 +41,11 @@ in { default = "-*-clean-*-*-*-*-*-*-*-*-*-*-iso10646-1"; }; }; + config.services.xresources.resources.X = '' + *.font: ${config.lass.fonts.regular} + *.boldFont: ${config.lass.fonts.bold} + *.italicFont: ${config.lass.fonts.italic} + ''; } ]; @@ -64,9 +69,11 @@ in { dic dmenu gi + git-preview gitAndTools.qgit - lm_sensors haskellPackages.hledger + lm_sensors + mpv-poll much ncdu nix-repl @@ -74,7 +81,7 @@ in { pavucontrol powertop push - rxvt_unicode + rxvt_unicode_with-plugins screengrab slock sxiv @@ -97,26 +104,8 @@ in { xlibs.fontschumachermisc ]; + lass.xserver.enable = true; services.xserver = { - enable = true; - - desktopManager.xterm.enable = false; - desktopManager.default = "none"; - displayManager.lightdm.enable = true; - displayManager.lightdm.autoLogin = { - enable = true; - user = "lass"; - }; - windowManager.default = "xmonad"; - windowManager.session = [{ - name = "xmonad"; - start = '' - ${pkgs.xorg.xhost}/bin/xhost +LOCAL: - ${pkgs.xmonad-lass}/bin/xmonad & - waitPID=$! - ''; - }]; - layout = "us"; xkbModel = "evdev"; xkbVariant = "altgr-intl"; @@ -127,12 +116,7 @@ in { HandleLidSwitch=ignore ''; - services.xserver.synaptics = { - enable = true; - twoFingerScroll = true; - accelFactor = "0.035"; - }; - services.urxvtd.enable = true; + services.xresources.enable = true; lass.screenlock.enable = true; } |