diff --git a/scripts/controller-battery b/scripts/controller-battery index 2f4257c..b8ed4f2 100755 --- a/scripts/controller-battery +++ b/scripts/controller-battery @@ -10,20 +10,29 @@ if test -z "$CONTROLLER"; then fi CAPACITY=$(cat "$CONTROLLER/capacity") -STATUS=$(cat "$CONTROLLER/status") -echo -n '󰊴 ' - -if test "$STATUS" = "Charging"; then - echo -n "󰂄" -else - print-battery-icon "$CAPACITY" -fi - -# Add terminating newline -echo - -# Tooltip echo -n '󰊴' -print-battery-icon "$CAPACITY" -echo " $CAPACITY%" + +if test "$CAPACITY" -ge 90; then + echo '󰁹' +elif test "$CAPACITY" -ge 90; then + echo '󰂂' +elif test "$CAPACITY" -ge 80; then + echo '󰂁' +elif test "$CAPACITY" -ge 70; then + echo '󰂀' +elif test "$CAPACITY" -ge 60; then + echo '󰁿' +elif test "$CAPACITY" -ge 50; then + echo '󰁾' +elif test "$CAPACITY" -ge 40; then + echo '󰁽' +elif test "$CAPACITY" -ge 30; then + echo '󰁼' +elif test "$CAPACITY" -ge 20; then + echo '󰁻' +elif test "$CAPACITY" -ge 10; then + echo '󰁺' +else + echo '󰂎' +fi diff --git a/scripts/default.nix b/scripts/default.nix index 13c19c0..3003685 100644 --- a/scripts/default.nix +++ b/scripts/default.nix @@ -137,9 +137,7 @@ libinput libratbag ]; - print-battery-icon = [ ]; - controller-battery = [ print-battery-icon ]; - mouse-battery = [ print-battery-icon ]; + controller-battery = [ ]; _docker-block-external-connections = [ iptables gawk diff --git a/scripts/mouse-battery b/scripts/mouse-battery deleted file mode 100755 index e1fbc3d..0000000 --- a/scripts/mouse-battery +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh - -set -e - -MODEL_NAME_FILE=$(rg --files-with-matches G502 /sys/class/power_supply/*/model_name | head -n1) - -if test -z "$MODEL_NAME_FILE"; then - echo - exit 0 -fi - -MOUSE=$(dirname "$MODEL_NAME_FILE") - -if test -z "$MOUSE"; then - echo - exit 0 -fi - -CAPACITY=$(cat "$MOUSE/capacity") -STATUS=$(cat "$MOUSE/status") - -echo -n '🖱️' - -if test "$STATUS" = "Charging"; then - echo -n "󰂄" -else - print-battery-icon "$CAPACITY" -fi - -if test "$CAPACITY" -lt 50; then - echo -n "$CAPACITY%" -fi - -echo - -# Tooltip -echo -n '🖱️' -print-battery-icon "$CAPACITY" -echo " $CAPACITY%" diff --git a/scripts/print-battery-icon b/scripts/print-battery-icon deleted file mode 100755 index b893315..0000000 --- a/scripts/print-battery-icon +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh - -set -e - -if test $# -ne 1; then - echo "Usage $0" >&2 - exit 1 -fi -CAPACITY="$1" - -if test "$CAPACITY" -ge 90; then - echo -n '󰁹' -elif test "$CAPACITY" -ge 90; then - echo -n '󰂂' -elif test "$CAPACITY" -ge 80; then - echo -n '󰂁' -elif test "$CAPACITY" -ge 70; then - echo -n '󰂀' -elif test "$CAPACITY" -ge 60; then - echo -n '󰁿' -elif test "$CAPACITY" -ge 50; then - echo -n '󰁾' -elif test "$CAPACITY" -ge 40; then - echo -n '󰁽' -elif test "$CAPACITY" -ge 30; then - echo -n '󰁼' -elif test "$CAPACITY" -ge 20; then - echo -n '󰁻' -elif test "$CAPACITY" -ge 10; then - echo -n '󰁺' -else - echo -n '󰂎' -fi diff --git a/switch b/switch index 32bc217..d341e87 100755 --- a/switch +++ b/switch @@ -4,9 +4,6 @@ set -euo pipefail nix fmt -# Allow usage of untracked files in nix code -git add --intent-to-add . - git --no-pager diff run() { diff --git a/system/configuration.nix b/system/configuration.nix index ec44aed..2380d22 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -49,7 +49,6 @@ services.logind.extraConfig = '' HandlePowerKey=suspend ''; - services.upower.enable = true; # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions diff --git a/user/firefox.nix b/user/firefox.nix index 7a457ed..15ec1d4 100644 --- a/user/firefox.nix +++ b/user/firefox.nix @@ -61,8 +61,8 @@ in }) (pkgs.fetchFirefoxAddon { name = "youtube_no_translation"; - url = "https://addons.mozilla.org/firefox/downloads/file/4561536/youtube_no_translation-2.11.0.xpi"; - hash = "sha256-8VpoUDbvZZf0oYGSHnXEiYDjfcPjQqtbDaxp5ndAJ94="; + url = "https://addons.mozilla.org/firefox/downloads/file/4529979/youtube_no_translation-2.7.1.xpi"; + hash = "sha256-HOLeSWt0phsR/l3FcCRUUFCurU2zyBuZBlynlxPbGqs="; }) # (pkgs.fetchFirefoxAddon { # name = "invidious_redirect"; diff --git a/user/kakoune/default.nix b/user/kakoune/default.nix index 090246d..fa63e6b 100644 --- a/user/kakoune/default.nix +++ b/user/kakoune/default.nix @@ -110,7 +110,6 @@ in set global scrolloff 10,20 set global autoreload yes set global startup_info_version 99999999 - set global grepcmd 'rg -Hn' '' + (import ./colors.nix { @@ -142,8 +141,6 @@ in aspell aspellDicts.en aspellDicts.pt_BR - - ripgrep ]; home.activation = { update_kakoune = lib.hm.dag.entryAfter [ "writeBoundary" ] '' diff --git a/user/sway/sway-binds.nix b/user/sway/sway-binds.nix index 27a27b4..3d61b4e 100644 --- a/user/sway/sway-binds.nix +++ b/user/sway/sway-binds.nix @@ -14,7 +14,6 @@ let terminal = "alacritty"; _lock = pkgs.writeShellScriptBin "_lock" '' - pkill caffeinated || true ${pkgs.sway}/bin/swaymsg mode default ${pkgs.swaylock}/bin/swaylock -f ''; @@ -161,7 +160,7 @@ let screen_binds = { "XF86MonBrightnessDown" = "exec brightnessctl --min-value=1 set 5%-"; "XF86MonBrightnessUp" = "exec brightnessctl --min-value=1 set 5%+"; - "${mod}+l" = "exec ${lib.getExe _lock}"; + "${mod}+l" = lib.getExe _lock; }; other_binds = { diff --git a/user/waybar/default.nix b/user/waybar/default.nix index c9ec809..696f062 100644 --- a/user/waybar/default.nix +++ b/user/waybar/default.nix @@ -38,7 +38,6 @@ in "custom/playerctl" "tray" "custom/controller-battery" - "custom/mouse-battery" "custom/caffeine" "pulseaudio" (lib.optional (osConfig.services.vpn.enable or false) "custom/vpn") @@ -165,11 +164,7 @@ in format = "{}"; exec = lib.getExe pkgs.controller-battery; interval = 1; - }; - "custom/mouse-battery" = { - format = "{}"; - exec = lib.getExe pkgs.mouse-battery; - interval = 1; + tooltip = false; }; "custom/caffeine" = { format = "{}"; diff --git a/user/waybar/style.css b/user/waybar/style.css index 9ff675f..36c6ebd 100644 --- a/user/waybar/style.css +++ b/user/waybar/style.css @@ -38,7 +38,6 @@ window#waybar.solo { #custom-mpd, #custom-playerctl, #custom-controller-battery, -#custom-mouse-battery, #tray, #clock, #network,