Merge branches 'fix-akkoma', 'add-twinkle', 'fix-peertube-nodejs' and 'more-colors'
This commit is contained in:
commit
4a34778dd5
6 changed files with 9 additions and 10 deletions
|
@ -156,4 +156,5 @@
|
||||||
services.tailscale.useRoutingFeatures = "client";
|
services.tailscale.useRoutingFeatures = "client";
|
||||||
home-manager.users.darkkirb._module.args.withNSFW = lib.mkForce true;
|
home-manager.users.darkkirb._module.args.withNSFW = lib.mkForce true;
|
||||||
system.autoUpgrade.allowReboot = true;
|
system.autoUpgrade.allowReboot = true;
|
||||||
|
networking.extra-hosts = "192.168.2.1 speedport.ip";
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,6 +3,6 @@
|
||||||
(element-desktop.override (_: {
|
(element-desktop.override (_: {
|
||||||
electron = pkgs.electron-bin;
|
electron = pkgs.electron-bin;
|
||||||
}))
|
}))
|
||||||
simplex-chat-desktop
|
twinkle
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -263,12 +263,12 @@ in {
|
||||||
cursor = color 15;
|
cursor = color 15;
|
||||||
selection_background = "#4f414c";
|
selection_background = "#4f414c";
|
||||||
color0 = color 0;
|
color0 = color 0;
|
||||||
color1 = color 9;
|
color1 = color 1;
|
||||||
color2 = color 10;
|
color2 = color 2;
|
||||||
color3 = color 11;
|
color3 = color 3;
|
||||||
color4 = color 12;
|
color4 = color 4;
|
||||||
color5 = color 13;
|
color5 = color 5;
|
||||||
color6 = color 14;
|
color6 = color 6;
|
||||||
color7 = color 7;
|
color7 = color 7;
|
||||||
color8 = color 8;
|
color8 = color 8;
|
||||||
color9 = color 9;
|
color9 = color 9;
|
||||||
|
|
|
@ -4,7 +4,6 @@ desktop: _: {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableAutosuggestions = true;
|
enableAutosuggestions = true;
|
||||||
enableCompletion = true;
|
enableCompletion = true;
|
||||||
syntaxHighlighting.enable = true;
|
|
||||||
enableVteIntegration = desktop;
|
enableVteIntegration = desktop;
|
||||||
autocd = true;
|
autocd = true;
|
||||||
loginExtra =
|
loginExtra =
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
database.createLocally = true;
|
database.createLocally = true;
|
||||||
redis.createLocally = true;
|
redis.createLocally = true;
|
||||||
};
|
};
|
||||||
systemd.services.peertube.path = with pkgs; lib.mkForce [bashInteractive ffmpeg_5 nodejs-16_x openssl yarn python3 coreutils systemd];
|
systemd.services.peertube.path = with pkgs; lib.mkForce [bashInteractive ffmpeg_5 nodejs-18_x openssl yarn python3 coreutils systemd];
|
||||||
services.caddy.virtualHosts."peertube.chir.rs" = {
|
services.caddy.virtualHosts."peertube.chir.rs" = {
|
||||||
useACMEHost = "chir.rs";
|
useACMEHost = "chir.rs";
|
||||||
logFormat = pkgs.lib.mkForce "";
|
logFormat = pkgs.lib.mkForce "";
|
||||||
|
|
|
@ -58,7 +58,6 @@ in
|
||||||
checkPhase = "";
|
checkPhase = "";
|
||||||
installCheckPhase = "";
|
installCheckPhase = "";
|
||||||
});
|
});
|
||||||
nodejs-16_x = prev.nodejs-18_x;
|
|
||||||
neomutt = prev.neomutt.overrideAttrs (super: {
|
neomutt = prev.neomutt.overrideAttrs (super: {
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
doInstallCheck = false;
|
doInstallCheck = false;
|
||||||
|
|
Loading…
Reference in a new issue