Commit 4ba660f0 authored by Dom Sekotill's avatar Dom Sekotill
Browse files

Merge branch 'master' into feature/mail-imapsync

parents 1ded696b bc51f89e

.bash_profile

+2 −1
Original line number Diff line number Diff line
@@ -13,10 +13,11 @@ source_first ~/.profile /etc/profile 
# Prompt

if [ -n "$PS1" ]; then

	PS1="\[${PROMPTCODES}\e[1;${PROMPTCOLOUR:-0}m\]\u@\h: \$\[\e[0m\] "

	export _PS1=$PS1

	export PS1

fi



source_each ~/.shell/$(get_platform)/profile ~/.sh_local ~/.bash_local

source_each ~/.bash_local



# Automatically run terminal multiplexer on SSH connect

[ -n "$SSH_TTY" ] && [ "x$TERM" != xscreen ] && has tmux &&

.bashrc

+2 −5
Original line number Diff line number Diff line
@@ -14,12 +14,9 @@ fi 
do_update



# Source global definitions

# (debian global bashrc has a bad habit of setting PS1, so store and revert 

# after)

_PS1="$PS1"

# (debian global bashrc has a bad habit of setting PS1, so revert after)

source_first /etc/bash.bashrc /etc/bashrc

PS1="$_PS1"

unset _PS1 grc

PS1="${_PS1-$PS1}"



source_each ~/.shell/aliases ~/.shell/$(get_platform)/aliases ~/.bash_aliases

.config/awesome/debian/menu.lua

0 → 100644
+207 −0
Original line number Diff line number Diff line 
-- automatically generated file. Do not edit (see /usr/share/doc/menu/html)



module("debian.menu")



Debian_menu = {}



Debian_menu["Debian_Applications_Accessibility"] = {

	{"Xmag","xmag"},

}

Debian_menu["Debian_Applications_Data_Management"] = {

	{"LibreOffice Base","/usr/bin/libreoffice --base","/usr/share/icons/hicolor/32x32/apps/libreoffice-base.xpm"},

}

Debian_menu["Debian_Applications_Editors"] = {

	{"Gedit","/usr/bin/gedit","/usr/share/pixmaps/gedit-icon.xpm"},

	{"Nano", "x-terminal-emulator -e ".."/bin/nano","/usr/share/nano/nano-menu.xpm"},

	{"Xedit","xedit"},

}

Debian_menu["Debian_Applications_File_Management"] = {

	{"Baobab","/usr/bin/baobab","/usr/share/pixmaps/baobab.xpm"},

	{"Brasero","/usr/bin/brasero"},

	{"File-Roller","/usr/bin/file-roller","/usr/share/pixmaps/file-roller.xpm"},

	{"Nautilus","/usr/bin/nautilus --no-desktop","/usr/share/pixmaps/nautilus.xpm"},

}

Debian_menu["Debian_Applications_Graphics"] = {

	{"dotty","/usr/bin/dotty"},

	{"lefty","/usr/bin/lefty"},

	{"LibreOffice Draw","/usr/bin/libreoffice --draw","/usr/share/icons/hicolor/32x32/apps/libreoffice-draw.xpm"},

	{"The GIMP","/usr/bin/gimp","/usr/share/pixmaps/gimp.xpm"},

	{"X Window Snapshot","xwd | xwud"},

}

Debian_menu["Debian_Applications_Network_Communication"] = {

	{"Irssi", "x-terminal-emulator -e ".."/usr/bin/irssi"},

	{"Mutt", "x-terminal-emulator -e ".."/usr/bin/mutt","/usr/share/pixmaps/mutt.xpm"},

	{"Remmina","/usr/bin/remmina"},

	{"Telnet", "x-terminal-emulator -e ".."/usr/bin/telnet"},

	{"Xbiff","xbiff"},

	{"xtightvncviewer","/usr/bin/xtightvncviewer"},

}

Debian_menu["Debian_Applications_Network_File_Transfer"] = {

	{"Transmission BitTorrent Client (GTK)","/usr/bin/transmission-gtk","/usr/share/pixmaps/transmission.xpm"},

}

