From 776a1e558866cb82936e75549b735287adbb175d Mon Sep 17 00:00:00 2001 From: Quentin Duchemin Date: Thu, 10 Jan 2019 10:13:42 +0100 Subject: [PATCH] Removed references to GMail, enhance usb mount --- .config/polybar/config | 6 --- .config/polybar/scripts/gmail/.gitignore | 1 - .config/polybar/scripts/gmail/auth.py | 28 ------------ .config/polybar/scripts/gmail/launch.py | 50 ---------------------- .config/polybar/scripts/system-usb-udev.sh | 15 +++++-- .config/terminator/config | 2 + 6 files changed, 13 insertions(+), 89 deletions(-) delete mode 100644 .config/polybar/scripts/gmail/.gitignore delete mode 100755 .config/polybar/scripts/gmail/auth.py delete mode 100755 .config/polybar/scripts/gmail/launch.py diff --git a/.config/polybar/config b/.config/polybar/config index 6a37c94..034d316 100644 --- a/.config/polybar/config +++ b/.config/polybar/config @@ -319,12 +319,6 @@ type = custom/script exec = ~/.config/polybar/scripts/filesystem.sh interval = 60 -[module/gmail] -type = custom/script -exec = ~/.config/polybar/scripts/gmail/launch.py -tail = true -click-left = xdg-open https://mail.google.com - [module/system-uptime-pretty] type = custom/script exec = ~/.config/polybar/scripts/system-uptime-pretty.sh diff --git a/.config/polybar/scripts/gmail/.gitignore b/.config/polybar/scripts/gmail/.gitignore deleted file mode 100644 index a6c57f5..0000000 --- a/.config/polybar/scripts/gmail/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.json diff --git a/.config/polybar/scripts/gmail/auth.py b/.config/polybar/scripts/gmail/auth.py deleted file mode 100755 index e821e6c..0000000 --- a/.config/polybar/scripts/gmail/auth.py +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env python - -import os -import pathlib -import httplib2 -import webbrowser -from oauth2client import client, file - -SCOPE = 'https://www.googleapis.com/auth/gmail.readonly' -REDIRECT_URI = 'urn:ietf:wg:oauth:2.0:oob' -DIR = os.path.dirname(os.path.realpath(__file__)) -CLIENT_SECRETS_PATH = os.path.join(DIR, 'client_secrets.json') -CREDENTIALS_PATH = os.path.join(DIR, 'credentials.json') -storage = file.Storage(CREDENTIALS_PATH) - -if pathlib.Path(CREDENTIALS_PATH).is_file(): - credentials = storage.get() - credentials.refresh(httplib2.Http()) - print('Credentials successfully refreshed') -else: - flow = client.flow_from_clientsecrets(CLIENT_SECRETS_PATH, scope=SCOPE, - redirect_uri=REDIRECT_URI) - auth_uri = flow.step1_get_authorize_url() - webbrowser.open(auth_uri) - auth_code = input('Enter the auth code: ') - credentials = flow.step2_exchange(auth_code) - storage.put(credentials) - print('Credentials successfully created') diff --git a/.config/polybar/scripts/gmail/launch.py b/.config/polybar/scripts/gmail/launch.py deleted file mode 100755 index 0bfe1f8..0000000 --- a/.config/polybar/scripts/gmail/launch.py +++ /dev/null @@ -1,50 +0,0 @@ -#!/usr/bin/env python - -import os -import pathlib -import subprocess -import time -import argparse -from apiclient import discovery, errors -from oauth2client import client, file -from httplib2 import ServerNotFoundError - -parser = argparse.ArgumentParser() -parser.add_argument('-p', '--prefix', default=' ') -parser.add_argument('-c', '--color', default='#e06c75') -parser.add_argument('-ns', '--nosound', action='store_true') -args = parser.parse_args() - -DIR = os.path.dirname(os.path.realpath(__file__)) -CREDENTIALS_PATH = os.path.join(DIR, 'credentials.json') - -unread_prefix = '%{F' + args.color + '}' + args.prefix + ' %{F-}' -error_prefix = '%{F' + args.color + '}\uf06a %{F-}' -count_was = 0 - -def update_count(count_was): - gmail = discovery.build('gmail', 'v1', credentials=file.Storage(CREDENTIALS_PATH).get()) - labels = gmail.users().labels().get(userId='me', id='INBOX').execute() - count = labels['messagesUnread'] - if count > 0: - print(unread_prefix + str(count), flush=True) - else: - print(args.prefix, flush=True) - if not args.nosound and count_was < count and count > 0: - subprocess.run(['canberra-gtk-play', '-i', 'message']) - return count - -while True: - try: - if pathlib.Path(CREDENTIALS_PATH).is_file(): - count_was = update_count(count_was) - time.sleep(10) - else: - print(error_prefix + 'credentials not found', flush=True) - time.sleep(2) - except (errors.HttpError, ServerNotFoundError, OSError) as error: - print(error_prefix + str(error), flush=True) - time.sleep(5) - except client.AccessTokenRefreshError: - print(error_prefix + 'revoked/expired credentials', flush=True) - time.sleep(5) diff --git a/.config/polybar/scripts/system-usb-udev.sh b/.config/polybar/scripts/system-usb-udev.sh index 76e0140..0a18297 100755 --- a/.config/polybar/scripts/system-usb-udev.sh +++ b/.config/polybar/scripts/system-usb-udev.sh @@ -1,17 +1,21 @@ #!/bin/sh +# Dependencies : jq ; udisks2 # Some updates by Quentin Duchemin on 18/03/07 # - Add label in lsblk selection # - Add symbols from Material Google font # - Remove term emulator opening and unused parts # - Remove udiskctl power-off because we cannot mount again the removable device # - Change printed name from vendor of the device to partition name (arbitrary choice) +# On 18/11/20 +# - Change jq rm == '1' to rm == true usb_print() { devices=$(lsblk -Jplno NAME,TYPE,RM,SIZE,MOUNTPOINT,VENDOR,LABEL) output="" counter=0 - for unmounted in $(echo "$devices" | jq -r '.blockdevices[] | select(.type == "part") | select(.rm == "1") | select(.mountpoint == null) | .name'); do + for unmounted in $(echo "$devices" | jq -r '.blockdevices[] | select(.type == +"part") | select(.rm == true) | select(.mountpoint == null) | .name'); do unmounted=$(echo "$devices" | jq -r '.blockdevices[] | select(.name == "'"$unmounted"'") | .label') unmounted=$(echo "$unmounted" | tr -d ' ') @@ -25,7 +29,8 @@ usb_print() { output="$output$space $unmounted" done - for mounted in $(echo "$devices" | jq -r '.blockdevices[] | select(.type == "part") | select(.rm == "1") | select(.mountpoint != null) | .size'); do + for mounted in $(echo "$devices" | jq -r '.blockdevices[] | select(.type == +"part") | select(.rm == true) | select(.mountpoint != null) | .size'); do if [ $counter -eq 0 ]; then space="" else @@ -54,7 +59,8 @@ case "$1" in --mount) devices=$(lsblk -Jplno NAME,TYPE,RM,MOUNTPOINT) - for mount in $(echo "$devices" | jq -r '.blockdevices[] | select(.type == "part") | select(.rm == "1") | select(.mountpoint == null) | .name'); do + for mount in $(echo "$devices" | jq -r '.blockdevices[] | select(.type == +"part") | select(.rm == true) | select(.mountpoint == null) | .name'); do mountpoint=$(udisksctl mount --no-user-interaction -b "$mount") done @@ -63,7 +69,8 @@ case "$1" in --unmount) devices=$(lsblk -Jplno NAME,TYPE,RM,MOUNTPOINT) - for unmount in $(echo "$devices" | jq -r '.blockdevices[] | select(.type == "part") | select(.rm == "1") | select(.mountpoint != null) | .name'); do + for unmount in $(echo "$devices" | jq -r '.blockdevices[] | select(.type == +"part") | select(.rm == true) | select(.mountpoint != null) | .name'); do udisksctl unmount --no-user-interaction -b "$unmount" #power-off makes us unable to mount again... #udisksctl power-off --no-user-interaction -b "$unmount" diff --git a/.config/terminator/config b/.config/terminator/config index 4a6d757..d994016 100644 --- a/.config/terminator/config +++ b/.config/terminator/config @@ -2,11 +2,13 @@ borderless = True custom_url_handler = firefox enabled_plugins = TerminalShot, LaunchpadCodeURLHandler, APTURLHandler, LaunchpadBugURLHandler + suppress_multiple_term_dialog = True title_font = DejaVu Sans Mono 11 title_use_system_font = False use_custom_url_handler = True [keybindings] layout_launcher = l + reset_clear = l switch_to_tab_1 = None switch_to_tab_2 = None [layouts]