Move the public keys out of secrets
This commit is contained in:
parent
df1532ece0
commit
00ab80d1b8
14 changed files with 45 additions and 28 deletions
|
@ -5,7 +5,13 @@
|
|||
description = "Jimbo";
|
||||
hashedPassword = config.secrets.jimboAccPass;
|
||||
isNormalUser = true;
|
||||
openssh.authorizedKeys.keys = config.secrets.jimKeys;
|
||||
openssh.authorizedKeys.keys = [
|
||||
(builtins.readFile ../../../../../hosts/firefly/id_ed25519.pub)
|
||||
(builtins.readFile ../../../../../hosts/cyberspark/id_ed25519.pub)
|
||||
(builtins.readFile ../../../../../hosts/shuttleworth/id_ed25519.pub)
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJahAoF74BY6GCTsFkt1ADKaraFgJJozW1Y1aBTLK0j9 pixel9"
|
||||
];
|
||||
|
||||
extraGroups = [
|
||||
"wheel"
|
||||
"audio"
|
||||
|
|
|
@ -2,7 +2,24 @@
|
|||
{
|
||||
services = {
|
||||
# Configure greetd for "auto" login (single user only)
|
||||
greetd = {
|
||||
greetd = let
|
||||
startSway = pkgs.writeScript "startsway" ''
|
||||
if lspci -k | grep "Kernel driver in use: nvidia" &> /dev/null; then
|
||||
export LIBVA_DRIVER_NAME=nvidia
|
||||
export GBM_BACKEND=nvidia-drm
|
||||
export __GLX_VENDOR_LIBRARY_NAME=nvidia
|
||||
export WLR_NO_HARDWARE_CURSORS=1
|
||||
else
|
||||
:
|
||||
fi
|
||||
|
||||
export WLR_RENDERER=vulkan
|
||||
export XDG_CURRENT_DESKTOP=sway
|
||||
export QT_QPA_PLATFORM="wayland;xcb"
|
||||
|
||||
sway --unsupported-gpu
|
||||
'';
|
||||
in {
|
||||
enable = true;
|
||||
restart = true;
|
||||
settings = {
|
||||
|
@ -11,22 +28,7 @@
|
|||
switch = true;
|
||||
};
|
||||
default_session = {
|
||||
command = ''
|
||||
if lspci -k | grep "Kernel driver in use: nvidia" &> /dev/null; then
|
||||
export LIBVA_DRIVER_NAME=nvidia
|
||||
export GBM_BACKEND=nvidia-drm
|
||||
export __GLX_VENDOR_LIBRARY_NAME=nvidia
|
||||
export WLR_NO_HARDWARE_CURSORS=1
|
||||
else
|
||||
:
|
||||
fi
|
||||
|
||||
export WLR_RENDERER=vulkan
|
||||
export XDG_CURRENT_DESKTOP=sway
|
||||
export QT_QPA_PLATFORM="wayland;xcb"
|
||||
|
||||
sway --unsupported-gpu
|
||||
'';
|
||||
command = "${startSway}";
|
||||
user = "jimbo";
|
||||
};
|
||||
};
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
hardware.nvidia = {
|
||||
modesetting.enable = true;
|
||||
nvidiaSettings = false;
|
||||
package = config.boot.kernelPackages.nvidiaPackages.beta;
|
||||
package = config.boot.kernelPackages.nvidiaPackages.latest;
|
||||
open = false;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -10,8 +10,6 @@
|
|||
./servers/uberbeta
|
||||
];
|
||||
|
||||
nixpkgs.overlays = [ minecraft.overlay ];
|
||||
|
||||
services.minecraft-servers = {
|
||||
enable = true;
|
||||
eula = true;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue