Desktop changes

This commit is contained in:
2024-09-12 18:43:03 +02:00
parent 5d25dcf186
commit 3b7198327e
10 changed files with 94 additions and 17 deletions

View File

@@ -0,0 +1,23 @@
{ pkgs, ... }:
{
virtualisation.oci-containers.containers = {
adguardhome = {
image = "docker.io/adguard/adguardhome";
autoStart = true;
ports = [
"192.168.100.107:53:53/udp"
"81:3000/tcp"
];
volumes = [
"workdir:/opt/adguardhome/work"
"confdir:/opt/adguardhome/conf"
];
};
};
networking.firewall = {
allowedTCPPorts = [ 81 53 ];
allowedUDPPorts = [ 53 ];
};
}

View File

@@ -0,0 +1,16 @@
{ pkgs, ... }:
pkgs.dockerTools.buildImage {
name = "caddy-custom";
tag = "latest";
fromImage = "docker.io/caddy";
fromImageName = null;
fromImageTag = "2.8.4-builder";
runAsRoot = ''
#!${pkgs.runtimeShell}
xcaddy build --with github.com/caddy-dns/cloudflare
'';
}

View File

@@ -35,6 +35,13 @@
"lxqt-policykit-agent"
];
env = lib.mkIf (config.host == "xv-desktop") [
"LIBVA_DRIVER_NAME,nvidia"
"XDG_SESSION_TYPE,wayland"
"GBM_BACKEND,nvidia-drm"
"__GLX_VENDOR_LIBRARY_NAME,nvidia"
];
"$mod" = "SUPER";
input = {
@@ -83,11 +90,11 @@
]
(lib.mkIf (config.host == "xv-desktop") [
"1, monitor:DP-2"
"2, monitor:DP-2"
"3, monitor:DP-2"
"4, monitor:DP-2"
"5, monitor:DP-2"
"1, monitor:DP-1"
"2, monitor:DP-1"
"3, monitor:DP-1"
"4, monitor:DP-1"
"5, monitor:DP-1"
"6, monitor:HDMI-A-1"
"7, monitor:HDMI-A-1"
"8, monitor:HDMI-A-1"

View File

@@ -35,6 +35,10 @@
"DP-10" = [ 1 2 3 4 ];
"DP-9" = [ 5 6 7 ];
"eDP-1" = [ 8 9 10 ];
})
(lib.mkIf (config.host == "xv-desktop") {
"DP-1" = [ 1 2 3 4 5 ];
"HDMI-A-1" = [ 6 7 8 9 10 ];
})];
"format-icons" = {
"default" = "";

View File

@@ -9,6 +9,8 @@
defaultNetwork.settings.dns_enabled = true;
};
virtualisation.oci-containers.backend = "podman";
environment.systemPackages = with pkgs; [
dive
podman-tui

View File

@@ -34,6 +34,13 @@
open = false;
nvidiaSettings = true;
package = config.boot.kernelPackages.nvidiaPackages.beta;
package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
version = "555.58.02";
sha256_64bit = "sha256-xctt4TPRlOJ6r5S54h5W6PT6/3Zy2R4ASNFPu8TSHKM=";
sha256_aarch64 = "sha256-xctt4TPRlOJ6r5S54h5W6PT6/3Zy2R4ASNFPu8TSHKM=";
openSha256 = "sha256-ZpuVZybW6CFN/gz9rx+UJvQ715FZnAOYfHn5jt5Z2C8=";
settingsSha256 = "sha256-ZpuVZybW6CFN/gz9rx+UJvQ715FZnAOYfHn5jt5Z2C8=";
persistencedSha256 = lib.fakeSha256;
};
};
}