diff --git a/.NERDTreeBookmarks b/.NERDTreeBookmarks deleted file mode 100644 index 55e0401..0000000 --- a/.NERDTreeBookmarks +++ /dev/null @@ -1,18 +0,0 @@ - -bbpress /home/admin/app/public/wp-content/plugins/bbpress/templates/default/bbpress -bp-default /home/admin/app/public/wp-content/plugins/buddypress/bp-themes/bp-default -buddypress /home/admin/app/public/wp-content/plugins/buddypress -buddypress-docs /home/admin/app/public/wp-content/plugins/buddypress-docs -cbox-auth /home/admin/app/public/wp-content/plugins/cbox-auth -cbox-mla /home/admin/app/public/wp-content/themes/cbox-mla -cbox-mla-blog /home/admin/app/public/wp-content/themes/cbox-mla-blog -cbox-theme /home/admin/app/public/wp-content/themes/cbox-theme -functions.php /home/admin/app/public/wp-content/themes/cbox-mla/functions.php -languages /home/admin/app/public/wp-content/languages -mla-admin-bar /home/admin/app/public/wp-content/plugins/mla-admin-bar -mu-plugins /home/admin/app/public/wp-content/mu-plugins -plugins /home/admin/app/public/wp-content/plugins -style.scss /home/admin/app/public/wp-content/themes/cbox-mla/style.scss -todo.txt /home/admin/notes/todo.txt -wp-config.php /home/admin/app/wp-config.php -wp-content /home/admin/app/public/wp-content diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua deleted file mode 100644 index a460df5..0000000 --- a/.config/awesome/rc.lua +++ /dev/null @@ -1,643 +0,0 @@ --- Standard awesome library ---local gears = require("gears") -local awful = require("awful") -awful.rules = require("awful.rules") -require("awful.autofocus") --- Widget and layout library -local wibox = require("wibox") --- Theme handling library -local beautiful = require("beautiful") --- Notification library -local naughty = require("naughty") -local menubar = require("menubar") -local vicious = require("vicious") - --- {{{ Error handling --- Check if awesome encountered an error during startup and fell back to --- another config (This code will only ever execute for the fallback config) -if awesome.startup_errors then - naughty.notify({ preset = naughty.config.presets.critical, - title = "Oops, there were errors during startup!", - text = awesome.startup_errors }) -end - --- Handle runtime errors after startup -do - local in_error = false - awesome.connect_signal("debug::error", function (err) - -- Make sure we don't go into an endless error loop - if in_error then return end - in_error = true - - naughty.notify({ preset = naughty.config.presets.critical, - title = "Oops, an error happened!", - text = err }) - in_error = false - end) -end --- }}} - --- {{{ Variable definitions --- Themes define colours, icons, and wallpapers - ---{{---| Theme | ------------------------------------- - --- Todo: Please change the "ep" to your $USER -config_dir = ("/home/jreeve/.config/awesome/") -themes_dir = (config_dir .. "/powerarrowf") - -beautiful.init(themes_dir .. "/theme.lua") - --- This is used later as the default terminal, browser and editor to run. -terminal = "gnome-terminal" -editor = os.getenv("EDITOR") or "vim" -editor_cmd = terminal .. " -e " .. editor -browser = "chromium" - -font = "Inconsolata 11" - --- {{ These are the power arrow dividers/separators }} -- -arr1 = wibox.widget.imagebox() -arr1:set_image(beautiful.arr1) -arr2 = wibox.widget.imagebox() -arr2:set_image(beautiful.arr2) -arr3 = wibox.widget.imagebox() -arr3:set_image(beautiful.arr3) -arr4 = wibox.widget.imagebox() -arr4:set_image(beautiful.arr4) -arr5 = wibox.widget.imagebox() -arr5:set_image(beautiful.arr5) -arr6 = wibox.widget.imagebox() -arr6:set_image(beautiful.arr6) -arr7 = wibox.widget.imagebox() -arr7:set_image(beautiful.arr7) -arr8 = wibox.widget.imagebox() -arr8:set_image(beautiful.arr8) -arr9 = wibox.widget.imagebox() -arr9:set_image(beautiful.arr9) - - --- Default modkey. --- Usually, Mod4 is the key with a logo between Control and Alt. --- If you do not like this or do not have such a key, --- I suggest you to remap Mod4 to another key using xmodmap or other tools. --- However, you can use another modifier like Mod1, but it may interact with others. -modkey = "Mod4" - --- Table of layouts to cover with awful.layout.inc, order matters. -local layouts = -{ - awful.layout.suit.floating, - awful.layout.suit.tile, - awful.layout.suit.tile.left, - awful.layout.suit.tile.bottom, - awful.layout.suit.tile.top, -} --- }}} - --- {{{ Wallpaper ---if beautiful.wallpaper then - --for s = 1, screen.count() do - --gears.wallpaper.maximized(beautiful.wallpaper, s, true) - --end ---end --- }}} - --- {{{ Tags --- Define a tag table which hold all screen tags. -tags = {} -for s = 1, screen.count() do - -- Each screen has its own tag table. - tags[s] = awful.tag({ 1, 2, 3}, s, layouts[1]) -end --- }}} - --- {{{ Menu --- Create a laucher widget and a main menu -myawesomemenu = { - { "manual", terminal .. " -e man awesome" }, - { "edit config", editor_cmd .. " " .. awesome.conffile }, - { "restart", awesome.restart }, - { "quit", awesome.quit } -} - -mymainmenu = awful.menu({ items = { { "awesome", myawesomemenu, beautiful.awesome_icon }, - { "open terminal", terminal } - } - }) - -mylauncher = awful.widget.launcher({ menu = mymainmenu }) - --- Menubar configuration -menubar.utils.terminal = terminal -- Set the terminal for applications that require it --- }}} - --- {{{ Wibox - ---{{-- Time and Date Widget }} -- -tdwidget = wibox.widget.textbox() -local strf = '%b %d %I:%M' -vicious.register(tdwidget, vicious.widgets.date, strf, 20) - -clockicon = wibox.widget.imagebox() -clockicon:set_image(beautiful.clock) - ---{{ Net Widget }} -- -netwidget = wibox.widget.textbox() -vicious.register(netwidget, vicious.widgets.net, function(widget, args) - local interface = "" - if args["{wlp2s0 carrier}"] == 1 then - interface = "wlp2s0" - elseif args["{enp0s25 carrier}"] == 1 then - interface = "enp0s25" - else - return "" - end - return ' '..args["{"..interface.." down_kb}"]..'kbps'..'' end, 10) - ----{{---| Wifi Signal Widget |------- -neticon = wibox.widget.imagebox() -vicious.register(neticon, vicious.widgets.wifi, function(widget, args) - local sigstrength = tonumber(args["{link}"]) - if sigstrength > 69 then - neticon:set_image(beautiful.nethigh) - elseif sigstrength > 40 and sigstrength < 70 then - neticon:set_image(beautiful.netmedium) - else - neticon:set_image(beautiful.netlow) - end -end, 120, 'wlp2s0') - - ---{{ Battery Widget }} -- -baticon = wibox.widget.imagebox() -baticon:set_image(beautiful.baticon) - -batwidget = wibox.widget.textbox() -vicious.register( batwidget, vicious.widgets.bat, '$1$2% ', 30, "BAT0" ) - - ---{{---| File Size widget |----- -fswidget = wibox.widget.textbox() - -vicious.register(fswidget, vicious.widgets.fs, -' ${/home used_gb}/${/home avail_gb} GB ', -800) - -fsicon = wibox.widget.imagebox() -fsicon:set_image(beautiful.fsicon) - -----{{--| Volume / volume icon |---------- -volume = wibox.widget.textbox() -vicious.register(volume, vicious.widgets.volume, -' Vol:$1 ', 0.3, "Master") - -volumeicon = wibox.widget.imagebox() -vicious.register(volumeicon, vicious.widgets.volume, function(widget, args) - local paraone = tonumber(args[1]) - - if args[2] == "♩" or paraone == 0 then - volumeicon:set_image(beautiful.mute) - elseif paraone >= 67 and paraone <= 100 then - volumeicon:set_image(beautiful.volhi) - elseif paraone >= 33 and paraone <= 66 then - volumeicon:set_image(beautiful.volmed) - else - volumeicon:set_image(beautiful.vollow) - end - -end, 0.3, "Master") - ---{{---| CPU / sensors widget |----------- -cpuwidget = wibox.widget.textbox() -vicious.register(cpuwidget, vicious.widgets.cpu, -' $2%·$3% ', 5) - -cpuicon = wibox.widget.imagebox() -cpuicon:set_image(beautiful.cpuicon) - ---{{--| MEM widget |----------------- -memwidget = wibox.widget.textbox() - -vicious.register(memwidget, vicious.widgets.mem, ' $2MB ', 20) -memicon = wibox.widget.imagebox() -memicon:set_image(beautiful.mem) - ---{{--| Mail widget |--------- -mailicon = wibox.widget.imagebox() - -vicious.register(mailicon, vicious.widgets.gmail, function(widget, args) - local newMail = tonumber(args["{count}"]) - if newMail > 0 then - mailicon:set_image(beautiful.mail) - else - mailicon:set_image(beautiful.mailopen) - end -end, 15) - --- to make GMail pop up when pressed: -mailicon:buttons(awful.util.table.join(awful.button({ }, 1, -function () awful.util.spawn_with_shell(browser .. " gmail.com") end))) - - --- Create a wibox for each screen and add it -mywibox = {} -mypromptbox = {} -mylayoutbox = {} -mytaglist = {} -mytaglist.buttons = awful.util.table.join( - awful.button({ }, 1, awful.tag.viewonly), - awful.button({ modkey }, 1, awful.client.movetotag), - awful.button({ }, 3, awful.tag.viewtoggle), - awful.button({ modkey }, 3, awful.client.toggletag), - awful.button({ }, 4, function(t) awful.tag.viewnext(awful.tag.getscreen(t)) end), - awful.button({ }, 5, function(t) awful.tag.viewprev(awful.tag.getscreen(t)) end) - ) -mytasklist = {} -mytasklist.buttons = awful.util.table.join( - awful.button({ }, 1, function (c) - if c == client.focus then - c.minimized = true - else - -- Without this, the following - -- :isvisible() makes no sense - c.minimized = false - if not c:isvisible() then - awful.tag.viewonly(c:tags()[1]) - end - -- This will also un-minimize - -- the client, if needed - client.focus = c - c:raise() - end - end), - awful.button({ }, 3, function () - if instance then - instance:hide() - instance = nil - else - instance = awful.menu.clients({ width=250 }) - end - end), - awful.button({ }, 4, function () - awful.client.focus.byidx(1) - if client.focus then client.focus:raise() end - end), - awful.button({ }, 5, function () - awful.client.focus.byidx(-1) - if client.focus then client.focus:raise() end - end)) - -for s = 1, screen.count() do - -- Create a promptbox for each screen - mypromptbox[s] = awful.widget.prompt() - -- Create an imagebox widget which will contains an icon indicating which layout we're using. - -- We need one layoutbox per screen. - mylayoutbox[s] = awful.widget.layoutbox(s) - mylayoutbox[s]:buttons(awful.util.table.join( - awful.button({ }, 1, function () awful.layout.inc(layouts, 1) end), - awful.button({ }, 3, function () awful.layout.inc(layouts, -1) end), - awful.button({ }, 4, function () awful.layout.inc(layouts, 1) end), - awful.button({ }, 5, function () awful.layout.inc(layouts, -1) end))) - -- Create a taglist widget - mytaglist[s] = awful.widget.taglist(s, awful.widget.taglist.filter.all, mytaglist.buttons) - - -- Create a tasklist widget - mytasklist[s] = awful.widget.tasklist(s, awful.widget.tasklist.filter.currenttags, mytasklist.buttons) - - -- Create the wibox - mywibox[s] = awful.wibox({ position = "top", screen = s, height = "16" }) - - -- Widgets that are aligned to the left - local left_layout = wibox.layout.fixed.horizontal() - left_layout:add(mylauncher) - left_layout:add(mytaglist[s]) - left_layout:add(mypromptbox[s]) - - -- Widgets that are aligned to the right - local right_layout = wibox.layout.fixed.horizontal() - if s == 1 then right_layout:add(wibox.widget.systray()) end - right_layout:add(arr9) - right_layout:add(mailicon) - right_layout:add(arr8) - right_layout:add(memicon) - right_layout:add(memwidget) - right_layout:add(arr7) - right_layout:add(cpuicon) - right_layout:add(cpuwidget) - right_layout:add(arr6) - right_layout:add(volumeicon) - right_layout:add(volume) - right_layout:add(arr5) - right_layout:add(fsicon) - right_layout:add(fswidget) - right_layout:add(arr4) - right_layout:add(baticon) - right_layout:add(batwidget) - right_layout:add(arr3) - right_layout:add(neticon) - right_layout:add(netwidget) - right_layout:add(arr2) - right_layout:add(clockicon) - right_layout:add(tdwidget) - right_layout:add(arr1) - right_layout:add(mylayoutbox[s]) - - -- Now bring it all together (with the tasklist in the middle) - local layout = wibox.layout.align.horizontal() - layout:set_left(left_layout) - layout:set_middle(mytasklist[s]) - layout:set_right(right_layout) - - mywibox[s]:set_widget(layout) -end --- }}} - --- {{{ Mouse bindings -root.buttons(awful.util.table.join( - awful.button({ }, 3, function () mymainmenu:toggle() end), - awful.button({ }, 4, awful.tag.viewnext), - awful.button({ }, 5, awful.tag.viewprev) -)) --- }}} - --- {{{ Key bindings -globalkeys = awful.util.table.join( - awful.key({ modkey, }, "Left", awful.tag.viewprev ), - awful.key({ modkey, }, "Right", awful.tag.viewnext ), - awful.key({ modkey, }, "Escape", awful.tag.history.restore), - --- {{ Opens Chromium }} -- - -awful.key({ "Control", "Shift"}, "c", function() awful.util.spawn("chromium") end), -awful.key({ "Control", "Shift"}, "n", function() awful.util.spawn("chromium -incognito") end), - --- {{ Shuts down Computer }} -- - -awful.key({ "Control", }, "Escape", function() awful.util.spawn("systemctl poweroff") end), - --- {{ Spawns Skype }} -- - -awful.key({ "Control", "Shift"}, "s", function() awful.util.spawn("skype") end), - --- {{ Spawns Sublime }} -- - -awful.key({ "Control", "Shift"}, "b", function() awful.util.spawn("/opt/sublime-text/sublime_text") end), - --- {{ Volume Control }} -- - -awful.key({ }, "XF86AudioRaiseVolume", function() awful.util.spawn("amixer set Master 5%+", false) end), -awful.key({ }, "XF86AudioLowerVolume", function() awful.util.spawn("amixer set Master 5%-", false) end), -awful.key({ }, "XF86AudioMute", function() awful.util.spawn("amixer set Master toggle", false) end), - --- {{ Vim-like controls: - - awful.key({ modkey, }, "l", - function () - awful.client.focus.bydirection("right") - if client.focus then client.focus:raise() end - end), - awful.key({ modkey, }, "h", - function () - awful.client.focus.bydirection("left") - if client.focus then client.focus:raise() end - end), - awful.key({ modkey, }, "j", - function () - awful.client.focus.bydirection("down") - if client.focus then client.focus:raise() end - end), - awful.key({ modkey, }, "k", - function () - awful.client.focus.bydirection("up") - if client.focus then client.focus:raise() end - end), - - -- Layout manipulation - awful.key({ modkey, "Shift" }, "j", function () awful.client.swap.byidx( 1) end), - awful.key({ modkey, "Shift" }, "k", function () awful.client.swap.byidx( -1) end), - awful.key({ modkey, "Control" }, "j", function () awful.screen.focus_relative( 1) end), - awful.key({ modkey, "Control" }, "k", function () awful.screen.focus_relative(-1) end), - awful.key({ modkey, }, "Tab", - function () - awful.client.focus.history.previous() - if client.focus then - client.focus:raise() - end - end), - - -- Standard program - awful.key({ modkey, }, "Return", function () awful.util.spawn(terminal) end), - awful.key({ modkey, "Control" }, "r", awesome.restart), - awful.key({ modkey, "Shift" }, "q", awesome.quit), - - awful.key({ modkey, }, "i", function () awful.tag.incmwfact( 0.05) end), - awful.key({ modkey, }, "u", function () awful.tag.incmwfact(-0.05) end), - awful.key({ modkey, "Shift" }, "h", function () awful.tag.incnmaster( 1) end), - awful.key({ modkey, "Shift" }, "l", function () awful.tag.incnmaster(-1) end), - awful.key({ modkey, "Control" }, "h", function () awful.tag.incncol( 1) end), - awful.key({ modkey, "Control" }, "l", function () awful.tag.incncol(-1) end), - awful.key({ modkey, }, "space", function () awful.layout.inc(layouts, 1) end), - awful.key({ modkey, "Shift" }, "space", function () awful.layout.inc(layouts, -1) end), - - awful.key({ modkey, "Control" }, "n", awful.client.restore), - - -- Prompt - awful.key({ modkey }, "r", function () mypromptbox[mouse.screen]:run() end), - - awful.key({ modkey }, "x", - function () - awful.prompt.run({ prompt = "Run Lua code: " }, - mypromptbox[mouse.screen].widget, - awful.util.eval, nil, - awful.util.getdir("cache") .. "/history_eval") - end), - -- Menubar - awful.key({ modkey }, "p", function() menubar.show() end) -) - -clientkeys = awful.util.table.join( - awful.key({ modkey, }, "f", function (c) c.fullscreen = not c.fullscreen end), - awful.key({ modkey, "Shift" }, "c", function (c) c:kill() end), - awful.key({ modkey, "Control" }, "space", awful.client.floating.toggle ), - awful.key({ modkey, "Control" }, "Return", function (c) c:swap(awful.client.getmaster()) end), - awful.key({ modkey, }, "o", awful.client.movetoscreen ), - awful.key({ modkey, }, "t", function (c) c.ontop = not c.ontop end), - awful.key({ modkey, }, "n", - function (c) - -- The client currently has the input focus, so it cannot be - -- minimized, since minimized clients can't have the focus. - c.minimized = true - end), - awful.key({ modkey, }, "m", - function (c) - c.maximized_horizontal = not c.maximized_horizontal - c.maximized_vertical = not c.maximized_vertical - end) -) - --- Bind all key numbers to tags. --- Be careful: we use keycodes to make it works on any keyboard layout. --- This should map on the top row of your keyboard, usually 1 to 9. -for i = 1, 9 do - globalkeys = awful.util.table.join(globalkeys, - awful.key({ modkey }, "#" .. i + 9, - function () - local screen = mouse.screen - local tag = awful.tag.gettags(screen)[i] - if tag then - awful.tag.viewonly(tag) - end - end), - awful.key({ modkey, "Control" }, "#" .. i + 9, - function () - local screen = mouse.screen - local tag = awful.tag.gettags(screen)[i] - if tag then - awful.tag.viewtoggle(tag) - end - end), - awful.key({ modkey, "Shift" }, "#" .. i + 9, - function () - local tag = awful.tag.gettags(client.focus.screen)[i] - if client.focus and tag then - awful.client.movetotag(tag) - end - end), - awful.key({ modkey, "Control", "Shift" }, "#" .. i + 9, - function () - local tag = awful.tag.gettags(client.focus.screen)[i] - if client.focus and tag then - awful.client.toggletag(tag) - end - end)) -end - -clientbuttons = awful.util.table.join( - awful.button({ }, 1, function (c) client.focus = c; c:raise() end), - awful.button({ modkey }, 1, awful.mouse.client.move), - awful.button({ modkey }, 3, awful.mouse.client.resize)) - --- Set keys -root.keys(globalkeys) --- }}} - --- {{{ Rules -awful.rules.rules = { - -- All clients will match this rule. - { rule = { }, - properties = { border_width = beautiful.border_width, - border_color = beautiful.border_normal, - focus = awful.client.focus.filter, - keys = clientkeys, - size_hints_honor = false, - buttons = clientbuttons, - callback = awful.client.setslave } }, - { rule = { class = "MPlayer" }, - properties = { floating = true } }, - { rule = { class = "pinentry" }, - properties = { floating = true } }, - { rule = { class = "gimp" }, - properties = { floating = true } }, - --{ rule = { class = "Terminal" }, - -- properties = { } }, - { rule = { class = "Gvim" }, - properties = { opacity = 0.95 } }, - -- Set Firefox to always map on tags number 2 of screen 1. - -- { rule = { class = "Firefox" }, - -- properties = { tag = tags[1][2] } }, -} --- }}} - --- {{{ Signals --- Signal function to execute when a new client appears. -client.connect_signal("manage", function (c, startup) - -- Enable sloppy focus - c:connect_signal("mouse::enter", function(c) - if awful.layout.get(c.screen) ~= awful.layout.suit.magnifier - and awful.client.focus.filter(c) then - client.focus = c - end - end) - - if not startup then - -- Set the windows at the slave, - -- i.e. put it at the end of others instead of setting it master. - -- awful.client.setslave(c) - - -- Put windows in a smart way, only if they does not set an initial position. - if not c.size_hints.user_position and not c.size_hints.program_position then - awful.placement.no_overlap(c) - awful.placement.no_offscreen(c) - end - end - - local titlebars_enabled = false - if titlebars_enabled and (c.type == "normal" or c.type == "dialog") then - -- buttons for the titlebar - local buttons = awful.util.table.join( - awful.button({ }, 1, function() - client.focus = c - c:raise() - awful.mouse.client.move(c) - end), - awful.button({ }, 3, function() - client.focus = c - c:raise() - awful.mouse.client.resize(c) - end) - ) - - -- Widgets that are aligned to the left - local left_layout = wibox.layout.fixed.horizontal() - left_layout:add(awful.titlebar.widget.iconwidget(c)) - left_layout:buttons(buttons) - - -- Widgets that are aligned to the right - local right_layout = wibox.layout.fixed.horizontal() - right_layout:add(awful.titlebar.widget.floatingbutton(c)) - right_layout:add(awful.titlebar.widget.maximizedbutton(c)) - right_layout:add(awful.titlebar.widget.stickybutton(c)) - right_layout:add(awful.titlebar.widget.ontopbutton(c)) - right_layout:add(awful.titlebar.widget.closebutton(c)) - - -- The title goes in the middle - local middle_layout = wibox.layout.flex.horizontal() - local title = awful.titlebar.widget.titlewidget(c) - title:set_align("center") - middle_layout:add(title) - middle_layout:buttons(buttons) - - -- Now bring it all together - local layout = wibox.layout.align.horizontal() - layout:set_left(left_layout) - layout:set_right(right_layout) - layout:set_middle(middle_layout) - - awful.titlebar(c):set_widget(layout) - end -end) - --- {{ Function to ensure that certain programs only have one --- instance of themselves when i restart awesome - -function run_once(cmd) - findme = cmd - firstspace = cmd:find(" ") - if firstspace then - findme = cmd:sub(0, firstspace-1) - end - awful.util.spawn_with_shell("pgrep -u $USER -x " .. findme .. " > /dev/null || (" .. cmd .. ")") -end - --- {{ I need redshift to save my eyes }} - ---run_once("redshift -l 49.26:-123.23") -awful.util.spawn_with_shell("gnome-session") -awful.util.spawn_with_shell("xcompmgr -cfFn") - --- {{ Turns off the terminal bell }} -- -awful.util.spawn_with_shell("/usr/bin/xset b off") - -client.connect_signal("focus", function(c) c.border_color = beautiful.border_focus end) -client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_normal end) --- }}} diff --git a/.dwb/custom_keys b/.dwb/custom_keys deleted file mode 100644 index b8a75df..0000000 --- a/.dwb/custom_keys +++ /dev/null @@ -1,4 +0,0 @@ -sb:tabopen dwb:bookmarks;; -sq:tabopen dwb:quickmarks;; -sk:tabopen dwb:keys;; -ss:tabopen dwb:settings;; diff --git a/.dwb/keys b/.dwb/keys deleted file mode 100644 index 9cb34e2..0000000 --- a/.dwb/keys +++ /dev/null @@ -1,168 +0,0 @@ -[default] -allow_cookie= CC -allow_session_cookie= CS -allow_session_cookie_tmp= CT -backopen= xo -backopen_url= xO -bookmark= M -bookmarks= gb -buffers= gt -cancel_download= ad -clear_tab= gc -close_tab= d -command_mode= : -complete_bookmarks=Control B -complete_history=Control H -complete_path=Control p -complete_searchengines=Control S -complete_userscript=Control U -download= gd -download_set_execute=Control x -dump= -entry_confirm=Control g -entry_delete_letter=Control h -entry_delete_line=Control u -entry_delete_line_end=Control e -entry_delete_word=Control w -entry_delete_word_forward=Control e -entry_escape=Control c -entry_history_back=Control k -entry_history_forward=Control j -entry_word_back=Control b -entry_word_forward=Control f -eval= -execute_javascript= -execute_userscript= eu -find_backward= ? -find_backward_ic= c? -find_forward= / -find_forward_ic= c/ -find_next= n -find_previous= N -focus_input= gi -focus_next= J -focus_prev= K -focus_tab= q -fullscreen= @F11@ -hints= f -hints_background= ;b -hints_clipboard= ;y -hints_download= ;d -hints_editable= ;e -hints_images= ;i -hints_images_background= .i -hints_images_tab= ;I -hints_links= ;; -hints_primary= ;Y -hints_rapid= ;r -hints_rapid_win= ;R -hints_tab= F -hints_url= ;o -hints_url_background= .o -hints_url_tab= ;O -hints_win= wf -history_back= H -history_forward= L -insert_mode= i -load_html= -load_html_tab= -local_set= -lock_domain= xd -lock_uri= xu -new_tab=Control T -new_win= W -normal_mode=Control n -only= co -open= o -open_editor=Control e -open_url= O -paste= pp -paste_primary= pP -presentation_mode= @F12@ -print=Control Mod1 p -print_preview= -protect=Control P -proxy=Control p -quickmark= b -quit=Control q -reload= r -reload_bookmarks= -reload_bypass_cache= R -reload_quickmarks= -reload_userscripts= -sanitize= -save= sf -save_named_session= gZZ -save_quickmark= m -save_search_field= gs -save_session= ZZ -scroll_bottom= G -scroll_down= j -scroll_halfpage_down=Control d -scroll_halfpage_up=Control u -scroll_left= h -scroll_page_down=Control f -scroll_page_up=Control b -scroll_right= l -scroll_top= gg -scroll_up= k -set= -set_key= sk -set_local_setting= sl -set_setting= ss -show_bookmarks= Sb -show_downloads= Sd -show_history= Sh -show_keys= Sk -show_quickmarks= Sq -show_settings= Ss -start_page=Control h -stop_loading=Control s -tab_bookmarks= gB -tab_hist_back= -tab_hist_forward= -tab_move= gm -tab_move_left= gl -tab_move_right= gr -tab_new= ga -tab_paste= Pp -tab_paste_primary= PP -tab_quickmark= B -tabdo= -tabopen= t -tabopen_url= T -toggle_bars= xx -toggle_hidden_files= g. -toggle_local_setting= -toggle_plugins_host= ph -toggle_plugins_host_tmp= pth -toggle_plugins_uri= pu -toggle_plugins_uri_tmp= ptu -toggle_scripts_host= -toggle_scripts_host_tmp= -toggle_scripts_uri= -toggle_scripts_uri_tmp= -toggle_setting= -toggle_statusbar= xb -toggle_tab=Control @Tab@ -toggle_tabbar= xt -undo= u -view_source= gf -visible= xv -visual_mode= v -web_inspector= wi -win_bookmarks= wB -win_hist_back= wh -win_hist_forward= wl -win_paste= wp -win_paste_primary= wP -win_quickmark= wb -winopen= wo -winopen_url= wO -yank= yy -yank_primary= yY -yank_title= yt -yank_title_primary= yT -zoom= = -zoom_in= + -zoom_out= - diff --git a/.dwb/searchengines b/.dwb/searchengines deleted file mode 100644 index c7b1557..0000000 --- a/.dwb/searchengines +++ /dev/null @@ -1,8 +0,0 @@ -l https://www.google.com/search?hl=en&q=_dwb_search_submit_&btnI=I -g https://www.google.com/search?output=search&sclient=psy-ab&q=_dwb_search_submit_&oq=&gs_l=&pbx=1 -s http://stackoverflow.com/search?q=_dwb_search_submit_ -w http://en.wikipedia.org/w/index.php?search=_dwb_search_submit_&title=Special:Search -m https://maps.google.com/maps?f=q&source=s_q&output=js&hl=en&geocode=+&abauth=5320b3dbvfpOp3YLEhBTbAmKqGaxpN4pdlA&authuser=0&q=_dwb_search_submit_ -d https://duckduckgo.com/?q=_dwb_search_submit_ -s http://stackoverflow.com/search?q=_dwb_search_submit_ -wa http://www.wolframalpha.com/input/?i=_dwb_search_submit_&dataset= diff --git a/.gitignore b/.gitignore index 6492afe..f204cda 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,9 @@ bak/ -.vim/undo -.vim/plugged/ -.vim/spell/en.utf-8.spl -.vim/spell/en.utf-8.sug -.vim/init.vim -.vim/.netrwhist +dotfiles/.vim/undo +dotfiles/.vim/plugged/ +dotfiles/.vim/spell/en.utf-8.spl +dotfiles/.vim/spell/en.utf-8.sug +dotfiles/.vim/init.vim +dotfiles/.vim/.netrwhist +dotfiles/.vim/swap/ +dotfiles/.vim/backup/ diff --git a/.gitmodules b/.gitmodules index f26f215..700f7e1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,18 +1,9 @@ -[submodule "scripts/todo"] - path = scripts/todo - url = https://github.com/ginatrapani/todo.txt-cli.git -[submodule "scripts/zgen"] - path = scripts/zgen - url = https://github.com/tarjoilija/zgen.git [submodule "scripts/toggl-cli"] path = scripts/toggl-cli url = https://github.com/drobertadams/toggl-cli [submodule "scripts/scripts/toggl-cli"] path = scripts/scripts/toggl-cli url = https://github.com/drobertadams/toggl-cli -[submodule "scripts/vim-plug"] - path = scripts/vim-plug - url = https://github.com/junegunn/vim-plug.git [submodule "scripts/i3blocks-contrib"] path = scripts/i3blocks-contrib url = https://github.com/vivien/i3blocks-contrib.git diff --git a/.gvimrc b/.gvimrc deleted file mode 100644 index bd514bf..0000000 --- a/.gvimrc +++ /dev/null @@ -1,3 +0,0 @@ -set guiheadroom=0 -set guioptions= -set guifont=Droid\ Sans\ Mono\ 11 diff --git a/.uzbl-config b/.uzbl-config deleted file mode 100644 index c56d406..0000000 --- a/.uzbl-config +++ /dev/null @@ -1,471 +0,0 @@ -# Example uzbl config. All settings are optional. You can use uzbl without -# any config at all (but it won't do much). - -# === Core settings ========================================================== - -# common directory locations -set prefix = @(echo $PREFIX)@ -set data_home = @(echo $XDG_DATA_HOME)@ -set cache_home = @(echo $XDG_CACHE_HOME)@ -set config_home = @(echo $XDG_CONFIG_HOME)@ - -# Interface paths. -set fifo_dir = /tmp -set socket_dir = /tmp - -set shell_cmd = sh -c - -# === General config aliases ================================================= - -# Config related events (use the request function): -# request MODE_CONFIG = -set mode_config = request MODE_CONFIG -# request ON_EVENT -set on_event = request ON_EVENT -# request ON_SET -set on_set = request ON_SET -# request MODMAP -set modmap = request MODMAP -# request IGNORE_KEY -set ignore_key = request IGNORE_KEY -# request TOGGLE_MODES ... -set toggle_modes = request TOGGLE_MODES - -set set_mode = set mode = -set set_status = set status_message = - -# Spawn path shortcuts. In spawn the first dir+path match is used in "dir1:dir2:dir3:executable" -set scripts_dir = @data_home/uzbl:@prefix/share/uzbl/examples/data:scripts - -# === Hardcoded handlers ===================================================== - -# These handlers can't be moved to the new event system yet as we don't -# support events that can wait for a response from a script. -set scheme_handler = sync_spawn @scripts_dir/scheme.py -#set request_handler = sync_spawn @scripts_dir/request.py -set authentication_handler = sync_spawn @scripts_dir/auth.py -set download_handler = sync_spawn @scripts_dir/download.sh - -# === Dynamic event handlers ================================================= - -# What to do when a website wants to open a new window: -# Open link in new window -@on_event NEW_WINDOW sh 'uzbl-browser ${1:+-u "$1"}' %r -# Open in current window (also see the REQ_NEW_WINDOW event handler below) -#@on_event NEW_WINDOW uri %s -# Open in new tab. Other options are NEW_TAB_NEXT, NEW_BG_TAB and NEW_BG_TAB_NEXT. -#@on_event NEW_WINDOW event NEW_TAB %s - -# What to do when the user requests a new window: -# If your the NEW_WINDOW handler opens the uri in the current window, you'll -# probably want to change this handler to open a new window or tab. -@on_event REQ_NEW_WINDOW event NEW_WINDOW %s - -# Load start handler -@on_event LOAD_START @set_status wait -# Reset the keycmd on navigation -@on_event LOAD_START @set_mode - -# Load commit handlers -@on_event LOAD_COMMIT @set_status recv - - # add some javascript to the page for other 'js' and 'script' commands to access later. -@on_event LOAD_COMMIT js uzbl = {}; -@on_event LOAD_COMMIT script @scripts_dir/formfiller.js -@on_event LOAD_COMMIT script @scripts_dir/follow.js - -# Userscripts/per-site-settings. See the script and the example configuration for details -#@on_event LOAD_COMMIT spawn @scripts_dir/per-site-settings.py @data_home/uzbl/per-site-settings - -# Load finish handlers -@on_event LOAD_FINISH @set_status done -@on_event LOAD_FINISH spawn @scripts_dir/history.sh - -# Switch to insert mode if a (editable) html form is clicked -@on_event FOCUS_ELEMENT sh 'if [ "$1" = INPUT -o "$1" = TEXTAREA -o "$1" = SELECT ]; then echo "@set_mode insert" > $UZBL_FIFO; fi' %s -# Switch to command mode if anything else is clicked -@on_event ROOT_ACTIVE @set_mode command - -# Example CONFIG_CHANGED event handler -#@on_event CONFIG_CHANGED print Config changed: %1 = %2 - -# Scroll percentage calculation -@on_event SCROLL_VERT set scroll_message = \@<(function(curr, min, max, size){if(max == size) return '--'; var p=(curr/(max - size)); return Math.round(10000*p)/100;})(%1,%2,%3,%4)>\@% - -# === Behaviour and appearance =============================================== - -# Custom CSS can be defined here, including link follower hint styles -set stylesheet_uri = file://@config_home/uzbl/style.css - -set show_status = 1 -set status_top = 0 -set status_background = #303030 - -set modcmd_style = weight="bold" foreground="red" -set keycmd_style = weight="light" foreground="red" -set prompt_style = foreground="grey" -set cursor_style = underline="single" -set completion_style = foreground="green" -set hint_style = weight="bold" - -set mode_section = [\@[\@mode_indicator]\@] -set keycmd_section = [\@[\@keycmd_prompt]\@\@modcmd\@keycmd\@completion_list] -set progress_section = \@[\@progress.output]\@ -set scroll_section = \@[\@scroll_message]\@ -set uri_section = \@[\@uri]\@ -set name_section = \@[\@NAME]\@ -set status_section = \@status_message -set selected_section = \@[\@SELECTED_URI]\@ - -set download_section = \@downloads - -set status_format = @mode_section @keycmd_section @progress_section @name_section @status_section @scroll_section @selected_section @download_section -set status_format_right = uri: @uri_section - -set title_format_long = \@keycmd_prompt \@raw_modcmd \@raw_keycmd \@TITLE - Uzbl browser <\@NAME> \@SELECTED_URI - -# Progress bar config -# %d = done, %p = pending %c = percent done, %i = int done, %s = spinner, -# %t = percent pending, %o = int pending, %r = sprite scroll -set progress.width = 8 -set progress.format = [%d>%p]%c -set progress.done = = -set progress.pending = - -# === Useragent setup ======================================================== - -#set useragent = Uzbl (Webkit @{WEBKIT_MAJOR}.@{WEBKIT_MINOR}) (@(+uname -sm)@ [@ARCH_UZBL]) -set useragent = Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2227.0 Safari/537.36 - -# === Configure cookie blacklist ======================================================== - -# Accept 'session cookies' from uzbl.org (when you have a whitelist all other cookies are dropped) -#request WHITELIST_COOKIE domain 'uzbl.org$' expires '^$' - -# Drop google analytics tracking cookies (applied after whitelists if any) -#request BLACKLIST_COOKIE name '^__utm.$' - -# === SSL related configuration ============================================== - -# Set it to certificates store of your distribution, or your own CAfile. -set ssl_ca_file = /etc/ssl/certs/ca-certificates.crt -set ssl_verify = 1 -# Command to toggle ssl_verify value: -@cbind !ssl = chain 'toggle ssl_verify' 'reload' -# Example SSL error handler: -@on_event LOAD_ERROR js var patt=new RegExp('SSL handshake failed'); if (patt.test('%3')) {alert ('%3');} - -# === Key binding configuration ============================================== -# --- Internal modmapping and ignoring --------------------------------------- - -#modmap -@modmap -@modmap -@modmap -@modmap - -#ignore_key -@ignore_key -@ignore_key -@ignore_key -@ignore_key - -# --- Bind aliases ----------------------------------------------------------- - -# request BIND = -set bind = request MODE_BIND global - -# request MODE_BIND = -set mode_bind = request MODE_BIND - -# Insert mode binding alias -set ibind = @mode_bind insert - -# Command mode binding alias -set cbind = @mode_bind command - -# Non-insert mode bindings alias (ebind for edit-bind). -set ebind = @mode_bind global,-insert - -# --- Global & keycmd editing binds ------------------------------------------ - -# Resets keycmd and returns to default mode. -@on_event ESCAPE @set_mode -@on_event ESCAPE event KEYCMD_CLEAR -@on_event ESCAPE js uzbl.follow.clearHints() -@on_event ESCAPE search_clear -@on_event ESCAPE js window.getSelection().removeAllRanges() -@bind = event ESCAPE -@bind [ = event ESCAPE - -# Commands for editing and traversing the keycmd. -@ebind = event KEYCMD_EXEC_CURRENT -@ebind = event SET_CURSOR_POS 0 -@ebind = event SET_CURSOR_POS -1 -@ebind = event SET_CURSOR_POS - -@ebind = event SET_CURSOR_POS + -@ebind = event KEYCMD_BACKSPACE -@ebind = event KEYCMD_DELETE -@ebind = event START_COMPLETION -# Readline-ish bindings. -@ebind w = event KEYCMD_STRIP_WORD \ -./&?= -@ebind u = event SET_KEYCMD -@ebind a = event SET_CURSOR_POS 0 -@ebind e = event SET_CURSOR_POS -1 - -@ebind = event HISTORY_PREV -@ebind = event HISTORY_NEXT -@ebind r_ = event HISTORY_SEARCH %s -# Keycmd injection/append examples. -#@ebind su = event INJECT_KEYCMD \@uri -#@ebind st = event INJECT_KEYCMD \@title -#@ebind du = event APPEND_KEYCMD \@uri -#@ebind dt = event APPEND_KEYCMD \@title - -# --- Mouse bindings --------------------------------------------------------- - -# Middle click open in new window -@bind = sh 'if [ "$1" ]; then echo "event REQ_NEW_WINDOW $1" > "$UZBL_FIFO"; else echo "uri $(xclip -o | sed s/\\\@/%40/g)" > "$UZBL_FIFO"; fi' '\@SELECTED_URI' - -# --- Keyboard bindings ------------------------------------------------------ - -# With this command you can enter in any command at runtime when prefixed with -# a colon. -@cbind :_ = %s - -# open a new window or a new tab (see the on_event NEW_WINDOW settings above) -@cbind w = event REQ_NEW_WINDOW - -# Page movement binds -@cbind j = scroll vertical 20 -@cbind k = scroll vertical -20 -@cbind h = scroll horizontal -20 -@cbind l = scroll horizontal 20 -@cbind = scroll vertical -100% -@cbind = scroll vertical 100% -@cbind f = scroll vertical 100% -@cbind b = scroll vertical -100% -@cbind gg = scroll vertical begin -@cbind G = scroll vertical end -@cbind = scroll vertical begin -@cbind = scroll vertical end -@cbind ^ = scroll horizontal begin -@cbind $ = scroll horizontal end -@cbind = scroll vertical end -@cbind G_ = scroll vertical %r! -@cbind _G_ = scroll horizontal %r! - -# Navigation binds -@cbind H = back -@cbind L = forward -@cbind S = stop -@cbind r = reload -@cbind R = reload_ign_cache - -# Zoom binds -@cbind + = zoom_in -@cbind - = zoom_out -@cbind T = toggle zoom_type -@cbind 1 = set zoom_level = 1.0 -@cbind 2 = set zoom_level = 2.0 - -# Appearance binds -#@cbind t = toggle show_status - -# Page searching binds -@cbind /* = search %s -@cbind ?* = search_reverse %s -# Jump to next and previous items -@cbind n = search -@cbind N = search_reverse - -# Print pages to a printer -@cbind p = hardcopy - -# Web searching binds -@cbind goo_ = uri http://www.google.com/search?q=\@\@ -@cbind ddg_ = uri http://duckduckgo.com/?q=%s -@cbind \\awiki_ = uri http://wiki.archlinux.org/index.php/Special:Search?search=\@\@&go=Go -@cbind \\wiki_ = uri http://en.wikipedia.org/w/index.php?title=Special:Search&search=\@\@&go=Go - -# Handy binds -# Set function shortcut -@cbind s__ = set %1 = %2 -# Exit binding -@cbind ZZ = exit -# Dump config to stdout -@cbind !dump = sh 'echo dump_config > "$UZBL_FIFO"' -# Reload all variables in the config -@cbind !reload = sh "sed '/^# === Post-load misc commands/,$d' \"$UZBL_CONFIG\" | grep '^set ' > \"$UZBL_FIFO\"" - -# Use socat to directly inject commands into uzbl-core and view events -# raised by uzbl-core: -@cbind t = sh 'xterm -e "socat unix-connect:\"$UZBL_SOCKET\" -"' -#@cbind t = sh 'urxvt -e socat unix-connect:"$UZBL_SOCKET" -' - -# Uri opening prompts -@cbind o_ = uri %s -# Or have it load the current uri into the keycmd for editing -@cbind O_ = uri %s - -# Mode setting binds -@cbind i = @set_mode insert -@bind i = @set_mode insert - -# Hard-bound bookmarks -@cbind gh = uri http://www.uzbl.org - -# New window binds -@cbind gw = event REQ_NEW_WINDOW - -# SSL-ify bindings -@cbind zs = uri \@(echo "$UZBL_URI" | sed -e 's/^http:/https:/')\@ -@cbind zS = event REQ_NEW_WINDOW \@(echo "$UZBL_URI" | sed -e 's/^http:/https:/')\@ - -# Yanking & pasting binds -@cbind yy = sh 'echo -n "$UZBL_URI" | xclip' -@cbind yU = sh 'echo -n "$1" | xclip' '\@SELECTED_URI' -@cbind yt = sh 'echo -n "$UZBL_TITLE" | xclip' -@cbind ys = spawn @scripts_dir/follow.sh \@< uzbl.follow.followSelection('returnuri') >\@ clipboard - -# Clone current window -@cbind c = event REQ_NEW_WINDOW \@uri -# Go the page from primary selection -@cbind P = sh 'echo "uri $(xclip -o | sed s/\\\@/%40/g)" > "$UZBL_FIFO"' -# Go to the page in clipboard -@cbind p = sh 'echo "uri $(xclip -selection clipboard -o | sed s/\\\@/%40/g)" > "$UZBL_FIFO"' -# Start a new uzbl instance from the page in primary selection -@cbind 'p = sh 'echo "event REQ_NEW_WINDOW $(xclip -o)" > "$UZBL_FIFO"' -# paste primary selection into keycmd at the cursor position -@bind = sh 'echo "event INJECT_KEYCMD $(xclip -o | sed s/\\\@/%40/g)" > "$UZBL_FIFO"' - -# Bookmark inserting binds -@cbind m_ = sh 'echo "$UZBL_URI $1" >> "$XDG_DATA_HOME"/uzbl/bookmarks' '%s' -# Or use a script to insert a bookmark. -@cbind M = spawn @scripts_dir/insert_bookmark.sh - -# Bookmark/history loading -@cbind U = spawn @scripts_dir/load_url_from_history.sh -@cbind u = spawn @scripts_dir/load_url_from_bookmarks.sh - -# Temporary bookmarks -@cbind d = spawn @scripts_dir/insert_temp.sh -@cbind D = spawn @scripts_dir/load_url_from_temps.sh - -# Link following (similar to vimperator and konqueror) -# Set custom keys you wish to use for navigation. Some common examples: -#set follow_hint_keys = 0123456789 -#set follow_hint_keys = qwerty -set follow_hint_keys = asdfghjkl; -#set follow_hint_keys = thsnd-rcgmvwb/;789aefijkopquxyz234 -#@cbind fl* = spawn @scripts_dir/follow.sh \@< uzbl.follow("\@follow_hint_keys", "%s", 'click') >\@ -@cbind f* = spawn @scripts_dir/follow.sh \@< uzbl.follow("\@follow_hint_keys", "%s", 'newwindow') >\@ -#@cbind fL* = spawn @scripts_dir/follow.sh \@< uzbl.follow("\@follow_hint_keys", "%s", 'returnuri') >\@ set -#@cbind FL* = spawn @scripts_dir/follow.sh \@< uzbl.follow("\@follow_hint_keys", "%s", 'returnuri') >\@ clipboard -@cbind gi = spawn @scripts_dir/go_input.sh - -#@cbind fs = spawn @scripts_dir/follow.sh \@< uzbl.follow.followSelection('returnuri') >\@ set -#@cbind fS = spawn @scripts_dir/follow.sh \@< uzbl.follow.followSelection('click') >\@ -#@cbind Fs = spawn @scripts_dir/follow.sh \@< uzbl.follow.followSelection('newwindow') >\@ -#@cbind FS = spawn @scripts_dir/follow.sh \@< uzbl.follow.followSelection('returnuri') >\@ clipboard - -#@cbind ft* = spawn @scripts_dir/follow.sh \@< uzbl.follow.followTextContent("%s", 'returnuri') >\@ set -#@cbind fT* = spawn @scripts_dir/follow.sh \@< uzbl.follow.followTextContent("%s", 'click') >\@ -#@cbind Ft* = spawn @scripts_dir/follow.sh \@< uzbl.follow.followTextContent("%s", 'newwindow') >\@ -#@cbind FT* = spawn @scripts_dir/follow.sh \@< uzbl.follow.followTextContent("%s", 'returnuri') >\@ clipboard - -@cbind '* = spawn @scripts_dir/follow.sh \@< uzbl.follow.followTextContent("%s", 'click') >\@ - -# Form filler binds -# This script allows you to configure (per domain) values to fill in form -# fields (eg login information) and to fill in these values automatically. -# This implementation allows you to save multiple profiles for each form -# (think about multiple accounts on some website). -set formfiller = spawn @scripts_dir/formfiller.sh -@cbind ze = @formfiller edit -@cbind zn = @formfiller new -@cbind zl = @formfiller load -@cbind zo = @formfiller once - -# --- Uzbl tabbed binds ------------------------------------------------------ - -# Tab opening -@cbind gn = event NEW_TAB -@cbind gN = event NEW_TAB_NEXT -@cbind t_ = event NEW_TAB %s -@cbind gO_ = event NEW_TAB_NEXT %s - -# Closing / resting -@cbind d = exit -@cbind gQ = event CLEAN_TABS - -# Tab navigating -@cbind g0 = event FIRST_TAB -@cbind g$ = event LAST_TAB -@cbind J = event NEXT_TAB -@cbind K = event PREV_TAB -@cbind g_ = event GOTO_TAB %s - -# Preset loading -set preset = event PRESET_TABS -@cbind gs_ = @preset save %s -@cbind glo_ = @preset load %s -@cbind gd_ = @preset del %s -# This doesn't work right now. -#@cbind gli = @preset list - -# === Context menu items ===================================================== - -# Default context menu -menu_add Google = set uri = http://google.com -menu_add Go Home = set uri = http://uzbl.org -menu_separator separator_1 -menu_add Quit uzbl = exit - -# Link context menu -menu_link_add Print Link = print \@SELECTED_URI - -# === Mode configuration ===================================================== - -# Define some mode specific uzbl configurations. -set command = @mode_config command -set insert = @mode_config insert -set stack = @mode_config stack - -# Command mode config. -@command keycmd_style = foreground="red" -@command status_background = #202020 -@command mode_indicator = Cmd -@command keycmd_events = 1 -@command forward_keys = 0 -@command modcmd_updates = 1 - -# Insert mode config. -@insert status_background = #303030 -@insert mode_indicator = Ins -@insert forward_keys = 1 -@insert keycmd_events = 0 -@insert modcmd_updates = 0 - -# Multi-stage-binding mode config. -@stack keycmd_style = foreground="red" -@stack status_background = #202020 -@stack mode_indicator = Bnd -@stack prompt_style = foreground="#888" weight="light" -@stack keycmd_events = 1 -@stack modcmd_updates = 1 -@stack forward_keys = 0 - -set default_mode = command - -# === Post-load misc commands ================================================ -sync_spawn_exec @scripts_dir/load_cookies.sh -sync_spawn_exec @scripts_dir/load_cookies.sh @data_home/uzbl/session-cookies.txt - -# Set the "home" page. -set uri = uzbl.org/doesitwork/@COMMIT - -# Switch to insert mode when javascript focuses text element -@on_event LOAD_FINISH sh 'if [ "\@\@" = "text" ]; then echo "event FORM_ACTIVE" > $4; fi' - -# vim: set fdm=syntax: diff --git a/.vim/swap/.gitignore b/.vim/swap/.gitignore deleted file mode 100644 index 5e7d273..0000000 --- a/.vim/swap/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -# Ignore everything in this directory -* -# Except this file -!.gitignore diff --git a/README.md b/README.md index 975ffc8..2998dd7 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,12 @@ -#Dotfiles +# Dotfiles My personal configurations for applications like vim, pentadactyl, tmux, etc. Jonathan Reeve, jon.reeve@gmail.com + +# Installation +Use `stow`: + + git clone https://github.com/JonathanReeve/dotfiles + cd dotfiles + stow -t ~ dotfiles diff --git a/.Xmodmap b/dotfiles/.Xmodmap similarity index 100% rename from .Xmodmap rename to dotfiles/.Xmodmap diff --git a/.bashrc b/dotfiles/.bashrc similarity index 98% rename from .bashrc rename to dotfiles/.bashrc index 5616809..6536fd5 100644 --- a/.bashrc +++ b/dotfiles/.bashrc @@ -281,3 +281,7 @@ export PATH="$HOME/dotfiles/scripts:$PATH" #Needed for WP / BP tests export WP_TESTS_DIR="/home/jreeve/Apps/wordpress-develop/tests/phpunit" +# >>> BEGIN ADDED BY CNCHI INSTALLER +BROWSER=/usr/bin/chromium +EDITOR=/usr/bin/nano +# <<< END ADDED BY CNCHI INSTALLER diff --git a/dotfiles/.config/fish/conf.d/omf.fish b/dotfiles/.config/fish/conf.d/omf.fish new file mode 100644 index 0000000..3e0f6d6 --- /dev/null +++ b/dotfiles/.config/fish/conf.d/omf.fish @@ -0,0 +1,7 @@ +# Path to Oh My Fish install. +set -q XDG_DATA_HOME + and set -gx OMF_PATH "$XDG_DATA_HOME/omf" + or set -gx OMF_PATH "$HOME/.local/share/omf" + +# Load Oh My Fish configuration. +source $OMF_PATH/init.fish diff --git a/dotfiles/.config/fish/config.fish b/dotfiles/.config/fish/config.fish new file mode 100644 index 0000000..0699515 --- /dev/null +++ b/dotfiles/.config/fish/config.fish @@ -0,0 +1,3 @@ +fish_vi_key_bindings + +set PATH ~/.local/bin $PATH diff --git a/dotfiles/.config/fish/fishd.jon-laptop b/dotfiles/.config/fish/fishd.jon-laptop new file mode 100644 index 0000000..c03cc6d --- /dev/null +++ b/dotfiles/.config/fish/fishd.jon-laptop @@ -0,0 +1,35 @@ +# This file is automatically generated by the fish. +# Do NOT edit it directly, your changes will be overwritten. +SET BROWSER:firefox +SET EDITOR:vim +SET __fish_init_2_39_8:\x1d +SET __fish_init_2_3_0:\x1d +SET fish_color_autosuggestion:555\x1ebrblack +SET fish_color_command:\x2d\x2dbold +SET fish_color_comment:red +SET fish_color_cwd:green +SET fish_color_cwd_root:red +SET fish_color_end:brmagenta +SET fish_color_error:brred +SET fish_color_escape:bryellow\x1e\x2d\x2dbold +SET fish_color_history_current:\x2d\x2dbold +SET fish_color_host:normal +SET fish_color_match:\x2d\x2dbackground\x3dbrblue +SET fish_color_normal:normal +SET fish_color_operator:bryellow +SET fish_color_param:cyan +SET fish_color_quote:yellow +SET fish_color_redirection:brblue +SET fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack +SET fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack +SET fish_color_user:brgreen +SET fish_color_valid_path:\x2d\x2dunderline +SET fish_greeting:\x1d +SET fish_key_bindings:fish_vi_key_bindings +SET fish_pager_color_completion:\x1d +SET fish_pager_color_description:B3A06D\x1eyellow +SET fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline +SET fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan +SET fish_user_abbreviations:gst\x20git\x20status\x1egco\x20git\x20checkout\x1egcob\x20git\x20checkout\x20\x2db\x1egcom\x20git\x20checkout\x20master\x1egp\x20git\x20push\x1egc\x20git\x20commit\x1egcam\x20git\x20commit\x20\x2dam\x1egcm\x20git\x20commit\x20\x2dm\x1einstall\x20sudo\x20pacman\x20\x2dS\x1esearch\x20pacman\x20\x2dSs\x1eupdate\x20yaourt\x20\x2dSyu\x20\x2d\x2daur\x20\x2d\x2dnoconfirm\x1epw\x20vim\x20/home/jon/Dropbox/Personal/\x2ep10\x2etxt +SET vaultloc:/home/jon/Dropbox/Personal/\x2eVault_encfs +SET vaultmount:/home/jon/Documents/Settings/\x2eprivate\x2dmount diff --git a/dotfiles/.config/fish/fishd.localhost.localdomain b/dotfiles/.config/fish/fishd.localhost.localdomain new file mode 100644 index 0000000..b7edc19 --- /dev/null +++ b/dotfiles/.config/fish/fishd.localhost.localdomain @@ -0,0 +1,30 @@ +# This file is automatically generated by the fish. +# Do NOT edit it directly, your changes will be overwritten. +SET __fish_init_2_39_8:\x1d +SET __fish_init_2_3_0:\x1d +SET fish_color_autosuggestion:555\x1ebrblack +SET fish_color_command:\x2d\x2dbold +SET fish_color_comment:red +SET fish_color_cwd:green +SET fish_color_cwd_root:red +SET fish_color_end:brmagenta +SET fish_color_error:brred +SET fish_color_escape:bryellow\x1e\x2d\x2dbold +SET fish_color_history_current:\x2d\x2dbold +SET fish_color_host:normal +SET fish_color_match:\x2d\x2dbackground\x3dbrblue +SET fish_color_normal:normal +SET fish_color_operator:bryellow +SET fish_color_param:cyan +SET fish_color_quote:yellow +SET fish_color_redirection:brblue +SET fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack +SET fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack +SET fish_color_user:brgreen +SET fish_color_valid_path:\x2d\x2dunderline +SET fish_greeting:\x1d +SET fish_key_bindings:fish_vi_key_bindings +SET fish_pager_color_completion:\x1d +SET fish_pager_color_description:B3A06D\x1eyellow +SET fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline +SET fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan diff --git a/dotfiles/.config/fish/fishd.nohost b/dotfiles/.config/fish/fishd.nohost new file mode 100644 index 0000000..a4daef8 --- /dev/null +++ b/dotfiles/.config/fish/fishd.nohost @@ -0,0 +1,30 @@ +# This file is automatically generated by the fish. +# Do NOT edit it directly, your changes will be overwritten. +SET __fish_init_2_39_8:\x1d +SET __fish_init_2_3_0:\x1d +SET fish_color_autosuggestion:555\x1ebrblack +SET fish_color_command:\x2d\x2dbold +SET fish_color_comment:red +SET fish_color_cwd:green +SET fish_color_cwd_root:red +SET fish_color_end:brmagenta +SET fish_color_error:brred +SET fish_color_escape:bryellow\x1e\x2d\x2dbold +SET fish_color_history_current:\x2d\x2dbold +SET fish_color_host:normal +SET fish_color_match:\x2d\x2dbackground\x3dbrblue +SET fish_color_normal:normal +SET fish_color_operator:bryellow +SET fish_color_param:cyan +SET fish_color_quote:yellow +SET fish_color_redirection:brblue +SET fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack +SET fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack +SET fish_color_user:brgreen +SET fish_color_valid_path:\x2d\x2dunderline +SET fish_greeting:\x1d +SET fish_key_bindings:fish_default_key_bindings +SET fish_pager_color_completion:\x1d +SET fish_pager_color_description:B3A06D\x1eyellow +SET fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline +SET fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan diff --git a/qutebrowser.conf b/dotfiles/.config/qutebrowser/qutebrowser.conf similarity index 100% rename from qutebrowser.conf rename to dotfiles/.config/qutebrowser/qutebrowser.conf diff --git a/.gitconfig b/dotfiles/.gitconfig similarity index 100% rename from .gitconfig rename to dotfiles/.gitconfig diff --git a/.gtkrc-2.0 b/dotfiles/.gtkrc-2.0 similarity index 100% rename from .gtkrc-2.0 rename to dotfiles/.gtkrc-2.0 diff --git a/.i3/config b/dotfiles/.i3/config similarity index 100% rename from .i3/config rename to dotfiles/.i3/config diff --git a/.i3blocks.conf b/dotfiles/.i3blocks.conf similarity index 100% rename from .i3blocks.conf rename to dotfiles/.i3blocks.conf diff --git a/.inputrc b/dotfiles/.inputrc similarity index 100% rename from .inputrc rename to dotfiles/.inputrc diff --git a/.spacemacs b/dotfiles/.spacemacs similarity index 72% rename from .spacemacs rename to dotfiles/.spacemacs index 6184483..dff6653 100644 --- a/.spacemacs +++ b/dotfiles/.spacemacs @@ -31,6 +31,7 @@ values." ;; List of configuration layers to load. dotspacemacs-configuration-layers '( + javascript ;; vimscript yaml html @@ -40,6 +41,7 @@ values." ;; (Emacs style) to install them. ;; ---------------------------------------------------------------- helm + haskell (auto-completion :variables spacemacs-default-company-backends '(company-files company-capf ein:company-backend)) @@ -54,6 +56,7 @@ values." git markdown python + pdf-tools org (shell :variables shell-default-height 30 @@ -68,7 +71,9 @@ values." ;; wrapped in a layer. If you need some configuration for these ;; packages, then consider creating a layer. You can also put the ;; configuration in `dotspacemacs/user-config'. - dotspacemacs-additional-packages '() + dotspacemacs-additional-packages '( + (stylus-mode :location (recipe :fetcher github :repo "vladh/stylus-mode")) + ) ;; A list of packages that cannot be updated. dotspacemacs-frozen-packages '() ;; A list of packages that will not be installed and loaded. @@ -140,15 +145,15 @@ values." ;; List of themes, the first of the list is loaded when spacemacs starts. ;; Press `SPC T n' to cycle to the next theme in the list (works great ;; with 2 themes variants, one dark and one light) - dotspacemacs-themes '(sanityinc-tomorrow-night + dotspacemacs-themes '(gotham + sanityinc-tomorrow-night gruvbox - gotham spacemacs-dark) ;; If non nil the cursor color matches the state color in GUI Emacs. dotspacemacs-colorize-cursor-according-to-state t ;; Default font, or prioritized list of fonts. `powerline-scale' allows to ;; quickly tweak the mode-line size to make separators look not too crappy. - dotspacemacs-default-font '("Fira Mono for Powerline" + dotspacemacs-default-font '("Droid Sans Mono Dotted for Powerline" :size 30 :weight normal :width normal @@ -383,6 +388,7 @@ you should place your code here." (setq org-startup-indented t) (setq org-todo-keywords '((sequence "TODO" "|" "DONE" "CANCELED"))) + (setq evil-org-key-theme '(textobjects navigation additional insert todo)) ;; Enable visual-line-mode by default in Org Mode. (add-hook 'org-mode-hook 'visual-line-mode) @@ -393,6 +399,13 @@ you should place your code here." (define-key evil-visual-state-map "j" 'evil-next-visual-line) (define-key evil-visual-state-map "k" 'evil-previous-visual-line) + ;; Org Code Execution + (org-babel-do-load-languages + 'org-babel-load-languages + '((python . t) + (haskell . t) + (emacs-lisp . t))) + ;; Org Calendar and Diary (setq diary-file "~/Dropbox/Org/diary") (setq org-agenda-include-diary t) @@ -434,7 +447,7 @@ you should place your code here." (setq org-capture-templates '(("t" "Todo" entry (file+headline "/home/jon/Dropbox/Org/notes.org" "Tasks") "* TODO %? %i\n %a") - ("m" "Movie" entry (file+headline "/home/jon/Dropbox/Org/notes.org" "Movies") + ("m" "Movie" entry (file+headline "/home/jon/Dropbox/Org/movies.org" "To Watch") "* %a\n %?\n %i") ("l" "Link" entry (file+olp "/home/jon/Dropbox/Org/notes.org" "Web Links") "* %a\n %?\n %i"))) @@ -447,10 +460,58 @@ you should place your code here." (setq holiday-hebrew-holidays nil) ;; Bibliography + (setq reftex-default-bibliography '("~/Dropbox/Papers/library.bib")) (setq org-ref-default-bibliography '("~/Dropbox/Papers/library.bib") - org-ref-pdf-directory "~/Dropbox/Papers/" - org-ref-bibliography-notes "~/Dropbox/Papers/notes.org" - bibtex-completion-pdf-field "file") + org-ref-pdf-directory "~/Dropbox/Papers" ;; keep the final slash off + org-ref-bibliography-notes "~/Dropbox/Org/Projects/books.org" + bibtex-completion-pdf-field "file" + org-ref-get-pdf-filename-function 'org-ref-get-zotero-pdf-filename) + + (setq org-ref-note-title-format + "** TODO %y - %t + :PROPERTIES: + :Custom_ID: %k + :AUTHOR: %9a + :JOURNAL: %j + :YEAR: %y + :END: +") + + (defun org-ref-get-zotero-pdf-filename (key) + "Return the pdf filename indicated by zotero file field. +Argument KEY is the bibtex key." + (let* ((results (org-ref-get-bibtex-key-and-file key)) + (bibfile (cdr results)) + entry) + (with-temp-buffer + (insert-file-contents bibfile) + (bibtex-set-dialect (parsebib-find-bibtex-dialect) t) + (bibtex-search-entry key nil 0) + (setq entry (bibtex-parse-entry)) + (let ((e (org-ref-reftex-get-bib-field "file" entry))) + (if (> (length e) 4) + (let ((clean-field (replace-regexp-in-string "/+" "/" e))) + (let ((first-file (car (split-string clean-field ";" t)))) + (concat org-ref-pdf-directory first-file))) + (message "PDF filename not found.") + ))))) + + ;; Override this function. + (defun org-ref-open-bibtex-pdf () + "Open pdf for a bibtex entry, if it exists. +assumes point is in +the entry of interest in the bibfile. but does not check that." + (interactive) + (save-excursion + (bibtex-beginning-of-entry) + (let* ((bibtex-expand-strings t) + (entry (bibtex-parse-entry t)) + (key (reftex-get-bib-field "=key=" entry)) + (pdf (org-ref-get-zotero-pdf-filename key))) + (message "%s" pdf) + (if (file-exists-p pdf) + (org-open-link-from-string (format "[[file:%s]]" pdf)) + (ding))))) (setq neo-theme 'nerd) @@ -470,13 +531,19 @@ you should place your code here." ;; Mail ;; Send email via Gmail: + ;; smtpmail-smtp-service 25) (setq smtpmail-smtp-server "smtp.gmail.com" - smtpmail-smtp-service 25) - (setq message-send-mail-function 'smtpmail-send-it + smtpmail-smtp-service 587 + message-send-mail-function 'smtpmail-send-it smtpmail-default-smtp-server "smtp.gmail.com") (add-hook 'mu4e-view-mode-hook 'visual-line-mode) + ;; configure orgmode support in mu4e + ;;(require 'org-mu4e) + ;; when mail is sent, automatically convert org body to HTML + (setq org-mu4e-convert-to-html t) + ;; Better looking HTML mail ;; (setq shr-color-visible-luminance-min 80) (setq shr-use-colors nil) @@ -550,3 +617,60 @@ you should place your code here." ;; (setq nnml-directory "~/Mail") ;; (setq message-directory "~/Mail") ) +(defun dotspacemacs/emacs-custom-settings () + "Emacs custom settings. +This is an auto-generated function, do not modify its content directly, use +Emacs customize menu instead. +This function is called at the very end of Spacemacs initialization." +(custom-set-variables + ;; custom-set-variables was added by Custom. + ;; If you edit it by hand, you could mess it up, so be careful. + ;; Your init file should contain only one such instance. + ;; If there is more than one, they won't work right. + '(ansi-color-faces-vector + [default bold shadow italic underline bold bold-italic bold]) + '(ansi-color-names-vector + ["#3c3836" "#fb4934" "#b8bb26" "#fabd2f" "#83a598" "#d3869b" "#8ec07c" "#ebdbb2"]) + '(auth-source-save-behavior nil) + '(evil-want-Y-yank-to-eol nil) + '(fci-rule-color "#373b41" t) + '(flycheck-color-mode-line-face-to-color (quote mode-line-buffer-id)) + '(org-agenda-files + (quote + ("~/Dropbox/Org/Projects/books.org" "/home/jon/Dropbox/Org/Projects/orals.org" "/home/jon/Dropbox/Org/Projects/DH Box.org" "/home/jon/Dropbox/Org/Projects/Joyce TEI.org" "/home/jon/Dropbox/Org/Projects/Middlemarch.org" "/home/jon/Dropbox/Org/Projects/University Writing.org" "/home/jon/Dropbox/Org/Projects/annotags.org" "/home/jon/Dropbox/Org/Projects/chapters.org" "/home/jon/Dropbox/Org/Projects/late style.org" "/home/jon/Dropbox/Org/Projects/macro-etym.org" "/home/jon/Dropbox/Org/Projects/prospectus.org" "/home/jon/Dropbox/Org/Projects/schedule.org" "/home/jon/Dropbox/Org/Projects/todo.org"))) + '(org-modules + (quote + (org-bbdb org-bibtex org-docview org-gnus org-habit org-info org-irc org-mhe org-protocol org-rmail org-w3m))) + '(package-selected-packages + (quote + (window-purpose imenu-list async org-brain impatient-mode evil-org ereader org-notebook add-node-modules-path request-deferred ht helm-bibtex alert log4e gntp intero hlint-refactor hindent helm-hoogle parsebib haskell-snippets haml-mode gitignore-mode flyspell-correct pos-tip flycheck-haskell magit-popup git-commit simple-httpd ace-jump-mode noflet websocket dante web-completion-data company-ghci company-ghc ghc haskell-mode company-cabal cmm-mode biblio biblio-core anaconda-mode pythonic auto-complete password-generator key-chord evil-lion editorconfig ivy company elfeed smartparens evil flycheck helm helm-core yasnippet markdown-mode deferred org-plus-contrib magit with-editor dash pdf-tools tablist livid-mode json-mode js2-refactor company-tern dash-functional web-beautify skewer-mode json-snatcher json-reformat multiple-cursors js2-mode js-doc tern coffee-mode zonokai-theme zenburn-theme zen-and-art-theme yapfify yaml-mode xterm-color ws-butler winum white-sand-theme which-key web-mode volatile-highlights vi-tilde-fringe uuidgen use-package underwater-theme ujelly-theme twilight-theme twilight-bright-theme twilight-anti-bright-theme tronesque-theme toxi-theme toc-org tao-theme tangotango-theme tango-plus-theme tango-2-theme tagedit symon sunny-day-theme sublime-themes subatomic256-theme subatomic-theme string-inflection spaceline spacegray-theme soothe-theme solarized-theme soft-stone-theme soft-morning-theme soft-charcoal-theme smyx-theme smeargle slim-mode shell-pop seti-theme scss-mode sass-mode reverse-theme restart-emacs rebecca-theme rainbow-delimiters railscasts-theme pyvenv pytest pyenv-mode py-isort purple-haze-theme pug-mode professional-theme planet-theme pip-requirements phoenix-dark-pink-theme phoenix-dark-mono-theme persp-mode pcre2el pastels-on-dark-theme paradox orgit organic-green-theme org-ref org-projectile org-present org-pomodoro org-gcal org-download org-bullets open-junk-file omtose-phellack-theme oldlace-theme occidental-theme obsidian-theme noctilux-theme niflheim-theme neotree naquadah-theme mustang-theme multi-term mu4e-maildirs-extension mu4e-alert move-text monokai-theme monochrome-theme molokai-theme moe-theme mmm-mode minimal-theme material-theme markdown-toc majapahit-theme magit-gitflow madhat2r-theme macrostep lush-theme lorem-ipsum live-py-mode linum-relative link-hint light-soap-theme less-css-mode jbeans-theme jazz-theme ir-black-theme inkpot-theme info+ indent-guide hy-mode hungry-delete htmlize hl-todo highlight-parentheses highlight-numbers highlight-indentation hide-comnt heroku-theme hemisu-theme help-fns+ helm-themes helm-swoop helm-pydoc helm-purpose helm-projectile helm-mode-manager helm-make helm-gitignore helm-flx helm-descbinds helm-css-scss helm-company helm-c-yasnippet helm-ag hc-zenburn-theme gruvbox-theme gruber-darker-theme grandshell-theme gotham-theme google-translate golden-ratio gnuplot gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link gh-md gandalf-theme fuzzy flyspell-correct-helm flycheck-pos-tip flx-ido flatui-theme flatland-theme firebelly-theme fill-column-indicator farmhouse-theme fancy-battery eyebrowse expand-region exec-path-from-shell evil-visualstar evil-visual-mark-mode evil-unimpaired evil-tutor evil-surround evil-search-highlight-persist evil-numbers evil-nerd-commenter evil-mc evil-matchit evil-magit evil-lisp-state evil-indent-plus evil-iedit-state evil-exchange evil-escape evil-ediff evil-args evil-anzu eval-sexp-fu espresso-theme eshell-z eshell-prompt-extras esh-help emmet-mode elisp-slime-nav elfeed-web elfeed-org elfeed-goodies ein dumb-jump dracula-theme django-theme define-word darktooth-theme darkokai-theme darkmine-theme darkburn-theme dakrone-theme cython-mode cyberpunk-theme company-web company-statistics company-anaconda column-enforce-mode color-theme-sanityinc-tomorrow color-theme-sanityinc-solarized clues-theme clean-aindent-mode cherry-blossom-theme calfw busybee-theme bubbleberry-theme birds-of-paradise-plus-theme badwolf-theme auto-yasnippet auto-highlight-symbol auto-dictionary auto-compile apropospriate-theme anti-zenburn-theme ample-zen-theme ample-theme alect-themes aggressive-indent afternoon-theme ace-window ace-link ace-jump-helm-line ac-ispell))) + '(vc-annotate-background nil) + '(vc-annotate-color-map + (quote + ((20 . "#cc6666") + (40 . "#de935f") + (60 . "#f0c674") + (80 . "#b5bd68") + (100 . "#8abeb7") + (120 . "#81a2be") + (140 . "#b294bb") + (160 . "#cc6666") + (180 . "#de935f") + (200 . "#f0c674") + (220 . "#b5bd68") + (240 . "#8abeb7") + (260 . "#81a2be") + (280 . "#b294bb") + (300 . "#cc6666") + (320 . "#de935f") + (340 . "#f0c674") + (360 . "#b5bd68")))) + '(vc-annotate-very-old-color nil)) + +(custom-set-faces + ;; custom-set-faces was added by Custom. + ;; If you edit it by hand, you could mess it up, so be careful. + ;; Your init file should contain only one such instance. + ;; If there is more than one, they won't work right. + ) +) diff --git a/.tmux.conf-child b/dotfiles/.tmux.conf-child similarity index 100% rename from .tmux.conf-child rename to dotfiles/.tmux.conf-child diff --git a/.tmux.conf-parent b/dotfiles/.tmux.conf-parent similarity index 100% rename from .tmux.conf-parent rename to dotfiles/.tmux.conf-parent diff --git a/.vim/after/syntax b/dotfiles/.vim/after/syntax similarity index 100% rename from .vim/after/syntax rename to dotfiles/.vim/after/syntax diff --git a/.vim/autoload/plug.vim b/dotfiles/.vim/autoload/plug.vim similarity index 100% rename from .vim/autoload/plug.vim rename to dotfiles/.vim/autoload/plug.vim diff --git a/.vim/backup/.gitignore b/dotfiles/.vim/backup/.gitignore similarity index 100% rename from .vim/backup/.gitignore rename to dotfiles/.vim/backup/.gitignore diff --git a/.vim/notes-shadow/New note b/dotfiles/.vim/notes-shadow/New note similarity index 100% rename from .vim/notes-shadow/New note rename to dotfiles/.vim/notes-shadow/New note diff --git a/.vim/notes-shadow/Note taking commands b/dotfiles/.vim/notes-shadow/Note taking commands similarity index 100% rename from .vim/notes-shadow/Note taking commands rename to dotfiles/.vim/notes-shadow/Note taking commands diff --git a/.vim/notes-shadow/Note taking syntax b/dotfiles/.vim/notes-shadow/Note taking syntax similarity index 100% rename from .vim/notes-shadow/Note taking syntax rename to dotfiles/.vim/notes-shadow/Note taking syntax diff --git a/.vim/spell/en.utf-8.add b/dotfiles/.vim/spell/en.utf-8.add similarity index 100% rename from .vim/spell/en.utf-8.add rename to dotfiles/.vim/spell/en.utf-8.add diff --git a/.vim/spell/en.utf-8.add.spl b/dotfiles/.vim/spell/en.utf-8.add.spl similarity index 100% rename from .vim/spell/en.utf-8.add.spl rename to dotfiles/.vim/spell/en.utf-8.add.spl diff --git a/.vim/syntax/debuglog.vim b/dotfiles/.vim/syntax/debuglog.vim similarity index 100% rename from .vim/syntax/debuglog.vim rename to dotfiles/.vim/syntax/debuglog.vim diff --git a/.vim/syntax/journal.vim b/dotfiles/.vim/syntax/journal.vim similarity index 100% rename from .vim/syntax/journal.vim rename to dotfiles/.vim/syntax/journal.vim diff --git a/.vim/syntax/man.vim b/dotfiles/.vim/syntax/man.vim similarity index 100% rename from .vim/syntax/man.vim rename to dotfiles/.vim/syntax/man.vim diff --git a/.vimperatorrc b/dotfiles/.vimperatorrc similarity index 100% rename from .vimperatorrc rename to dotfiles/.vimperatorrc diff --git a/.vimrc b/dotfiles/.vimrc similarity index 100% rename from .vimrc rename to dotfiles/.vimrc diff --git a/.zshrc b/dotfiles/.zshrc similarity index 97% rename from .zshrc rename to dotfiles/.zshrc index 271c89f..f50190e 100644 --- a/.zshrc +++ b/dotfiles/.zshrc @@ -27,8 +27,8 @@ zgen load zsh-users/zsh-syntax-highlighting zgen load zsh-users/zsh-completions src # -- Theme -- -zgen oh-my-zsh themes/juanghurtado -# zgen load caiogondim/bullet-train-oh-my-zsh-theme bullet-train +#zgen oh-my-zsh themes/juanghurtado +zgen load caiogondim/bullet-train-oh-my-zsh-theme bullet-train # Get history search working again bindkey "^R" history-incremental-search-backward diff --git a/dotfiles/README.md b/dotfiles/README.md new file mode 100644 index 0000000..975ffc8 --- /dev/null +++ b/dotfiles/README.md @@ -0,0 +1,5 @@ +#Dotfiles +My personal configurations for applications like vim, pentadactyl, tmux, etc. + +Jonathan Reeve, +jon.reeve@gmail.com diff --git a/dotfiles/scripts/dropbox-status b/dotfiles/scripts/dropbox-status new file mode 100755 index 0000000..02b2c02 --- /dev/null +++ b/dotfiles/scripts/dropbox-status @@ -0,0 +1,28 @@ +#!/bin/bash +STATUS=$(dropbox-cli status) + +case $STATUS in + 'Up to date') + SYMBOL=✓ + ;; + "Uploading") + SYMBOL=↑ + ;; + "Syncing") + SYMBOL=S + ;; + "Dropbox isn't running!") + SYMBOL=x + ;; + "Indexing...") + SYMBOL=.. + ;; +esac + +echo $SYMBOL + +if [[ $STATUS == ✓ ]]; then + echo "#00FF00" +else + echo "#FF0000" +fi diff --git a/scripts/done-block.sh b/scripts/done-block.sh deleted file mode 100755 index c93eb39..0000000 --- a/scripts/done-block.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -SCRIPTS_DIR=/home/jon/Documents/Settings/dotfiles/scripts/ - -DONETODAY=`$SCRIPTS_DIR/donetoday` -DONETHISWEEK=`$SCRIPTS_DIR/donethisweek` - -echo $DONETHISWEEK-$DONETODAY - -if [[ $DONETODAY -eq 0 ]]; then - echo "#FF0000" -else - echo "#00FF00" -fi diff --git a/scripts/donethisweek b/scripts/donethisweek deleted file mode 100755 index 8ebae70..0000000 --- a/scripts/donethisweek +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/zsh - -TODOFILE=~/Dropbox/Personal/Todo/todo.txt -DONEFILE=~/Dropbox/Personal/Todo/done.txt - -# This gets a numeric day of the week. Monday is 1. -DAYOFWEEK=`date +%u` - -for i in `seq $DAYOFWEEK` -do - let j=i-1 # adjust for today - EXPR=`date +%Y-%m-%d -d "$j days ago"` - DONE1=$(grep -c "x $EXPR" $TODOFILE) - DONE2=$(grep -c "x $EXPR" $DONEFILE) - DONETODAY=`echo "$DONE1+$DONE2" | bc` - let DONETHISWEEK=DONETHISWEEK+DONETODAY -done -echo $DONETHISWEEK diff --git a/scripts/donetoday b/scripts/donetoday deleted file mode 100755 index d2d8f7e..0000000 --- a/scripts/donetoday +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/zsh -TODOFILE=~/Dropbox/Personal/Todo/todo.txt -DONEFILE=~/Dropbox/Personal/Todo/done.txt - -DONE1=$(grep -c "x `date +%Y-%m-%d`" $TODOFILE) -DONE2=$(grep -c "x `date +%Y-%m-%d`" $DONEFILE) -DONETODAY=`echo "$DONE1+$DONE2" | bc` - -# Set prompt value -BULLETTRAIN_CUSTOM_MSG=$DONETODAY -export BULLETTRAIN_CUSTOM_MSG - -echo $DONETODAY diff --git a/scripts/suspend b/scripts/suspend deleted file mode 100755 index f2e6c60..0000000 --- a/scripts/suspend +++ /dev/null @@ -1 +0,0 @@ -dbus-send --system --print-reply --dest="org.freedesktop.UPower" /org/freedesktop/UPower org.freedesktop.UPower.Suspend diff --git a/scripts/todo b/scripts/todo deleted file mode 160000 index 66634da..0000000 --- a/scripts/todo +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 66634da336969084a98eff2bf5dffbe3e3d9ab34 diff --git a/scripts/vim-plug b/scripts/vim-plug deleted file mode 160000 index fe0ff38..0000000 --- a/scripts/vim-plug +++ /dev/null @@ -1 +0,0 @@ -Subproject commit fe0ff38cd9539cc919717893f53485ef0c85d8ae diff --git a/scripts/wifi b/scripts/wifi deleted file mode 100755 index 2433278..0000000 --- a/scripts/wifi +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/bash -# Copyright (C) 2014 Alexander Keller - -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -#------------------------------------------------------------------------ - -INTERFACE="${BLOCK_INSTANCE:-wlan0}" - -#------------------------------------------------------------------------ - -# As per #36 -- It is transparent: e.g. if the machine has no battery or wireless -# connection (think desktop), the corresponding block should not be displayed. -[[ ! -d /sys/class/net/${INTERFACE}/wireless ]] || - [[ "$(cat /sys/class/net/$INTERFACE/operstate)" = 'down' ]] && exit - -#------------------------------------------------------------------------ - -QUALITY=$(grep $INTERFACE /proc/net/wireless | awk '{ print int($3 * 100 / 70) }') -ESSID=$(nmcli -t -f connection d | head -n 1) - -#------------------------------------------------------------------------ - -echo $QUALITY% $ESSID # full text -echo $QUALITY% # short text - -# color -if [[ $QUALITY -ge 80 ]]; then - echo "#00FF00" -elif [[ $QUALITY -lt 80 ]]; then - echo "#FFF600" -elif [[ $QUALITY -lt 60 ]]; then - echo "#FFAE00" -elif [[ $QUALITY -lt 40 ]]; then - echo "#FF0000" -fi diff --git a/scripts/zgen b/scripts/zgen deleted file mode 160000 index 774088c..0000000 --- a/scripts/zgen +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 774088c9fcea57c502c3643ea7d07901957eb588 diff --git a/setup.sh b/setup.sh deleted file mode 100755 index 0f0cdf8..0000000 --- a/setup.sh +++ /dev/null @@ -1,82 +0,0 @@ -# Start Debugging Mode -set -x - -# Make a temporary backup location. -mkdir /tmp/bak - -for f in tmux.conf inputrc gitconfig zshrc vim vimrc -do - # Back up existing files, if any. - mv ~/.$f /tmp/bak - # Symlink to their expected locations - ln -s $PWD/.$f ~/.$f -done - -# Determine Linux version -if [ -f "/etc/arch-release" ]; then - OS="Arch" -else - OS=$(lsb_release -si) -fi - -# Get Linux install commands. -if [ $OS == "Ubuntu" ] || [ $OS == "Debian" ] -then - INSTALL='sudo apt-get install' - # Ubuntu doesn't have neovim yet, so we have to add it - # from a PPA. - $INSTALL software-properties-common - $INSTALL python-software-properties - add-apt-repository ppa:neovim-ppa/unstable - apt-get update - $INSTALL neovim -fi -if [ $OS == "Arch" ] -then - INSTALL='sudo pacman -S' - $INSTALL neovim python-neovim python2-neovim -fi - -# DOTFILES environment variable needed by .zshrc -export DOTFILES=$PWD - -#Install Essential Packages -$INSTALL vim git zsh - -# Use zsh instead of BASH -chsh -s /bin/zsh - -# Set up vim environment -mkdir -p $HOME/.vim/autoload -ln -s $PWD/scripts/vim-plug/plug.vim $HOME/.vim/autoload/plug.vim - -# Set up neovim -mkdir -p ${XDG_CONFIG_HOME:=$HOME/.config} -ln -s ~/.vim $XDG_CONFIG_HOME/nvim -ln -s ~/.vimrc $XDG_CONFIG_HOME/nvim/init.vim -sudo ln -s $HOME/.vimrc /home/root/.vimrc -sudo ln -s /home/root/.vimrc /home/.config/nvim/init.vim - -# Get submodules -git submodule update --init --recursive -vim -c PlugInstall - -## Personal Stuff - -# todo.txt -#mv scripts/todo/todo.cfg bak/ -#ln -s $PWD/todo.cfg scripts/todo/todo.cfg -#chmod +x scripts/todo-plugins/.todo.actions.d/birdseye - -# Check for GUI -if [[ $DISPLAY ]] -then - for f in vimperatorrc i3/config i3blocks.conf - do - mv ~/.$f bak/ - ln -s $PWD/.$f ~/.$f - done - $INSTALL i3 -fi - -set +x # Stop debugging. diff --git a/todo.cfg b/todo.cfg deleted file mode 100644 index 375ba18..0000000 --- a/todo.cfg +++ /dev/null @@ -1,84 +0,0 @@ -# === EDIT FILE LOCATIONS BELOW === - -# Your todo.txt directory -export TODO_DIR="$HOME/Dropbox/Personal/Todo" -#export TODO_DIR=$(dirname "$0") - -# Your todo/done/report.txt locations -export TODO_FILE="$TODO_DIR/todo.txt" -export DONE_FILE="$TODO_DIR/done.txt" -export REPORT_FILE="$TODO_DIR/report.txt" - -# You can customize your actions directory location -export TODO_ACTIONS_DIR="$HOME/Documents/Settings/dotfiles/scripts/todo-plugins/.todo.actions.d" - -# == EDIT FILE LOCATIONS ABOVE === - -# === COLOR MAP === - -## Text coloring and formatting is done by inserting ANSI escape codes. -## If you have re-mapped your color codes, or use the todo.txt -## output in another output system (like Conky), you may need to -## over-ride by uncommenting and editing these defaults. -## If you change any of these here, you also need to uncomment -## the defaults in the COLORS section below. Otherwise, todo.txt -## will still use the defaults! - -# export BLACK='\\033[0;30m' -# export RED='\\033[0;31m' -# export GREEN='\\033[0;32m' -# export BROWN='\\033[0;33m' -# export BLUE='\\033[0;34m' -# export PURPLE='\\033[0;35m' -# export CYAN='\\033[0;36m' -# export LIGHT_GREY='\\033[0;37m' -# export DARK_GREY='\\033[1;30m' -# export LIGHT_RED='\\033[1;31m' -# export LIGHT_GREEN='\\033[1;32m' -# export YELLOW='\\033[1;33m' -# export LIGHT_BLUE='\\033[1;34m' -# export LIGHT_PURPLE='\\033[1;35m' -# export LIGHT_CYAN='\\033[1;36m' -# export WHITE='\\033[1;37m' -# export DEFAULT='\\033[0m' - -# === COLORS === - -## Uncomment and edit to override these defaults. -## Reference the constants from the color map above, -## or use $NONE to disable highlighting. -# -# Priorities can be any upper-case letter. -# A,B,C are highlighted; you can add coloring for more. -# -# export PRI_A=$YELLOW # color for A priority -# export PRI_B=$GREEN # color for B priority -# export PRI_C=$LIGHT_BLUE # color for C priority -# export PRI_D=... # define your own -# export PRI_X=$WHITE # color unless explicitly defined - -# There is highlighting for tasks that have been done, -# but haven't been archived yet. -# -# export COLOR_DONE=$LIGHT_GREY - -# There is highlighting for projects and contexts. -# -# export COLOR_PROJECT=$RED -# export COLOR_CONTEXT=$RED - -# === BEHAVIOR === - -## customize list output -# -# TODOTXT_SORT_COMMAND will filter after line numbers are -# inserted, but before colorization, and before hiding of -# priority, context, and project. -# -export TODOTXT_SORT_COMMAND='env LC_COLLATE=C sort -f -k2 -r' - -# TODOTXT_FINAL_FILTER will filter list output after colorization, -# priority hiding, context hiding, and project hiding. That is, -# just before the list output is displayed. -# -# export TODOTXT_FINAL_FILTER='cat'