diff --git a/Xsession/.Xresources b/Xsession/.Xresources index aaf72a3..df56fbe 100644 --- a/Xsession/.Xresources +++ b/Xsession/.Xresources @@ -2,7 +2,7 @@ ! Xft settings !------------------------------------------------------------------------------- -Xft.dpi: 96 +Xft.dpi: 140 Xft.antialias: true Xft.rgba: none Xft.hinting: true @@ -305,4 +305,4 @@ rofi.color-window: #273238, #273238, #1e2529 rofi.color-normal: #273238, #c1c1c1, #273238, #394249, #ffffff rofi.color-active: #273238, #80cbc4, #273238, #394249, #80cbc4 rofi.color-urgent: #273238, #ff1844, #273238, #394249, #ff1844 -rofi.ssh-command: {terminal} -e "{ssh-client} {host}" \ No newline at end of file +rofi.ssh-command: {terminal} -e "{ssh-client} {host}" diff --git a/Xsession/.profile b/Xsession/.profile index ff74414..b868be5 100644 --- a/Xsession/.profile +++ b/Xsession/.profile @@ -24,3 +24,7 @@ fi if [ -f $HOME/.Xmodmap ]; then /usr/bin/xmodmap $HOME/.Xmodmap 2>/dev/null & fi + +if [ -f $HOME/.xsession ]; then + . $HOME/.xsession +fi diff --git a/Xsession/.xprofile b/Xsession/.xsessionrc similarity index 61% rename from Xsession/.xprofile rename to Xsession/.xsessionrc index c06a47a..85864cf 100755 --- a/Xsession/.xprofile +++ b/Xsession/.xsessionrc @@ -1,7 +1,12 @@ -# echo "pasado(xprofile)" $(date) >> /tmp/LOG +#!/bin/sh +touch /tmp/LOG +echo "loaded(xprofile)" $(date) >> /tmp/LOG setxkbmap "us,es" "altgr-intl," -option "ctrl:nocaps,grp:shift_toggle,terminate:ctrl_alt_bksp" #xmodmap ~/.Xmodmap #source ~/.xinitrc export XTERMINAL=termite export TERMINAL=termite export TERMCMD=termite +export BROWSER=chromium-browser +export MOZ_USE_XINPUT2=1 + diff --git a/i3/.config/i3/config b/i3/.config/i3/config index 6a1213b..1eb3740 100644 --- a/i3/.config/i3/config +++ b/i3/.config/i3/config @@ -55,8 +55,8 @@ bindsym XF86AudioLowerVolume exec --no-startup-id volume-down.sh bindsym XF86AudioMute exec --no-startup-id volume-toggle-mute.sh # Brightness -#bindsym XF86MonBrightnessUp exec --no-startup-id xbacklight +5 -#bindsym XF86MonBrightnessDown exec --no-startup-id xbacklight -5 +bindsym XF86MonBrightnessUp exec --no-startup-id brightnessctl set "5%+" +bindsym XF86MonBrightnessDown exec --no-startup-id brightnessctl set "5%-" # kill focused window bindsym $mod+q kill @@ -230,29 +230,29 @@ bindsym $mod+n exec i3-input -F 'rename workspace to %s' -P 'New name: ' #status_command i3status #} -# bar { -# mode dock -# position top -# font pango:DejaVu Sans 10 -# workspace_buttons yes -# # status_command ~/.config/i3/status.sh -# status_command i3status -c ~/.config/i3status/conf -# colors { -# background #101010 -# statusline #ffffff -# focused_workspace #101010 #586e75 #fdf6e3 -# active_workspace #101010 #101010 #cb4b16 -# inactive_workspace #101010 #101010 #93a1a1 -# urgent_workspace #fdf6e3 #dc322f -# } -# } +bar { + mode dock #hide + position bottom + font pango:DejaVu Sans 10 + workspace_buttons yes + # status_command ~/.config/i3/status.sh + status_command i3blocks #i3status -c ~/.config/i3status/conf + colors { + background #101010 + statusline #ffffff + focused_workspace #101010 #586e75 #fdf6e3 + active_workspace #101010 #101010 #cb4b16 + inactive_workspace #101010 #101010 #93a1a1 + urgent_workspace #fdf6e3 #dc322f + } +} # class border backgr. text indicator client.focused #4c7899 #4c7899 fefef #93a1a1 #2e9ef4 client.focused_inactive #4c7899 #101010 #93a1a1 #484e50 client.unfocused #ffffff #101010 #93a1a1 #292d2e client.urgent #2f343a #101010 #93a1a1 #900000 -default_border pixel 5 +default_border pixel 1 # smart_borders on workspace_layout tabbed @@ -297,8 +297,8 @@ workspace "7: Chat" output eDP1 workspace "8: Misc Big" output DP1 workspace "9: Misc Small" output eDP1 -gaps inner 8 -gaps outer 5 +#gaps inner 8 +#gaps outer 5 set $mode_system System (l) lock, (e) logout, (s) suspend, (h) hibernate, (r) reboot, (Shift+s) shutdown mode "$mode_system" { @@ -317,8 +317,6 @@ bindsym $mod+Delete mode "$mode_system" bindsym $mod+Escape exec xfce4-session-logout #exec --no-startup-id xautolock -corners '----' -time 10 -locker 'dm-tool lock' # lightdm #exec xautolock -time 10 -corners "----" -locker 'i3lock -t -c 000000 -i ~/Pictures/Wallpapers/Game\ Over\ Hacker.png' & -exec --no-startup-id compton -b --config ~/.compton.conf -exec --no-startup-id dropbox start exec --no-startup-id i3-sensible-terminal --title=filemanager -e 'ranger' exec --no-startup-id nitrogen --restore exec --no-startup-id nm-applet @@ -326,9 +324,12 @@ exec --no-startup-id pasystray exec --no-startup-id syndaemon -i 0.5 -d exec --no-startup-id i3-sensible-terminal --title=scratch -e 'tmux attach' exec --no-startup-id i3-exit.sh autolock -exec --no-startup-id xfce4-power-manager #exec --no-startup-id xfsettingsd --sm-client-disable & +#exec --no-startup-id polybar.sh +exec --no-startup-id autorotate.py +exec --no-startup-id touchegg exec --no-startup-id clipit -n exec --no-startup-id owncloud exec --no-startup-id udiskie --no-notify --tray --use-udisks2 -exec --no-startup-id polybar.sh +exec --no-startup-id xfce4-power-manager +exec --no-startup-id compton -b --config ~/.compton.conf diff --git a/i3/.config/i3/status.conf b/i3/.config/i3/status.conf index a384d62..539063d 100644 --- a/i3/.config/i3/status.conf +++ b/i3/.config/i3/status.conf @@ -12,6 +12,7 @@ order += "path_exists VPN" order += "wireless wlan0" order += "ethernet eth0" order += "battery 0" +order += "battery 1" # order += "cpu_temperature 0" order += "load" order += "tztime local" @@ -39,6 +40,17 @@ battery 0 { low_threshold = 10 } +battery 1 { + format = "%status %percentage %remaining %emptytime" + format_down = "No battery" + status_chr = "⚡ CHR" + status_bat = "🔋 BAT" + status_unk = "? UNK" + status_full = "☻ FULL" + path = "/sys/class/power_supply/BAT1/uevent" + low_threshold = 10 +} + run_watch DHCP { pidfile = "/var/run/dhclient*.pid" } diff --git a/i3/.config/i3status/conf b/i3/.config/i3status/conf index 722d5ee..3d6eaf1 100644 --- a/i3/.config/i3status/conf +++ b/i3/.config/i3status/conf @@ -6,19 +6,20 @@ general { order += "disk /" order += "disk /home" order += "path_exists VPN" -order += "wireless wlp2s0" -order += "ethernet eth0" +order += "wireless _first_" +order += "ethernet _first_" order += "battery 0" +order += "battery 1" order += "cpu_temperature 0" order += "load" order += "tztime local" -wireless wlp2s0 { +wireless _first_ { format_up = "%essid %ip %quality %bitrate" format_down = "Wireless down" } -ethernet eth0 { +ethernet _first_ { # if you use %speed, i3status requires the cap_net_admin capability format_up = "E: %ip (%speed) " format_down = "E: down" @@ -26,7 +27,18 @@ ethernet eth0 { battery 0 { format = "%status %percentage %remaining %emptytime" - format_down = "No battery" + format_down = "" + status_chr = "⚡ CHR" + status_bat = "🔋 BAT" + status_unk = "? UNK" + status_chr = "⚡ FULL" + path = "/sys/class/power_supply/BAT%d/uevent" + low_threshold = 10 +} + +battery 1 { + format = "%status %percentage %remaining" + format_down = "" status_chr = "⚡ CHR" status_bat = "🔋 BAT" status_unk = "? UNK" @@ -48,10 +60,10 @@ load { format = "%5min" } -# cpu_temperature 0 { -# format = "T: %degrees °C" -# path = "/sys/devices/platform/coretemp.0/temp1_input" -# } +#cpu_temperature 0 { +# format = "T: %degrees °C" +# path = "/sys/devices/platform/coretemp.0/temp1_input" +#} disk "/" { format = "%free / " diff --git a/scripts/.bin/autorotate.py b/scripts/.bin/autorotate.py new file mode 100755 index 0000000..14d1a0c --- /dev/null +++ b/scripts/.bin/autorotate.py @@ -0,0 +1,93 @@ +#!/usr/bin/env python + +from time import sleep +from os import path as op +import sys +from subprocess import check_call, check_output +from glob import glob + + +def bdopen(fname): + return open(op.join(basedir, fname)) + + +def read(fname): + return bdopen(fname).read() + + +for basedir in glob('/sys/bus/iio/devices/iio:device*'): + if 'accel' in read('name'): + break +else: + sys.stderr.write("Can't find an accellerator device!\n") + sys.exit(1) + + +def update_devices(): + devices = check_output(['xinput', '--list', '--name-only']).splitlines() + + touchscreen_names = ['touchscreen', 'wacom', 'pen'] + touchscreens = [i for i in devices if any(j in i.lower() for j in touchscreen_names)] + + touchpad_names = ['touchpad', 'trackpoint'] + touchpads = [i for i in devices if any(j in i.lower() for j in touchpad_names)] + + return touchscreens, touchpads + +disable_touchpads = False +scale = float(read('in_accel_scale')) +g = 7.0 # (m^2 / s) sensibility, gravity trigger + +STATES = [ + {'rot': 'normal', 'coord': '1 0 0 0 1 0 0 0 1', 'touchpad': 'enable', + 'check': lambda x, y: y <= -g}, + {'rot': 'inverted', 'coord': '-1 0 1 0 -1 1 0 0 1', 'touchpad': 'disable', + 'check': lambda x, y: y >= g}, + {'rot': 'left', 'coord': '0 -1 1 1 0 0 0 0 1', 'touchpad': 'disable', + 'check': lambda x, y: x >= g}, + {'rot': 'right', 'coord': '0 1 0 -1 0 1 0 0 1', 'touchpad': 'disable', + 'check': lambda x, y: x <= -g}, +] + + +def rotate(state): + s = STATES[state] + check_call(['xrandr', '-o', s['rot']]) + touchscreens, touchpads = update_devices() + for dev in touchscreens if disable_touchpads else (touchscreens + touchpads): + check_call([ + 'xinput', 'set-prop', dev, + 'Coordinate Transformation Matrix', + ] + s['coord'].split()) + if disable_touchpads: + for dev in touchpads: + check_call(['xinput', s['touchpad'], dev]) + + +def read_accel(fp): + fp.seek(0) + return float(fp.read()) * scale + + +if __name__ == '__main__': + + accel_x = bdopen('in_accel_x_raw') + accel_y = bdopen('in_accel_y_raw') + + current_state = None + + while True: + x = read_accel(accel_x) + y = read_accel(accel_y) + for i in range(4): + if i == current_state: + continue + if STATES[i]['check'](x, y): + current_state = i + try: + rotate(i) + except Exception as ex: + print('Error rotating: {}'.format(ex)) + break + sleep(1) + diff --git a/scripts/.bin/mapinputs.sh b/scripts/.bin/mapinputs.sh new file mode 100644 index 0000000..d2e7826 --- /dev/null +++ b/scripts/.bin/mapinputs.sh @@ -0,0 +1,4 @@ +#!/bin/sh +xinput map-to-output 16 eDP-1 # Eraser +xinput map-to-output 12 eDP-1 # Stylus +xinput map-to-output 11 eDP-1 # Touch diff --git a/scripts/.bin/onboard.sh b/scripts/.bin/onboard.sh new file mode 100755 index 0000000..eccbb45 --- /dev/null +++ b/scripts/.bin/onboard.sh @@ -0,0 +1,3 @@ +#!/bin/sh +dbus-send --type=method_call --print-reply --dest=org.onboard.Onboard /org/onboard/Onboard/Keyboard org.onboard.Onboard.Keyboard.ToggleVisible || onboard + diff --git a/touchegg/.config/touchegg/touchegg.conf b/touchegg/.config/touchegg/touchegg.conf new file mode 100644 index 0000000..2f5656b --- /dev/null +++ b/touchegg/.config/touchegg/touchegg.conf @@ -0,0 +1,83 @@ + + + + 0 + + + + + + + BUTTON=3 + + + + BUTTON=2 + + + onboard.sh + + + + + + + + SPEED=7:INVERTED=false + + + + + + + + + Super+Control+l + + + + Super+Control+h + + + + Alt+F1 + + + + + + + + + Control+KP_Add + + + + Control+KP_Subtract + + + + Control+L + + + + Control+R + + + + + + + + + Alt+Left + + + + Alt+Right + + + + + + diff --git a/udiskie/.config/udiskie/config.yml b/udiskie/.config/udiskie/config.yml new file mode 100644 index 0000000..d22521b --- /dev/null +++ b/udiskie/.config/udiskie/config.yml @@ -0,0 +1,4 @@ +--- +ignore_device: + - device_file: "/dev/loop*" + ignore: true diff --git a/zsh/.zshenv b/zsh/.zshenv index ffb764a..b0549ef 100644 --- a/zsh/.zshenv +++ b/zsh/.zshenv @@ -50,3 +50,4 @@ path=( export PATH export GOPATH=$HOME/go export PATH=$PATH:$GOPATH/bin/ +export PATH=$PATH:/snap/bin/