diff --git a/awesome/rc.lua b/awesome/rc.lua index ee77dd7..59d8d1b 100644 --- a/awesome/rc.lua +++ b/awesome/rc.lua @@ -1,5 +1,3 @@ -os.setlocale("fr_FR.UTF-8") - -- Standard awesome library local gears = require("gears") local awful = require("awful") @@ -15,14 +13,10 @@ naughty = require("naughty") local menubar = require("menubar") local vicious = require("vicious") --- Widgets -local volume = require("volume") -local battery = require("battery") -local calendar = require("calendar") - home = "/home/thomas" os.execute('xset m 16/1 0') +os.setlocale("fr_FR.UTF-8") -- awful.util.spawn_with_shell("xcompmgr -cF &") @@ -87,6 +81,11 @@ end change_wallpaper('1200custom.png') +-- Widgets +local volume = require("volume") +local battery = require("battery") +local calendar = require("calendar") + -- This is used later as the default terminal and editor to run. terminal = "terminator" editor = os.getenv("EDITOR") or "nano" @@ -556,7 +555,7 @@ client.connect_signal("manage", function (c, startup) end) client.connect_signal("focus", function(c) c.border_color = beautiful.border_focus end) --- client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_normal end) +client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_normal end) -- }}} os.execute('resetusb&') diff --git a/awesome/themes/default/theme.lua b/awesome/themes/default/theme.lua index bfcd295..a6046b3 100644 --- a/awesome/themes/default/theme.lua +++ b/awesome/themes/default/theme.lua @@ -18,8 +18,8 @@ theme.fg_urgent = "#ffffff" theme.fg_minimize = "#ffffff" theme.border_width = 1 -theme.border_normal = "#000000" -theme.border_focus = "#535d6c" +theme.border_normal = "#39404b" +theme.border_focus = "#6d7a8d" theme.border_marked = "#91231c" -- There are other variable sets diff --git a/init.vim b/init.vim index 7431d84..20548bb 100644 --- a/init.vim +++ b/init.vim @@ -28,6 +28,8 @@ Plug 'tomtom/tcomment_vim' Plug 'Shougo/deoplete.nvim' " Snippets made easy () Plug 'Shougo/neosnippet.vim' | Plug 'Shougo/neosnippet-snippets' +" Python highlight +Plug 'hdima/python-syntax' " Search files " Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' } | Plug 'junegunn/fzf.vim' " Real-time collaborative editing