Debian_menu["Debian_Applications_Network_Monitoring"] = {

	{"Wireshark","/usr/bin/wireshark","/usr/share/pixmaps/wsicon32.xpm"},

}

Debian_menu["Debian_Applications_Network_Web_Browsing"] = {

	{"dwb","/usr/bin/dwb"},

	{"w3m", "x-terminal-emulator -e ".."/usr/bin/w3m /usr/share/doc/w3m/MANUAL.html"},

}

Debian_menu["Debian_Applications_Network"] = {

	{ "Communication", Debian_menu["Debian_Applications_Network_Communication"] },

	{ "File Transfer", Debian_menu["Debian_Applications_Network_File_Transfer"] },

	{ "Monitoring", Debian_menu["Debian_Applications_Network_Monitoring"] },

	{"VNC Viewer","xvnc4viewer"},

	{ "Web Browsing", Debian_menu["Debian_Applications_Network_Web_Browsing"] },

}

Debian_menu["Debian_Applications_Office"] = {

	{"LibreOffice Calc","/usr/bin/libreoffice --calc","/usr/share/icons/hicolor/32x32/apps/libreoffice-calc.xpm"},

	{"LibreOffice Impress","/usr/bin/libreoffice --impress","/usr/share/icons/hicolor/32x32/apps/libreoffice-impress.xpm"},

	{"LibreOffice Writer","/usr/bin/libreoffice --writer","/usr/share/icons/hicolor/32x32/apps/libreoffice-writer.xpm"},

}

Debian_menu["Debian_Applications_Programming"] = {

	{"GDB", "x-terminal-emulator -e ".."/usr/bin/gdb"},

	{"Python (v2.7)", "x-terminal-emulator -e ".."/usr/bin/python2.7","/usr/share/pixmaps/python2.7.xpm"},

	{"Python (v3.3)", "x-terminal-emulator -e ".."/usr/bin/python3.3","/usr/share/pixmaps/python3.3.xpm"},

	{"Python (v3.4)", "x-terminal-emulator -e ".."/usr/bin/python3.4","/usr/share/pixmaps/python3.4.xpm"},

	{"Ruby (irb1.9.1)", "x-terminal-emulator -e ".."/usr/bin/irb1.9.1"},

	{"Tclsh8.5", "x-terminal-emulator -e ".."/usr/bin/tclsh8.5"},

	{"Tclsh8.6", "x-terminal-emulator -e ".."/usr/bin/tclsh8.6"},

	{"TkWish8.5","x-terminal-emulator -e /usr/bin/wish8.5"},

	{"TkWish8.6","x-terminal-emulator -e /usr/bin/wish8.6"},

	{"winpdb","/usr/bin/winpdb","/usr/share/pixmaps/winpdb.xpm"},

}

Debian_menu["Debian_Applications_Science_Electronics"] = {

	{"Oregano","/usr/bin/oregano"},

}

Debian_menu["Debian_Applications_Science_Mathematics"] = {

	{"Bc", "x-terminal-emulator -e ".."/usr/bin/bc"},

	{"Dc", "x-terminal-emulator -e ".."/usr/bin/dc"},

	{"LibreOffice Math","/usr/bin/libreoffice --math","/usr/share/icons/hicolor/32x32/apps/libreoffice-math.xpm"},

	{"Xcalc","xcalc"},

}

Debian_menu["Debian_Applications_Science"] = {

	{ "Electronics", Debian_menu["Debian_Applications_Science_Electronics"] },

	{ "Mathematics", Debian_menu["Debian_Applications_Science_Mathematics"] },

}

Debian_menu["Debian_Applications_Shells"] = {

	{"Bash", "x-terminal-emulator -e ".."/bin/bash --login"},

	{"Dash", "x-terminal-emulator -e ".."/bin/dash -i"},

	{"Sh", "x-terminal-emulator -e ".."/bin/sh --login"},

	{"Zsh", "x-terminal-emulator -e ".."/bin/zsh5"},

}

