Some style updates

3 files changed, 77 insertions, 118 deletions

diff --git a/conkyrc b/conkyrc
index 9718df0..13f6800 100644
--- a/conkyrc
+++ b/conkyrc
@@ -1,16 +1,16 @@
-alignment top_left
+alignment top_middle
 background yes
 default_color white
 use_xft yes
 xftfont Sans:size=7
-gap_y 2
+gap_y 3
 no_buffers yes
 out_to_console no
 out_to_stderr no
 extra_newline no
 own_window yes
 own_window_class Conky
-own_window_type override
+own_window_type desktop
 own_window_transparent yes
 format_human_readable yes
 update_interval 1.0
@@ -18,4 +18,4 @@ update_interval_on_battery 10.0
 double_buffer yes
 
 TEXT
-${font Sans:bold:size=7} ${time %A, %d. %B %Y - %H:%M:%S }    •••    ${font Sans:bold:size=7}Uptime:${font} ${uptime_short}   ${font Sans:bold:size=7}CPU1:${font} ${freq 1} mhz   ${font Sans:bold:size=7}Mem:${font} ${mem}/${memmax}   ${font Sans:bold:size=7}root:${font} ${fs_used_perc /}%   ${font Sans:bold:size=7}home:${font} ${fs_used_perc /home}%   ${font Sans:bold:size=7}var:${font} ${fs_used_perc /var}%   ${font Sans:bold:size=7}Battery:${font} ${battery_percent BAT0}%
+${font Sans:bold:size=7} ${time} ••• ${font Sans:bold:size=7}Uptime:${font} ${uptime_short}   ${font Sans:bold:size=7}CPU1:${font} ${freq 1} mhz   ${font Sans:bold:size=7}Mem:${font} ${mem}/${memmax}   ${font Sans:bold:size=7}root:${font} ${fs_used_perc /}%   ${font Sans:bold:size=7}home:${font} ${fs_used_perc /home}%   ${font Sans:bold:size=7}var:${font} ${fs_used_perc /var}%   ${font Sans:bold:size=7}Battery:${font} ${battery_percent BAT0}%
diff --git a/i3/config b/i3/config
index 53710cc..a7c7d51 100644
--- a/i3/config
+++ b/i3/config
@@ -1,115 +1,72 @@
-font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
-floating_modifier Mod1
+workspace 1 com
+workspace 2 web
+workspace 3 div
+workspace 4 div
+workspace 5 div
+workspace 6 div
+workspace 7 div
+workspace 8 div
+workspace 9 div
+workspace 10 aud
+
+client.focused			#303030 #202020 #fecf35
+client.unfocused 		#303030 #202020 #b8b8b8
+client.focused_inactive #303030 #202020 #b8b8b8
+client.urgent			#303030 #202020 #ff9800
+
+bar.focused				#303030 #202020 #fecf35
+bar.unfocused 			#303030 #202020 #b8b8b8
+bar.urgent				#303030 #202020 #ff9800
+
+font *-xos4-terminus-*-*-*-*-12-*-*-*-*-*-*-*
+workspace_bar yes
+#new_window bp
+
+set $mod Mod1
+floating_modifier $mod
+
+bind $mod+58 f # Fullscreen
+bind $mod+43 s # Stacked layout
+bind $mod+65 t # Toggle floating
+
+# Focus ($mod+j/k/l/;)
+bind $mod+44 h # Focus left
+bind $mod+45 j # Focus down
+bind $mod+31 k # Focus up
+bind $mod+46 l # Focus right
+
+bind $mod+Shift+44 mh # Move left
+bind $mod+Shift+45 mj # Move down
+bind $mod+Shift+31 mk # Move up
+bind $mod+Shift+46 ml # Move right
+
+bind $mod+10 1
+bind $mod+11 2
+bind $mod+12 3
+bind $mod+13 4
+bind $mod+14 5
+bind $mod+15 6
+bind $mod+16 7
+bind $mod+17 8
+bind $mod+18 9
+bind $mod+19 10
+
+bind $mod+Shift+10 m1
+bind $mod+Shift+11 m2
+bind $mod+Shift+12 m3
+bind $mod+Shift+13 m4
+bind $mod+Shift+14 m5
+bind $mod+Shift+15 m6
+bind $mod+Shift+16 m7
+bind $mod+Shift+17 m8
+bind $mod+Shift+18 m9
+bind $mod+Shift+19 m10
+
+bind $mod+36 exec /usr/bin/urxvt
+bind $mod+26 exec /usr/bin/xscreensaver-command -lock
+bind $mod+33 exec /usr/bin/dmenu_run
+
+bind $mod+Control+33 exit
+bind $mod+Control+45 restart
 
