nyanloutre/nixos-config
1
1
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: nyanloutre:721e1be1f75c6fc71af31c8fedd82d4dda011bd4
Branches Tags
nyanloutre:master
..
compare: nyanloutre:ef246753b871c39d0a35ad5308e0bc4b0ee74d77
Branches Tags
nyanloutre:master

No commits in common. "721e1be1f75c6fc71af31c8fedd82d4dda011bd4" and "ef246753b871c39d0a35ad5308e0bc4b0ee74d77" have entirely different histories.
721e1be1f7 ... ef246753b8

3 changed files with 396 additions and 402 deletions
Show Stats Expand all files Collapse all files

12
flake.lock generated
View File

@ -75,11 +75,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1665613119, "lastModified": 1665132027,
"narHash": "sha256-VTutbv5YKeBGWou6ladtgfx11h6et+Wlkdyh4jPJ3p0=", "narHash": "sha256-zoHPqSQSENt96zTk6Mt1AP+dMNqQDshXKQ4I6MfjP80=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e06bd4b64bbfda91d74f13cb5eca89485d47528f", "rev": "9ecc270f02b09b2f6a76b98488554dd842797357",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -90,11 +90,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1665643254, "lastModified": 1665259268,
"narHash": "sha256-IBVWNJxGCsshwh62eRfR6+ry3bSXmulB3VQRzLQo3hk=", "narHash": "sha256-ONFhHBLv5nZKhwV/F2GOH16197PbvpyWhoO0AOyktkU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ba187fbdc5e35322c7dff556ef2c47bddfd6e8d7", "rev": "c5924154f000e6306030300592f4282949b2db6c",
"type": "github" "type": "github"
}, },
"original": { "original": {

651
systems/LoutreOS/services.nix
View File

@ -174,35 +174,31 @@ in
home-assistant = { home-assistant = {
enable = true; enable = true;
extraComponents = [
# Components required to complete the onboarding
"met"
"radio_browser"
];
config = { config = {
default_config = {};
homeassistant = { homeassistant = {
latitude = 48.60038; elevation = 143;
longitude = 7.74063;
elevation = 146;
}; };
meteo_france = null; influxdb = null;
#influxdb = null; config = null;
#config = null; dhcp = null;
#dhcp = null; frontend = null;
#frontend = null; history = null;
#history = null;
http = { http = {
use_x_forwarded_for = true; use_x_forwarded_for = true;
trusted_proxies = [ "127.0.0.1" ]; trusted_proxies = [ "127.0.0.1" ];
}; };
#logbook = null; logbook = null;
#map = null; map = null;
#mobile_app = null; mobile_app = null;
#person = null; person = null;
#script = null; script = null;
#sun = null; sun = null;
#system_health = null; system_health = null;
yeelight.devices = {
"10.40.249.0".name = "Chambre";
"10.40.249.1".name = "Bureau";
"10.40.249.2".name = "Cuisine";
};
zha = null; zha = null;
esphome = null; esphome = null;
light = [ light = [
@ -210,9 +206,8 @@ in
platform = "group"; platform = "group";
name = "Salon"; name = "Salon";
entities = [ entities = [
"light.ikea_of_sweden_tradfri_bulb_e27_cws_806lm_e69e6dfe_level_light_color_on_off" "light.bureau"
"light.ikea_of_sweden_tradfri_bulb_e27_cws_806lm_43c25efe_level_light_color_on_off" "light.cuisine"
"light.ikea_of_sweden_tradfri_bulb_e27_cws_806lm_3d0f76fe_level_light_color_on_off"
]; ];
} }
]; ];
@ -222,317 +217,317 @@ in
host = "10.30.0.1"; host = "10.30.0.1";
} }
]; ];
#tplink.switch = [ tplink.switch = [
# { host = "10.30.50.7"; } { host = "10.30.50.7"; }
#]; ];
#sensor = [ sensor = [
# { {
# platform = "template"; platform = "template";
# sensors = { sensors = {
# serveur_amps = { serveur_amps = {
# friendly_name_template = "{{ states.switch.serveur.name}} Current"; friendly_name_template = "{{ states.switch.serveur.name}} Current";
# value_template = ''{{ states.switch.serveur.attributes["current_a"] | float }}''; value_template = ''{{ states.switch.serveur.attributes["current_a"] | float }}'';
# unit_of_measurement = "A"; unit_of_measurement = "A";
# }; };
# serveur_watts = { serveur_watts = {
# friendly_name_template = "{{ states.switch.serveur.name}} Current Consumption"; friendly_name_template = "{{ states.switch.serveur.name}} Current Consumption";
# value_template = ''{{ states.switch.serveur.attributes["current_power_w"] | float }}''; value_template = ''{{ states.switch.serveur.attributes["current_power_w"] | float }}'';
# unit_of_measurement = "W"; unit_of_measurement = "W";
# }; };
# serveur_total_kwh = { serveur_total_kwh = {
# friendly_name_template = "{{ states.switch.serveur.name}} Total Consumption"; friendly_name_template = "{{ states.switch.serveur.name}} Total Consumption";
# value_template = ''{{ states.switch.serveur.attributes["total_energy_kwh"] | float }}''; value_template = ''{{ states.switch.serveur.attributes["total_energy_kwh"] | float }}'';
# unit_of_measurement = "kWh"; unit_of_measurement = "kWh";
# }; };
# serveur_volts = { serveur_volts = {
# friendly_name_template = "{{ states.switch.serveur.name}} Voltage"; friendly_name_template = "{{ states.switch.serveur.name}} Voltage";
# value_template = ''{{ states.switch.serveur.attributes["voltage"] | float }}''; value_template = ''{{ states.switch.serveur.attributes["voltage"] | float }}'';
# unit_of_measurement = "V"; unit_of_measurement = "V";
# }; };
# serveur_today_kwh = { serveur_today_kwh = {
# friendly_name_template = "{{ states.switch.serveur.name}} Today's Consumption"; friendly_name_template = "{{ states.switch.serveur.name}} Today's Consumption";
# value_template = ''{{ states.switch.serveur.attributes["today_energy_kwh"] | float }}''; value_template = ''{{ states.switch.serveur.attributes["today_energy_kwh"] | float }}'';
# unit_of_measurement = "kWh"; unit_of_measurement = "kWh";
# }; };
# }; };
# } }
#]; ];
#switch = [ switch = [
# { {
# platform = "wake_on_lan"; platform = "wake_on_lan";
# name = "PC Fixe"; name = "PC Fixe";
# mac = "b4:2e:99:ed:24:26"; mac = "b4:2e:99:ed:24:26";
# host = "10.30.135.71"; host = "10.30.135.71";
# broadcast_address = "10.30.255.255"; broadcast_address = "10.30.255.255";
# } }
#]; ];
#device_tracker = [ device_tracker = [
# { {
# platform = "ping"; platform = "ping";
# hosts = { telephone_paul = "10.30.50.2"; }; hosts = { telephone_paul = "10.30.50.2"; };
# } }
#]; ];
#scene = [ scene = [
# { {
# name = "Movie"; name = "Movie";
# icon = "mdi:movie-open"; icon = "mdi:movie-open";
# entities = { entities = {
# "light.salon" = { "light.salon" = {
# state = "on"; state = "on";
# xy_color = [0.299 0.115]; xy_color = [0.299 0.115];
# brightness = 50; brightness = 50;
# }; };
# "light.bande_led_tv" = { "light.bande_led_tv" = {
# state = "on"; state = "on";
# effect = "Movie"; effect = "Movie";
# brightness = 180; brightness = 180;
# }; };
# "light.bande_led_bureau" = { "light.bande_led_bureau" = {
# state = "on"; state = "on";
# xy_color = [0.299 0.115]; xy_color = [0.299 0.115];
# brightness = 130; brightness = 130;
# }; };
# }; };
# } }
# { {
# name = "Home"; name = "Home";
# icon = "mdi:home"; icon = "mdi:home";
# entities = { entities = {
# "light.salon" = { "light.salon" = {
# state = "on"; state = "on";
# kelvin = 2700; kelvin = 2700;
# brightness = 255; brightness = 255;
# }; };
# }; };
# } }
# { {
# name = "Night"; name = "Night";
# icon = "mdi:weather-night"; icon = "mdi:weather-night";
# entities = { entities = {
# "light.salon" = { "light.salon" = {
# state = "off"; state = "off";
# }; };
# "light.bande_led_tv" = { "light.bande_led_tv" = {
# state = "off"; state = "off";
# }; };
# "light.bande_led_bureau" = { "light.bande_led_bureau" = {
# state = "off"; state = "off";
# }; };
# "light.chambre" = { "light.chambre" = {
# state = "on"; state = "on";
# kelvin = 1900; kelvin = 1900;
# brightness = 50; brightness = 50;
# }; };
# }; };
# } }
#]; ];
#automation = let automation = let
# min_sun_elevation = 4; min_sun_elevation = 4;
# switch_chambre = { switch_chambre = {
# domain = "zha"; domain = "zha";
# platform = "device"; platform = "device";
# device_id = "3329ecdcad244e5e8fc0f4b96d52ffe1"; device_id = "3329ecdcad244e5e8fc0f4b96d52ffe1";
# }; };
# switch_entree = { switch_entree = {
# domain = "zha"; domain = "zha";
# platform = "device"; platform = "device";
# device_id = "7cd814190ec543dba76a7aa7e7996c41"; device_id = "7cd814190ec543dba76a7aa7e7996c41";
# }; };
# remote = { remote = {
# domain = "zha"; domain = "zha";
# platform = "device"; platform = "device";
# device_id = "d1230b76264e483388a8fdaad4f44143"; device_id = "d1230b76264e483388a8fdaad4f44143";
# }; };
#in [ in [
# # ENTREE # ENTREE
# { {
# alias = "Aziz lumière"; alias = "Aziz lumière";
# trigger = [ trigger = [
# { {
# platform = "numeric_state"; platform = "numeric_state";
# entity_id = "sun.sun"; entity_id = "sun.sun";
# value_template = "{{ state.attributes.elevation }}"; value_template = "{{ state.attributes.elevation }}";
# below = min_sun_elevation; below = min_sun_elevation;
# } }
# ]; ];
# condition = [ condition = [
# { {
# condition = "state"; condition = "state";
# entity_id = "person.paul"; entity_id = "person.paul";
# state = "home"; state = "home";
# } }
# # Sun below max elevation # Sun below max elevation
# { {
# condition = "template"; condition = "template";
# value_template = "{{ state_attr('sun.sun', 'elevation') < ${toString min_sun_elevation} }}"; value_template = "{{ state_attr('sun.sun', 'elevation') < ${toString min_sun_elevation} }}";
# } }
# ]; ];
# action = { action = {
# scene = "scene.home"; scene = "scene.home";
# }; };
# } }
# { {
# alias = "Aziz lumière switch"; alias = "Aziz lumière switch";
# trigger = { trigger = {
# type = "remote_button_short_press"; type = "remote_button_short_press";
# subtype = "turn_on"; subtype = "turn_on";
# } // switch_entree; } // switch_entree;
# action = { action = {
# scene = "scene.home"; scene = "scene.home";
# }; };
# } }
# { {
# alias = "Adios"; alias = "Adios";
# trigger = [ trigger = [
# { {
# platform = "state"; platform = "state";
# entity_id = "person.paul"; entity_id = "person.paul";
# to = "not_home"; to = "not_home";
# } }
# ({ ({
# type = "remote_button_short_press"; type = "remote_button_short_press";
# subtype = "turn_off"; subtype = "turn_off";
# } // switch_entree) } // switch_entree)
# ]; ];
# action = [ action = [
# { {
# service = "light.turn_off"; service = "light.turn_off";
# entity_id = "all"; entity_id = "all";
# } }
# { {
# service = "media_player.turn_off"; service = "media_player.turn_off";
# entity_id = "all"; entity_id = "all";
# } }
# ]; ];
# } }
# # REMOTE # REMOTE
# { {
# alias = "Button toggle"; alias = "Button toggle";
# trigger = { trigger = {
# type = "remote_button_short_press"; type = "remote_button_short_press";
# subtype = "turn_on"; subtype = "turn_on";
# } // remote; } // remote;
# action = { action = {
# choose = { choose = {
# conditions = { conditions = {
# condition = "template"; condition = "template";
# value_template = '' value_template = ''
# {% set domain = 'light' %} {% set domain = 'light' %}
# {% set state = 'off' %} {% set state = 'off' %}
# {{ states[domain] | count == states[domain] | selectattr('state','eq',state) | list | count }} {{ states[domain] | count == states[domain] | selectattr('state','eq',state) | list | count }}
# ''; '';
# }; };
# sequence = { sequence = {
# scene = "scene.home"; scene = "scene.home";
# }; };
# }; };
# default = { default = {
# service = "light.turn_off"; service = "light.turn_off";
# entity_id = "all"; entity_id = "all";
# }; };
# }; };
# } }
# { {
# alias = "Button scene movie"; alias = "Button scene movie";
# trigger = { trigger = {
# type = "remote_button_short_press"; type = "remote_button_short_press";
# subtype = "right"; subtype = "right";
# } // remote; } // remote;
# action = { action = {
# scene = "scene.movie"; scene = "scene.movie";
# }; };
# } }
# { {
# alias = "Button scene home"; alias = "Button scene home";
# trigger = { trigger = {
# type = "remote_button_short_press"; type = "remote_button_short_press";
# subtype = "left"; subtype = "left";
# } // remote; } // remote;
# action = { action = {
# scene = "scene.home"; scene = "scene.home";
# }; };
# } }
# { {
# alias = "Button light up"; alias = "Button light up";
# trigger = { trigger = {
# type = "remote_button_short_press"; type = "remote_button_short_press";
# subtype = "dim_up"; subtype = "dim_up";
# } // remote; } // remote;
# action = { action = {
# service = "light.turn_on"; service = "light.turn_on";
# entity_id = "light.salon"; entity_id = "light.salon";
# data = { data = {
# brightness_step = 25; brightness_step = 25;
# }; };
# }; };
# } }
# { {
# alias = "Button light down"; alias = "Button light down";
# trigger = { trigger = {
# type = "remote_button_short_press"; type = "remote_button_short_press";
# subtype = "dim_down"; subtype = "dim_down";
# } // remote; } // remote;
# action = { action = {
# service = "light.turn_on"; service = "light.turn_on";
# entity_id = "light.salon"; entity_id = "light.salon";
# data = { data = {
# brightness_step = -25; brightness_step = -25;
# }; };
# }; };
# } }
# # CHAMBRE # CHAMBRE
# { {
# alias = "Button scene night"; alias = "Button scene night";
# trigger = { trigger = {
# type = "remote_button_short_press"; type = "remote_button_short_press";
# subtype = "turn_on"; subtype = "turn_on";
# } // switch_chambre; } // switch_chambre;
# action = { action = {
# scene = "scene.night"; scene = "scene.night";
# }; };
# } }
# { {
# alias = "Button scene dodo"; alias = "Button scene dodo";
# trigger = { trigger = {
# type = "remote_button_short_press"; type = "remote_button_short_press";
# subtype = "turn_off"; subtype = "turn_off";
# } // switch_chambre; } // switch_chambre;
# action = { action = {
# service = "light.turn_off"; service = "light.turn_off";
# entity_id = "all"; entity_id = "all";
# }; };
# } }
# { {
# alias = "Button scene lumière chambre ON"; alias = "Button scene lumière chambre ON";
# trigger = { trigger = {
# type = "remote_button_long_press"; type = "remote_button_long_press";
# subtype = "dim_up"; subtype = "dim_up";
# } // switch_chambre; } // switch_chambre;
# action = { action = {
# service = "light.turn_on"; service = "light.turn_on";
# entity_id = "light.chambre"; entity_id = "light.chambre";
# }; };
# } }
# { {
# alias = "Button scene lumière chambre OFF"; alias = "Button scene lumière chambre OFF";
# trigger = { trigger = {
# type = "remote_button_long_press"; type = "remote_button_long_press";
# subtype = "dim_down"; subtype = "dim_down";
# } // switch_chambre; } // switch_chambre;
# action = { action = {
# service = "light.turn_off"; service = "light.turn_off";
# entity_id = "light.chambre"; entity_id = "light.chambre";
# }; };
# } }
#]; ];
}; };
}; };
}; };

