Merge remote-tracking branch 'prism/master'
This commit is contained in:
commit
a8c7618699
@ -133,6 +133,7 @@ with config.krebs.lib;
|
||||
'';
|
||||
};
|
||||
};
|
||||
ssh.pubkey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDRyEogeejET/UlqYYzrla3W2xG771oLK8uTFsVlVQFes4/c++Pp3KryJ/+avb/FQGlUb5YTO2SViZyAPTyw3Anv/8wxryB6ExDcfiiPL9D4Kgk559Gc1C+8vJu3Se3zB9huefllhdwsVkeFrInyWRarH3LNSbBq1TH2Rw/T4wyDVILu/QFxyqECdNzi6sufQ/92rEi3oDqlMbS8f45nbVm9CJpdn7ATwLW1PoBrrYkGll3P7ggOmR45rgldTVCLq3rIrIooiOaOhY1Leq+/sBeDa7fVeRFxFaLGYb9KFjQ4x2kL+3dDv0r726wKhrMQX75g/+Hqkv2di4/AGETI71b";
|
||||
};
|
||||
cloudkrebs = {
|
||||
cores = 1;
|
||||
|
@ -32,7 +32,7 @@ with config.krebs.lib;
|
||||
nets = {
|
||||
retiolum = {
|
||||
addrs4 = ["10.243.0.84"];
|
||||
addrs6 = ["42:ff6b:5f0b:460d:2cee:4d05:73f7:5566/128"];
|
||||
addrs6 = ["42:ff6b:5f0b:460d:2cee:4d05:73f7:5566"];
|
||||
aliases = [
|
||||
"darth.retiolum"
|
||||
"darth.r"
|
||||
@ -383,7 +383,7 @@ TNs2RYfwDy/r6H/hDeB/BSngPouedEVcPwIDAQAB
|
||||
nets = {
|
||||
retiolum = {
|
||||
addrs4 = ["10.243.231.219"];
|
||||
addrs6 = ["42:f7bf:178d:4b68:1c1b:42e8:6b27:6a72/128"];
|
||||
addrs6 = ["42:f7bf:178d:4b68:1c1b:42e8:6b27:6a72"];
|
||||
aliases = [
|
||||
"nukular.r"
|
||||
];
|
||||
|
@ -33,7 +33,6 @@ in {
|
||||
|
||||
dmenu
|
||||
gitAndTools.qgit
|
||||
mpv
|
||||
much
|
||||
pavucontrol
|
||||
powertop
|
||||
@ -44,6 +43,9 @@ in {
|
||||
xsel
|
||||
zathura
|
||||
|
||||
mpv
|
||||
mpv-poll
|
||||
yt-next
|
||||
#window manager stuff
|
||||
#haskellPackages.xmobar
|
||||
#haskellPackages.yeganesh
|
||||
|
@ -45,24 +45,6 @@ let
|
||||
instanceid = mkOption {
|
||||
type = str;
|
||||
};
|
||||
ssl = mkOption {
|
||||
type = with types; submodule ({
|
||||
options = {
|
||||
enable = mkEnableOption "ssl";
|
||||
certificate = mkOption {
|
||||
type = str;
|
||||
};
|
||||
certificate_key = mkOption {
|
||||
type = str;
|
||||
};
|
||||
ciphers = mkOption {
|
||||
type = str;
|
||||
default = "AES128+EECDH:AES128+EDH";
|
||||
};
|
||||
};
|
||||
});
|
||||
default = {};
|
||||
};
|
||||
};
|
||||
}));
|
||||
default = {};
|
||||
@ -72,7 +54,7 @@ let
|
||||
group = config.services.nginx.group;
|
||||
|
||||
imp = {
|
||||
krebs.nginx.servers = flip mapAttrs cfg ( name: { domain, folder, ssl, ... }: {
|
||||
krebs.nginx.servers = flip mapAttrs cfg ( name: { domain, folder, ... }: {
|
||||
server-names = [
|
||||
"${domain}"
|
||||
"www.${domain}"
|
||||
@ -116,16 +98,7 @@ let
|
||||
|
||||
error_page 403 /core/templates/403.php;
|
||||
error_page 404 /core/templates/404.php;
|
||||
${if ssl.enable then ''
|
||||
ssl_certificate ${ssl.certificate};
|
||||
ssl_certificate_key ${ssl.certificate_key};
|
||||
'' else ""}
|
||||
'';
|
||||
listen = (if ssl.enable then
|
||||
[ "80" "443 ssl" ]
|
||||
else
|
||||
"80"
|
||||
);
|
||||
});
|
||||
services.phpfpm.poolConfigs = flip mapAttrs cfg (name: { domain, folder, ... }: ''
|
||||
listen = ${folder}/phpfpm.pool
|
||||
|
@ -42,10 +42,6 @@ let
|
||||
certificate_key = mkOption {
|
||||
type = str;
|
||||
};
|
||||
ciphers = mkOption {
|
||||
type = str;
|
||||
default = "AES128+EECDH:AES128+EDH";
|
||||
};
|
||||
};
|
||||
});
|
||||
default = {};
|
||||
@ -74,16 +70,7 @@ let
|
||||
deny all;
|
||||
'')
|
||||
];
|
||||
|
||||
listen = (if ssl.enable then
|
||||
[ "80" "443 ssl" ]
|
||||
else
|
||||
"80"
|
||||
);
|
||||
extraConfig = (if ssl.enable then ''
|
||||
ssl_certificate ${ssl.certificate};
|
||||
ssl_certificate_key ${ssl.certificate_key};
|
||||
'' else "");
|
||||
inherit ssl;
|
||||
|
||||
});
|
||||
};
|
||||
|
@ -8,8 +8,10 @@
|
||||
ublock = pkgs.callPackage ./firefoxPlugins/ublock.nix {};
|
||||
vimperator = pkgs.callPackage ./firefoxPlugins/vimperator.nix {};
|
||||
};
|
||||
mpv-poll = pkgs.callPackage ./mpv-poll/default.nix {};
|
||||
xmonad-lass =
|
||||
let src = pkgs.writeNixFromCabal "xmonad-lass.nix" ./xmonad-lass; in
|
||||
pkgs.haskellPackages.callPackage src {};
|
||||
yt-next = pkgs.callPackage ./yt-next/default.nix {};
|
||||
};
|
||||
}
|
||||
|
40
lass/5pkgs/mpv-poll/default.nix
Normal file
40
lass/5pkgs/mpv-poll/default.nix
Normal file
@ -0,0 +1,40 @@
|
||||
{ pkgs, ... }:
|
||||
|
||||
pkgs.writeScriptBin "mpv-poll" ''
|
||||
#! ${pkgs.bash}/bin/bash
|
||||
|
||||
pl=$1
|
||||
hist=''${HISTORY:-"./mpv_history"}
|
||||
mpv_options=''${MPV_OPTIONS:-""}
|
||||
|
||||
lastYT=""
|
||||
|
||||
play_video () {
|
||||
toPlay=$1
|
||||
echo $toPlay >> $hist
|
||||
mpv $mpv_options $toPlay
|
||||
}
|
||||
|
||||
if ! [ -e $hist ]; then
|
||||
touch $hist
|
||||
fi
|
||||
|
||||
while :
|
||||
do
|
||||
if [ -s $pl ]; then
|
||||
toPlay=$(head -1 $pl)
|
||||
sed -i '1d' $pl
|
||||
if $(echo $toPlay | grep -Eq 'https?://(www.)?youtube.com/watch'); then
|
||||
lastYT=$toPlay
|
||||
fi
|
||||
play_video $toPlay
|
||||
else
|
||||
if [ -n "$lastYT" ]; then
|
||||
next=$(yt-next $lastYT)
|
||||
lastYT=$next
|
||||
play_video $next
|
||||
fi
|
||||
sleep 1
|
||||
fi
|
||||
done
|
||||
''
|
13
lass/5pkgs/yt-next/default.nix
Normal file
13
lass/5pkgs/yt-next/default.nix
Normal file
@ -0,0 +1,13 @@
|
||||
{ pkgs, ... }:
|
||||
|
||||
pkgs.writeScriptBin "yt-next" ''
|
||||
#! ${pkgs.bash}/bin/bash
|
||||
|
||||
vid=$1
|
||||
num=''${NUM:-1}
|
||||
|
||||
curl -Ls $1 \
|
||||
| grep 'href="/watch?v=' \
|
||||
| head -n$num \
|
||||
| sed 's,.*href="\([^"]*\)".*,https://youtube.com\1,'
|
||||
''
|
Loading…
Reference in New Issue
Block a user