Merge remote-tracking branch 'gum/20.03'

This commit is contained in:
lassulus 2020-04-22 16:44:20 +02:00
commit 96102f20cc
7 changed files with 13 additions and 12 deletions

View File

@ -301,6 +301,7 @@ let
default = mkDefault true; default = mkDefault true;
inherit (webcfg) basicAuth; inherit (webcfg) basicAuth;
root = optionalString rucfg.enable webdir; root = optionalString rucfg.enable webdir;
listen = [ { inherit (webcfg) addr port; } ];
locations = { locations = {
"/RPC2".extraConfig = '' "/RPC2".extraConfig = ''
@ -319,15 +320,7 @@ let
include ${pkgs.nginx}/conf/fastcgi.conf; include ${pkgs.nginx}/conf/fastcgi.conf;
''; } ''; }
); );
# workaround because upstream nginx api changed };
# TODO remove when nobody uses 17.03 anymore
} // (if hasAttr "port" (head options.services.nginx.virtualHosts.type.getSubModules).submodule.options then {
port = webcfg.port;
} else {
listen = [
{ inherit (webcfg) addr port; }
];
});
}; };
rutorrent-imp = { rutorrent-imp = {

View File

@ -85,4 +85,8 @@ with import <stockholm/lib>;
RuntimeMaxUse=128M RuntimeMaxUse=128M
''; '';
environment.pathsToLink = [ "/share" ]; environment.pathsToLink = [ "/share" ];
security.acme = {
email = "letsencrypt@syntax-fehler.de";
acceptTerms = true;
};
} }

View File

@ -10,7 +10,7 @@ in {
serviceConfig = { serviceConfig = {
SyslogIdentifier = "urxvtd"; SyslogIdentifier = "urxvtd";
ExecReload = "${pkgs.coreutils}/bin/echo NOP"; ExecReload = "${pkgs.coreutils}/bin/echo NOP";
ExecStart = "${pkgs.rxvt_unicode_with-plugins}/bin/urxvtd"; ExecStart = "${pkgs.rxvt_unicode-with-plugins}/bin/urxvtd";
Restart = "always"; Restart = "always";
RestartSec = "2s"; RestartSec = "2s";
StartLimitBurst = 0; StartLimitBurst = 0;

View File

@ -12,7 +12,7 @@
windowManager = lib.mkForce { windowManager = lib.mkForce {
awesome.enable = false; awesome.enable = false;
default = "none"; default = "xfce";
}; };
desktopManager.xfce = { desktopManager.xfce = {
extraSessionCommands = '' extraSessionCommands = ''

View File

@ -9,6 +9,7 @@
home-manager.users.makefu.home.packages = [ pkgs.bat ]; home-manager.users.makefu.home.packages = [ pkgs.bat ];
home-manager.users.makefu.programs.zsh.shellAliases = { home-manager.users.makefu.programs.zsh.shellAliases = {
cat = "bat --style=header,snip"; cat = "bat --style=header,snip";
mirage = "sxiv"; # only available when tools/extra-gui is in use
catn = "${pkgs.coreutils}/bin/cat"; catn = "${pkgs.coreutils}/bin/cat";
ncat = "${pkgs.coreutils}/bin/cat"; ncat = "${pkgs.coreutils}/bin/cat";
}; };

View File

@ -4,7 +4,7 @@
users.users.makefu.packages = with pkgs;[ users.users.makefu.packages = with pkgs;[
# media # media
gimp gimp
mirage # mirage - last time available in 19.09
inkscape inkscape
libreoffice libreoffice
# skype # skype

View File

@ -1,6 +1,9 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
nixpkgs.config.permittedInsecurePackages = [
"openssl-1.0.2u" # required for studio-link
];
users.users.makefu.packages = with pkgs; [ users.users.makefu.packages = with pkgs; [
obs-studio obs-studio
studio-link studio-link