135
systems/LoutreOS/web.nix
View File

@ -61,10 +61,10 @@ in
isSystemUser = true; isSystemUser = true;
group = config.users.groups.webdav.name; group = config.users.groups.webdav.name;
}; };
# wordpress = { wordpress = {
# isSystemUser = true; isSystemUser = true;
# group = config.services.nginx.group; group = config.services.nginx.group;
# }; };
}; };
services = { services = {
@ -83,19 +83,19 @@ in
# }; # };
# }; # };
# "wordpress-designyourfuture" = { "wordpress-designyourfuture" = {
# user = config.users.users.wordpress.name; user = config.users.users.wordpress.name;
# group = config.services.nginx.group; group = config.services.nginx.group;
# settings = { settings = {
# "listen.owner" = config.services.nginx.user; "listen.owner" = config.services.nginx.user;
# "pm" = "dynamic"; "pm" = "dynamic";
# "pm.max_children" = 32; "pm.max_children" = 32;
# "pm.start_servers" = 2; "pm.start_servers" = 2;
# "pm.min_spare_servers" = 2; "pm.min_spare_servers" = 2;
# "pm.max_spare_servers" = 4; "pm.max_spare_servers" = 4;
# "pm.max_requests" = 500; "pm.max_requests" = 500;
# }; };
# }; };
drive = { drive = {
@ -316,53 +316,52 @@ in
} }
]; ];
"designyourfuture.amandoline-creations.fr" = base { "designyourfuture.amandoline-creations.fr" = base {
"/".alias = "/var/www/amandoleene-designyourfuture/"; "/" = {
# "/" = { priority = 200;
# priority = 200; extraConfig = ''
# extraConfig = '' try_files $uri $uri/ /index.php$is_args$args;
# try_files $uri $uri/ /index.php$is_args$args; '';
# ''; };
# }; "~ \\.php$" = {
# "~ \\.php$" = { priority = 500;
# priority = 500; extraConfig = ''
# extraConfig = '' fastcgi_split_path_info ^(.+\.php)(/.+)$;
# fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_pass unix:${config.services.phpfpm.pools."wordpress-designyourfuture".socket};
# fastcgi_pass unix:${config.services.phpfpm.pools."wordpress-designyourfuture".socket}; fastcgi_index index.php;
# fastcgi_index index.php; include "${config.services.nginx.package}/conf/fastcgi.conf";
# include "${config.services.nginx.package}/conf/fastcgi.conf"; fastcgi_param PATH_INFO $fastcgi_path_info;
# fastcgi_param PATH_INFO $fastcgi_path_info; fastcgi_param PATH_TRANSLATED $document_root$fastcgi_path_info;
# fastcgi_param PATH_TRANSLATED $document_root$fastcgi_path_info; # Mitigate https://httpoxy.org/ vulnerabilities
# # Mitigate https://httpoxy.org/ vulnerabilities fastcgi_param HTTP_PROXY "";
# fastcgi_param HTTP_PROXY ""; fastcgi_intercept_errors off;
# fastcgi_intercept_errors off; fastcgi_buffer_size 16k;
# fastcgi_buffer_size 16k; fastcgi_buffers 4 16k;
# fastcgi_buffers 4 16k; fastcgi_connect_timeout 300;
# fastcgi_connect_timeout 300; fastcgi_send_timeout 300;
# fastcgi_send_timeout 300; fastcgi_read_timeout 300;
# fastcgi_read_timeout 300; '';
# ''; };
# }; "~ /\\." = {
# "~ /\\." = { priority = 800;
# priority = 800; extraConfig = "deny all;";
# extraConfig = "deny all;"; };
# }; "~* /(?:uploads|files)/.*\\.php$" = {
# "~* /(?:uploads|files)/.*\\.php$" = { priority = 900;
# priority = 900; extraConfig = "deny all;";
# extraConfig = "deny all;"; };
# }; "~* \\.(js|css|png|jpg|jpeg|gif|ico)$" = {
# "~* \\.(js|css|png|jpg|jpeg|gif|ico)$" = { priority = 1000;
# priority = 1000; extraConfig = ''
# extraConfig = '' expires max;
# expires max; log_not_found off;
# log_not_found off; '';
# ''; };
# }; } // {
} // { root = "/var/www/wordpress-designyourfuture";
# root = "/var/www/wordpress-designyourfuture"; extraConfig = ''
# extraConfig = '' index index.php;
# index index.php; '';
# ''; };
};
}; };
}; };
@ -393,10 +392,10 @@ in
python-ci.enable = true; python-ci.enable = true;
# mysql = { mysql = {
# enable = true; enable = true;
# package = pkgs.mariadb; package = pkgs.mariadb;
# }; };
}; };
systemd.services.nginx.serviceConfig = { systemd.services.nginx.serviceConfig = {