Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: virtuoso/dotfiles
base: 33d76e8b37
...
head fork: virtuoso/dotfiles
compare: 837281c3e2
Checking mergeability… Don't worry, you can still create the pull request.
  • 12 commits
  • 6 files changed
  • 0 commit comments
  • 1 contributor
Commits on Jul 14, 2011
@virtuoso xsession: start moc server if available
Signed-off-by: Alexander Shishkin <ash@koowaldah.org>
97640a9
Commits on Jul 25, 2011
@virtuoso emacs/notmuch: put tags in front of subjects
Signed-off-by: Alexander Shishkin <ash@koowaldah.org>
8a9600f
@virtuoso emacs: switch to a bitmapped font
Signed-off-by: Alexander Shishkin <ash@koowaldah.org>
8aa475b
@virtuoso emacs: really disable menu-bar and tool-bar
Signed-off-by: Alexander Shishkin <ash@koowaldah.org>
92fb048
@virtuoso emacs: add user's local lisp modules
Signed-off-by: Alexander Shishkin <ash@koowaldah.org>
519269d
@virtuoso emacs: add a qemu-style indentation
Signed-off-by: Alexander Shishkin <ash@koowaldah.org>
9fd255f
@virtuoso awesome: add titlebar to floating windows
Signed-off-by: Alexander Shishkin <ash@koowaldah.org>
9c12dff
@virtuoso awesome: make mouse warping less annoying
Signed-off-by: Alexander Shishkin <ash@koowaldah.org>
50a25e3
Commits on Oct 31, 2011
@virtuoso zsh: silence zle
Signed-off-by: Alexander Shishkin <ash@koowaldah.org>
62defb1
@virtuoso awesome: swap work and chat tags
Signed-off-by: Alexander Shishkin <ash@koowaldah.org>
a2e9472
@virtuoso awesome: Mod5+digit == toggle tag
Signed-off-by: Alexander Shishkin <ash@koowaldah.org>
77d6f94
@virtuoso amodkey+F2: prompt for urxvt resource name
Signed-off-by: Alexander Shishkin <ash@koowaldah.org>
837281c
View
73 awesome/rc.lua
@@ -279,7 +279,14 @@ globalkeys = awful.util.table.join(
awful.key({ modkey, "Shift" }, "space", function () awful.layout.inc(layouts, -1) end),
-- Prompt
- --awful.key({ modkey }, "F3", function () mypromptbox[mouse.screen]:run() end),
+ awful.key({ amodkey }, "F2",
+ function ()
+ awful.prompt.run({ prompt = "urxvt name: " },
+ mypromptbox[mouse.screen].widget,
+ function (x)
+ awful.util.spawn("urxvt -name " .. x .. "urxvt")
+ end, nil, nil)
+ end),
awful.key({ modkey }, "F3", obvious.popup_run_prompt.run_prompt),
awful.key({ modkey }, "x",
@@ -316,13 +323,14 @@ clientbuttons = awful.util.table.join(
awful.button({ modkey }, 3, awful.mouse.client.resize))
shifty.config.tags = {
- ["1:chat"] = {
+ ["1:work"] = {
persist = true,
position = 1,
- screen = 1,
- nmaster = 3,
+ screen = 2,
layout = awful.layout.suit.tile.bottom,
- mwfact = 0.6
+ nmaster = 2,
+ ncol = 2,
+ mwfact = 0.58
},
["2:www"] = {
exclusive = true,
@@ -331,14 +339,13 @@ shifty.config.tags = {
spawn = "iceweasel",
layout = awful.layout.suit.tile.max,
},
- ["3:work"] = {
+ ["3:chat"] = {
persist = true,
position = 3,
- screen = 2,
- layout = awful.layout.suit.tile.bottom,
- nmaster = 2,
- ncol = 2,
- mwfact = 0.58
+ screen = 1,
+ nmaster = 3,
+ layout = awful.layout.suit.tile.floating,
+ mwfact = 0.6
},
["4:scr"] = {
layout = awful.layout.suit.max,
@@ -383,7 +390,7 @@ shifty.config.apps = {
},
{
match = { "gkrellm" },
- tag = "1:chat",
+ --tag = "1:chat",
skip_taskbar = true,
float = true,
ontop = true,
@@ -410,7 +417,7 @@ shifty.config.apps = {
"XOsview",
"xconsole"
},
- tag = { "6:misc", "1:chat", "2:www" },
+ tag = { "6:misc" },
nofocus = true,
slave = yes,
},
@@ -427,12 +434,12 @@ shifty.config.apps = {
tag = "6:misc",
float = true,
},
- { match = {"defurxvt" }, tag = "3:work", },
+ { match = {"defurxvt" }, tag = "1:work", },
{
match = { "ncmpc.*", "MOC.*" },
tag = "6:misc",
},
- { match = {"MPlayer" }, tag = "3:work", float = true },
+ { match = {"MPlayer" }, tag = "1:work", float = true },
{
match = {
"chaturxvt",
@@ -442,12 +449,12 @@ shifty.config.apps = {
"Irssi:.*",
--"[screen: mutt.*",
},
- tag = "1:chat",
+ tag = "3:chat",
},
{ match = { "MOC.*" }, tag = "6:misc", },
{ match = { ".*rtorrent.*" }, tag = "p2p", },
{ match = { "minicom" }, tag = "4:scr", },
- { match = {"emacs@.*" }, tag = "3:work", },
+ { match = {"emacs@.*" }, tag = "1:work", },
{ match = { "Hydrogen.*", "Audacity.*" }, tag = "5:miscfs", },
{ match = {"Gimp","Ufraw" }, tag = { "graph", "gimp" } },
{ match = {"gimp-image-window" }, slave = true, },
@@ -472,6 +479,10 @@ for i = 1, ( shifty.config.maxtags or 9 ) do
function ()
awful.tag.viewtoggle(shifty.getpos(i))
end),
+ awful.key({ amodkey }, "#" .. i + 9,
+ function ()
+ awful.tag.viewtoggle(shifty.getpos(i))
+ end),
awful.key({ modkey, "Shift" }, "#" .. i + 9,
function ()
if client.focus then
@@ -496,8 +507,17 @@ shifty.config.clientkeys = clientkeys
-- {{{ Signals
-- Signal function to execute when a new client appears.
client.add_signal("manage", function (c, startup)
- -- Add a titlebar
- --awful.titlebar.add(c, { modkey = modkey, height = 15, position = "" })
+ -- Add a titlebar to floating windows only
+ c:add_signal("property::floating",
+ function (c)
+ if (awful.client.floating.get(c)) then
+ c["border_width"] = 5
+ awful.titlebar.add(c, { modkey = modkey, height = 15, position = "" })
+ else
+ c["border_width"] = theme.border_width
+ awful.titlebar.remove(c)
+ end
+ end)
-- Enable sloppy focus
c:add_signal("mouse::enter", function(c)
@@ -525,12 +545,15 @@ client.add_signal("focus", function(c)
--
c.border_color = beautiful.border_focus
- -- mouse cursor should follow focus
- -- this prevents losing focus history on dual screen
- -- and is nice otherwise
- if awful.mouse.client_under_pointer() ~= c then
- mouse.coords(c:geometry(), true)
- end
+ local c_c = c:geometry()
+ local m_c = mouse.coords()
+
+ if m_c.x < c_c.x or m_c.x >= c_c.x + c_c.width or
+ m_c.y < c_c.y or m_c.y >= c_c.y + c_c.height then
+ if table.maxn(m_c.buttons) == 0 then
+ mouse.coords({ x = c_c.x + 5, y = c_c.y + 5})
+ end
+ end
end)
client.add_signal("unfocus", function(c) c.border_color = beautiful.border_normal end)
-- }}}
View
12 emacs/emacs.d/notmuchstuff.el
@@ -2,6 +2,18 @@
(setq notmuch-search-oldest-first nil)
+(setq notmuch-show-all-tags-list t)
+
+(setq notmuch-search-result-format
+ `(
+ ("date" . "%s ")
+ ("count" . "%-7s ")
+ ("authors" . "%-30s ")
+ ("tags" . "(%s)")
+ ("subject" . "%s ")
+ )
+ )
+
(defun notmuch-search-delete-thread ()
"Delete thread (add \"delete\" tag).
View
16 emacs/emacs.d/yk.el
@@ -1,11 +1,13 @@
(setq my-fcolor "Cyan3")
(setq my-bcolor (if (eq window-system 'x) "#001020" "black"))
-(setq my-font "Droid Sans Mono")
(setq my-font-size "11")
-;; (setq my-font "-rfx-fixed-medium-r-*-*-*-140-*-*-*-*-*-*")
-;; (setq my-bfont "-rfx-fixed-bold-r-*-*-*-140-*-*-*-*-*-*")
-;; (setq my-ifont "-rfx-fixed-medium-*-*-*-*-140-*-*-*-*-*-*")
-;; (setq my-bifont "-rfx-fixed-bold-*-*-*-*-140-*-*-*-*-*-*")
+;;(setq my-font "Droid Sans Mono")
+;;(setq my-normal-font (concat(my-font " " my-font-size)))
+;;(setq my-bold-font (concat(my-font " Bold " my-font-size)))
+(setq my-font "-rfx-fixed-medium-r-*-*-15-*-*-*-*-*-*-r")
+(setq my-normal-font my-font)
+(setq my-bold-font "-rfx-fixed-bold-r-*-*-15-*-*-*-*-*-*-r")
+
(add-to-list 'default-frame-alist `(background-color . ,my-bcolor))
(add-to-list 'default-frame-alist `(foreground-color . ,my-fcolor))
(add-to-list 'default-frame-alist `(cursor-color . "red"))
@@ -32,8 +34,8 @@
(set-face-background 'widget-field "gray10")
;;(set-face-background 'hl-line "black")
(set-face-background 'diff-header "gray10")
- (set-face-font 'font-lock-keyword-face (concat my-font " Bold " my-font-size))
- (set-frame-font (concat my-font " " my-font-size))
+ (set-face-font 'font-lock-keyword-face my-bold-font)
+ (set-frame-font my-normal-font)
;; (set-default-font my-font)
;; (set-face-font 'default my-font)
;; (set-face-font 'bold my-bfont)
View
15 emacs/emacs.el
@@ -19,13 +19,14 @@
((message (concat "No luck with " mode-name))))
)
-(menu-bar-mode)
-(tool-bar-mode)
+(menu-bar-mode 0)
+(tool-bar-mode 0)
(setq my-home (getenv "HOME"))
(setq backup-directory-alist `(("." . ,(concat my-home "/.emacs.d/backup"))))
(push (concat my-home "/.emacs.d") load-path)
+(push (concat my-home "/share/emacs/site-lisp") load-path)
;; goodies
;; -- auto-complete
@@ -78,6 +79,16 @@
(setq indent-tabs-mode t)
(setq c-basic-offset 8))
+(defun qemu-c-mode ()
+ "C mode with adjusted defaults for use with the Linux kernel."
+ (interactive)
+ (c-mode)
+ (c-set-style "K&R")
+ (c-set-offset 'case-label 4)
+ (setq tab-width 4)
+ (setq indent-tabs-mode nil)
+ (setq c-basic-offset 4))
+
;; lua
(require 'lua-mode)
(setq lua-indent-level 8)
View
1  xsession/xsession
@@ -17,6 +17,7 @@ xkbcomp -I${HOME}/.xkb ${HOME}/.xkb/keymap/shisha ${DISPLAY}
# /usr/bin/xrandr --output VGA-0 --mode 1152x864 || true
rm -f ~/.config/xmms2/clients/xmms2-scrobbler/lock
+[ -x /usr/bin/mocp ] && mocp -S || :
#LC_ALL=C
#gkrellm&
View
2  zsh/zshrc
@@ -111,7 +111,7 @@ precmd() {
TRAPWINCH() {
precmd
- zle reset-prompt
+ zle reset-prompt >/dev/null 2>&1
}
preexec() {

No commit comments for this range

Something went wrong with that request. Please try again.