diff --git a/modules/hardware/misc/battery-power.nix b/modules/hardware/misc/battery-power.nix index a8dbc96..bd8ee20 100644 --- a/modules/hardware/misc/battery-power.nix +++ b/modules/hardware/misc/battery-power.nix @@ -1,4 +1,4 @@ -{ pkgs, username, resume-dev, ... }: { +{ pkgs, resume-dev, ... }: { powerManagement.powertop.enable = true; services = { @@ -10,18 +10,6 @@ echo 85 > /sys/class/power_supply/BAT*/charge_control_end_threshold || true ''}" ''; - cron = { - enable = true; - systemCronJobs = [ - "* * * * * ${username} bash -x ${pkgs.writeShellScript "low-battery-notifier" '' - BAT_PCT=`${pkgs.acpi}/bin/acpi -b | ${pkgs.gnugrep}/bin/grep -P -o '[0-9]+(?=%)'` - BAT_STA=`${pkgs.acpi}/bin/acpi -b | ${pkgs.gnugrep}/bin/grep -P -o '\w+(?=,)'` - echo "`date` battery status:$BAT_STA percentage:$BAT_PCT" - test $BAT_PCT -le 30 && test $BAT_PCT -gt 15 && test $BAT_STA = "Discharging" && DISPLAY=:0.0 ${pkgs.libnotify}/bin/notify-send -c device -u normal "Low Battery" "\$\{BAT_PCT}% remaining." - test $BAT_PCT -le 15 && test $BAT_STA = "Discharging" && DISPLAY=:0.0 ${pkgs.libnotify}/bin/notify-send -c device -u critical "Low Battery" "Shutdown at 10%." - ''} > /tmp/cron.batt.log 2>&1" - ]; - }; upower = { enable = true; percentageCritical = 15; diff --git a/modules/home/core/zed.nix b/modules/home/core/zed.nix index b3d3dc2..9060a36 100644 --- a/modules/home/core/zed.nix +++ b/modules/home/core/zed.nix @@ -2,14 +2,7 @@ programs.zed-editor = { enable = true; package = pkgs.zed-editor; - extensions = [ - "html" "html-snippets" - "svelte" "svelte-snippets" - "wakatime" "discord-presence" - "catppuccin" "catppuccin-icons" - "git-firefly" - "nix" - ]; + extensions = [ "nix" ]; userSettings = { format_on_save = "off"; vim_mode = true; diff --git a/modules/system/homelab/git.nix b/modules/system/homelab/git.nix index 3d436ca..39f2961 100644 --- a/modules/system/homelab/git.nix +++ b/modules/system/homelab/git.nix @@ -25,7 +25,7 @@ DISABLE_REGISTRATION = true; ENABLE_OPENID_SIGNIN = false; ENABLE_OPENID_SIGNUP = false; - ENABLE_INTERNAL_SIGNIN = false; + ENABLE_INTERNAL_SIGNIN = true; SHOW_REGISTRATION_BUTTON = false; ALLOW_ONLY_EXTERNAL_REGISTRATION = true; ALLOW_ONLY_INTERNAL_REGISTRATION = false; diff --git a/modules/system/homelab/proxy.nix b/modules/system/homelab/proxy.nix index de38a69..0eb1e49 100644 --- a/modules/system/homelab/proxy.nix +++ b/modules/system/homelab/proxy.nix @@ -74,7 +74,7 @@ in { } // lib.mapAttrs' (subdomain: cfg: lib.nameValuePair "${subdomain}.${base}" { useACMEHost = base; forceSSL = true; - locations."/".return = "301 ${cfg.dest}"; + locations."/".return = "301 ${base}"; }) redirects // lib.mapAttrs' (subdomain: cfg: lib.nameValuePair (if subdomain == "@" then base else "${subdomain}.${base}") { useACMEHost = base; forceSSL = true;