Compare commits
No commits in common. "11d178c34d752d20adf10f95c4f5ed010890d681" and "bd0f0b2720d8b6a43e9fd37653c895d04f20ce40" have entirely different histories.
11d178c34d
...
bd0f0b2720
|
@ -92,5 +92,4 @@
|
||||||
rawMouse=yes
|
rawMouse=yes
|
||||||
escapeKey=KEY_RIGHTALT
|
escapeKey=KEY_RIGHTALT
|
||||||
'';
|
'';
|
||||||
programs.mpv.config.hwdec = lib.mkForce "vdpau";
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -417,14 +417,10 @@ in
|
||||||
''}";
|
''}";
|
||||||
});
|
});
|
||||||
startup = [
|
startup = [
|
||||||
/*{
|
{
|
||||||
always = true;
|
always = true;
|
||||||
command = pkgs.writeShellScript "dbus-upd.sh" ''
|
command = "${lib.getBin pkgs.dbus}/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; /run/current-system/sw/bin/systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP; /run/current-system/sw/bin/systemctl --user reset-failed && /run/current-system/sw/bin/systemctl --user start sway-session.target && ${pkgs.sway}/bin/swaymsg -mt subscribe '[]' || true && /run/current-system/sw/bin/systemctl --user stop sway-session.target";
|
||||||
${lib.getBin pkgs.dbus}/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE
|
}
|
||||||
/run/current-system/sw/bin/systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP
|
|
||||||
/run/current-system/sw/bin/systemctl --user reset-failed";
|
|
||||||
'';
|
|
||||||
}*/
|
|
||||||
{
|
{
|
||||||
command = "${pkgs.wl-clipboard}/bin/wl-paste -t text --watch ${pkgs.clipman}/bin/clipman store --no-persist";
|
command = "${pkgs.wl-clipboard}/bin/wl-paste -t text --watch ${pkgs.clipman}/bin/clipman store --no-persist";
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
let
|
let
|
||||||
uuids.enc = "e2abdea5-71dc-4a9e-aff3-242117342d60";
|
uuids.enc = "e2abdea5-71dc-4a9e-aff3-242117342d60";
|
||||||
uuids.boot = "9DA3-28AC";
|
uuids.boot = "9DA3-28AC";
|
||||||
uuids.root = "ac343ffb-407c-4966-87bf-a0ef1075e93d";
|
uuids.bch = "ac343ffb-407c-4966-87bf-a0ef1075e93d";
|
||||||
parts = builtins.mapAttrs (k: v: "/dev/disk/by-uuid/${v}") uuids;
|
parts = builtins.mapAttrs (k: v: "/dev/disk/by-uuid/${v}") uuids;
|
||||||
in
|
in
|
||||||
|
|
||||||
|
@ -32,14 +32,16 @@ in
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
boot.supportedFilesystems = [ "bcachefs" ];
|
||||||
|
|
||||||
fileSystems = let
|
fileSystems = let
|
||||||
neededForBoot = true;
|
neededForBoot = true;
|
||||||
in {
|
in {
|
||||||
"/" = { device = "none"; fsType = "tmpfs"; inherit neededForBoot;
|
"/" = { device = "none"; fsType = "tmpfs"; inherit neededForBoot;
|
||||||
options = [ "defaults" "size=2G" "mode=755" ]; };
|
options = [ "defaults" "size=2G" "mode=755" ]; };
|
||||||
"/persist" =
|
"/persist" =
|
||||||
{ device = parts.root; fsType = "btrfs"; inherit neededForBoot;
|
{ device = "UUID=${uuids.bch}"; fsType = "bcachefs"; inherit neededForBoot;
|
||||||
options = [ "discard=async" "compress=zstd:15" ]; };
|
options = [ "errors=ro" ]; };
|
||||||
"/boot" = { device = parts.boot; fsType = "vfat"; inherit neededForBoot; };
|
"/boot" = { device = parts.boot; fsType = "vfat"; inherit neededForBoot; };
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -119,28 +119,28 @@ in {
|
||||||
meta.license = lib.licenses.unfreeRedistributableFirmware;
|
meta.license = lib.licenses.unfreeRedistributableFirmware;
|
||||||
};
|
};
|
||||||
|
|
||||||
linux = pkgs.linux_testing.override {
|
linux = pkgs.linux_6_9.override {
|
||||||
# TODO: uncomment
|
# TODO: uncomment
|
||||||
# ignoreConfigErrors = false;
|
# ignoreConfigErrors = false;
|
||||||
kernelPatches = [
|
kernelPatches = [
|
||||||
{
|
|
||||||
name = "linux_6_11";
|
|
||||||
patch = pkgs.fetchpatch {
|
|
||||||
url = "https://github.com/chayleaf/linux-sdm845/compare/v6.11-rc2...7223c2b9c8917c0e315ee7ec53cee27cc1054b16.diff";
|
|
||||||
hash = "sha256-BxRBmB89wxXXD09FP6dZi1bsn7/fCihQRbnAUOJwEvc=";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
# {
|
# {
|
||||||
# name = "linux_6_9";
|
# name = "linux_6_11";
|
||||||
# patch = pkgs.fetchpatch {
|
# patch = pkgs.fetchpatch {
|
||||||
# url = "https://github.com/chayleaf/linux-sdm845/compare/v6.9.12...1ffe541f384cdfee347bf92773a740677de1b824.diff";
|
# url = "https://github.com/chayleaf/linux-sdm845/compare/v6.11-rc2...8914f1483d0784bf1133577f3c161a3f83a12653.diff";
|
||||||
# hash = "sha256-6TMiXaZy8YEB2vmrpXwAKklHYhvlA/TklCQv95iyMNY=";
|
# hash = "sha256-orBQDGHAXOAy1PVLwNIBk3FgiMslziW1xddQyIwbnCs=";
|
||||||
# };
|
# };
|
||||||
# }
|
# }
|
||||||
|
{
|
||||||
|
name = "linux_6_9";
|
||||||
|
patch = pkgs.fetchpatch {
|
||||||
|
url = "https://github.com/chayleaf/linux-sdm845/compare/v6.9.12...1ffe541f384cdfee347bf92773a740677de1b824.diff";
|
||||||
|
hash = "sha256-6TMiXaZy8YEB2vmrpXwAKklHYhvlA/TklCQv95iyMNY=";
|
||||||
|
};
|
||||||
|
}
|
||||||
{
|
{
|
||||||
name = "config_fixes";
|
name = "config_fixes";
|
||||||
# patch = ./config_fixes.patch;
|
patch = ./config_fixes.patch;
|
||||||
patch = ./config_fixes_611.patch;
|
# patch = ./config_fixes_611.patch;
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -152,8 +152,8 @@ in {
|
||||||
# fix build
|
# fix build
|
||||||
LENOVO_YOGA_C630_EC = no;
|
LENOVO_YOGA_C630_EC = no;
|
||||||
RPMSG_QCOM_GLINK_SMEM = yes;
|
RPMSG_QCOM_GLINK_SMEM = yes;
|
||||||
TOUCHSCREEN_STM_FTS_DOWNSTREAM = no;
|
# TOUCHSCREEN_STM_FTS_DOWNSTREAM = no;
|
||||||
TOUCHSCREEN_FTM4 = no;
|
# TOUCHSCREEN_FTM4 = no;
|
||||||
# for adb and stuff (doesn't have to be built-in, but it's easier that way)
|
# for adb and stuff (doesn't have to be built-in, but it's easier that way)
|
||||||
USB_FUNCTIONFS = yes;
|
USB_FUNCTIONFS = yes;
|
||||||
USB_LIBCOMPOSITE = yes;
|
USB_LIBCOMPOSITE = yes;
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
"phy-rockchip-naneng-combphy"
|
"phy-rockchip-naneng-combphy"
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_6_9;
|
boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_latest;
|
||||||
|
|
||||||
boot.kernelParams = [ "dtb=/${config.hardware.deviceTree.name}" ];
|
boot.kernelParams = [ "dtb=/${config.hardware.deviceTree.name}" ];
|
||||||
hardware.deviceTree.enable = true;
|
hardware.deviceTree.enable = true;
|
||||||
|
|
|
@ -40,7 +40,7 @@
|
||||||
"vm.swappiness" = 40;
|
"vm.swappiness" = 40;
|
||||||
};
|
};
|
||||||
# TODO: switch back to latest
|
# TODO: switch back to latest
|
||||||
kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
|
kernelPackages = lib.mkDefault pkgs.linuxPackages_testing;
|
||||||
/*kernelPackages = zenKernelPackages "6.1.9" "0fsmcjsawxr32fxhpp6sgwfwwj8kqymy0rc6vh4qli42fqmwdjgv";*/
|
/*kernelPackages = zenKernelPackages "6.1.9" "0fsmcjsawxr32fxhpp6sgwfwwj8kqymy0rc6vh4qli42fqmwdjgv";*/
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -143,7 +143,7 @@
|
||||||
|
|
||||||
programs.ccache.enable = true;
|
programs.ccache.enable = true;
|
||||||
services.sshd.enable = true;
|
services.sshd.enable = true;
|
||||||
boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
|
# boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
|
||||||
users.users.hydra-builder = {
|
users.users.hydra-builder = {
|
||||||
uid = 1001;
|
uid = 1001;
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
|
|
|
@ -42,7 +42,7 @@ in {
|
||||||
locations = {
|
locations = {
|
||||||
"= /.well-known/matrix/server".extraConfig = matrixServerConfigResponse;
|
"= /.well-known/matrix/server".extraConfig = matrixServerConfigResponse;
|
||||||
"= /.well-known/matrix/client".extraConfig = matrixClientConfigResponse;
|
"= /.well-known/matrix/client".extraConfig = matrixClientConfigResponse;
|
||||||
"~ ^/(_matrix(?!/maubot)|_synapse/client|$)".proxyPass = "http://${lib.quoteListenAddr matrixAddr}:${toString matrixPort}";
|
"~ ^/(_matrix|_synapse/client|$)".proxyPass = "http://${lib.quoteListenAddr matrixAddr}:${toString matrixPort}";
|
||||||
"~ ^/(client/|_matrix/client/unstable/org.matrix.msc3575/)".proxyPass = "http://${config.services.matrix-sliding-sync.settings.SYNCV3_BINDADDR}";
|
"~ ^/(client/|_matrix/client/unstable/org.matrix.msc3575/)".proxyPass = "http://${config.services.matrix-sliding-sync.settings.SYNCV3_BINDADDR}";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -78,7 +78,6 @@ in {
|
||||||
services.matrix-synapse = {
|
services.matrix-synapse = {
|
||||||
enable = true;
|
enable = true;
|
||||||
extraConfigFiles = [ "/var/lib/matrix-synapse/config.yaml" ];
|
extraConfigFiles = [ "/var/lib/matrix-synapse/config.yaml" ];
|
||||||
log.root.level = "WARNING";
|
|
||||||
settings = {
|
settings = {
|
||||||
app_service_config_files = [
|
app_service_config_files = [
|
||||||
"/var/lib/heisenbridge/registration.yml"
|
"/var/lib/heisenbridge/registration.yml"
|
||||||
|
|
|
@ -9,7 +9,7 @@ in {
|
||||||
services.nginx.virtualHosts."matrix.${cfg.domainName}".locations = let
|
services.nginx.virtualHosts."matrix.${cfg.domainName}".locations = let
|
||||||
inherit (config.services.maubot) settings;
|
inherit (config.services.maubot) settings;
|
||||||
in {
|
in {
|
||||||
"^~ /_matrix/maubot/" = {
|
"/_matrix/maubot/" = {
|
||||||
proxyPass = "http://${lib.quoteListenAddr settings.server.hostname}:${toString settings.server.port}";
|
proxyPass = "http://${lib.quoteListenAddr settings.server.hostname}:${toString settings.server.port}";
|
||||||
proxyWebsockets = true;
|
proxyWebsockets = true;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue