Merge branch 'master' of github.com:IvanMalison/dotfiles

dotfiles/config/htop/htoprc

@@ -1,13 +1,14 @@
-f# Beware! This file is rewritten by htop when settings are changed in the interface.
+# Beware! This file is rewritten by htop when settings are changed in the interface.
 # The parser is also very primitive, and not human-friendly.
 fields=0 48 17 18 38 39 40 2 46 47 49 1 
-sort_key=46
+sort_key=47
 sort_direction=1
 hide_threads=0
-hide_userland_threads=1
 hide_kernel_threads=1
+hide_userland_threads=1
 shadow_other_users=0
 show_thread_names=0
+show_program_path=1
 highlight_base_name=0
 highlight_megabytes=1
 highlight_threads=0
@@ -16,6 +17,7 @@ header_margin=1
 detailed_cpu_time=0
 cpu_count_from_zero=0
 update_process_names=0
+account_guest_in_cpu_meter=0
 color_scheme=0
 delay=15
 left_meters=AllCPUs Memory Swap 

dotfiles/config/sparkleshare/config.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sparkleshare>
-  <user>
-    <name>Ivan Malison</name>
-    <email>IvanMalison@gmail.com</email>
-  </user>
-  <notifications>True</notifications>
-  <folder>
-    <name>org</name>
-    <identifier>a6a8820b6d7b59f782ea6b9995b6b3b141877498</identifier>
-    <url>ssh://git@bitbucket.org/ivanmalison/org.git</url>
-    <backend>Git</backend>
-  </folder>
-  <folder>
-    <name>config</name>
-    <identifier>66e07b6027eecec90670e4b608dcd6ec7d51f5d9</identifier>
-    <url>ssh://git@bitbucket.org/ivanmalison/config</url>
-    <backend>Git</backend>
-  </folder>
-</sparkleshare>

dotfiles/lib/bin/xsettingsd-setup

@@ -21,13 +21,13 @@ echo "Setting dpi to $dpi"
 cp  ~/.xsettingsd ~/.xsettingsd.local
 echo Xft/DPI $(( $dpi * 1024 )) >> ~/.xsettingsd.local
 
+# # Also use xrdb for very old stuff (you know, LibreOffice)
+echo Xft.dpi: "$dpi" | xrdb -merge
+
 # Signal xsettingsd
 pid=$(xprop -name xsettingsd _NET_WM_PID 2> /dev/null | awk '{print $NF}')
 if [ x"$pid" = x ]; then
-    xsettingsd -c ~/.xsettingsd.local &
+    xsettingsd -c ~/.xsettingsd.local
 else
     kill -HUP $pid
 fi
-
-# # Also use xrdb for very old stuff (you know, LibreOffice)
-echo Xft.dpi: "$dpi" | xrdb -merge

dotfiles/lib/shellenv/functions.sh

@@ -454,5 +454,12 @@ function which_readlink {
 }
 
 function localip {
-    command_exists ip && ip addr show || ifconfig | grep -Eo 'inet (addr:)?([0-9]*\.){3}[0-9]*' | grep -Eo '([0-9]*\.){3}[0-9]*' | grep -v '127.0.0.1'
+    case `uname` in
+        'Darwin')
+            ifconfig | grep -Eo 'inet (addr:)?([0-9]*\.){3}[0-9]*' | grep -Eo '([0-9]*\.){3}[0-9]*' | grep -v '127.0.0.1'
+            ;;
+        'Linux')
+            hostname --ip-address
+            ;;
+    esac
 }

dotfiles/synergy.conf

@@ -14,6 +14,7 @@ section: aliases
     imalison-arch
     imalison-desktop
   controlling:
+    imalison-uber-loaner
     Livien-MacbookAir
     kat-uber-loaner
     Dean-PC

dotfiles/xmonad/xmonad.hs

@@ -343,7 +343,7 @@ addKeys conf@XConfig {modMask = modm} =
        "systemctl --user restart taffybar.service")
     , ((modm, xK_v), spawn "copyq paste")
     , ((modm, xK_s), swapNextScreen)
-    , ((modm .|. controlMask, xK_space), sendMessage $ JumpToLayout "Full")
+    , ((modm .|. controlMask, xK_space), sendMessage $ Toggle FULL)
     , ((modm, xK_slash), sendMessage $ Toggle MIRROR)
     , ((modm, xK_m), withFocused minimizeWindow)
     , ((modm .|. shiftMask, xK_m), withLastMinimized maximizeWindowAndFocus)

tasks/__init__.py

@@ -5,14 +5,18 @@ from invoke import Collection, task as ctask
 
 from . import arch
 from . import linux
+from . import imalison
 from . import osx
-from .util import DOTFILES_DIRECTORY, RESOURCES_DIRECTORY, link_filenames
+from .util import DOTFILES_DIRECTORY, RESOURCES_DIRECTORY, TASKS_DIRECTORY, link_filenames
 
 
 ns = Collection()
 ns.add_collection(osx)
 ns.add_collection(linux)
 ns.add_collection(arch)
+ns.add_collection(imalison.tasks_from_directory(
+    os.path.join(TASKS_DIRECTORY, "shell"))
+)
 
 
 @ctask(default=True)