Mic92
/
stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into 20.03

This commit is contained in:
makefu 2020-04-22 00:36:07 +02:00
parent 49f06e6d91 c96504d9a0
commit 2b33dd262f
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225
12 changed files with 91 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
makefu/1systems/gum/config.nix
View File

@ -137,6 +137,7 @@ in {
<stockholm/makefu/2configs/deployment/owncloud.nix>
<stockholm/makefu/2configs/deployment/board.euer.krebsco.de.nix>
<stockholm/makefu/2configs/deployment/rss.euer.krebsco.de.nix>
<stockholm/makefu/2configs/deployment/feed.euer.krebsco.de>
<stockholm/makefu/2configs/deployment/boot-euer.nix>
<stockholm/makefu/2configs/deployment/gecloudpad>
<stockholm/makefu/2configs/deployment/docker/archiveteam-warrior.nix>

1
makefu/2configs/git/cgit-retiolum.nix
View File

@ -18,6 +18,7 @@ let
yacos-backend = {
cgit.desc = "Yet Another Check-Out System";
};
ebk-notify.cgit.desc = "Ebay Kleinanzeigen Notify";
};
krebs-repos = mapAttrs make-krebs-repo {

10
makefu/2configs/gui/base.nix
View File

@ -32,8 +32,11 @@ in
default = "awesome";
};
displayManager.auto.enable = true;
displayManager.auto.user = mainUser;
displayManager.lightdm = {
enable = true;
autoLogin.enable = true;
autoLogin.user = mainUser;
};
desktopManager.xterm.enable = false;
};
environment.systemPackages = [ pkgs.gnome3.defaultIconTheme ];
@ -43,10 +46,9 @@ in
i18n.consoleFont = "Lat2-Terminus16";
fonts = {
enableCoreFonts = true;
enableFontDir = true;
enableGhostscriptFonts = true;
fonts = [ pkgs.terminus_font ];
fonts = [ pkgs.terminus_font pkgs.corefonts ];
};
users.users.${mainUser} = {

4
makefu/2configs/ham/androidtv/adbshell.nix
View File

@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "adb_shell";
version = "0.0.8";
version = "0.1.1";
src = fetchPypi {
inherit pname version;
sha256 = "01f9jinhfyjldg9793gz2i7gcd9xyx0a62r7a5ijssklcnn2rwnm";
sha256 = "0a4mjrnw2lrhsakb1vjb5l6m3cr1ii7fibs7020nwv08cyx6pq6q";
};
propagatedBuildInputs = [

4
makefu/2configs/ham/androidtv/default.nix
View File

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "androidtv";
version = "0.0.34";
version = "0.0.38";
src = fetchPypi {
inherit pname version;
sha256 = "13078i2a9hglpv4ldycph5n5485np21vs6z2qn830hybmx8kfxsw";
sha256 = "0ri1fnc63zashc667w2mlpb0c7ri3x6wnhnf54klb89v73pdnb8k";
};
propagatedBuildInputs = [

6
makefu/2configs/ham/androidtv/purepythonadb.nix
View File

@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "pure-python-adb";
version = "0.2.3.dev0";
version = "0.2.2.dev0";
src = fetchPypi {
inherit pname version;
sha256 = "88e5a4578435197799aa368fb1a5d87fe43e02a888cb7e85c2ad66173b383c89";
sha256 = "1xigv6c8xyb4g852nr3smz0137rnp81jvlikza071y7rc6pdzwza";
};
meta = with lib; {
@ -18,4 +18,4 @@ buildPythonPackage rec {
license = licenses.mit;
# maintainers = [ maintainers. ];
};
}
}

3
makefu/2configs/ham/default.nix
View File

@ -50,6 +50,8 @@ in {
logger = {
default = "info";
};
rest_command = {}
// the_playlist.rest_command;
tts = [
{ platform = "google_translate";
language = "de";
@ -142,6 +144,7 @@ in {
++ (import ./automation/firetv_restart.nix)
++ kurzzeitwecker.automation
#++ flurlicht.automation
++ the_playlist.automation
++ zigbee.automation;
script =
{ }

57
makefu/2configs/ham/multi/the_playlist.nix
View File

@ -1,9 +1,66 @@
# Inputs:
# binary_sensor.playlist_button_good
# binary_sensor.playlist_button_bad
# outputs
# rest_command
# automation
# sensor
{
rest_command = {
good_song = {
url = "http://prism.r:8001/good";
method = "POST";
};
bad_song = {
url = "http://prism.r:8001/skip";
method = "POST";
};
};
automation = [
{
alias = "playlist song publish";
trigger = {
#platform = "event";
#event_data.entity_id = "sensor.the_playlist_song";
platform = "state";
entity_id = "sensor.the_playlist_song";
};
action = {
service = "mqtt.publish";
data = {
topic = "/ham/the_playlist/song";
payload_template = "{{ states.sensor.the_playlist_song.state }}";
};
};
}
{
alias = "playlist upvote on button";
trigger = {
platform = "state";
entity_id = "binary_sensor.playlist_button_good";
from = "off";
to = "on";
};
action.service = "rest_command.good_song";
}
{
alias = "playlist downvote on button";
trigger = {
platform = "state";
entity_id = "binary_sensor.playlist_button_bad";
from = "off";
to = "on";
};
action.service = "rest_command.bad_song";
}
];
sensor = [
{ platform = "rest";
name = "pl";
resource = "http://prism.r:8001/current";
scan_interval = 30;
value_template = "1";
json_attributes = [ "name" "filename" "youtube" ];
}
{ platform = "template";

2
makefu/2configs/home-manager/zsh.nix
View File

@ -8,7 +8,7 @@
{ # bat
home-manager.users.makefu.home.packages = [ pkgs.bat ];
home-manager.users.makefu.programs.zsh.shellAliases = {
cat = "bat";
cat = "bat --style=header,snip";
catn = "${pkgs.coreutils}/bin/cat";
ncat = "${pkgs.coreutils}/bin/cat";
};

4
makefu/2configs/nur.nix
View File

@ -1,8 +1,8 @@
{ pkgs, ... }:{
nixpkgs.config.packageOverrides = pkgs: {
nur = import (builtins.fetchTarball {
url = "https://github.com/nix-community/NUR/archive/7bfd0117b359d0f72d086ff7e1f0ba3aeaf8d91e.tar.gz";
sha256 = "0gb2np1r2m9kkz1s374gxdqrwhkzx48iircy00y6mjr7h14rhyxk";
url = "https://github.com/nix-community/NUR/archive/b7f7e072b3fa56aa0d86dfe3689cb13f0615bbbe.tar.gz";
sha256 = "0slxxg3r460aa1rc83j0rklmr0i1hyzfbjy0kn30fyh1l3lqb22m";
}
){
inherit pkgs;

12
makefu/2configs/share/omo.nix
View File

@ -42,6 +42,18 @@ in {
browseable = "yes";
"guest ok" = "yes";
};
anime = {
path = "/media/cryptX/anime";
"read only" = "yes";
browseable = "yes";
"guest ok" = "yes";
};
serien = {
path = "/media/cryptX/series";
"read only" = "yes";
browseable = "yes";
"guest ok" = "yes";
};
crypX-games = {
path = "/media/cryptX/games";
"read only" = "yes";

1
makefu/2configs/tools/dev.nix
View File

@ -21,6 +21,7 @@
brain
whatsupnix
nixpkgs-pytools
hydra-check
# git-related
git-preview
tig