update, patch nix, reformat

This commit is contained in:
Gerg-L 2024-02-14 19:20:35 -05:00
parent 15529d185d
commit 1dfe51881d
Signed by: gerg-l
SSH key fingerprint: SHA256:FPYDHIkvMocr4wdmZXpgpJjsb2Tw6rASs2ISPbOb0KI
9 changed files with 130 additions and 128 deletions

View file

@ -1,5 +1,5 @@
_:
{config, ... }:
#{ config, ... }:
{
# users.users = {
# ${config.services.gitea.user} = {

View file

@ -17,7 +17,7 @@ _:
adminpassFile = config.sops.secrets.nextcloud.path;
adminuser = "admin-root";
};
extraOptions = {
settings = {
overwriteprotocol = "https";
default_phone_region = "US";
};

View file

@ -9,12 +9,10 @@ _:
"gerg_ssl_key"
"gerg_ssl_cert"
]
(
_: {
owner = config.services.nginx.user;
inherit (config.services.nginx) group;
}
);
(_: {
owner = config.services.nginx.user;
inherit (config.services.nginx) group;
});
services.nginx = {
enable = true;

View file

@ -80,31 +80,29 @@ in
enable = true;
qemu = {
#don't hook evdev at vm start
package = pkgs.qemu_kvm.overrideAttrs (
old: {
patches = old.patches ++ [
(pkgs.writeText "qemu.diff" ''
diff --git a/ui/input-linux.c b/ui/input-linux.c
index e572a2e..a9d76ba 100644
--- a/ui/input-linux.c
+++ b/ui/input-linux.c
@@ -397,12 +397,6 @@ static void input_linux_complete(UserCreatable *uc, Error **errp)
}
package = pkgs.qemu_kvm.overrideAttrs (old: {
patches = old.patches ++ [
(pkgs.writeText "qemu.diff" ''
diff --git a/ui/input-linux.c b/ui/input-linux.c
index e572a2e..a9d76ba 100644
--- a/ui/input-linux.c
+++ b/ui/input-linux.c
@@ -397,12 +397,6 @@ static void input_linux_complete(UserCreatable *uc, Error **errp)
}
qemu_set_fd_handler(il->fd, input_linux_event, NULL, il);
- if (il->keycount) {
- /* delay grab until all keys are released */
- il->grab_request = true;
- } else {
- input_linux_toggle_grab(il);
- }
QTAILQ_INSERT_TAIL(&inputs, il, next);
il->initialized = true;
return;
'')
];
}
);
qemu_set_fd_handler(il->fd, input_linux_event, NULL, il);
- if (il->keycount) {
- /* delay grab until all keys are released */
- il->grab_request = true;
- } else {
- input_linux_toggle_grab(il);
- }
QTAILQ_INSERT_TAIL(&inputs, il, next);
il->initialized = true;
return;
'')
];
});
runAsRoot = true;
ovmf.enable = true;
verbatimConfig = ''