Merge branch 'master' of tardis:/dotfiles

Conflicts:
	awesome/topbar.lua

diff --git a/Makefile b/Makefile
index 842770875e01a65c248f56c0caa050f788b8e45f..7ffd817cc76de0cec764dbe5272781edaaef4466 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 APATH := $(realpath .)
 
 FILES := bin
-DOTFILES := aliases bash* conky* flexget git* vim* xbindkeysrc Xmodmap zsh*
-CONFIGFILES := retroarch
+DOTFILES := aliases bash* conky* flexget git* vim* xbindkeysrc Xmodmap xprofile zsh*
+CONFIGFILES := retroarch compton.conf
 
 .PHONY: install $(FILES) $(DOTFILES) $(CONFIGFILES)
 install: $(FILES) $(DOTFILES) $(CONFIGFILES)

diff --git a/Xmodmap b/Xmodmap
index c82a58d025c2395c1b33ea3b19fdca3e26547beb..60918a3f2773730ea655586759b95f09f109905c 100644 (file)
--- a/Xmodmap
+++ b/Xmodmap
@@ -19,3 +19,8 @@ keycode 212 = F24
 ! remap Caps_Lock as Escape
 remove Lock = Caps_Lock
 keysym Caps_Lock = Escape
+
+! Alt_L as 3rd level chooser
+keycode 108 = Alt_R Alt_R
+remove mod1 = Alt_R
+add mod5 = Alt_R

diff --git a/Xresources b/Xresources
new file mode 100644 (file)
index 0000000..c81907d
--- /dev/null
+++ b/Xresources
@@ -0,0 +1,32 @@
+URxvt*.scrollBar: false
+URxvt.font: xft:Anonymous Pro Minus:bold:size=10
+
+URxvt*.depth: 32
+*background:             [75]#222222
+*foreground:             #f8f8f2
+! Black
+*color0:                 #262729
+*color8:                 #262729
+! Red
+*color1:                 #f92671
+*color9:                 #ff669d
+! Green
+*color2:                 #a6e22e
+*color10:                #beed5f
+! Yellow
+*color3:                 #fd971f
+*color11:                #e6db74
+! Blue
+*color4:                 #1692d0
+*color12:                #66d9ef
+! Magenta
+*color5:                 #9e6ffe
+*color13:                #df92f6
+! Cyan
+*color6:                 #5e7175
+*color14:                #a3babf
+! White
+*color7:                 #ffffff
+*color15:                #ffffff
+! Cursor
+*cursorColor:            #b5d2dd

diff --git a/awesome/autostart.lua b/awesome/autostart.lua
index 976769c813bf587195e3756a9fec2292504d40aa..ab9fbca361cd767cb114a61cbf8368e66061bedd 100644 (file)
--- a/awesome/autostart.lua
+++ b/awesome/autostart.lua
@@ -1,8 +1,5 @@
 local utils = require("utils")
 
---run_once("xscreensaver","-no-splash")
---run_once("pidgin",nil,nil,2)
---run_once("wicd-client",nil,"/usr/bin/python2 -O /usr/share/wicd/gtk/wicd-client.py")
 utils.run_once("xmodmap", "~/.Xmodmap")
 utils.run_once("qupzilla")
 utils.run_once("kopete")

diff --git a/awesome/conky.lua b/awesome/conky.lua
index fa1c3f59b6d4a9378591a854948f0be1c9c297d6..0f9eca9e5fd74e61ef9aa0c2d78bfbd3622f499d 100644 (file)
--- a/awesome/conky.lua
+++ b/awesome/conky.lua
@@ -21,6 +21,7 @@ local function raise_conky()
     if conky
     then
         conky.ontop = true
+        conky.hidden = false
     end
 end
 
@@ -29,6 +30,7 @@ local function lower_conky()
     if conky
     then
         conky.ontop = false
+        conky.hidden = true
     end
 end
 
