summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--host/athena.nix12
-rw-r--r--host/software/desktop/default.nix18
-rw-r--r--user/common.nix2
3 files changed, 17 insertions, 15 deletions
diff --git a/host/athena.nix b/host/athena.nix
index 2c58a51..7124ebc 100644
--- a/host/athena.nix
+++ b/host/athena.nix
@@ -54,12 +54,12 @@
xserver = {
videoDrivers = [ "nvidia" ];
+ };
- libinput = {
- enable = true;
- touchpad = {
- accelSpeed = "2.0";
- };
+ libinput = {
+ enable = true;
+ touchpad = {
+ accelSpeed = "2.0";
};
};
@@ -70,7 +70,7 @@
avahi = {
enable = true;
- nssmdns = true;
+ nssmdns4 = true;
};
};
diff --git a/host/software/desktop/default.nix b/host/software/desktop/default.nix
index da15c8f..d557f5a 100644
--- a/host/software/desktop/default.nix
+++ b/host/software/desktop/default.nix
@@ -29,14 +29,16 @@
xserver = {
enable = true;
- layout = "de";
- xkbOptions = "caps:escape";
-
- displayManager = {
- autoLogin = {
- enable = true;
- user = "common";
- };
+ xkb = {
+ options = "caps:escape";
+ layout = "de";
+ };
+ };
+
+ displayManager = {
+ autoLogin = {
+ enable = true;
+ user = "common";
};
};
diff --git a/user/common.nix b/user/common.nix
index 6a2af52..727eb0f 100644
--- a/user/common.nix
+++ b/user/common.nix
@@ -14,7 +14,7 @@
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC+Nfzp2M4QaTyWa8H1T3YvajH57pMJfzvDO2Meyu3fZAXNVfBCTVG1Bf/bFd81Htj4L750ORUhivgWFW/1DZKNYpqD4wDWVPg+WAGlIA28+QWoUaKnZV9u/6YKOrF801HMKbkusoaEJrnzwo4ktxgeXuDKEoly5IQ80wtd4ItE83wCMBIdUdKXaypDhbyNGMIJYC7V9qNWOhoYWKrF/fo9IIQYVU+RexYClPgqXChEMa9gKC48yJ+ExaEwFlortR3H+tfcG4Os19YKmTTlbMn/DIHcF3j9G/G73sycPomVESgRhEYIPAHHGV9TKFLjDWrendrhxtIcjWUtUomMZo4f31Fdgo9qKWd5AyIcqn2lNz4gKcXplZjsTrhl8wMcywrsOD3OEhP3/wmz/0ad48OHafW0eETHjLgNu3LbhrmihXf2rjgQiQESbJ75hUzS2J5R/3ub8+QdHY94XCwAFdp/+x/X3gdsQoQ2k1uEp6i/7ESTgSFfIyyRlwRS62C13aE= common@athena"
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC4usSgXZDPbPij4ZzLxWgMKveHhXMZAabQw2eAQCVIvj7oNEpuH5rn4qmMmfuNrbfzjZHnd2JKIDnS4RSNI3sX52xgp7dZ9L3rxce3lc18o32oIP21uVPGr7tFI1jVYrcVVzWBel+IKm9AijAV9TFGyWu0Rvm/CO9F2h0+5GlPclusjdj9mk+WovRGlfVZ0MYGKOUenIeW9a21N1PCgRZhCQ0pm5XmY/RK4i79BStWCtcpfcGCMwagGd8FMU/yqUGobxRevZ3E45SSZCL+LCvqTZNWkDMWiPTkKtVHh2W09ivMSpTne5s2UfmP6wUYQQ1NFAgEke9Fufh3qvf9OQqwee2Ko9NaixRb7jtqsyZmhUPHSEINKQT11smBNzvXNYODw4hA4PdzonqOtAQnCNUwJ7fAmqMZUehWjejMIJ0aL9keWO7cUWS7aVEYjav39rbmm1CCfJ0iTmsZmB3wUuVt9Y26SNwtiGSYxjbDqvD6LKnzzm/7ZwTZUa5FNda1kqs= common@idefix"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFO25gUXqx6hP9Qy3mK9s0q/JdgYynJkgkdZfcOe6HBp common@atlas"
- "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAZ4akvjDRJ/3ab+3rXaT5FNJ45kmSjA14MS607dezyE common@mobiltelefon"
+ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGWLPkBst9lFfWjTyA8sF73PtYgxpXwi82vlOMpXBu1V common@mobiltelefon"
];
};
}