commit e3d0364071608525a40593e9bfa95001be3e5452
parent 3b2e72678ef5d508c613f9e8fd418c0d9d74d8e2
Author: pyratebeard <root@pyratebeard.net>
Date: Sat, 22 Oct 2016 19:33:50 +0100
merge conflict in decker-cyan theme.lua fixed
Diffstat:
7 files changed, 532 insertions(+), 4 deletions(-)
diff --git a/awesome/.config/awesome/themes/decker-cyan/Wireframe.png b/awesome/.config/awesome/themes/decker-cyan/Wireframe.png
Binary files differ.
diff --git a/awesome/.config/awesome/themes/decker-cyan/mr_robot_bg.jpg b/awesome/.config/awesome/themes/decker-cyan/mr_robot_bg.jpg
Binary files differ.
diff --git a/awesome/.config/awesome/themes/decker-cyan/theme.lua b/awesome/.config/awesome/themes/decker-cyan/theme.lua
@@ -22,7 +22,7 @@ if not awful.util.file_readable(themes .. themename .. "/theme.lua") then
end
themedir = themes .. themename
-wallpaper1 = themedir .. "/wires.jpg"
+wallpaper1 = themedir .. "/Wireframe.png"
wallpaper2 = themedir .. "/background.png"
wallpaper3 = sharedthemes .. "/zenburn/zenburn-background.png"
wallpaper4 = sharedthemes .. "/default/background.png"
diff --git a/sublime/.config/sublime-text-2/Packages/User/Preferences.sublime-settings b/sublime/.config/sublime-text-2/Packages/User/Preferences.sublime-settings
@@ -1,7 +1,7 @@
{
- "color_scheme": "Packages/Colorsublime-Themes/decker-dark.tmTheme",
+ "color_scheme": "Packages/Neka Theme/Neka.tmTheme",
"font_face": "tamsyn",
- "font_size": 11,
+ "font_size": 10,
"ignored_packages":
[
"Vintage"
diff --git a/sublime/.config/sublime-text-3/Packages/Colorsublime-Themes/decker-cyan.tmTheme b/sublime/.config/sublime-text-3/Packages/Colorsublime-Themes/decker-cyan.tmTheme
@@ -0,0 +1,510 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>author</key>
+ <string>terminal.sexy</string>
+ <key>name</key>
+ <string>terminal.sexy</string>
+ <key>semanticClass</key>
+ <string>terminal.sexy</string>
+ <key>colorSpaceName</key>
+ <string>sRGB</string>
+ <key>gutterSettings</key>
+ <dict>
+ <key>background</key>
+ <string>#0b0b0b</string>
+ <key>divider</key>
+ <string>#c33027</string>
+ <key>foreground</key>
+ <string>#d9d9d9</string>
+ <key>selectionBackground</key>
+ <string>#093748</string>
+ <key>selectionForeground</key>
+ <string>#d3ebe9</string>
+ </dict>
+ <key>settings</key>
+ <array>
+ <dict>
+ <key>settings</key>
+ <dict>
+ <key>background</key>
+ <string>#0b0b0b</string>
+ <key>caret</key>
+ <string>#3c6465</string>
+ <key>foreground</key>
+ <string>#d9d9d9</string>
+ <key>invisibles</key>
+ <string>#d9d9d9</string>
+ <key>lineHighlight</key>
+ <string>#d9d9d955</string>
+ <key>selection</key>
+ <string>#61b343</string>
+ </dict>
+ </dict>
+ <dict>
+ <key>name</key>
+ <string>Text</string>
+ <key>scope</key>
+ <string>variable.parameter.function</string>
+ <key>settings</key>
+ <dict>
+ <key>foreground</key>
+ <string>#3c6465</string>
+ </dict>
+ </dict>
+ <dict>
+ <key>name</key>
+ <string>Comments</string>
+ <key>scope</key>
+ <string>comment, punctuation.definition.comment</string>
+ <key>settings</key>
+ <dict>
+ <key>foreground</key>
+ <string>#d9d9d9</string>
+ </dict>
+ </dict>
+ <dict>
+ <key>name</key>
+ <string>Punctuation</string>
+ <key>scope</key>
+ <string>punctuation.definition.string, punctuation.definition.variable, punctuation.definition.string, punctuation.definition.parameters, punctuation.definition.string, punctuation.definition.array</string>
+ <key>settings</key>
+ <dict>
+ <key>foreground</key>
+ <string>#3c6465</string>
+ </dict>
+ </dict>
+ <dict>
+ <key>name</key>
+ <string>Delimiters</string>
+ <key>scope</key>
+ <string>none</string>
+ <key>settings</key>
+ <dict>
+ <key>foreground</key>
+ <string>#3c6465</string>
+ </dict>
+ </dict>
+ <dict>
+ <key>name</key>
+ <string>Operators</string>
+ <key>scope</key>
+ <string>keyword.operator</string>
+ <key>settings</key>
+ <dict>
+ <key>foreground</key>
+ <string>#3c6465</string>
+ </dict>
+ </dict>
+ <dict>
+ <key>name</key>
+ <string>Keywords</string>
+ <key>scope</key>
+ <string>keyword</string>
+ <key>settings</key>
+ <dict>
+ <key>foreground</key>
+ <string>#599caa</string>
+ </dict>
+ </dict>
+ <dict>
+ <key>name</key>
+ <string>Variables</string>
+ <key>scope</key>
+ <string>variable</string>
+ <key>settings</key>
+ <dict>
+ <key>foreground</key>
+ <string>#245361</string>
+ </dict>
+ </dict>
+ <dict>
+ <key>name</key>
+ <string>Functions</string>
+ <key>scope</key>
+ <string>entity.name.function, meta.require, support.function.any-method</string>
+ <key>settings</key>
+ <dict>
+ <key>foreground</key>
+ <string>#246184</string>
+ </dict>
+ </dict>
+ <dict>
+ <key>name</key>
+ <string>Classes</string>
+ <key>scope</key>
+ <string>support.class, entity.name.class, entity.name.type.class</string>
+ <key>settings</key>
+ <dict>
+ <key>foreground</key>
+ <string>#33859d</string>
+ </dict>
+ </dict>
+ <dict>
+ <key>name</key>
+ <string>Classes</string>
+ <key>scope</key>
+ <string>meta.class</string>
+ <key>settings</key>
+ <dict>
+ <key>foreground</key>
+ <string>#98d1ce</string>
+ </dict>
+ </dict>
+ <dict>
+ <key>name</key>
+ <string>Methods</string>
+ <key>scope</key>
+ <string>keyword.other.special-method</string>
+ <key>settings</key>
+ <dict>
+ <key>foreground</key>
+ <string>#246184</string>
+ </dict>
+ </dict>
+ <dict>
+ <key>name</key>
+ <string>Storage</string>
+ <key>scope</key>
+ <string>storage</string>
+ <key>settings</key>
+ <dict>
+ <key>foreground</key>
+ <string>#599caa</string>
+ </dict>
+ </dict>
+ <dict>
+ <key>name</key>
+ <string>Support</string>
+ <key>scope</key>
+ <string>support.function</string>
+ <key>settings</key>
+ <dict>
+ <key>foreground</key>
+ <string>#33859d</string>
+ </dict>
+ </dict>
+ <dict>
+ <key>name</key>
+ <string>Strings, Inherited Class</string>
+ <key>scope</key>
+ <string>string, constant.other.symbol, entity.other.inherited-class</string>
+ <key>settings</key>
+ <dict>
+ <key>foreground</key>
+ <string>#245361</string>
+ </dict>
+ </dict>
+ <dict>
+ <key>name</key>
+ <string>Integers</string>
+ <key>scope</key>
+ <string>constant.numeric</string>
+ <key>settings</key>
+ <dict>
+ <key>foreground</key>
+ <string>#21bed8</string>
+ </dict>
+ </dict>
+ <dict>
+ <key>name</key>
+ <string>Floats</string>
+ <key>scope</key>
+ <string>none</string>
+ <key>settings</key>
+ <dict>
+ <key>foreground</key>
+ <string>#21bed8</string>
+ </dict>
+ </dict>
+ <dict>
+ <key>name</key>
+ <string>Boolean</string>
+ <key>scope</key>
+ <string>none</string>
+ <key>settings</key>
+ <dict>
+ <key>foreground</key>
+ <string>#21bed8</string>
+ </dict>
+ </dict>
+ <dict>
+ <key>name</key>
+ <string>Constants</string>
+ <key>scope</key>
+ <string>constant</string>
+ <key>settings</key>
+ <dict>
+ <key>foreground</key>
+ <string>#21bed8</string>
+ </dict>
+ </dict>
+ <dict>
+ <key>name</key>
+ <string>Tags</string>
+ <key>scope</key>
+ <string>entity.name.tag</string>
+ <key>settings</key>
+ <dict>
+ <key>foreground</key>
+ <string>#245361</string>
+ </dict>
+ </dict>
+ <dict>
+ <key>name</key>
+ <string>Attributes</string>
+ <key>scope</key>
+ <string>entity.other.attribute-name</string>
+ <key>settings</key>
+ <dict>
+ <key>foreground</key>
+ <string>#21bed8</string>
+ </dict>
+ </dict>
+ <dict>
+ <key>name</key>
+ <string>Attribute IDs</string>
+ <key>scope</key>
+ <string>entity.other.attribute-name.id, punctuation.definition.entity</string>
+ <key>settings</key>
+ <dict>
+ <key>foreground</key>
+ <string>#246184</string>
+ </dict>
+ </dict>
+ <dict>
+ <key>name</key>
+ <string>Selector</string>
+ <key>scope</key>
+ <string>meta.selector</string>
+ <key>settings</key>
+ <dict>
+ <key>foreground</key>
+ <string>#599caa</string>
+ </dict>
+ </dict>
+ <dict>
+ <key>name</key>
+ <string>Values</string>
+ <key>scope</key>
+ <string>none</string>
+ <key>settings</key>
+ <dict>
+ <key>foreground</key>
+ <string>#21bed8</string>
+ </dict>
+ </dict>
+ <dict>
+ <key>name</key>
+ <string>Headings</string>
+ <key>scope</key>
+ <string>markup.heading punctuation.definition.heading, entity.name.section</string>
+ <key>settings</key>
+ <dict>
+ <key>fontStyle</key>
+ <string></string>
+ <key>foreground</key>
+ <string>#246184</string>
+ </dict>
+ </dict>
+ <dict>
+ <key>name</key>
+ <string>Units</string>
+ <key>scope</key>
+ <string>keyword.other.unit</string>
+ <key>settings</key>
+ <dict>
+ <key>foreground</key>
+ <string>#21bed8</string>
+ </dict>
+ </dict>
+ <dict>
+ <key>name</key>
+ <string>Bold</string>
+ <key>scope</key>
+ <string>markup.bold, punctuation.definition.bold</string>
+ <key>settings</key>
+ <dict>
+ <key>fontStyle</key>
+ <string>bold</string>
+ <key>foreground</key>
+ <string>#33859d</string>
+ </dict>
+ </dict>
+ <dict>
+ <key>name</key>
+ <string>Italic</string>
+ <key>scope</key>
+ <string>markup.italic, punctuation.definition.italic</string>
+ <key>settings</key>
+ <dict>
+ <key>fontStyle</key>
+ <string>italic</string>
+ <key>foreground</key>
+ <string>#599caa</string>
+ </dict>
+ </dict>
+ <dict>
+ <key>name</key>
+ <string>Code</string>
+ <key>scope</key>
+ <string>markup.raw.inline</string>
+ <key>settings</key>
+ <dict>
+ <key>foreground</key>
+ <string>#245361</string>
+ </dict>
+ </dict>
+ <dict>
+ <key>name</key>
+ <string>Link Text</string>
+ <key>scope</key>
+ <string>string.other.link</string>
+ <key>settings</key>
+ <dict>
+ <key>foreground</key>
+ <string>#245361</string>
+ </dict>
+ </dict>
+ <dict>
+ <key>name</key>
+ <string>Link Url</string>
+ <key>scope</key>
+ <string>meta.link</string>
+ <key>settings</key>
+ <dict>
+ <key>foreground</key>
+ <string>#21bed8</string>
+ </dict>
+ </dict>
+ <dict>
+ <key>name</key>
+ <string>Lists</string>
+ <key>scope</key>
+ <string>markup.list</string>
+ <key>settings</key>
+ <dict>
+ <key>foreground</key>
+ <string>#245361</string>
+ </dict>
+ </dict>
+ <dict>
+ <key>name</key>
+ <string>Quotes</string>
+ <key>scope</key>
+ <string>markup.quote</string>
+ <key>settings</key>
+ <dict>
+ <key>foreground</key>
+ <string>#21bed8</string>
+ </dict>
+ </dict>
+ <dict>
+ <key>name</key>
+ <string>Separator</string>
+ <key>scope</key>
+ <string>meta.separator</string>
+ <key>settings</key>
+ <dict>
+ <key>background</key>
+ <string>#61b343</string>
+ <key>foreground</key>
+ <string>#3c6465</string>
+ </dict>
+ </dict>
+ <dict>
+ <key>name</key>
+ <string>Inserted</string>
+ <key>scope</key>
+ <string>markup.inserted</string>
+ <key>settings</key>
+ <dict>
+ <key>foreground</key>
+ <string>#245361</string>
+ </dict>
+ </dict>
+ <dict>
+ <key>name</key>
+ <string>Deleted</string>
+ <key>scope</key>
+ <string>markup.deleted</string>
+ <key>settings</key>
+ <dict>
+ <key>foreground</key>
+ <string>#245361</string>
+ </dict>
+ </dict>
+ <dict>
+ <key>name</key>
+ <string>Changed</string>
+ <key>scope</key>
+ <string>markup.changed</string>
+ <key>settings</key>
+ <dict>
+ <key>foreground</key>
+ <string>#599caa</string>
+ </dict>
+ </dict>
+ <dict>
+ <key>name</key>
+ <string>Colors</string>
+ <key>scope</key>
+ <string>constant.other.color</string>
+ <key>settings</key>
+ <dict>
+ <key>foreground</key>
+ <string>#33859d</string>
+ </dict>
+ </dict>
+ <dict>
+ <key>name</key>
+ <string>Regular Expressions</string>
+ <key>scope</key>
+ <string>string.regexp</string>
+ <key>settings</key>
+ <dict>
+ <key>foreground</key>
+ <string>#33859d</string>
+ </dict>
+ </dict>
+ <dict>
+ <key>name</key>
+ <string>Escape Characters</string>
+ <key>scope</key>
+ <string>constant.character.escape</string>
+ <key>settings</key>
+ <dict>
+ <key>foreground</key>
+ <string>#33859d</string>
+ </dict>
+ </dict>
+ <dict>
+ <key>name</key>
+ <string>Embedded</string>
+ <key>scope</key>
+ <string>punctuation.section.embedded, variable.interpolation</string>
+ <key>settings</key>
+ <dict>
+ <key>foreground</key>
+ <string>#d3ebe9</string>
+ </dict>
+ </dict>
+ <dict>
+ <key>name</key>
+ <string>Invalid</string>
+ <key>scope</key>
+ <string>invalid.illegal</string>
+ <key>settings</key>
+ <dict>
+ <key>background</key>
+ <string>#245361</string>
+ <key>foreground</key>
+ <string>#093748</string>
+ </dict>
+ </dict>
+ </array>
+ <key>uuid</key>
+ <string>terminal-dot-sexy</string>
+</dict>
+</plist>
diff --git a/sublime/.config/sublime-text-3/Packages/Colorsublime-Themes/decker-dark.tmTheme b/sublime/.config/sublime-text-3/Packages/Colorsublime-Themes/decker-dark.tmTheme
@@ -18,7 +18,7 @@
<key>invisibles</key>
<string>#3A3A3A</string>
<key>lineHighlight</key>
- <string>#343434</string>
+ <string>#1e1e1e</string>
<key>selection</key>
<string>#3C3C3C</string>
<key>findHighlight</key>
diff --git a/tmux/.tmuxinator/work2.yml b/tmux/.tmuxinator/work2.yml
@@ -0,0 +1,18 @@
+# ~/.tmuxinator/work.yml
+
+name: work2
+root: ~/
+
+tmux_options: -2
+
+windows:
+ - mail:
+ layout: 0abe,98x55,0,0[98x17,0,0,2,98x37,0,18,3]
+ panes:
+ - mps
+ - mutt
+ - news:
+ layout: 0ac7,98x55,0,0[98x17,0,0,4,98x37,0,18,5]
+ panes:
+ - ranger
+ - snownews
