diff --git a/.gitignore b/.gitignore index 57cf2ba2..43c93040 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,23 @@ dotfiles/config/hub dotfiles/cider/.cache/ dotfiles/pip/download_cache/ .gitignore -dotfiles/pip/pip.log \ No newline at end of file +dotfiles/pip/pip.log +config/google-chrome +dotfiles/config/google-chrome +dotfiles/config/spotify +dotfiles/config/dconf/ +dotfiles/config/menus/applications-merged/ +dotfiles/config/menus/gnome-applications-merged +dotfiles/config/pulse/ +dotfiles/config/hexchat +dotfiles/config/Trolltech.conf +dotfiles/config/gtk-2.0/ +dotfiles/config/gtk-3.0/ +dotfiles/config/linuxmint/ +dotfiles/config/menus/ +dotfiles/config/monitors.xml +dotfiles/config/totem/ +dotfiles/config/user-dirs.dirs +dotfiles/config/user-dirs.locale +dotfiles/config/vlc/ +dotfiles/config/nemo/ \ No newline at end of file diff --git a/dotfiles/config/htop/htoprc b/dotfiles/config/htop/htoprc new file mode 100644 index 00000000..9c39c23b --- /dev/null +++ b/dotfiles/config/htop/htoprc @@ -0,0 +1,24 @@ +# 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_direction=1 +hide_threads=0 +hide_kernel_threads=1 +hide_userland_threads=0 +shadow_other_users=0 +show_thread_names=0 +highlight_base_name=0 +highlight_megabytes=1 +highlight_threads=0 +tree_view=0 +header_margin=1 +detailed_cpu_time=0 +cpu_count_from_zero=0 +update_process_names=0 +color_scheme=0 +delay=15 +left_meters=AllCPUs Memory Swap +left_meter_modes=1 1 1 +right_meters=Tasks LoadAverage Uptime +right_meter_modes=2 2 2 diff --git a/dotfiles/config/terminator/config b/dotfiles/config/terminator/config new file mode 100644 index 00000000..37da0bd7 --- /dev/null +++ b/dotfiles/config/terminator/config @@ -0,0 +1,15 @@ +[global_config] +[keybindings] +[profiles] + [[default]] + use_system_font = False + font = Monaco 10 +[layouts] + [[default]] + [[[child1]]] + type = Terminal + parent = window0 + [[[window0]]] + type = Window + parent = "" +[plugins] diff --git a/dotfiles/xkb/keymap/default b/dotfiles/xkb/keymap/default new file mode 100644 index 00000000..fc6e3a9a --- /dev/null +++ b/dotfiles/xkb/keymap/default @@ -0,0 +1,7 @@ +default xkb_keymap "default" { + xkb_keycodes { include "evdev+aliases(qwerty)" }; + xkb_types { include "complete" }; + xkb_compat { include "complete" }; + xkb_symbols { include "pc+us+inet(evdev)+ctrl(nocaps)+ctrl(swapcaps)" }; + xkb_geometry { include "pc(pc105)" }; +}; \ No newline at end of file diff --git a/dotfiles/xkb/symbols/default b/dotfiles/xkb/symbols/default new file mode 100644 index 00000000..bdc7b385 --- /dev/null +++ b/dotfiles/xkb/symbols/default @@ -0,0 +1,153 @@ +// $Id: symbols 67048 2014-02-05 00:39:26Z vinc17/xvii $ + +// See examples in /usr/share/X11/xkb/symbols + +xkb_symbols "local" { + key { + type = "ONE_LEVEL", + symbols[Group1] = [ ISO_Level3_Shift ] + }; + key { + type = "ONE_LEVEL", + symbols[Group1] = [ ISO_Level3_Shift ] + }; + key { + type = "ONE_LEVEL", + symbols[Group1] = [ Alt_L ] + }; + key { + type = "ONE_LEVEL", + symbols[Group1] = [ Alt_L ] + }; + key { [ grave, notsign, dead_grave ] }; + key { [ 1, exclam, onesuperior, exclamdown ] }; + key { [ 2, quotedbl, twosuperior, dead_diaeresis ] }; + key { [ 3, sterling, threesuperior, ellipsis ] }; + key { [ 4, dollar, EuroSign, currency ] }; + key { [ 5, percent ] }; + key { [ 6, asciicircum, diamond, dead_circumflex ] }; + key { [ 7, ampersand ] }; + key { [ 8, asterisk, U220F, multiply ] }; + key { [ 9, parenleft ] }; + key { [ 0, parenright, degree, dead_abovering ] }; + key { [ minus, underscore, hyphen, U2212 ] }; + key { [ equal, plus, notequal, plusminus ] }; + key { [ BackSpace, 0x1000017 ] }; + key { [ q, Q, emptyset ] }; + key { [ w, W ] }; + key { [ e, E, U2203, U2200 ] }; + key { [ r, R, registered, radical ] }; + key { [ t, T ] }; + key { [ y, Y, yen ] }; + key { [ u, U, union, uparrow ] }; + key { [ i, I, intersection, infinity ] }; + key { [ o, O, oe, OE ] }; + key { [ p, P, section, paragraph ] }; + key { [ bracketleft, braceleft, dead_acute, leftarrow ] }; + key { [ bracketright, braceright, dead_grave, rightarrow ] }; + key { [ a, A, ae, AE ] }; + key { [ s, S, ssharp, U2211 ] }; + key { [ d, D, dagger, downarrow ] }; + key { [ f, F, U2500, U2502 ] }; + key { [ g, G, U250C, U251C ] }; + key { [ h, H, U2510, U2524 ] }; + key { [ j, J, U2514, U252C ] }; + key { [ k, K, U2518, U2534 ] }; + key { [ l, L, sterling, U253C ] }; + key { [ semicolon, colon, dead_diaeresis ] }; + key { [ apostrophe, at, dead_acute, dead_cedilla ] }; + key { [ numbersign, asciitilde, dead_circumflex, dead_tilde ] }; + key { [ backslash, bar, emdash, brokenbar ] }; + key { [ z, Z, guillemotleft, elementof ] }; + key { [ x, X, guillemotright, notelementof ] }; + key { [ c, C, copyright, includedin ] }; + key { [ v, V, logicalor, logicaland ] }; + key { [ b, B ] }; + key { [ n, N, endash ] }; + key { [ m, M, mu ] }; + key { [ comma, less, cedilla, lessthanequal ] }; + key { [ period, greater, periodcentered, greaterthanequal ] }; + key { [ slash, question, division, questiondown ] }; + key { + type = "CUSTFNKEY", + symbols[Group1] = [ eacute, Eacute, F1, XF86Switch_VT_1 ] + }; + key { + type = "CUSTFNKEY", + symbols[Group1] = [ egrave, Egrave, F2, XF86Switch_VT_2 ] + }; + key { + type = "CUSTFNKEY", + symbols[Group1] = [ ecircumflex, Ecircumflex, F3, XF86Switch_VT_3 ] + }; + key { + type = "CUSTFNKEY", + symbols[Group1] = [ ediaeresis, Ediaeresis, F4, XF86Switch_VT_4 ] + }; + key { + type = "CUSTFNKEY", + symbols[Group1] = [ acircumflex, Acircumflex, F5, XF86Switch_VT_5 ] + }; + key { + type = "CUSTFNKEY", + symbols[Group1] = [ icircumflex, Icircumflex, F6, XF86Switch_VT_6 ] + }; + key { + type = "CUSTFNKEY", + symbols[Group1] = [ ocircumflex, Ocircumflex, F7, XF86Switch_VT_7 ] + }; + key { + type = "CUSTFNKEY", + symbols[Group1] = [ ucircumflex, Ucircumflex, F8, XF86Switch_VT_8 ] + }; + key { + type = "CUSTFNKEY", + symbols[Group1] = [ agrave, Agrave, F9, XF86Switch_VT_9 ] + }; + key { + type = "CUSTFNKEY", + symbols[Group1] = [ ugrave, Ugrave, F10, XF86Switch_VT_10 ] + }; + key { + type = "CUSTFNKEY", + symbols[Group1] = [ idiaeresis, Idiaeresis, F11, XF86Switch_VT_11 ] + }; + key { + type = "CUSTFNKEY", + symbols[Group1] = [ ccedilla, Ccedilla, F12, XF86Switch_VT_12 ] + }; + key { [ space, nobreakspace ] }; + key { [ equal ] }; + key { [ slash ] }; + key { [ asterisk ] }; + key { [ minus ] }; + key { [ plus ] }; + key { [ Return ] }; + key { [ 7 ] }; + key { [ 8 ] }; + key { [ 9 ] }; + key { [ 4 ] }; + key { [ 5 ] }; + key { [ 6 ] }; + key { [ 1 ] }; + key { [ 2 ] }; + key { [ 3 ] }; + key { [ 0 ] }; + key { [ period ] }; + key { + type = "CUSTLEVELTHREE", + symbols[Group1] = [ Up, 0x1000012 ] + }; + key { + type = "CUSTLEVELTHREE", + symbols[Group1] = [ Left, 0x1000001 ] + }; + key { + type = "CUSTLEVELTHREE", + symbols[Group1] = [ Down, 0x1000013 ] + }; + key { + type = "CUSTLEVELTHREE", + symbols[Group1] = [ Right, 0x1000005 ] + }; +}; diff --git a/dotfiles/xkb/types/default b/dotfiles/xkb/types/default new file mode 100644 index 00000000..72c89969 --- /dev/null +++ b/dotfiles/xkb/types/default @@ -0,0 +1,26 @@ +// $Id: types 43746 2011-05-15 14:32:38Z vinc17/xvii $ + +default xkb_types "local" { + + include "complete" + + type "CUSTFNKEY" { + modifiers = Shift+Lock+Control+Alt; + map[Shift] = Level2; + map[Lock] = Level2; + map[Control] = Level3; + map[Control+Alt] = Level4; + level_name[Level1] = "Base"; + level_name[Level2] = "Caps"; + level_name[Level3] = "Level3"; + level_name[Level4] = "Ctrl+Alt"; + }; + + type "CUSTLEVELTHREE" { + modifiers = LevelThree; + map[LevelThree] = Level2; + level_name[Level1] = "Base"; + level_name[Level2] = "Alt"; + }; + +}; \ No newline at end of file diff --git a/dotfiles/xsession b/dotfiles/xsession new file mode 100644 index 00000000..c16fc59a --- /dev/null +++ b/dotfiles/xsession @@ -0,0 +1,5 @@ +if [ -d $HOME/.xkb/keymap ]; then + setxkbmap -types local -print | \ + sed -e '/xkb_symbols/s/"[[:space:]]/+local&/' > $HOME/.xkb/keymap/custom + xkbcomp -w0 -I$HOME/.xkb -R$HOME/.xkb keymap/custom $DISPLAY +fi \ No newline at end of file diff --git a/start.sh b/start.sh index ade855df..227e7960 100644 --- a/start.sh +++ b/start.sh @@ -31,7 +31,6 @@ function osx() { } function go() { - while true; do sudo -n true; sleep 60; kill -0 "$$" || exit; done 2>/dev/null & git clone https://github.com/IvanMalison/dotfiles.git --recursive cd dotfiles sudo pip install invoke dotfiles @@ -39,7 +38,6 @@ function go() { } while true; do sudo -n true; sleep 60; kill -0 "$$" || exit; done 2>/dev/null & - case `uname` in 'Darwin') osx diff --git a/tasks/__init__.py b/tasks/__init__.py index 74169254..4db8f01e 100644 --- a/tasks/__init__.py +++ b/tasks/__init__.py @@ -28,7 +28,6 @@ def setup(ctx): change_shell(ctx) - @ctask def dotfiles(ctx, flags=''): ctx.run('hash dotfiles || sudo pip install dotfiles')