steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

laptop: reconfigure & fix X11 services

Browse source
This commit is contained in:
steveej 2018-01-26 12:48:31 +01:00
parent 8330cfac00
commit 296d3f14d9
1 changed files with 27 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

36
nixos-configuration/steveej-laptop/system.nix
View file

@ -138,31 +138,35 @@ rec {
services.pcscd.enable = true; services.pcscd.enable = true;
services.xserver = { services.xserver = {
enable = true;
libinput.enable = true; libinput.enable = true;
libinput.naturalScrolling = true; libinput.naturalScrolling = true;
videoDrivers = [ "qxl" "modesetting" ]; videoDrivers = [ "qxl" "modesetting" ];
enable = true; xkbVariant = "altgr-intl";
layout = "us"; xkbOptions = "nodeadkeys,caps:swapescape";
windowManager.qtile.enable = true; windowManager.qtile.enable = true;
windowManager.default = "qtile"; windowManager.default = "qtile";
desktopManager = { desktopManager = {
gnome3.enable = true;
xterm.enable = true; xterm.enable = true;
gnome3.enable = false; plasma5.enable = false;
xfce.enable = true;
}; };
displayManager = { displayManager = {
sddm.enable = true; gdm.enable = true;
gdm.wayland = false;
# ${pkgs.xautolock}/bin/xautolock -time 10 -locker slimlock &
# ${pkgs.redshift}/bin/redshift-gtk -v -b 1.0:1.0 -l 47.6691:9.1698 -t 7000:4500 -m randr &
sessionCommands = '' sessionCommands = ''
xscreensaver -no-splash & ${pkgs.redshift}/bin/redshift-gtk -v -l 47.6691:9.1698 -t 7000:4500 -m randr &
${pkgs.networkmanagerapplet}/bin/nm-applet & ${pkgs.networkmanagerapplet}/bin/nm-applet &
$(sleep 2; xmodmap ~/.Xmodmap) & ${pkgs.xorg.xsetroot}/bin/xsetroot -solid darkblue &
${pkgs.autorandr}/bin/autorandr -l common &
''; '';
}; };
}; };
services.udev.packages = [ services.udev.packages = [
pkgs.libu2f-host pkgs.libu2f-host
pkgs.yubikey-personalization pkgs.yubikey-personalization
@ -172,15 +176,15 @@ rec {
ATTR{idVendor}=="05c6", ATTR{idProduct}=="6764", SYMLINK+="libmtp-%k", MODE="660", GROUP="audio", ENV{ID_MTP_DEVICE}="1", ENV{ID_MEDIA_PLAYER}="1", TAG+="uaccess" ATTR{idVendor}=="05c6", ATTR{idProduct}=="6764", SYMLINK+="libmtp-%k", MODE="660", GROUP="audio", ENV{ID_MTP_DEVICE}="1", ENV{ID_MEDIA_PLAYER}="1", TAG+="uaccess"
ATTR{idVendor}=="05c6", ATTR{idProduct}=="6765", SYMLINK+="libmtp-%k", MODE="660", GROUP="audio", ENV{ID_MTP_DEVICE}="1", ENV{ID_MEDIA_PLAYER}="1", TAG+="uaccess" ATTR{idVendor}=="05c6", ATTR{idProduct}=="6765", SYMLINK+="libmtp-%k", MODE="660", GROUP="audio", ENV{ID_MTP_DEVICE}="1", ENV{ID_MEDIA_PLAYER}="1", TAG+="uaccess"
'' ''
# + builtins.readFile (pkgs.fetchurl {
# url="https://raw.githubusercontent.com/Yubico/libu2f-host/master/70-u2f.rules";
# sha256="1vmvk6pybvw92y97xbf8gm08x54f4zhvjawmbc37f25g2x97kgrf";
# })
; ;
services.packagekit.enable = true;
services.resolved.enable = false; services.resolved.enable = false;
# hardware related services # hardware related services
services.illum.enable = true;
hardware = { hardware = {
bluetooth.enable = true; bluetooth.enable = true;
pulseaudio = { pulseaudio = {
@ -197,9 +201,17 @@ rec {
virtualbox.host.addNetworkInterface = true; virtualbox.host.addNetworkInterface = true;
}; };
# Activation scripts for impure set up of paths in /
system.activationScripts.bin = '' system.activationScripts.bin = ''
echo "setting up /bin..." echo "setting up /bin..."
ln -sfn ${pkgs.bash}/bin/bash /tmp/.binbash ln -sfn ${pkgs.bash}/bin/bash /tmp/.binbash
mv /tmp/.binbash /bin/bash mv /tmp/.binbash /bin/bash
''; '';
system.activationScripts.etcX11sessinos = ''
echo "setting up /etc/X11/sessions..."
mkdir -p /etc/X11
[[ ! -L /etc/X11/sessions ]] || rm /etc/X11/sessions
ln -sf ${config.services.xserver.displayManager.session.desktops} /etc/X11/sessions
'';
} }