diff --git a/dotfiles/i3/blocks b/dotfiles/i3/blocks index 50853a9..cbd77c8 100644 --- a/dotfiles/i3/blocks +++ b/dotfiles/i3/blocks @@ -40,7 +40,16 @@ BASE_COLOR=#5fff5f UPDATE_COLOR=#ffff85 LABEL= +[temperature] +label= +interval=10 + +[cpu_usage] +interval=10 +LABEL= + [ccurrency] +LABEL=test command=scripts/ccurrency -f USD interval=1800 @@ -54,12 +63,13 @@ interval=1800 [protonvpn] interval=5 -LABEL= +LABEL_ON= +LABEL_OFF= [rofi-calendar] interval=60 LABEL= -DATEFTM=+ %a. %d %b. - %H:%M +DATEFTM=+ %a %d %b - %H:%M SHORTFTM=+ %d.%m.%Y [] diff --git a/dotfiles/i3/scripts/protonvpn b/dotfiles/i3/scripts/protonvpn index bd5451d..389b1f6 100755 --- a/dotfiles/i3/scripts/protonvpn +++ b/dotfiles/i3/scripts/protonvpn @@ -7,7 +7,7 @@ from protonvpn_cli import utils as pvpn_utils IP_ADDR = pvpn_utils.get_ip_info()[0] if not pvpn_utils.is_connected(): - OUTPUT = "{}".format(os.environ['LABEL']) + OUTPUT = os.environ['LABEL_OFF'] OUTPUT += " {}".format(IP_ADDR) else: @@ -16,7 +16,7 @@ else: COUNTRY_CODE = pvpn_utils.get_server_value(CONNECTED_SERVER, "ExitCountry", SERVERS) COUNTRY = pvpn_utils.get_country_name(COUNTRY_CODE) CITY = pvpn_utils.get_server_value(CONNECTED_SERVER, "City", SERVERS) - OUTPUT = "{}".format(os.environ['LABEL']) + OUTPUT = os.environ['LABEL_ON'] OUTPUT += " {} - {}, {}".format(IP_ADDR, CITY, COUNTRY) print(OUTPUT) diff --git a/install.py b/install.py index c1098ae..a6fe101 100755 --- a/install.py +++ b/install.py @@ -133,9 +133,10 @@ class Installer: ui.info_2("Installing packages...") for package in packages: if self.operating_system == "arch based": - command = "sudo pacman -S --needed {}".format(package) + command = "sudo pacman -S --needed --noconfirm {}"\ + .format(package) elif self.operating_system == "debian based": - command = "sudo apt install {}".format(package) + command = "sudo apt install -y {}".format(package) install = subprocess.run(command, check=False, shell=True, stdout=subprocess.DEVNULL,