diff --git a/404.html b/404.html deleted file mode 100644 index 428a14805288..000000000000 --- a/404.html +++ /dev/null @@ -1,12 +0,0 @@ ---- -layout: default -title: 404 - Page not found ---- - -
-

Whoops, this page doesn't exist.

-

Move along. (404 error)

-
- - -
\ No newline at end of file diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000000..13d3ec74386f --- /dev/null +++ b/Gemfile @@ -0,0 +1,5 @@ +source 'https://rubygems.org' + +gem 'execjs' +gem 'therubyracer' +gem 'github-pages' \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000000..9c58cc6f00c8 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,136 @@ +GEM + remote: https://rubygems.org/ + specs: + RedCloth (4.2.9) + activesupport (4.2.4) + i18n (~> 0.7) + json (~> 1.7, >= 1.7.7) + minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) + tzinfo (~> 1.1) + addressable (2.3.8) + blankslate (2.1.2.4) + classifier-reborn (2.0.4) + fast-stemmer (~> 1.0) + coffee-script (2.4.1) + coffee-script-source + execjs + coffee-script-source (1.9.1.1) + colorator (0.1) + ethon (0.8.0) + ffi (>= 1.3.0) + execjs (2.6.0) + fast-stemmer (1.0.2) + ffi (1.9.10) + gemoji (2.1.0) + github-pages (39) + RedCloth (= 4.2.9) + github-pages-health-check (~> 0.2) + jekyll (= 2.4.0) + jekyll-coffeescript (= 1.0.1) + jekyll-feed (= 0.3.1) + jekyll-mentions (= 0.2.1) + jekyll-redirect-from (= 0.8.0) + jekyll-sass-converter (= 1.3.0) + jekyll-sitemap (= 0.8.1) + jemoji (= 0.5.0) + kramdown (= 1.5.0) + liquid (= 2.6.2) + maruku (= 0.7.0) + mercenary (~> 0.3) + pygments.rb (= 0.6.3) + rdiscount (= 2.1.7) + redcarpet (= 3.3.2) + terminal-table (~> 1.4) + github-pages-health-check (0.5.3) + addressable (~> 2.3) + net-dns (~> 0.8) + public_suffix (~> 1.4) + typhoeus (~> 0.7) + html-pipeline (1.9.0) + activesupport (>= 2) + nokogiri (~> 1.4) + i18n (0.7.0) + jekyll (2.4.0) + classifier-reborn (~> 2.0) + colorator (~> 0.1) + jekyll-coffeescript (~> 1.0) + jekyll-gist (~> 1.0) + jekyll-paginate (~> 1.0) + jekyll-sass-converter (~> 1.0) + jekyll-watch (~> 1.1) + kramdown (~> 1.3) + liquid (~> 2.6.1) + mercenary (~> 0.3.3) + pygments.rb (~> 0.6.0) + redcarpet (~> 3.1) + safe_yaml (~> 1.0) + toml (~> 0.1.0) + jekyll-coffeescript (1.0.1) + coffee-script (~> 2.2) + jekyll-feed (0.3.1) + jekyll-gist (1.3.5) + jekyll-mentions (0.2.1) + html-pipeline (~> 1.9.0) + jekyll (~> 2.0) + jekyll-paginate (1.1.0) + jekyll-redirect-from (0.8.0) + jekyll (>= 2.0) + jekyll-sass-converter (1.3.0) + sass (~> 3.2) + jekyll-sitemap (0.8.1) + jekyll-watch (1.3.0) + listen (~> 3.0) + jemoji (0.5.0) + gemoji (~> 2.0) + html-pipeline (~> 1.9) + jekyll (>= 2.0) + json (1.8.3) + kramdown (1.5.0) + libv8 (3.16.14.13) + liquid (2.6.2) + listen (3.0.4) + rb-fsevent (>= 0.9.3) + rb-inotify (>= 0.9) + maruku (0.7.0) + mercenary (0.3.5) + mini_portile (0.6.2) + minitest (5.8.2) + net-dns (0.8.0) + nokogiri (1.6.6.2) + mini_portile (~> 0.6.0) + parslet (1.5.0) + blankslate (~> 2.0) + posix-spawn (0.3.11) + public_suffix (1.5.2) + pygments.rb (0.6.3) + posix-spawn (~> 0.3.6) + yajl-ruby (~> 1.2.0) + rb-fsevent (0.9.6) + rb-inotify (0.9.5) + ffi (>= 0.5.0) + rdiscount (2.1.7) + redcarpet (3.3.2) + ref (2.0.0) + safe_yaml (1.0.4) + sass (3.4.19) + terminal-table (1.5.2) + therubyracer (0.12.2) + libv8 (~> 3.16.14.0) + ref + thread_safe (0.3.5) + toml (0.1.2) + parslet (~> 1.5.0) + typhoeus (0.8.0) + ethon (>= 0.8.0) + tzinfo (1.2.2) + thread_safe (~> 0.1) + yajl-ruby (1.2.1) + +PLATFORMS + ruby + +DEPENDENCIES + execjs + github-pages + therubyracer diff --git a/README.md b/README.md index bf3a2857fd0c..a3317761b338 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,9 @@ This template is built on top of [Jekyll](http://jekyllrb.com/) and can be used for any [GitHub Pages](https://pages.github.com/) website. If you don't know what Jekyll and GitHub Pages are, you can still use these instructions to build a site quickly, but it might make a little more sense if you read up on them just a little bit. -Feel free to modify this in any way you'd like, but I would appreciate it if you don't remove the attribution to Beautiful Jekyll. I've noticed that many people copy this website and deliberately remove the tiny phrase that gives me credit, and it feels a bit sad to not get credit for the countless hours I've put into this. Don't make me sad! :) +Feel free to modify this in any way you'd like, but I would appreciate it if you don't remove the attribution to Beautiful Jekyll. I've noticed that many people copy this website and deliberately remove the tiny phrase that gives me credit, and it feels a bit sad to not get credit for the countless hours I've put into this. Don't make me sad! -If you need a bit of help or have comments, feel free to [contact me](http://deanattali.com/aboutme#contact). Even if you don't have anything important to say but found this useful, I'd love to [hear about it as well](http://deanattali.com/aboutme#contact). +If you need a bit of help or have comments, feel free to [contact me](http://deanattali.com/aboutme#contact). Even if you don't have anything important to say but found this useful, I'd love to [hear about it](http://deanattali.com/aboutme#contact). Lastly, if you like this theme, please consider [supporting me with a small donation](http://deanattali.com/aboutme#feed-meeee) if you want to make me extra happy. :) ### Table of contents @@ -16,6 +16,7 @@ If you need a bit of help or have comments, feel free to [contact me](http://dea - [Last important thing: YAML front matter](#last-important-thing-yaml-front-matter) - [Features](#features) - [More advanced features](#more-advanced-features) +- [Advanced: local development](#advanced-local-development) - [Featured users](#featured-users) - [Credits](#credits) - [Contributions](#contributions) @@ -29,7 +30,7 @@ If you need a bit of help or have comments, feel free to [contact me](http://dea ## Build your website in 3 steps Getting started is *literally* as easy as 1-2-3 :smile: -Scroll down to see the steps involved, but here is a 45-second GIF just as a reference as you work through the steps. You might need to wait a few seconds until the "video" gets back to its beginning. +Scroll down to see the steps involved, but here is a 40-second video just as a reference as you work through the steps. You might need to wait a few seconds until the "video" gets back to its beginning. ![Installation steps](img/install-steps.gif) @@ -43,16 +44,15 @@ This will create a GitHub User page ready with the **Beautiful Jekyll** template ### 3. Customize your website settings -Edit the `_config.yml` file to change all the settings to reflect your site. To edit the file, click on it and then click on the pencil icon (watch the GIF tutorial above if you're confused). The settings in the file are fairly self-explanatory and I added comments inside the file to help you further. Any line that begins with a pound sign (`#`) is a comment, and the rest of the lines are settings. +Edit the `_config.yml` file to change all the settings to reflect your site. To edit the file, click on it and then click on the pencil icon (watch the video tutorial above if you're confused). The settings in the file are fairly self-explanatory and I added comments inside the file to help you further. Any line that begins with a pound sign (`#`) is a comment, and the rest of the lines are settings. Another way to edit the config file (or any other file) is to use [prose.io](http://prose.io/), which is just a simple interface to allow you to more intuitively edit files or new new files to your project. -After you save your changes to the config file (by clicking on "Commit changes" as the GIF tutorial shows), your website should be ready in a minute or two at `yourusername.github.io`. Every time you make a change to any file, your website will get rebuilt and should be updated in about a minute or so. +After you save your changes to the config file (by clicking on "Commit changes" as the video tutorial shows), your website should be ready in a minute or two at `yourusername.github.io`. Every time you make a change to any file, your website will get rebuilt and should be updated in about a minute or so. You can now visit your shiny new website, which will be seeded with several sample blog posts and a couple other pages. Your website is at `http://yourusername.github.io` (replace `yourusername` with your user name). Do not add `www` to the URL - it will not work! -**Note:** The GIF above goes through the setup for a user with username `daattalitest`. I only edited one setting in the `_config.yml` file in the video, but **you should actually go through the rest of the settings as well. Don't be lazy, go through all the settings :)** - +**Note:** The video above goes through the setup for a user with username `daattalitest`. I only edited one setting in the `_config.yml` file in the video, but **you should actually go through the rest of the settings as well. Don't be lazy, go through all the settings :)** ### Add your own content @@ -60,7 +60,7 @@ To add pages to your site, you can either write a markdown file (`.md`) or you c In contrast, look at [`index.html`](./index.html). That's how your write HTML - not as pretty. So stick with markdown if you don't know HTML. -Any file that you add inside the [`_posts`](./_posts) directory will be treated as a blog entry. You can look at the existing files there to get an idea of how to write blog posts. +Any file that you add inside the [`_posts`](./_posts) directory will be treated as a blog entry. You can look at the existing files there to get an idea of how to write blog posts. After you successfully add your own post, you can delete the existing files [`_posts`](./_posts), as those are just demo posts to help you learn. As mentioned previously, you can use [prose.io](http://prose.io/) to add or edit files instead of doing it directly on GitHub, it can be a little easier that way. @@ -148,6 +148,18 @@ To set up a GitHub Project page, simply fork this repository into a branch calle I wrote [a blog post](http://deanattali.com/2015/03/12/beautiful-jekyll-how-to-build-a-site-in-minutes/) describing some more advanced features that I used in my website that are applicable to any Jekyll site. It describes how I used a custom URL for my site (deanattali.com instead of daattali.github.io), how to add a Google-powered search into your site, and provides a few more details about having an RSS feed. +### Advanced: Local development + +Beautiful Jekyll is meant to be so simple to use that you can do it all within the browser. However, if you'd like to develop locally on your own machine, that's possible too if you're comfortable with command line. Folow these simple steps to do that with Vagrant: + +1. Install [VirtualBox](http://virtualbox.org) and [Vagrant](https://www.vagrantup.com) +2. Clone your fork `git clone git@github.com:yourusername/yourusername.github.io.git` +3. Inside your repository folder, run `vagrant up` +4. View your website at `http://0.0.0.0:4000` on *nix or `http://127.0.0.1:4000` on Windows. +5. Commit any changes and push everything to the master branch of your GitHub repository. GitHub Pages will then rebuild and serve your website automatically. + +Disclaimer: I personally am NOT using local development so I don't know much about running Jekyll locally. If you follow this route, please don't ask me questions because unfortunately I honestly won't be able to help! + ### Featured users To my huge surprise, Beautiful Jekyll has been used in over 500 websites in its first 6 months. Here is a hand-picked selection of some websites that use Beautiful Jekyll. @@ -182,7 +194,6 @@ Want your website featured here? [Contact me](http://deanattali.com/aboutme#cont | [bkkkk.github.io](http://bkkkk.github.io) | Jacobo Blanco | Data scientist | | [chadchae.github.io](http://chadchae.github.io) | Chad Chae | Data analyst | | [trappmartin.github.io](http://trappmartin.github.io) | Martin Trapp | Machine learning researcher | -| [billy.sh](http://billy.sh/) | Billy Vera | Systems engineer | ### Credits diff --git a/Vagrantfile b/Vagrantfile new file mode 100644 index 000000000000..e7f4568c32d6 --- /dev/null +++ b/Vagrantfile @@ -0,0 +1,48 @@ +# -*- mode: ruby -*- +# vi: set ft=ruby : + +$script_provision = < {% endfor %} {% endif %} - -{% if page.common-js %} - {% for js in page.common-js %} - +{% if layout.common-ext-js %} + {% for js in layout.common-ext-js %} + {% endfor %} {% endif %} @@ -15,11 +16,50 @@ {% endfor %} {% endif %} +{% if layout.ext-js %} + {% for js in layout.ext-js %} + + {% endfor %} +{% endif %} {% if page.js %} {% for js in page.js %} {% endfor %} {% endif %} +{% if layout.js %} + {% for js in layout.js %} + + {% endfor %} +{% endif %} + +{% if layout.common-js %} + {% for js in layout.common-js %} + + {% if js contains 'jquery' %} + + {% else %} + + {% endif %} + {% endfor %} +{% endif %} +{% if page.common-js %} + {% for js in page.common-js %} + + {% if js contains 'jquery' %} + + {% else %} + + {% endif %} + {% endfor %} +{% endif %} -{% include google_analytics.html %} \ No newline at end of file +{% include google_analytics.html %} diff --git a/_includes/footer.html b/_includes/footer.html index 86991ed83d33..3e0299de7bcf 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -55,7 +55,7 @@ {% endif %} {% if site.author.stackoverflow and site.footer-links-active.stackoverflow %}
  • - + diff --git a/_includes/head.html b/_includes/head.html index 38b21539d754..af48dc4d3e44 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -13,41 +13,73 @@ + + {% if page.common-ext-css %} {% for css in page.common-ext-css %} {% endfor %} {% endif %} + {% if layout.common-ext-css %} + {% for css in layout.common-ext-css %} + + {% endfor %} + {% endif %} {% if page.common-css %} {% for css in page.common-css %} {% endfor %} {% endif %} + {% if layout.common-css %} + {% for css in layout.common-css %} + + {% endfor %} + {% endif %} {% if page.common-googlefonts %} {% for font in page.common-googlefonts %} {% endfor %} {% endif %} + {% if layout.common-googlefonts %} + {% for font in layout.common-googlefonts %} + + {% endfor %} + {% endif %} {% if page.ext-css %} {% for css in page.ext-css %} {% endfor %} {% endif %} + {% if layout.ext-css %} + {% for css in layout.ext-css %} + + {% endfor %} + {% endif %} {% if page.css %} {% for css in page.css %} {% endfor %} {% endif %} + {% if layout.css %} + {% for css in layout.css %} + + {% endfor %} + {% endif %} {% if page.googlefonts %} {% for font in page.googlefonts %} {% endfor %} {% endif %} + {% if layout.googlefonts %} + {% for font in layout.googlefonts %} + + {% endfor %} + {% endif %} diff --git a/_includes/nav.html b/_includes/nav.html index 555e261491d0..40ceac31f41b 100644 --- a/_includes/nav.html +++ b/_includes/nav.html @@ -13,8 +13,23 @@ - \ No newline at end of file + diff --git a/_layouts/default.html b/_layouts/default.html index 3956af322625..447999adbd8f 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -15,11 +15,11 @@ - + {% include head.html %} - + {% include nav.html %}
    @@ -27,8 +27,8 @@
    {% include footer.html %} - + {% include footer-scripts.html %} - + diff --git a/_layouts/minimal.html b/_layouts/minimal.html index 40f06e0a69f8..a2311c319a04 100644 --- a/_layouts/minimal.html +++ b/_layouts/minimal.html @@ -19,8 +19,8 @@ {% include footer-minimal.html %} - + {% include footer-scripts.html %} - + diff --git a/_posts/2013-04-08-silent-teleconference.md b/_posts/2013-04-08-silent-teleconference.md new file mode 100644 index 000000000000..1579b1895aad --- /dev/null +++ b/_posts/2013-04-08-silent-teleconference.md @@ -0,0 +1,35 @@ +--- +layout: post +title: Stealth teleconference +--- + +So, I oftentimes find myself in a place where I can't really take a +confidential phone call, or I have to step away from the computer to take a +conference call where I'm mostly just listening. I have found a way to take +calls from wherever I'm sitting without being concerned about being overheard. + +This is on OS X, but you could probably accomplish the same thing with +Pulseaudio and/or Jack. + +First, grab a copy of Soundflower: + + + +Reboot. + +Start Skype, and change your microphone input to be the 2ch Soundflower device. + +Now, open the terminal and type: + + say -a "?" + +It will give you an audio device list. Pick the number of the Soundflower +device. Let's say it's 199. + +Now, you can speak using: + + say -a 199 + + Yes, I was listening intently, but have no comments. + +Ta-da. diff --git a/_posts/2013-05-17-console-apps.md b/_posts/2013-05-17-console-apps.md new file mode 100644 index 000000000000..14d2fc8002e6 --- /dev/null +++ b/_posts/2013-05-17-console-apps.md @@ -0,0 +1,59 @@ +--- +layout: post +title: More useful console apps +--- + +On my software () page, I mention a few +console applications that I use regularly, like tmux, mutt, w3m, cmus, and +calcurse. I've recently discovered a couple more applications that are worth +knowing about if you prefer to do most of your work in a terminal-based +environment. + +Taskwarrior +----------- + + + +On the face of it, this project appears to be absurd: "It's a list of TODOs. I +already have a list of TODOs", you might say. However, after giving it a shot, +I've found it to be actually quite useful. The reasons why I like it better +than my previous flat file approach are: + +* Easy tagging and filtering. I primarily use +home and +work to keep my + full task list easily filterable. + +* Automatic urgency calculation. Taskwarrior is smart about figuring out + which stuff you actually need to work on next --- it looks at the age of + the task, your chosen priority, the due date and other metrics to + determine how tasks are sorted. I've found this to be quite useful. + +* It handles things like projects, dependencies, notes and annotations + attached to tasks. It knows that your blocking dependencies have higher + priority. + +* Lots of shortcuts. I just have to say that something is due at "eom", and + it'll do the right thing. + +* It keeps things together. Tasks are easy to synchronize between a remote + server and your local machine, using the "merge" command. + +Anyway, it's worth a try to see if it works for you. The only thing that it +really lacks is a modern way to integrate to calendaring applications, but I'm +sure that will come before too long. + + +Newsbeuter +---------- + + + +On OS X, there's not really a decent non-commercial RSS reader available, +unless you want to run Thunderbird all the time. I'd been using Liferea under +X, but it wasn't a terribly great solution. Newsbeuter aspires to be the mutt +of RSS readers, and it pretty much is. You define your URLs in a simple flat +file, spawn the reader, and it will handle updating them, downloading +summaries, and plenty of other stuff I'll never use. From the summary view, you +can have the actual article links launched in an external browser --- I use +w3m, as I run it under tmux on a remote server. That approach also means that +your read and unread items are pretty well tracked regardless of where I am. + diff --git a/_posts/2013-09-09-console-tiling.md b/_posts/2013-09-09-console-tiling.md new file mode 100644 index 000000000000..8e3a890b4d9e --- /dev/null +++ b/_posts/2013-09-09-console-tiling.md @@ -0,0 +1,70 @@ +--- +layout: post +title: dvtm + iTerm2 +subtitle: A usable console tiling solution +--- + +Working so much with iOS, I've had to be primarily on a Mac for the last year. +I've been spending most of my time in X, as dwm + terminals has been my primary +working environment for years. However, having upgraded to a Retina Macbook, X +looks freaking horrible compared to all the other applications. As such, I've +tried a couple different solutions to replicate dwm+urxvt functionality within +iTerm2. + +Native iTerm2 panes. +-------------------- + + +Using iTerm's builtin panes, you can do horizontal or vertical splits and +switch between them. I configured iTerm to use cmd-j and cmd-k to navigate +between them, and configured text dimming on inactive panes. All in all, this +is usable, but the real shortcoming is that it isn't really real tiling window +management. Splits all have to be manually configured, are a pain in the ass to +rearrange, and you can't temporarily full-screen a pane. Wasn't scratching my +dwm itch. + +tmux. +----- + + +I use tmux on my shell server, and I'm pretty used to it. However, the split +functionality has the same kind of shortcomings, where rearranging and resizing +is a pain, and you have to use an escape sequence before entering a command, +meaning 3 keypresses just to move to another pane. It has the advantage of +mixing windows and panes in a way that feels more natural to me than iTerm, but +otherwise, it's more of a multiplexer than a window manager. Also, I use tmux +on a remote host to attach to a long-running session, and nesting two tmux +instances is even more painful. + +dvtm. +----- + + +dvtm is essentially dwm for the terminal --- it does dynamic window management, +rearranging windows for you in a stack instead of you having to decide where to +split everything and rearrange manually. It still has the irritation of +requiring too many keystrokes for basic actions, though. It uses ctrl-g as its +escape sequence by default, which is annoying to use, but I can run tmux under +it and not have to double-escape commands (and yes, I realize I could have two +separate tmux configs, but I don't want to; I'm too used to ctrl-a when in +tmux, and would have to keep them both straight). So, it's *almost* great, but +a toss-up between this and using native panes when it comes to convenience. +Then, I discovered: + + + +Ding! Brilliant. Now I can configure my keybindings in iTerm so that the keys I +use in dwm will perform the exact same actions in dvtm. I kept the stock escape +sequence of ctrl-g to avoid clobbering tmux commands, and configured iTerm to +send 0x07 0xwhatever for cmd-j/k/l/h/i/x/t/g/b/enter. Now I navigate simply and +quickly with the command key instead of two-step escaped commands, and can run +a remote tmux session with no problem --- I never have to hit ctrl-g at all. +And I get to look at pretty Retina fonts. Scrolling is pretty slow, and there +are some artifact issues, but I think it's worth it. + +I've put my iTerm2 config here: + + + +Ideally, I'd like to see iTerm integrate dynamic tiling, but for the moment, +this is about as close as you can come. diff --git a/_posts/2014-09-25-environment-variables.md b/_posts/2014-09-25-environment-variables.md new file mode 100644 index 000000000000..269b4708148c --- /dev/null +++ b/_posts/2014-09-25-environment-variables.md @@ -0,0 +1,31 @@ +--- +layout: post +title: Putting secrets in environment variables is stupid. +subtitle: +--- + +There seems to be this infatuation, especially in the Rails community, with +putting secret information inside environment variables. Now, even if I take +off my old crufty Solaris hat and ignore what the '-e' flag of ps means on +that platform: this is a stupid, pointless idea. The process environment is +not a secret. + +The ostensible idea behind this is that if you pass in things in the +environment, you're protected from a scenario where someone breaks into your +machine and reads your presumably non-world-readable file containing your keys +or passwords. This is laughable for several reasons: + +* Files were designed to be secured with permissions. The environment, on the + other hand, was never designed or intended to store secret information. + +* Unless you're passing shit into a Docker container, the environment + variables are *already stored in a flat file* on the host. + +* If you passed your secrets in as an environment variable, and you use Linux, + your secrets ARE ALREADY IN A FILE in /proc. + +* If someone pops a shell within your process, they can just run "env" anyway. + +So just put your secrets in a file like a normal person. If you want to be +fancy, pass them to the process over a pipe from a higher privileged process, +but don't pretend that environment variables make things magically ephemeral. diff --git a/_posts/2015-01-04-first-post.md b/_posts/2015-01-04-first-post.md deleted file mode 100644 index 03da58a09d99..000000000000 --- a/_posts/2015-01-04-first-post.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -layout: post -title: First post! ---- - -This is my first post, how exciting! \ No newline at end of file diff --git a/_posts/2015-01-15-pirates.md b/_posts/2015-01-15-pirates.md deleted file mode 100644 index 0d184d3745b8..000000000000 --- a/_posts/2015-01-15-pirates.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -layout: post -title: Pirates arrrr ---- - -Piracy is typically an act of robbery or criminal violence at sea. The term can include acts committed on land, in the air, or in other major bodies of water or on a shore. It does not normally include crimes committed against persons traveling on the same vessel as the perpetrator (e.g. one passenger stealing from others on the same vessel). The term has been used throughout history to refer to raids across land borders by non-state agents. \ No newline at end of file diff --git a/_posts/2015-01-19-soccer.md b/_posts/2015-01-19-soccer.md deleted file mode 100644 index 6f37e066a6c6..000000000000 --- a/_posts/2015-01-19-soccer.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -layout: post -title: Soccer -subtitle: Best sport ever! ---- - -From Wikipedia: - -Association football, more commonly known as football or soccer,[2] is a sport played between two teams of eleven players with a spherical ball. It is played by 250 million players in over 200 countries, making it the world's most popular sport.[3][4][5][6] The game is played on a rectangular field with a goal at each end. The object of the game is to score by getting the ball into the opposing goal. - -The goalkeepers are the only players allowed to touch the ball with their hands or arms while it is in play and then only in their penalty area. Outfield players mostly use their feet to strike or pass the ball, but may use their head or torso to strike the ball instead. The team that scores the most goals by the end of the match wins. If the score is level at the end of the game, either a draw is declared or the game goes into extra time and/or a penalty shootout depending on the format of the competition. The Laws of the Game were originally codified in England by The Football Association in 1863. Association football is governed internationally by the International Federation of Association Football (FIFA; French: Fédération Internationale de Football Association) which organises a World Cup every four years.[7] \ No newline at end of file diff --git a/_posts/2015-01-27-dear-diary.md b/_posts/2015-01-27-dear-diary.md deleted file mode 100644 index 11b8b4a64b65..000000000000 --- a/_posts/2015-01-27-dear-diary.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -layout: post -title: Dear diary ---- - -What is it with that Mary girl? Dragging me to school every day. As if I had a choice. What you don't hear in those nursery rhymes is that she starves me if I don't go to school with her; it's the only way I can stay alive! I'm thinking about being adopted by Little Bo Peep, sure I may get lost, but anything is better than being with Mary and those little brats at school (shudder, shudder). \ No newline at end of file diff --git a/_posts/2015-02-13-hamlet-monologue.md b/_posts/2015-02-13-hamlet-monologue.md deleted file mode 100644 index 7874d9b25e4b..000000000000 --- a/_posts/2015-02-13-hamlet-monologue.md +++ /dev/null @@ -1,41 +0,0 @@ ---- -layout: post -title: To be -subtitle: ... or not to be? ---- - -To be, or not to be--that is the question: -Whether 'tis nobler in the mind to suffer -The slings and arrows of outrageous fortune -Or to take arms against a sea of troubles -And by opposing end them. To die, to sleep-- -No more--and by a sleep to say we end -The heartache, and the thousand natural shocks -That flesh is heir to. 'Tis a consummation -Devoutly to be wished. To die, to sleep-- -To sleep--perchance to dream: ay, there's the rub, -For in that sleep of death what dreams may come -When we have shuffled off this mortal coil, -Must give us pause. There's the respect -That makes calamity of so long life. -For who would bear the whips and scorns of time, -Th' oppressor's wrong, the proud man's contumely -The pangs of despised love, the law's delay, -The insolence of office, and the spurns -That patient merit of th' unworthy takes, -When he himself might his quietus make -With a bare bodkin? Who would fardels bear, -To grunt and sweat under a weary life, -But that the dread of something after death, -The undiscovered country, from whose bourn -No traveller returns, puzzles the will, -And makes us rather bear those ills we have -Than fly to others that we know not of? -Thus conscience does make cowards of us all, -And thus the native hue of resolution -Is sicklied o'er with the pale cast of thought, -And enterprise of great pitch and moment -With this regard their currents turn awry -And lose the name of action. -- Soft you now, -The fair Ophelia! -- Nymph, in thy orisons -Be all my sins remembered. \ No newline at end of file diff --git a/_posts/2015-02-20-test-markdown.md b/_posts/2015-02-20-test-markdown.md deleted file mode 100644 index a1f6cdcd7517..000000000000 --- a/_posts/2015-02-20-test-markdown.md +++ /dev/null @@ -1,27 +0,0 @@ ---- -layout: post -title: Test markdown -subtitle: Each post also has a subtitle ---- - -You can write regular [markdown](http://en.wikipedia.org/wiki/Markdown) here and Jekyll will automatically convert it to a nice webpage. - -**Here is some bold text** - -## Here is a secondary heading - -Here's a code chunk: - -~~~ -x <- 5 + 10 -print(x) -~~~ - -And here is some code with syntax highlighting - -{% highlight javascript linenos %} -var foo = function(x) { - return(x + 5); -} -foo(3) -{% endhighlight %} diff --git a/_posts/2015-02-26-flake-it-till-you-make-it.md b/_posts/2015-02-26-flake-it-till-you-make-it.md deleted file mode 100644 index a783af9dfcea..000000000000 --- a/_posts/2015-02-26-flake-it-till-you-make-it.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -layout: post -title: Flake it till you make it -subtitle: Excerpt from Soulshaping by Jeff Brown ---- - -Under what circumstances should we step off a path? When is it essential that we finish what we start? If I bought a bag of peanuts and had an allergic reaction, no one would fault me if I threw it out. If I ended a relationship with a woman who hit me, no one would say that I had a commitment problem. But if I walk away from a seemingly secure route because my soul has other ideas, I am a flake? - -The truth is that no one else can definitively know the path we are here to walk. It’s tempting to listen—many of us long for the omnipotent other—but unless they are genuine psychic intuitives, they can’t know. All others can know is their own truth, and if they’ve actually done the work to excavate it, they will have the good sense to know that they cannot genuinely know anyone else’s. Only soul knows the path it is here to walk. Since you are the only one living in your temple, only you can know its scriptures and interpretive structure. - -At the heart of the struggle are two very different ideas of success—survival-driven and soul-driven. For survivalists, success is security, pragmatism, power over others. Success is the absence of material suffering, the nourishing of the soul be damned. It is an odd and ironic thing that most of the material power in our world often resides in the hands of younger souls. Still working in the egoic and material realms, they love the sensations of power and focus most of their energy on accumulation. Older souls tend not to be as materially driven. They have already played the worldly game in previous lives and they search for more subtle shades of meaning in this one—authentication rather than accumulation. They are often ignored by the culture at large, although they really are the truest warriors. - -A soulful notion of success rests on the actualization of our innate image. Success is simply the completion of a soul step, however unsightly it may be. We have finished what we started when the lesson is learned. What a fear-based culture calls a wonderful opportunity may be fruitless and misguided for the soul. Staying in a passionless relationship may satisfy our need for comfort, but it may stifle the soul. Becoming a famous lawyer is only worthwhile if the soul demands it. It is an essential failure if you are called to be a monastic this time around. If you need to explore and abandon ten careers in order to stretch your soul toward its innate image, then so be it. Flake it till you make it. \ No newline at end of file diff --git a/aboutme.md b/aboutme.md index 23478094616d..68621a047fc3 100644 --- a/aboutme.md +++ b/aboutme.md @@ -1,16 +1,9 @@ --- layout: page title: About me -subtitle: Why you'd want to go on a date with me --- -My name is Inigo Montoya. I have the following qualities: +UNIX and cats, pretty much. -- I rock a great mustache -- I'm extremely loyal to my family +You can find my résumé here, as well as some various presentations I've given over the years here. -What else do you need? - -### my history - -To be honest, I'm having some trouble remembering right now, so why don't you just watch [my movie](http://en.wikipedia.org/wiki/The_Princess_Bride_%28film%29) and it will answer **all** your questions. \ No newline at end of file diff --git a/css/main.css b/css/main.css index 54f246c70394..0ebe081ca414 100644 --- a/css/main.css +++ b/css/main.css @@ -3,6 +3,16 @@ /* --- General --- */ body { +/* text-align: justify; + text-justify: distribute; + hyphens: auto + word-break: break-all; */ + text-rendering: optimizeLegibility; + font-feature-settings: "kern"; + -webkit-font-feature-settings: "kern"; + -moz-font-feature-settings: "kern"; + -moz-font-feature-settings: "kern=1"; + font-family: 'Lora', 'Times New Roman', serif; font-size: 18px; color: #404040; @@ -77,6 +87,10 @@ img::-moz-selection { background: transparent; } +img { + max-width: 100%; +} + .disqus-comments { margin-top: 30px; } diff --git a/img/404-southpark.jpg b/img/404-southpark.jpg deleted file mode 100644 index 354eb125760a..000000000000 Binary files a/img/404-southpark.jpg and /dev/null differ diff --git a/img/avatar.png b/img/avatar.png new file mode 100644 index 000000000000..6eb5bac84910 Binary files /dev/null and b/img/avatar.png differ diff --git a/index.html b/index.html index e15b8fd60dd6..ea6300797b03 100644 --- a/index.html +++ b/index.html @@ -1,37 +1,31 @@ --- layout: page -title: My website -subtitle: This is where I will tell my friends way too much about me +title: .plan +subtitle: --- -
    -

    Your website is ready!

    -

    After editing the _config.yml file to personalize your site's settings, you can start writing blog posts or pages.

    -

    Below are sample posts for illustration purposes.

    -
    -
    {% for post in paginator.posts %} {% endfor %}