diff options
| -rw-r--r-- | awesome/.config/awesome/rc.lua | 26 | ||||
| -rw-r--r-- | awesome/.config/awesome/themes/srcery/theme.lua | 129 | ||||
| -rw-r--r-- | luakit/.config/luakit/rc.lua | 3 | ||||
| -rw-r--r-- | luakit/.config/luakit/theme-dark.lua | 6 | ||||
| -rw-r--r-- | luakit/.config/luakit/theme-light.lua | 6 | ||||
| -rw-r--r-- | luakit/.config/luakit/theme.lua | 8 | ||||
| -rw-r--r-- | meta/.xinitrc | 1 | ||||
| -rw-r--r-- | screenshot.png | bin | 536021 -> 626274 bytes | |||
| -rw-r--r-- | zathura/.config/zathura/zathurarc | 8 |
9 files changed, 103 insertions, 84 deletions
diff --git a/awesome/.config/awesome/rc.lua b/awesome/.config/awesome/rc.lua index 4ffa8a3..485e4d2 100644 --- a/awesome/.config/awesome/rc.lua +++ b/awesome/.config/awesome/rc.lua @@ -88,7 +88,7 @@ awful.layout.layouts = { --awful.layout.suit.spiral, --awful.layout.suit.spiral.dwindle, awful.layout.suit.max, - --awful.layout.suit.max.fullscreen, + awful.layout.suit.max.fullscreen, --awful.layout.suit.magnifier, --awful.layout.suit.corner.nw, --awful.layout.suit.corner.ne, @@ -286,14 +286,22 @@ local tasklist_buttons = awful.util.table.join( awful.button({}, 5, function () awful.client.focus.byidx(-1) end) ) ---local function set_bg(s) end --- Re-set background color when a screen's geometry changes ---screen.connect_signal("property::geometry", set_bg) +local function set_wallpaper(s) + -- Wallpaper + if beautiful.wallpaper then + local wallpaper = beautiful.wallpaper + -- If wallpaper is a function, call it with the screen + if type(wallpaper) == "function" then + wallpaper = wallpaper(s) + end + gears.wallpaper.maximized(wallpaper, s, true) + end +end -awful.screen.connect_for_each_screen(function (s) - -- Background color - --set_bg(s) +-- Re-set wallpaper when a screen's geometry changes (e.g. different resolution) +screen.connect_signal("property::geometry", set_wallpaper) +awful.screen.connect_for_each_screen(function (s) -- Each screen has its own tag table. awful.tag({"1", "2", "3", "4", "5", "6", "7", "8", "9"}, s, awful.layout.layouts[1]) @@ -471,6 +479,8 @@ local globalkeys = awful.util.table.join( {description = "open Guile interpreter", group = "launcher"}), awful.key({modkey}, "o", spawner(octave), {description = "open Octave", group = "launcher"}), + awful.key({modkey, "Shift"}, "o", spawner"geogebra-classic", + {description = "open GeoGebra", group = "launcher"}), awful.key({modkey}, "z", spawner"zathura", {description = "open zathura document viewer", group = "launcher"}), awful.key({modkey}, "d", spawner"diodon", @@ -497,6 +507,8 @@ local globalkeys = awful.util.table.join( {description = "Audacious: previous track", group = "multimedia"}), awful.key({}, "XF86AudioNext", spawner(audacious_forward), {description = "Audacious: next track", group = "multimedia"}), + awful.key({}, "XF86Display", spawner"arandr", + {description = "open Arandr", group = "multimedia"}), awful.key({}, "Print", nil, spawner(scrot_select), {description = "shoot a window or rectangle selected with a mouse", group = "multimedia"}), diff --git a/awesome/.config/awesome/themes/srcery/theme.lua b/awesome/.config/awesome/themes/srcery/theme.lua index 0d08cae..d0c3e26 100644 --- a/awesome/.config/awesome/themes/srcery/theme.lua +++ b/awesome/.config/awesome/themes/srcery/theme.lua @@ -14,13 +14,15 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see <http://www.gnu.org/licenses/>. -local theme = {} +local gears = require'gears' +local theme = {} -- Working directory (where you place this theme) -theme.wd = "~/.config/awesome/themes/srcery/" +local wd = '~/.config/awesome/themes/srcery/' +local function abspath(relative) return wd .. relative end -theme.font = "Latin Modern Mono Caps 12" -theme.hotkeys_font = "Latin Modern Mono Bold 12" +theme.font = 'Latin Modern Mono Caps 12' +theme.hotkeys_font = 'Latin Modern Mono Bold 12' theme.hotkeys_description_font = theme.font -- Auxiliary colors @@ -71,81 +73,88 @@ theme.titlebar_bg_normal = theme.bg_normal theme.titlebar_bg_focus = theme.bg_normal -- Display the taglist squares -theme.taglist_squares_sel = theme.wd .. "taglist/squaref.png" -theme.taglist_squares_unsel = theme.wd .. "taglist/square.png" +theme.taglist_squares_sel = abspath'taglist/squaref.png' +theme.taglist_squares_unsel = abspath'taglist/square.png' -- Variables set for theming the menu: -- menu_[bg|fg]_[normal|focus] -- menu_[border_color|border_width] -theme.menu_submenu_icon = theme.wd .. "submenu.png" +theme.menu_submenu_icon = abspath'submenu.png' theme.menu_height = 22 theme.menu_width = 160 -- You can add as many variables as -- you wish and access them by using -- beautiful.variable in your rc.lua ---theme.bg_widget = "#cc0000" +--theme.bg_widget = '#cc0000' -- Define the image to load -theme.titlebar_close_button_normal = theme.wd .. "titlebar/normal.png" -theme.titlebar_close_button_focus = theme.wd .. "titlebar/close.png" - -theme.titlebar_minimize_button_normal = theme.wd .. "titlebar/normal.png" -theme.titlebar_minimize_button_focus = theme.wd .. "titlebar/minimize.png" - -theme.titlebar_ontop_button_normal_inactive = theme.wd .. "titlebar/normal.png" -theme.titlebar_ontop_button_focus_inactive = theme.wd .. "titlebar/ontop_inactive.png" -theme.titlebar_ontop_button_normal_active = theme.wd .. "titlebar/normal.png" -theme.titlebar_ontop_button_focus_active = theme.wd .. "titlebar/ontop_active.png" - -theme.titlebar_sticky_button_normal_inactive = theme.wd .. "titlebar/normal.png" -theme.titlebar_sticky_button_focus_inactive = theme.wd .. "titlebar/sticky_inactive.png" -theme.titlebar_sticky_button_normal_active = theme.wd .. "titlebar/normal.png" -theme.titlebar_sticky_button_focus_active = theme.wd .. "titlebar/sticky_active.png" - -theme.titlebar_floating_button_normal_inactive = theme.wd .. "titlebar/normal.png" -theme.titlebar_floating_button_focus_inactive = theme.wd .. "titlebar/floating_inactive.png" -theme.titlebar_floating_button_normal_active = theme.wd .. "titlebar/normal.png" -theme.titlebar_floating_button_focus_active = theme.wd .. "titlebar/floating_active.png" - -theme.titlebar_maximized_button_normal_inactive = theme.wd .. "titlebar/normal.png" -theme.titlebar_maximized_button_focus_inactive = theme.wd .. "titlebar/maximized_inactive.png" -theme.titlebar_maximized_button_normal_active = theme.wd .. "titlebar/normal.png" -theme.titlebar_maximized_button_focus_active = theme.wd .. "titlebar/maximized_active.png" - ---theme.wallpaper = theme.wd .. "background.png" +local function titlebar(button) + return abspath('titlebar/' .. button .. '.png') +end +theme.titlebar_close_button_normal = titlebar'normal' +theme.titlebar_close_button_focus = titlebar'close' + +theme.titlebar_minimize_button_normal = titlebar'normal' +theme.titlebar_minimize_button_focus = titlebar'minimize' + +theme.titlebar_ontop_button_normal_inactive = titlebar'normal' +theme.titlebar_ontop_button_focus_inactive = titlebar'ontop_inactive' +theme.titlebar_ontop_button_normal_active = titlebar'normal' +theme.titlebar_ontop_button_focus_active = titlebar'ontop_active' + +theme.titlebar_sticky_button_normal_inactive = titlebar'normal' +theme.titlebar_sticky_button_focus_inactive = titlebar'sticky_inactive' +theme.titlebar_sticky_button_normal_active = titlebar'normal' +theme.titlebar_sticky_button_focus_active = titlebar'sticky_active' + +theme.titlebar_floating_button_normal_inactive = titlebar'normal' +theme.titlebar_floating_button_focus_inactive = titlebar'floating_inactive' +theme.titlebar_floating_button_normal_active = titlebar'normal' +theme.titlebar_floating_button_focus_active = titlebar'floating_active' + +theme.titlebar_maximized_button_normal_inactive = titlebar'normal' +theme.titlebar_maximized_button_focus_inactive = titlebar'maximized_inactive' +theme.titlebar_maximized_button_normal_active = titlebar'normal' +theme.titlebar_maximized_button_focus_active = titlebar'maximized_active' + +-- Desktop background +function theme.wallpaper() gears.wallpaper.set(theme.black) end -- You can use your own layout icons like this: -theme.layout_fairh = theme.wd .. "layouts/fairh.png" -theme.layout_fairv = theme.wd .. "layouts/fairv.png" -theme.layout_floating = theme.wd .. "layouts/floating.png" -theme.layout_magnifier = theme.wd .. "layouts/magnifier.png" -theme.layout_max = theme.wd .. "layouts/max.png" -theme.layout_fullscreen = theme.wd .. "layouts/fullscreen.png" -theme.layout_tilebottom = theme.wd .. "layouts/tilebottom.png" -theme.layout_tileleft = theme.wd .. "layouts/tileleft.png" -theme.layout_tile = theme.wd .. "layouts/tile.png" -theme.layout_tiletop = theme.wd .. "layouts/tiletop.png" -theme.layout_spiral = theme.wd .. "layouts/spiral.png" -theme.layout_dwindle = theme.wd .. "layouts/dwindle.png" -theme.layout_cornernw = theme.wd .. "layouts/cornernw.png" -theme.layout_cornerne = theme.wd .. "layouts/cornerne.png" -theme.layout_cornersw = theme.wd .. "layouts/cornersw.png" -theme.layout_cornerse = theme.wd .. "layouts/cornerse.png" - -theme.awesome_icon = theme.wd .. "awesome.png" +local function layout(icon) + return abspath('layouts/' .. icon .. '.png') +end +theme.layout_fairh = layout'fairh' +theme.layout_fairv = layout'fairv' +theme.layout_floating = layout'floating' +theme.layout_magnifier = layout'magnifier' +theme.layout_max = layout'max' +theme.layout_fullscreen = layout'fullscreen' +theme.layout_tilebottom = layout'tilebottom' +theme.layout_tileleft = layout'tileleft' +theme.layout_tile = layout'tile' +theme.layout_tiletop = layout'tiletop' +theme.layout_spiral = layout'spiral' +theme.layout_dwindle = layout'dwindle' +theme.layout_cornernw = layout'cornernw' +theme.layout_cornerne = layout'cornerne' +theme.layout_cornersw = layout'cornersw' +theme.layout_cornerse = layout'cornerse' + +theme.awesome_icon = abspath'awesome.png' -- Define the icon theme for application icons. If not set then the icons -- from /usr/share/icons and /usr/share/icons/hicolor will be used. theme.icon_theme = nil -- Arrows -theme.arrow0 = theme.wd .. "arrows/0.png" -theme.arrow1 = theme.wd .. "arrows/1.png" -theme.arrow2 = theme.wd .. "arrows/2.png" -theme.arrow3 = theme.wd .. "arrows/3.png" -theme.arrow4 = theme.wd .. "arrows/4.png" -theme.arrow5 = theme.wd .. "arrows/5.png" -theme.arrow6 = theme.wd .. "arrows/6.png" +theme.arrow0 = abspath'arrows/0.png' +theme.arrow1 = abspath'arrows/1.png' +theme.arrow2 = abspath'arrows/2.png' +theme.arrow3 = abspath'arrows/3.png' +theme.arrow4 = abspath'arrows/4.png' +theme.arrow5 = abspath'arrows/5.png' +theme.arrow6 = abspath'arrows/6.png' return theme diff --git a/luakit/.config/luakit/rc.lua b/luakit/.config/luakit/rc.lua index a9771a4..0a5ebaf 100644 --- a/luakit/.config/luakit/rc.lua +++ b/luakit/.config/luakit/rc.lua @@ -7,7 +7,7 @@ require "lfs" require "unique_instance" -- Set the number of web processes to use. A value of 0 means 'no limit'. -luakit.process_limit = 4 +luakit.process_limit = 0 -- Set the cookie storage location soup.cookies_storage = luakit.data_dir .. "/cookies.db" @@ -102,7 +102,6 @@ local session = require "session" -- Add command to list closed tabs & bind to open closed tabs local undoclose = require "undoclose" -settings.undoclose.max_saved_tabs = 4 -- Add command to list tab history items local tabhistory = require "tabhistory" diff --git a/luakit/.config/luakit/theme-dark.lua b/luakit/.config/luakit/theme-dark.lua index 15efcb9..0dfae4f 100644 --- a/luakit/.config/luakit/theme-dark.lua +++ b/luakit/.config/luakit/theme-dark.lua @@ -1,6 +1,6 @@ --------------------------- --- Default luakit theme -- --------------------------- +------------------------------- +-- Dark gruvbox luakit theme -- +------------------------------- local theme = {} diff --git a/luakit/.config/luakit/theme-light.lua b/luakit/.config/luakit/theme-light.lua index e3d763f..2fc2b68 100644 --- a/luakit/.config/luakit/theme-light.lua +++ b/luakit/.config/luakit/theme-light.lua @@ -1,6 +1,6 @@ --------------------------- --- Default luakit theme -- --------------------------- +-------------------------------- +-- Light gruvbox luakit theme -- +------------------------------- local theme = {} diff --git a/luakit/.config/luakit/theme.lua b/luakit/.config/luakit/theme.lua index 06d94fc..55277a8 100644 --- a/luakit/.config/luakit/theme.lua +++ b/luakit/.config/luakit/theme.lua @@ -36,7 +36,7 @@ theme.error_fg = theme.fg theme.error_bg = color.red -- Warning colours -theme.warning_fg = color.red +theme.warning_fg = color.orange theme.warning_bg = theme.bg -- Notification colours @@ -72,7 +72,7 @@ theme.sbar_bg = theme.bg -- Downloadbar specific theme.dbar_fg = theme.fg theme.dbar_bg = theme.bg -theme.dbar_error_fg = color.brightred +theme.dbar_error_fg = color.red -- Input bar specific theme.ibar_fg = theme.fg @@ -81,7 +81,7 @@ theme.ibar_bg = theme.bg -- Tab label theme.tab_fg = theme.fg theme.tab_bg = color.brightblack -theme.tab_hover_bg = color.orange +theme.tab_hover_bg = color.blue theme.tab_ntheme = color.white theme.selected_fg = theme.fg theme.selected_bg = theme.bg @@ -98,7 +98,7 @@ theme.notrust_fg = color.brightred -- General colour pairings theme.ok = {fg = theme.fg, bg = theme.bg} -theme.warn = {fg = color.brightred, bg = theme.bg} +theme.warn = {fg = color.orange, bg = theme.bg} theme.error = {fg = theme.fg, bg = color.red} return theme diff --git a/meta/.xinitrc b/meta/.xinitrc index cff7943..598bd05 100644 --- a/meta/.xinitrc +++ b/meta/.xinitrc @@ -1,7 +1,6 @@ #!/bin/sh xrdb -merge ~/.Xresources xrandr --output DP1 --mode 1600x900 --primary --right-of eDP1 -xsetroot -solid '#1c1b19' redshift-gtk -l 21.028333:105.854167 & mate-power-manager & ibus-daemon -drx diff --git a/screenshot.png b/screenshot.png index d48a351..4e5cd16 100644 --- a/screenshot.png +++ b/screenshot.png Binary files differdiff --git a/zathura/.config/zathura/zathurarc b/zathura/.config/zathura/zathurarc index 43a48c5..9c77eba 100644 --- a/zathura/.config/zathura/zathurarc +++ b/zathura/.config/zathura/zathurarc @@ -4,7 +4,7 @@ set completion-group-bg \#1c1b19 set completion-group-fg \#519f50 set completion-highlight-bg \#e02c6d set completion-highlight-fg \#fce8c3 -set default-bg \#2d2c29 +set default-bg \#353535 set default-fg \#fce8c3 set font Latin\ Modern\ Mono\ 12 set inputbar-bg \#1c1b19 @@ -28,9 +28,9 @@ set recolor-darkcolor \#fce8c3 set render-loading-bg \#1c1b19 set render-loading-fg \#fce8c3 set index-bg \#1c1b19 -set index-fg \#519f50 -set index-active-bg \#519f50 -set index-active-fg \#fce8c3 +set index-fg \#98bc37 +set index-active-bg \#98bc37 +set index-active-fg \#1c1b19 set guioptions '' set show-recent 0 set smooth-scroll true |