-# Fullscreen (Mod1+f)
-# bind Mod1+58 f
-
-# Stacking
-bind Mod1+43 s
-
-# Tabbed (Mod1+w)
-# bind Mod1+25 T
-
-# Default (Mod1+e)
-# bind Mod1+57 d
-
-# Toggle tiling/floating of the current window (Mod1+Shift+Space)
-# bind Mod1+65 t
-
-# Go into the tiling layer / floating layer, depending on whether
-# the current window is tiling / floating (Mod1+t)
-# bind Mod1+28 focus ft
-
-# Focus (Mod1+j/k/l/;)
-bind Mod1+44 h
-bind Mod1+45 j
-bind Mod1+31 k
-bind Mod1+46 l
-
-# Focus Container (Mod3+j/k/l/;)
-#bind Mod3+44 wch
-#bind Mod3+45 wcj
-#bind Mod3+46 wck
-#bind Mod3+47 wcl
-# (alternatively, you can use the cursor keys:)
-#bindsym Mod3+Left wch
-#bindsym Mod3+Down wcj
-#bindsym Mod3+Up wck
-#bindsym Mod3+Right wcl
-
-# Snap (Mod1+Control+j/k/l/;)
-#bind Mod1+Control+44 sh
-#bind Mod1+Control+45 sj
-#bind Mod1+Control+46 sk
-#bind Mod1+Control+47 sl
-# (alternatively, you can use the cursor keys:)
-#bindsym Mod1+Control+Left sh
-#bindsym Mod1+Control+Down sj
-#bindsym Mod1+Control+Up sk
-#bindsym Mod1+Control+Right sl
-
-# Move (Mod1+Shift+j/k/l/;)
-bind Mod1+Shift+44 mh
-bind Mod1+Shift+45 mj
-bind Mod1+Shift+31 mk
-bind Mod1+Shift+46 ml
-# (alternatively, you can use the cursor keys:)
-#bindsym Mod1+Shift+Left mh
-#bindsym Mod1+Shift+Down mj
-#bindsym Mod1+Shift+Up mk
-#bindsym Mod1+Shift+Right ml
-
-# Move Container (Mod3+Shift+j/k/l/;)
-#bind Mod3+Shift+44 wcmh
-#bind Mod3+Shift+45 wcmj
-#bind Mod3+Shift+46 wcmk
-#bind Mod3+Shift+47 wcml
-
-# Workspaces (Mod1+1/2/…)
-bind Mod1+10 1
-bind Mod1+11 2
-bind Mod1+12 3
-bind Mod1+13 4
-bind Mod1+14 5
-bind Mod1+15 6
-bind Mod1+16 7
-bind Mod1+17 8
-bind Mod1+18 9
-bind Mod1+19 10
-
-# Move to Workspaces
-bind Mod1+Shift+10 m1
-bind Mod1+Shift+11 m2
-bind Mod1+Shift+12 m3
-bind Mod1+Shift+13 m4
-bind Mod1+Shift+14 m5
-bind Mod1+Shift+15 m6
-bind Mod1+Shift+16 m7
-bind Mod1+Shift+17 m8
-bind Mod1+Shift+18 m9
-bind Mod1+Shift+19 m10
-
-# Mod1+Enter starts a new terminal
-bind Mod1+36 exec /usr/bin/urxvt
-
-# Mod1+Shift+q kills the current client
-#bind Mod1+Shift+24 kill
-
-# Mod1+v starts dmenu and launches the selected application
-# for now, we don’t have a launcher of our own.
-bind Mod1+33 exec /usr/bin/dmenu_run
-
-# Mod1+Shift+e exits i3
-bind Mod1+Shift+33 exit
-
-# Mod1+Shift+r restarts i3 inplace
-bind Mod1+Shift+45 restart
-
-# The IPC interface allows programs like an external workspace bar
-# (i3-wsbar) or i3-msg (can be used to "remote-control" i3) to work.
 ipc-socket ~/.i3/ipc.sock
-
-#############################################################
-# DELETE THE FOLLOWING LINES TO DISABLE THE WELCOME MESSAGE #
-#############################################################
-exec xmessage -file /etc/i3/welcome
diff --git a/xorg/xresources b/xorg/xresources
index 0dfa39b..b628bd7 100644
--- a/xorg/xresources
+++ b/xorg/xresources
@@ -1,4 +1,6 @@
-*font: xft:Terminus:bold:size=8:antialias=false
+*font: xft:Terminus:bold:size=6:antialias=false
+#*font: -xos4-terminus-*-*-*-*-12-*-*-*-*-*-*-*
+*geometry: 100x25
 
 *buffered: true
 *internalBorder: 0