Debian_menu["Debian_Applications_Sound"] = {

	{"Rhythmbox","/usr/bin/rhythmbox","/usr/share/pixmaps/rhythmbox-small.xpm"},

}

Debian_menu["Debian_Applications_System_Administration"] = {

	{"Debian Task selector", "x-terminal-emulator -e ".."su-to-root -c tasksel"},

	{"DSL/PPPoE configuration tool", "x-terminal-emulator -e ".."/usr/sbin/pppoeconf","/usr/share/pixmaps/pppoeconf.xpm"},

	{"Editres","editres"},

	{"Gnome Control Center","/usr/bin/gnome-control-center",},

	{"GNOME Network Tool","/usr/bin/gnome-nettool","/usr/share/pixmaps/gnome-nettool.xpm"},

	{"pppconfig", "x-terminal-emulator -e ".."su-to-root -p root -c /usr/sbin/pppconfig"},

	{"Xclipboard","xclipboard"},

	{"Xfontsel","xfontsel"},

	{"Xkill","xkill"},

	{"Xrefresh","xrefresh"},

}

Debian_menu["Debian_Applications_System_Hardware"] = {

	{"Xvidtune","xvidtune"},

}

Debian_menu["Debian_Applications_System_Language_Environment"] = {

	{"Input Method Configuration", "x-terminal-emulator -e ".."/usr/bin/im-config"},

}

Debian_menu["Debian_Applications_System_Monitoring"] = {

	{"GNOME system monitor","/usr/bin/gnome-system-monitor"},

	{"Pstree", "x-terminal-emulator -e ".."/usr/bin/pstree.x11","/usr/share/pixmaps/pstree16.xpm"},

	{"Top", "x-terminal-emulator -e ".."/usr/bin/top"},

	{"Xconsole","xconsole -file /dev/xconsole"},

	{"Xev","x-terminal-emulator -e xev"},

	{"Xload","xload"},

}

Debian_menu["Debian_Applications_System_Package_Management"] = {

	{"Aptitude Package Manager (text)", "x-terminal-emulator -e ".."/usr/bin/aptitude-curses"},

}

Debian_menu["Debian_Applications_System_Security"] = {

	{"Seahorse","/usr/bin/seahorse","/usr/share/pixmaps/seahorse.xpm"},

}

Debian_menu["Debian_Applications_System"] = {

	{ "Administration", Debian_menu["Debian_Applications_System_Administration"] },

	{ "Hardware", Debian_menu["Debian_Applications_System_Hardware"] },

	{ "Language Environment", Debian_menu["Debian_Applications_System_Language_Environment"] },

	{ "Monitoring", Debian_menu["Debian_Applications_System_Monitoring"] },

	{ "Package Management", Debian_menu["Debian_Applications_System_Package_Management"] },

	{ "Security", Debian_menu["Debian_Applications_System_Security"] },

}

Debian_menu["Debian_Applications_Terminal_Emulators"] = {

	{"Gnome Terminal","/usr/bin/gnome-terminal","/usr/share/pixmaps/gnome-terminal.xpm"},

	{"Rxvt-Unicode","urxvt","/usr/share/pixmaps/urxvt.xpm"},

	{"Rxvt-Unicode (Black, Xft)","urxvt -fn \"xft:Mono\" -rv","/usr/share/pixmaps/urxvt.xpm"},

	{"XTerm","xterm","/usr/share/pixmaps/xterm-color_32x32.xpm"},

	{"X-Terminal as root (GKsu)","/usr/bin/gksu -u root /usr/bin/x-terminal-emulator","/usr/share/pixmaps/gksu-debian.xpm"},

	{"XTerm (Unicode)","uxterm","/usr/share/pixmaps/xterm-color_32x32.xpm"},

}

Debian_menu["Debian_Applications_Text"] = {

	{"Character map","/usr/bin/gucharmap"},

}