@@ -50,6 +52,7 @@ utils.rules.append({
                properties = { floating = true,
                               sticky = true,
                               ontop = false,
+                              hidden = true,
                               focusable = true,
                               size_hints = {"program_position", "program_size"} 
                              } },

diff --git a/awesome/rc.lua b/awesome/rc.lua
index 7dd4696ea5fd38d64d82253261a6bb3be9c178c9..8879c5e7115b481371bad07913ef7554f38f40ba 100644 (file)
--- a/awesome/rc.lua
+++ b/awesome/rc.lua
@@ -41,7 +41,7 @@ end
 beautiful.init("/usr/share/awesome/themes/default/theme.lua")
 
 -- This is used later as the default terminal and editor to run.
-terminal = "konsole"
+terminal = "urxvt"
 editor = os.getenv("EDITOR") or "vim"
 editor_cmd = terminal .. " -e " .. editor
 

diff --git a/awesome/topbar.lua b/awesome/topbar.lua
index 790640234479b3870b5de4857b2779dc70e5c56e..587bfc416187a088940556d46fa4b49ac0b5db4b 100644 (file)
--- a/awesome/topbar.lua
+++ b/awesome/topbar.lua
@@ -5,7 +5,7 @@ local utils = require("utils")
 local wibox = require("wibox")
 
 -- my widgets
-local volume_widget  = require("widgets/volume_widget")
+local volume_widget = require("widgets/volume_widget")
 local battery_widget = { }
 if utils.host == "chronos" then
     battery_widget = require("widgets/battery_widget")
@@ -14,6 +14,8 @@ local network_widget = require("widgets/network_widget")
 
 -- Create a textclock widget
 mytextclock = awful.widget.textclock()
+separator = wibox.widget.textbox()
+separator:set_markup('<span font="Symbola 10" color="#404040">│</span>')
 
 -- {{{ Wibox
 -- Create a wibox for each screen and add it
@@ -95,11 +97,15 @@ for s = 1, screen.count() do
     -- Widgets that are aligned to the right
     local right_layout = wibox.layout.fixed.horizontal()
     if s == 1 then right_layout:add(wibox.widget.systray()) end
+    right_layout:add(separator)
     right_layout:add(network_widget)
+    right_layout:add(separator)
     right_layout:add(volume_widget)
     if utils.host == "chronos" then
+    right_layout:add(separator)
         right_layout:add(battery_widget)
     end
+    right_layout:add(separator)
     right_layout:add(mytextclock)
     right_layout:add(mylayoutbox[s])
 

diff --git a/awesome/widgets/volume_progressbar_widget.lua b/awesome/widgets/volume_progressbar_widget.lua
new file mode 100644 (file)
index 0000000..fc9c82e
--- /dev/null
+++ b/awesome/widgets/volume_progressbar_widget.lua
@@ -0,0 +1,44 @@
+local vicious = require("vicious")
+vicious.contrib = require("vicious.contrib")
+local utils = require("utils")
+local volwidget = { }
+
+--{{{ Volume progressbar
+volwidget = awful.widget.progressbar()
+volwidget:set_width(8)
+volwidget:set_height(100)
+volwidget:set_vertical(true)
+volwidget:set_background_color("#353535")
+volwidget:set_color("#B1B1B1")
+volwidget:set_border_color(nil)
+volwidget:set_ticks(true)
+volwidget:set_ticks_gap(1)
+volwidget:set_ticks_size(2)
+-- Select device
+local device = ""
+if utils.host == "chronos" then device = "alsa_output.pci-0000_00_1b.0.analog-stereo" end
+if utils.host == "shada"   then device = "alsa_output.pci-0000_00_14.2.analog-stereo" end
+-- Register widget
+vicious.register(volwidget, vicious.contrib.pulse, "$1", 1, device)
+
+-- Mouse bindings
+volwidget:buttons(awful.util.table.join( awful.button({ }, 1, function () utils.run_or_kill("kmix") end),
+    awful.button({ }, 2,
+        function ()
+            vicious.contrib.pulse.toggle(device)
+            vicious.force({volwidget})
+        end),
+    awful.button({ }, 4,
+        function ()
+            vicious.contrib.pulse.add( 5, device)
+            vicious.force({volwidget})
+        end),
+    awful.button({ }, 5,
+        function ()
+            vicious.contrib.pulse.add(-5, device)
+            vicious.force({volwidget})
+        end)
+    ))
+--}}}
+
+return volwidget

diff --git a/awesome/widgets/volume_widget.lua b/awesome/widgets/volume_widget.lua
index fc9c82e1fdd94c84bf3e3132ba9b5781ec4e21c2..162ceafe125d4c2ae3acf21a7658fed00bebd806 100644 (file)
--- a/awesome/widgets/volume_widget.lua
+++ b/awesome/widgets/volume_widget.lua
@@ -1,25 +1,17 @@
+local wibox = require("wibox")
 local vicious = require("vicious")
 vicious.contrib = require("vicious.contrib")
 local utils = require("utils")
 local volwidget = { }
 
 --{{{ Volume progressbar
-volwidget = awful.widget.progressbar()
-volwidget:set_width(8)
-volwidget:set_height(100)
-volwidget:set_vertical(true)
-volwidget:set_background_color("#353535")
-volwidget:set_color("#B1B1B1")
-volwidget:set_border_color(nil)
-volwidget:set_ticks(true)
-volwidget:set_ticks_gap(1)
-volwidget:set_ticks_size(2)
 -- Select device
 local device = ""
 if utils.host == "chronos" then device = "alsa_output.pci-0000_00_1b.0.analog-stereo" end
 if utils.host == "shada"   then device = "alsa_output.pci-0000_00_14.2.analog-stereo" end
 -- Register widget
-vicious.register(volwidget, vicious.contrib.pulse, "$1", 1, device)
+volwidget = wibox.widget.textbox()
+vicious.register(volwidget, vicious.contrib.pulse, '<span font="Symbola 12">🔊</span> '.."$1", 1, device)
 
 -- Mouse bindings
 volwidget:buttons(awful.util.table.join( awful.button({ }, 1, function () utils.run_or_kill("kmix") end),

diff --git a/compton.conf b/compton.conf
new file mode 100644 (file)
index 0000000..e5be9e6
--- /dev/null
+++ b/compton.conf
@@ -0,0 +1,40 @@
+# Shadow
+shadow = true;                  # Enabled client-side shadows on windows.
+no-dock-shadow = true;          # Avoid drawing shadows on dock/panel windows.
+no-dnd-shadow = true;           # Don't draw shadows on DND windows.
+clear-shadow = true;            # Zero the part of the shadow's mask behind the window (experimental).
+shadow-radius = 7;              # The blur radius for shadows. (default 12)
+shadow-offset-x = -7;           # The left offset for shadows. (default -15)
+shadow-offset-y = -7;           # The top offset for shadows. (default -15)
+# shadow-opacity = 0.7;         # The translucency for shadows. (default .75)
+# shadow-red = 0.0;             # Red color value of shadow. (0.0 - 1.0, defaults to 0)
+# shadow-green = 0.0;           # Green color value of shadow. (0.0 - 1.0, defaults to 0)
+# shadow-blue = 0.0;            # Blue color value of shadow. (0.0 - 1.0, defaults to 0)
+shadow-exclude = [ "n:e:Notification" ];        # Exclude conditions for shadows.
+# shadow-exclude = "n:e:Notification";
+shadow-ignore-shaped = true;
+
+# Opacity
+menu-opacity = 0.9;                     # The opacity for menus. (default 1.0)
+inactive-opacity = 1.0;                 # Opacity of inactive windows. (0.1 - 1.0)
+#frame-opacity = 0.8;                   # Opacity of window titlebars and borders. (0.1 - 1.0)
+inactive-opacity-override = true;       # Inactive opacity set by 'inactive-opacity' overrides value of _NET_WM_OPACITY.
+
+# Fading
+fading = true;                  # Fade windows during opacity changes.
+# fade-delta = 30;              # The time between steps in a fade in milliseconds. (default 10).
+fade-in-step = 0.03;            # Opacity change between steps while fading in. (default 0.028).
+fade-out-step = 0.03;           # Opacity change between steps while fading out. (default 0.03).
+# no-fading-openclose = true;   # Fade windows in/out when opening/closing.
+
+# Other
+inactive-dim = 0.2;            # Dim inactive windows. (0.0 - 1.0, defaults to 0).
+mark-wmwin-focused = true;      # Try to detect WM windows and mark them as active.
+mark-ovredir-focused = true;
+detect-rounded-corners = true;
+
+# Window type settings
+wintypes:
+{
+  tooltip = { fade = true; shadow = false; opacity = 0.75; };
+};

diff --git a/conkyrc b/conkyrc
index 26cbeee8b48a0e125a7e143f452b932393f02c6a..2b496dd421af245e322dfc4abcd1630cbf270842 100644 (file)
--- a/conkyrc
+++ b/conkyrc
@@ -1,12 +1,12 @@
-alignment top_right
-gap_x 20
-gap_y 20 
+alignment top_left
+gap_x 0
+gap_y 30
 border_width 0
 border_inner_margin 8
 
-minimum_size 180 300
+minimum_size 180 1080
 maximum_width 180
-maximum_height 560
+maximum_heigth 1080
 
 default_bar_size 92 6
 

diff --git a/xprofile b/xprofile
new file mode 100644 (file)
index 0000000..c835729
--- /dev/null
+++ b/xprofile
@@ -0,0 +1 @@
+compton -b --config ~/.config/compton.conf