diff options
| author | Kjetil Orbekk <kjetil.orbekk@gmail.com> | 2020-02-12 21:32:59 -0500 |
|---|---|---|
| committer | Kjetil Orbekk <kjetil.orbekk@gmail.com> | 2020-02-12 21:32:59 -0500 |
| commit | aded33b30e09636e7db39ee414b7f8f231821489 (patch) | |
| tree | 65018e05c4529ccb738be2cae13e762ae22ca40d | |
| parent | 1a5977138eedf9605d03ddc0acaf1247764e77d9 (diff) | |
bunchafixes
| -rw-r--r-- | config/desktop.nix | 12 | ||||
| -rw-r--r-- | config/yubikey.nix | 16 | ||||
| -rw-r--r-- | machines/x220-aji.nix | 7 |
3 files changed, 23 insertions, 12 deletions
diff --git a/config/desktop.nix b/config/desktop.nix index 92fb93d..3c0bc87 100644 --- a/config/desktop.nix +++ b/config/desktop.nix @@ -69,6 +69,10 @@ layout = "us"; xkbVariant = "dvorak"; + desktopManager.mate = { + enable = true; + }; + windowManager.xmonad = { enable = true; enableContribAndExtras = true; @@ -77,10 +81,10 @@ displayManager.gdm = { enable = true; - autoLogin = { - enable = true; - user = "orbekk"; - }; + # autoLogin = { + # enable = true; + # user = "orbekk"; + # }; }; synaptics = { diff --git a/config/yubikey.nix b/config/yubikey.nix index 4565306..5ff9e79 100644 --- a/config/yubikey.nix +++ b/config/yubikey.nix @@ -9,15 +9,15 @@ let yubikey-personalization gnupg pinentry - libu2f-host ]; in { - services.pcscd.enable = true; + services.pcscd.enable = lib.mkForce false; services.udev.packages = with pkgs; [ - # libu2f-host + libu2f-host yubikey-personalization ]; + systemd.services.pcscd.after = ["multi-user.target"]; programs.gnupg.agent = { enable = true; @@ -45,11 +45,11 @@ in environment = { systemPackages = yubikey-pkgs; - shellInit = '' - export GPG_TTY="$(tty)" - gpg-connect-agent /bye - export SSH_AUTH_SOCK="/run/user/$UID/gnupg/S.gpg-agent.ssh" - ''; + # shellInit = '' + # export GPG_TTY="$(tty)" + # gpg-connect-agent /bye + # export SSH_AUTH_SOCK="/run/user/$UID/gnupg/S.gpg-agent.ssh" + # ''; # Without this, the gpg-agent has no way to ask the user for a password # when invoked from ssh. diff --git a/machines/x220-aji.nix b/machines/x220-aji.nix index 84112ab..e45ef02 100644 --- a/machines/x220-aji.nix +++ b/machines/x220-aji.nix @@ -10,6 +10,12 @@ networking.firewall.allowedTCPPorts = [ 3000 ]; + services.thinkfan.enable = true; + services.thinkfan.sensors = '' + hwmon /sys/devices/platform/coretemp.0/hwmon/hwmon4/temp1_input + hwmon /sys/devices/platform/coretemp.0/hwmon/hwmon4/temp2_input + hwmon /sys/devices/platform/coretemp.0/hwmon/hwmon4/temp3_input + ''; services.openssh.enable = true; services.postgresql.package = lib.mkForce pkgs.postgresql_11; @@ -41,6 +47,7 @@ extraModprobeConfig = '' options i915 enable_rc6=1 + options thinkpad_acpi fan_control=1 ''; }; |