diff --git a/rc.lua b/rc.lua index e3d0b68..0268c36 100644 --- a/rc.lua +++ b/rc.lua @@ -69,9 +69,11 @@ end -- }}} -- {{{ Variable definitions -- Themes define colours, icons, and wallpapers -beautiful.init('/home/von/vdotfiles/theme.lua') +beautiful.init('/usr/share/awesome/themes/default/theme.lua') theme.border_width = 1 theme.font = 'Terminus 9' +theme.taglist_squares_sel = nil +theme.taglist_squares_unsel = nil -- set wallpaper local wallpaper = '/home/von/Pictures/wallpaper.png' @@ -194,7 +196,7 @@ mylbmenu = awful.menu({ -- }}} -- {{{ Wibox -- Create a textclock widget -mytextclock = awful.widget.textclock('%a %d %H:%M') +mytextclock = awful.widget.textclock(' %a %d %H:%M ') mytextclock:set_font('Terminus Bold 11') -- Create a mail notification widget mytextbox = wibox.widget.textbox() @@ -283,7 +285,7 @@ for s = 1, screen.count() do mytasklist[s] = awful.widget.tasklist(s, awful.widget.tasklist.filter.currenttags, mytasklist.buttons) -- Create the wibox - mywibox[s] = awful.wibox({ position = 'top', height = '16', screen = s }) + mywibox[s] = awful.wibox({ position = 'top', height = '18', screen = s }) local left_layout = wibox.layout.fixed.horizontal() local right_layout = wibox.layout.fixed.horizontal() diff --git a/theme.lua b/theme.lua deleted file mode 100644 index 4713ad9..0000000 --- a/theme.lua +++ /dev/null @@ -1,124 +0,0 @@ ---------------------------------- --- "Solarized" awesome theme -- --- By Gwenhael Le Moine -- ---------------------------------- - --- Alternative icon sets and widget icons: --- * http://awesome.naquadah.org/wiki/Nice_Icons - --- {{{ Main -theme = {} -theme.default_themes_path = "/usr/share/awesome/themes" -theme.wallpaper_cmd = { "awsetbg "..theme.default_themes_path.."/zenburn/zenburn-background.png" } -theme.colors = {} -theme.colors.base3 = "#002b36ff" -theme.colors.base2 = "#073642ff" -theme.colors.base1 = "#586e75ff" -theme.colors.base0 = "#657b83ff" -theme.colors.base00 = "#839496ff" -theme.colors.base01 = "#93a1a1ff" -theme.colors.base02 = "#eee8d5ff" -theme.colors.base03 = "#fdf6e3ff" -theme.colors.yellow = "#b58900ff" -theme.colors.orange = "#cb4b16ff" -theme.colors.red = "#dc322fff" -theme.colors.magenta = "#d33682ff" -theme.colors.violet = "#6c71c4ff" -theme.colors.blue = "#268bd2ff" -theme.colors.cyan = "#2aa198ff" -theme.colors.green = "#859900ff" --- }}} - --- {{{ Styles -theme.font = "Terminus 9" - --- {{{ Colors -theme.fg_normal = theme.colors.base02 -theme.fg_focus = theme.colors.base03 -theme.fg_urgent = theme.colors.base3 - -theme.bg_normal = theme.colors.base3 -theme.bg_focus = theme.colors.base1 -theme.bg_urgent = theme.colors.red -theme.bg_systray = theme.bg_normal --- }}} - --- {{{ Borders -theme.border_width = "2" -theme.border_normal = theme.bg_normal -theme.border_focus = theme.bg_focus -theme.border_marked = theme.bg_urgent --- }}} - --- {{{ Titlebars -theme.titlebar_bg_focus = theme.bg_focus -theme.titlebar_bg_normal = theme.bg_normal --- }}} - --- {{{ Mouse finder -theme.mouse_finder_color = theme.colors.green --- mouse_finder_[timeout|animate_timeout|radius|factor] --- }}} - --- {{{ Menu --- Variables set for theming the menu: --- menu_[bg|fg]_[normal|focus] --- menu_[border_color|border_width] -theme.menu_height = "15" -theme.menu_width = "100" --- }}} - --- {{{ Icons --- {{{ Taglist -theme.taglist_squares_sel = theme.default_themes_path.."/zenburn/taglist/squarefz.png" -theme.taglist_squares_unsel = theme.default_themes_path.."/zenburn/taglist/squarez.png" ---theme.taglist_squares_resize = "false" --- }}} - --- {{{ Misc -theme.awesome_icon = theme.default_themes_path.."/zenburn/awesome-icon.png" -theme.menu_submenu_icon = theme.default_themes_path.."/default/submenu.png" --- }}} - --- {{{ Layout -theme.layout_tile = theme.default_themes_path.."/zenburn/layouts/tile.png" -theme.layout_tileleft = theme.default_themes_path.."/zenburn/layouts/tileleft.png" -theme.layout_tilebottom = theme.default_themes_path.."/zenburn/layouts/tilebottom.png" -theme.layout_tiletop = theme.default_themes_path.."/zenburn/layouts/tiletop.png" -theme.layout_fairv = theme.default_themes_path.."/zenburn/layouts/fairv.png" -theme.layout_fairh = theme.default_themes_path.."/zenburn/layouts/fairh.png" -theme.layout_spiral = theme.default_themes_path.."/zenburn/layouts/spiral.png" -theme.layout_dwindle = theme.default_themes_path.."/zenburn/layouts/dwindle.png" -theme.layout_max = theme.default_themes_path.."/zenburn/layouts/max.png" -theme.layout_fullscreen = theme.default_themes_path.."/zenburn/layouts/fullscreen.png" -theme.layout_magnifier = theme.default_themes_path.."/zenburn/layouts/magnifier.png" -theme.layout_floating = theme.default_themes_path.."/zenburn/layouts/floating.png" --- }}} - --- {{{ Titlebar -theme.titlebar_close_button_focus = theme.default_themes_path.."/zenburn/titlebar/close_focus.png" -theme.titlebar_close_button_normal = theme.default_themes_path.."/zenburn/titlebar/close_normal.png" - -theme.titlebar_ontop_button_focus_active = theme.default_themes_path.."/zenburn/titlebar/ontop_focus_active.png" -theme.titlebar_ontop_button_normal_active = theme.default_themes_path.."/zenburn/titlebar/ontop_normal_active.png" -theme.titlebar_ontop_button_focus_inactive = theme.default_themes_path.."/zenburn/titlebar/ontop_focus_inactive.png" -theme.titlebar_ontop_button_normal_inactive = theme.default_themes_path.."/zenburn/titlebar/ontop_normal_inactive.png" - -theme.titlebar_sticky_button_focus_active = theme.default_themes_path.."/zenburn/titlebar/sticky_focus_active.png" -theme.titlebar_sticky_button_normal_active = theme.default_themes_path.."/zenburn/titlebar/sticky_normal_active.png" -theme.titlebar_sticky_button_focus_inactive = theme.default_themes_path.."/zenburn/titlebar/sticky_focus_inactive.png" -theme.titlebar_sticky_button_normal_inactive = theme.default_themes_path.."/zenburn/titlebar/sticky_normal_inactive.png" - -theme.titlebar_floating_button_focus_active = theme.default_themes_path.."/zenburn/titlebar/floating_focus_active.png" -theme.titlebar_floating_button_normal_active = theme.default_themes_path.."/zenburn/titlebar/floating_normal_active.png" -theme.titlebar_floating_button_focus_inactive = theme.default_themes_path.."/zenburn/titlebar/floating_focus_inactive.png" -theme.titlebar_floating_button_normal_inactive = theme.default_themes_path.."/zenburn/titlebar/floating_normal_inactive.png" - -theme.titlebar_maximized_button_focus_active = theme.default_themes_path.."/zenburn/titlebar/maximized_focus_active.png" -theme.titlebar_maximized_button_normal_active = theme.default_themes_path.."/zenburn/titlebar/maximized_normal_active.png" -theme.titlebar_maximized_button_focus_inactive = theme.default_themes_path.."/zenburn/titlebar/maximized_focus_inactive.png" -theme.titlebar_maximized_button_normal_inactive = theme.default_themes_path.."/zenburn/titlebar/maximized_normal_inactive.png" --- }}} --- }}} - -return theme diff --git a/vimrc b/vimrc index 3481470..c5bb4ed 100644 --- a/vimrc +++ b/vimrc @@ -92,16 +92,15 @@ endif " set color scheme depending on the terminal capabilities if &t_Co > 88 || has("gui_running") - "colorscheme solarized - colorscheme jellybeans + colorscheme solarized else colorscheme elflord endif " gvim stuff if has("gui_running") - "let g:solarized_italic=0 - "let g:solarized_bold=0 + let g:solarized_italic=0 + let g:solarized_bold=0 set guioptions=aegimLl set mouse=a set guifont=Monofur\ 11