From 5fedc0b6c06f9c2e3525ac186015f5dd8b3f6399 Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Fri, 4 Aug 2023 00:43:27 +0200 Subject: [PATCH] try to fix battery problems with the framework --- nixos/machines/chungus/media-youtube.nix | 37 +++++++++++++++++------- nixos/machines/cream/configuration.nix | 13 +++++++++ 2 files changed, 40 insertions(+), 10 deletions(-) diff --git a/nixos/machines/chungus/media-youtube.nix b/nixos/machines/chungus/media-youtube.nix index b5a96e2..58aa3dc 100644 --- a/nixos/machines/chungus/media-youtube.nix +++ b/nixos/machines/chungus/media-youtube.nix @@ -2,6 +2,10 @@ with lib; let configuration = { + + # series + # ------ + druck1 = { url = "https://www.youtube.com/watch?list=PLUQncgYMM1RncxDFRfjkucPWRz5-8rjaH"; target = "/media/youtube/series/Druck"; @@ -42,56 +46,69 @@ let target = "/media/youtube/series/Druck"; output = "Druck S08E%(playlist_index)s %(title)s.%(ext)s"; }; + + # channels + # -------- + ordinary_things = { url = "https://www.youtube.com/@OrdinaryThings"; - target = "/media/youtube/series/Ordinary Things"; + target = "/media/youtube/channels/Ordinary Things"; output = "%(channel)s S%(upload_date>%Y)sE%(upload_date>%m%d)s %(title)s.%(ext)s"; }; internet_historian = { url = "https://www.youtube.com/@InternetHistorian"; - target = "/media/youtube/series/Internet Historian"; + target = "/media/youtube/channels/Internet Historian"; output = "%(channel)s S%(upload_date>%Y)sE%(upload_date>%m%d)s %(title)s.%(ext)s"; }; bigboss = { url = "https://www.youtube.com/@bigbosstube"; - target = "/media/youtube/series/Big Boss"; + target = "/media/youtube/channels/Big Boss"; output = "%(channel)s S%(upload_date>%Y)sE%(upload_date>%m%d)s %(title)s.%(ext)s"; }; CGPGrey = { url = "https://www.youtube.com/@CGPGrey"; - target = "/media/youtube/series/CGP Grey"; + target = "/media/youtube/channels/CGP Grey"; output = "%(channel)s S%(upload_date>%Y)sE%(upload_date>%m%d)s %(title)s.%(ext)s"; }; Joeseppi = { url = "https://www.youtube.com/@Joeseppi"; - target = "/media/youtube/series/Joeseppi"; + target = "/media/youtube/channels/Joeseppi"; output = "%(channel)s S%(upload_date>%Y)sE%(upload_date>%m%d)s %(title)s.%(ext)s"; }; HungrigerHugo = { url = "https://www.youtube.com/@HungrigerHugo"; - target = "/media/youtube/series/HungrigerHugo"; + target = "/media/youtube/channels/HungrigerHugo"; output = "%(channel)s S%(upload_date>%Y)sE%(upload_date>%m%d)s %(title)s.%(ext)s"; }; Kurzgesagt = { url = "https://www.youtube.com/@KurzgesagtDE"; - target = "/media/youtube/series/Kurzgesagt"; + target = "/media/youtube/channels/Kurzgesagt"; output = "%(channel)s S%(upload_date>%Y)sE%(upload_date>%m%d)s %(title)s.%(ext)s"; }; Simplicissimus = { url = "https://www.youtube.com/@Simplicissimus"; - target = "/media/youtube/series/Simplicissimus"; + target = "/media/youtube/channels/Simplicissimus"; output = "%(channel)s S%(upload_date>%Y)sE%(upload_date>%m%d)s %(title)s.%(ext)s"; }; Soosenbinder = { url = "https://www.youtube.com/@Soosenbinder"; - target = "/media/youtube/series/Soosenbinder"; + target = "/media/youtube/channels/Soosenbinder"; output = "%(channel)s S%(upload_date>%Y)sE%(upload_date>%m%d)s %(title)s.%(ext)s"; }; SunkCostGalaxy = { url = "https://www.youtube.com/watch?list=PL7SIP0NDfM2yyHKfRmCAociCcJKZHHY0E"; - target = "/media/youtube/series/SunkCostGalaxy"; + target = "/media/youtube/channels/SunkCostGalaxy"; output = "SunkCostGalaxy S01E%(playlist_index)s %(title)s.%(ext)s"; }; + AllGasNoBreaks = { + url = "https://www.youtube.com/@allgasnobrakes2491"; + target = "/media/youtube/channels/SunkCostGalaxy"; + output = "SunkCostGalaxy S01E%(playlist_index)s %(title)s.%(ext)s"; + }; + + # My Playlists + # ------------ + MusicVideos = { url = "https://www.youtube.com/playlist?list=PLP33x-q_GftakJgpD48pZNl0TkhljQI7S"; target = "/media/youtube/music-videos"; diff --git a/nixos/machines/cream/configuration.nix b/nixos/machines/cream/configuration.nix index af3a2d2..8623969 100644 --- a/nixos/machines/cream/configuration.nix +++ b/nixos/machines/cream/configuration.nix @@ -46,6 +46,19 @@ services.flatpak.enable = true; + # make sure battery is charged in a way to live for a long time + services.power-profiles-daemon.enable = false; + services.tlp = { + enable = true; + settings = { + CPU_BOOST_ON_BAT = 0; + CPU_SCALING_GOVERNOR_ON_BATTERY = "powersave"; + START_CHARGE_THRESH_BAT0 = 30; + STOP_CHARGE_THRESH_BAT0 = 85; + RUNTIME_PM_ON_BAT = "auto"; + }; + }; + security.wrappers = { pmount = { source = "${pkgs.pmount}/bin/pmount";