diff --git a/.gitmodules b/.gitmodules index 019644f..d9bd7e0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "awesome/lain"] path = awesome/lain url = https://github.com/copycat-killer/lain +[submodule "quassel/SolarizedQuassel"] + path = quassel/SolarizedQuassel + url = https://github.com/antoligy/SolarizedQuassel diff --git a/misc/bupignore b/misc/bupignore index 3a157bb..3de9972 100644 --- a/misc/bupignore +++ b/misc/bupignore @@ -17,3 +17,18 @@ media .nv .gem .config/sublime-text-2/Backup +.config/sublime-text-3/Backup +ru/*/lectures +ru/old/*/lectures +ru/*/opnames +ru/old/*/opnames +ru/ext +ru/netsec/netsec2015 +ru/netsec/NetSec-Debian-root.vdi +ru/ossec/ossec2015 +movies +tmp +Downloads +VirtualBox VMs/ +public + diff --git a/misc/compton.conf b/misc/compton.conf new file mode 100644 index 0000000..a1f9031 --- /dev/null +++ b/misc/compton.conf @@ -0,0 +1,53 @@ +# shadow +shadow = true; +no-dnd-shadow = true; +#no-dock-shadow = true; +clear-shadow = true; +shadow-exclude = [ "name = 'Notification'", "class_g = 'Conky'", "class_g ?= 'Notify-osd'" ]; + +# opacity +menu-opacity = 0.9 + +# general +backend = "glx" +sw-opti = true; + +# GLX backend +glx-no-stencil = true; +#glx-copy-from-front = false; +# glx-use-copysubbuffermesa = true; +#glx-no-rebind-pixmap = true; +glx-swap-method = 3; +unredir-if-possible = true; + +blur-background = true; +fading = true; + +vsync = "opengl-swc"; + +fade-in-step = 0.03; +fade-out-step = 0.03; +fade-delta = 10; + +# Window type settings +wintypes: +{ + tooltip = { fade = true; shadow = false; opacity = 0.75; focus = true; }; +}; + +no-fading-openclose = false; +detect-transient = false; +alpha-step = 0.0; +inactive-opacity = 0.85; +no-dock-shadow = false; +shadow-opacity = 0.75; +detect-client-leader = false; +blur-background-frame = true; +blur-background-fixed = false; +mark-wmwin-focused = true; +mark-ovredir-focused = true; +inactive-opacity-override = false; +dbe = false; +frame-opacity = 0.8; +detect-client-opacity = false; + diff --git a/misc/dot.json b/misc/dot.json deleted file mode 100644 index 3a94964..0000000 --- a/misc/dot.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "symlinks": [ - { - "source": "mplayerrc", - "target": "~/.mplayer/config" - }, - { - "source": "termiterc", - "target": "~/.config/termite/config" - }, - { - "source": "bupignore", - "target": "~/.bupignore" - } - ] -} \ No newline at end of file diff --git a/misc/mplayerrc b/misc/mplayerrc deleted file mode 100644 index 32c5ba7..0000000 --- a/misc/mplayerrc +++ /dev/null @@ -1,12 +0,0 @@ -ass=true -embeddedfonts=1 -fontconfig=yes -subcp=cp1251 -nolirc=yes -cache=8192 -ao=alsa - -vo=vdpau,xv, -#vc=ffh264vdpau,ffmpeg12vdpau, - -ao=pulse diff --git a/quassel/SolarizedQuassel b/quassel/SolarizedQuassel new file mode 160000 index 0000000..360a845 --- /dev/null +++ b/quassel/SolarizedQuassel @@ -0,0 +1 @@ +Subproject commit 360a84516d217f19ded75ceb4f6348d81f95d970 diff --git a/quassel/mytheme.qss b/quassel/jussi01-darktheme.qss similarity index 57% rename from quassel/mytheme.qss rename to quassel/jussi01-darktheme.qss index 677a842..cc7e2ed 100644 --- a/quassel/mytheme.qss +++ b/quassel/jussi01-darktheme.qss @@ -10,54 +10,38 @@ // You should have received a copy of the GNU General Public License // along with this file. If not, see . -// Original copyright (C) Jussi Schultink 2009 +// Copyright (C) Jussi Schultink 2009 // Custom ChatView Colors Palette { marker-line: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop:0 #ff0000, stop: 0.1 transparent); } -ChatView { background: #0d1926; } +ChatView { background: #131313; } ChatLine[label="highlight"] { - foreground: #eaecf5; - background: #0a0b15; + foreground: #debc85; + background: #00583a; } ChatLine::timestamp { foreground: #707c70; } -ChatLine#plain { foreground: #d9e6f2; } - -// yellow -ChatLine#notice { foreground: #acad80; } - -// bright blue -ChatLine#action { foreground: #b0ccd6; font-weight: bold; font-style: italic; } - -// green -ChatLine#join { foreground: #75ad80; } - -// purple -ChatLine#nick { foreground: #ac77b7; } -ChatLine#part { foreground: #ac77b7; } -ChatLine#kick { foreground: #ac77b7; } -ChatLine#kill { foreground: #ac77b7; } -ChatLine#topic { foreground: #ac77b7; } - -// blue -ChatLine#mode { foreground: #75adb7; font-weight: bold; } - -// red -ChatLine#quit { foreground: #ac7780; } - - -// gray -ChatLine#server { foreground: #c9cad4; } -ChatLine#info { foreground: #c9cad4; } -ChatLine#error { foreground: #c9cad4; } -ChatLine#daychange { foreground: #c9cad4; } +ChatLine#plain { foreground: #debc85; } +ChatLine#notice { foreground: #916409; } +ChatLine#action { foreground: #007a80; font-weight: bold; font-style: italic; } +ChatLine#nick { foreground: #633b5a; } +ChatLine#mode { foreground: #346E9E; font-weight: bold; } +ChatLine#join { foreground: #005538; } +ChatLine#part { foreground: #633b5a; } +ChatLine#quit { foreground: #683A38; } +ChatLine#kick { foreground: #633b5a; } +ChatLine#kill { foreground: #633b5a; } +ChatLine#server { foreground: #916409; } +ChatLine#info { foreground: #916409; } +ChatLine#error { foreground: #916409; } +ChatLine#daychange { foreground: #916409; } +ChatLine#topic { foreground: #633b5a; } // Sender Colors -// green ChatLine::sender#plain[sender="self"] { foreground: #009966; } ChatLine::sender#plain[sender="00"] { foreground: #e90d7f; } @@ -78,46 +62,45 @@ ChatLine::sender#plain[sender="0e"] { foreground: #b39775; } ChatLine::sender#plain[sender="0f"] { foreground: #3176b3; } // BufferView Colors -ChatListItem { foreground: #d9e6f2; } +ChatListItem { foreground: #debc85; } ChatListItem[state="inactive"] { foreground: #a0a0a4; } ChatListItem[state="channel-event"] { foreground: #008000; } ChatListItem[state="unread-message"] { foreground: #ff7b00; } ChatListItem[state="highlighted"] { foreground: #ff00bf; } -BufferView { background: #0d1926; } +BufferView { background: #131313; } // NickView Colors -NickListItem[type="category"] { foreground: #d9e6f2; } -NickListItem[type="user"] { foreground: #d9e6f2; } +NickListItem[type="category"] { foreground: #debc85; } +NickListItem[type="user"] { foreground: #debc85; } NickListItem[type="user", state="away"] { foreground: #a0a0a4; } -NickView { background: #0d1926; } +NickView { background: #131313; } -MultiLineEdit { background: #0d1926; color: #d9e6f2; } -StyledLabel#topicLabel { background: #0d1926; } -ChatLine#topic { foreground: #d9e6f2; } +MultiLineEdit { background: #131313; color: #debc85; } +StyledLabel#topicLabel { background: #131313; } +ChatLine#topic { foreground: #debc85; } // Miscellaneous Colors -QTreeView::item:selected { color: #0a0b15; } -ChatMonitorSettingsPage BufferView::item { color: #d9e6f2; } -QTreeView#settingsTree { background: #0d1926; } -QTreeView::item#settingsTree { color: #d9e6f2; } -QLineEdit:enabled { background: #0d1926; color: #d9e6f2; } -QSpinBox:enabled { background: #0d1926; color: #d9e6f2; } -QTableWidget { background-color: #0d1926; color: #d9e6f2; } -QListWidget { background-color: #0d1926; color: #d9e6f2; } +QTreeView::item:selected { color: #00004b; } +ChatMonitorSettingsPage BufferView::item { color: #debc85; }QTreeView#settingsTree { background: #131313; } +QTreeView::item#settingsTree { color: #debc85; } +QLineEdit:enabled { background: #131313; color: #debc85; } +QSpinBox:enabled { background: #131313; color: #debc85; } +QTableWidget { background-color: #131313; color: #debc85; } +QListWidget { background-color: #131313; color: #debc85; } QTableView { alternate-background-color: #42403B; background-color: #42403B; - color: #d9e6f2; } + color: #debc85; } Palette { link: #539FA3; link-visited: #845B90; - window: #0d1926; window-text: #d9e6f2; text: #d9e6f2; + window: #2b2b2b; window-text: #debc85; text: #00004b; - light: #B7B4AC; midlight: #d9e6f2; button: #292929; + light: #B7B4AC; midlight: #debc85; button: #292929; mid: #202553; dark: #000533; button-text: #B6B3AB; } StyledLabel#topicLabel { background: #282828; } -MultiLineEdit { background: #0d1926; color: #d9e6f2; } +MultiLineEdit { background: #131313; color: #debc85; } diff --git a/quassel/quasselclient.conf b/quassel/quasselclient.conf new file mode 100644 index 0000000..bc1aaf5 --- /dev/null +++ b/quassel/quasselclient.conf @@ -0,0 +1,65 @@ +# this file would normally have my username and password and binary blobs +[Config] +Version=1 + + +[QtUi] +Style= +UseSystemTrayIcon=true +MinimizeOnClose=false +MainWinMinimized=false +MainWinMaximized=false +MainWinHidden=false +LockLayout=true +ShowMenuBar=false +ChatView\ChatMonitor\ShowOwnMsgs=false +ChatView\ChatMonitor\OperationMode=2 +ChatView\ChatMonitor\ShowHighlights=false +ChatView\ChatMonitor\ShowBacklog=true +ChatView\ChatMonitor\IncludeRead=true +ChatView\ChatMonitor\Buffers=@Invalid() +ChatView\ChatMonitor\SecondColumnHandlePos=227 +ChatView\__default__\TimestampFormat=[hh:mm:ss] +ChatView\__default__\ShowWebPreview=false +ChatView\__default__\AutoMarkerLine=true +ChatView\__default__\AutoMarkerLineOnLostFocus=true +ChatView\__default__\WebSearchUrlFormat="https://www.google.com/search?q=%s" +ChatView\735\SecondColumnHandlePos=160 +ChatView\735\FirstColumnHandlePos=85 +ChatView\__default__\FirstColumnHandlePos=96 +ShowStatusBar=false +ChatView\255\SecondColumnHandlePos=172 +ChatView\631\FirstColumnHandlePos=96 +ChatView\631\SecondColumnHandlePos=193 + +[Buffer] +__default__\UserNoticesTarget=5 +__default__\ServerNoticesTarget=2 +__default__\ErrorMsgsTarget=1 +480\hasMessageTypeFilter=true +480\MessageTypeFilter=98528 +20\hasMessageTypeFilter=true +20\MessageTypeFilter=98536 +731\hasMessageTypeFilter=true +731\MessageTypeFilter=98552 +255\hasMessageTypeFilter=true +255\MessageTypeFilter=98528 + +[UiStyle] +UseCustomStyleSheet=true +CustomStyleSheetPath=/home/yorick/dotfiles/quassel/SolarizedQuassel/SolarizedDark.qss +AllowMircColors=true +Fonts\UseCustomItemViewFont=true +Fonts\ItemView=@Variant(\0\0\0@\0\0\0\x1e\0S\0o\0u\0r\0\x63\0\x65\0 \0\x43\0o\0\x64\0\x65\0 \0P\0r\0o@ \0\0\0\0\0\0\xff\xff\xff\xff\0\x1\0?\x10) +ShowItemViewIcons=true + +[Notification] +Systray\Animate=true + +[QtUiStyle] +Fonts\UseCustomChatViewFont=true +Fonts\ChatView=@Variant(\0\0\0@\0\0\0\x1e\0S\0o\0u\0r\0\x63\0\x65\0 \0\x43\0o\0\x64\0\x65\0 \0P\0r\0o@\x1c\0\0\0\0\0\0\xff\xff\xff\xff\0\x1\0?\x10) + +[ItemViews] +DisplayTopicInTooltip=false +MouseWheelChangesBuffer=false diff --git a/quassel/settings.qss b/quassel/settings.qss new file mode 100644 index 0000000..cbeef9c --- /dev/null +++ b/quassel/settings.qss @@ -0,0 +1,9 @@ +// This isn't actually used for now + +// ChatView Font +ChatLine { font: bold 7pt "Source Code Pro"; } + +// ItemView Font +ChatListItem { font: bold 7pt "Source Code Pro"; } +NickListItem { font: bold 7pt "Source Code Pro"; } +