Debian_menu["Debian_Applications_Video"] = {

	{"Totem","/usr/bin/totem","/usr/share/pixmaps/totem.xpm"},

	{"VLC media player","/usr/bin/qvlc","/usr/share/icons/hicolor/32x32/apps/vlc.xpm"},

}

Debian_menu["Debian_Applications_Viewers"] = {

	{"E-book reader","FBReader"},

	{"Evince","/usr/bin/evince","/usr/share/pixmaps/evince.xpm"},

	{"Eye of GNOME","/usr/bin/eog","/usr/share/pixmaps/gnome-eog.xpm"},

	{"Shotwell","/usr/bin/shotwell"},

	{"Xditview","xditview"},

}

Debian_menu["Debian_Applications"] = {

	{ "Accessibility", Debian_menu["Debian_Applications_Accessibility"] },

	{ "Data Management", Debian_menu["Debian_Applications_Data_Management"] },

	{ "Editors", Debian_menu["Debian_Applications_Editors"] },

	{ "File Management", Debian_menu["Debian_Applications_File_Management"] },

	{ "Graphics", Debian_menu["Debian_Applications_Graphics"] },

	{ "Network", Debian_menu["Debian_Applications_Network"] },

	{ "Office", Debian_menu["Debian_Applications_Office"] },

	{ "Programming", Debian_menu["Debian_Applications_Programming"] },

	{ "Science", Debian_menu["Debian_Applications_Science"] },

	{ "Shells", Debian_menu["Debian_Applications_Shells"] },

	{ "Sound", Debian_menu["Debian_Applications_Sound"] },

	{ "System", Debian_menu["Debian_Applications_System"] },

	{ "Terminal Emulators", Debian_menu["Debian_Applications_Terminal_Emulators"] },

	{ "Text", Debian_menu["Debian_Applications_Text"] },

	{ "Video", Debian_menu["Debian_Applications_Video"] },

	{ "Viewers", Debian_menu["Debian_Applications_Viewers"] },

}

Debian_menu["Debian_Games_Action"] = {

	{"bzflag","/usr/games/bzflag","/usr/share/games/bzflag/bzflag-32x32.xpm"},

	{"OpenArena","/usr/games/openarena","/usr/share/pixmaps/openarena32.xpm"},

}

Debian_menu["Debian_Games_Card"] = {

	{"Gnome Solitaire Games","/usr/games/sol","/usr/share/pixmaps/aisleriot.xpm"},

}

Debian_menu["Debian_Games_Strategy"] = {

	{"0 A.D.","/usr/games/0ad","/usr/share/pixmaps/0ad.xpm"},

}

Debian_menu["Debian_Games_Toys"] = {

	{"Oclock","oclock"},

	{"Xclock (analog)","xclock -analog"},

	{"Xclock (digital)","xclock -digital -update 1"},

	{"Xeyes","xeyes"},

	{"Xlogo","xlogo"},

}

Debian_menu["Debian_Games"] = {

	{ "Action", Debian_menu["Debian_Games_Action"] },

	{ "Card", Debian_menu["Debian_Games_Card"] },

	{ "Strategy", Debian_menu["Debian_Games_Strategy"] },

	{ "Toys", Debian_menu["Debian_Games_Toys"] },

}

Debian_menu["Debian_Help"] = {

	{"Info", "x-terminal-emulator -e ".."info"},

	{"Xman","xman"},

	{"yelp","/usr/bin/yelp"},

}

Debian_menu["Debian"] = {

	{ "Applications", Debian_menu["Debian_Applications"] },

	{ "Games", Debian_menu["Debian_Games"] },

	{ "Help", Debian_menu["Debian_Help"] },

}

.config/awesome/keys.lua

0 → 100644
+14 −0
Original line number Diff line number Diff line 
local awful = require("awful")



local keys = {}



function keys.run(keysuffix, cmd)

	return awful.key({}, "XF86Audio"..keysuffix, function()

		awful.util.spawn(cmd, false)

	end)

end



function keys.kodi(keysuffix, method, params)

end



return keys

.config/awesome/rc.lua

0 → 100644
+564 −0

File added.

Preview size limit exceeded, changes collapsed.