Update README.md

.gitignore

@@ -0,0 +1 @@
+/previous.tar

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "themes/blueish"]
+	path = themes/blueish
+	url = https://github.com/surferlul/blueish
+[submodule "vicious"]
+	path = vicious
+	url = https://github.com/vicious-widgets/vicious.git

README.md

@@ -1,3 +1,8 @@
 # My AwesomeWM configurations
 
 ### !!! any images found in this repository are made by others and may be subject to licenses other than the GPL !!!
+
+### Screenshots (Blur/Tranceparency is not present anymore in the current version of blueish)
+
+![](https://raw.githubusercontent.com/Surferlul/awesome/screenshots/desktop_1_1.0.png)
+![](https://raw.githubusercontent.com/Surferlul/awesome/screenshots/desktop_2_1.0.png)

TODO

@@ -1,5 +1,3 @@
-Nicer time depiction
-
 Option for animated wallpapers
 
 Rename theme

install.sh

@@ -1,10 +1,23 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
+deps="7z git tar curl"
+for i in $deps; do
+        if [ -z "$(command -v $i)" ] ; then
+            echo "Dependency $i NOT met!"
+            exit
+        fi
+done
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 CACHE_DIR="/tmp/surferlul_awesome"
-[ -d "$CACHE_DIR" ] && rm -rf /tmp/surferlul_awesome
+[ -d "$CACHE_DIR" ] && echo "Removing previous cache" && rm -rf /tmp/surferlul_awesome
 mkdir $CACHE_DIR
+echo "Downloading AwesomeWM Configs"
 git clone https://github.com/Surferlul/awesome.git $CACHE_DIR
-[ -d "$HOME/.config/awesome" ] && tar cf $CACHE_DIR/previous.tar $HOME/.config/awesome/ && rm -rf $HOME/.config/awesome/
-git clone https://github.com/vicious-widgets/vicious.git $CACHE_DIR/vicious
+[ -d "$HOME/.config/awesome" ] && echo "Backing up previous configs" && tar cf $CACHE_DIR/previous.tar $HOME/.config/awesome/ && echo "Removing previous configs" && rm -rf $HOME/.config/awesome/
+echo "Downloading Vicious widgets for AwesomeWM"
+git -C $CACHE_DIR submodule init vicious
+git -C $CACHE_DIR submodule update
+echo "Moving configs to install location"
 mv $CACHE_DIR $HOME/.config/awesome
-[ "$1" != "--preserve-git" ] && rm -rf $HOME/.config/awesome/.git
+[ "$1" != "--preserve-git" ] && echo "Removing git from configs" && rm -rf $HOME/.config/awesome/.git
+[ ! -d "$HOME/.fonts" ] && echo "Creating ~/.fonts directory" && mkdir $HOME/.fonts
+[ -z "$(ls $HOME/.fonts | grep '[Ii]ndie.*[Ff]lower')" ] && echo "Indie Flower doesn't exist, installing" && mkdir $CACHE_DIR && curl 'https://google-webfonts-helper.herokuapp.com/api/fonts/indie-flower?download=zip&subsets=latin&variants=regular' > $CACHE_DIR/IndieFlower.zip && 7z e -y $CACHE_DIR/IndieFlower.zip -o$CACHE_DIR/ && cp $CACHE_DIR/*.ttf $HOME/.fonts && rm -rf $CACHE_DIR

menubar/init.lua

@@ -113,6 +113,10 @@ menubar.geometry = { width = nil,
                      x = nil,
                      y = nil }
 
+menubar.geometry_override = { width = nil,
+                              height = nil,
+                              x = nil,
+                              y = nil }
 --- Width of blank space left in the right side.
 -- @tfield number right_margin
 menubar.right_margin = theme.xresources.apply_dpi(8)
@@ -538,6 +542,7 @@ function menubar.show(scr)
 
     -- Set position and size
     local scrgeom = scr.workarea
+    menubar.geometry = { height = menubar.geometry_override.height or awful.screen.focused().geometry.height, width = menubar.geometry_override.width or 200, x = (menubar.geometry_override.x or 0) + awful.screen.focused().geometry.x , y = menubar.geometry_override.y}
     local geometry = menubar.geometry
     instance.geometry = {x = geometry.x or scrgeom.x,
                              y = geometry.y or scrgeom.y,

rc.lua

@@ -14,10 +14,7 @@ local beautiful = require("beautiful")
 -- Notification library
 local naughty = require("naughty")
 local menubar = require("menubar")
-local menu_width = 200
-local tmp_screen = { 1080, 1920 }
-menubar.geometry = { height = tmp_screen[1], width = menu_width, x = 20 }
-
+menubar.geometry_override = { width = 200, x = 20 }
 
 --local hotkeys_popup = require("awful.hotkeys_popup")
 local hotkeys = require("awful.hotkeys_popup");
@@ -227,10 +224,23 @@ do
 end
 -- }}}
 
+-- {{{ Startup Commands
+do
+    local cmds = 
+    {
+        string.format("%s/.config/awesome/startup.sh", os.getenv("HOME")),
+    }
+
+    for _,i in pairs(cmds) do
+        awful.util.spawn(i)
+    end
+end
+-- }}}
+
 -- {{{ Variable definitions
 -- Themes define colours, icons, font and wallpapers.
 --beautiful.init(gears.filesystem.get_themes_dir() .. "default/theme.lua")
-local theme_path = string.format("%s/.config/awesome/themes/%s/theme.lua", os.getenv("HOME"), "zenburn")
+local theme_path = string.format("%s/.config/awesome/themes/%s/theme.lua", os.getenv("HOME"), "blueish")
 beautiful.init(theme_path)
 beautiful.font = "Indie Flower Bold 12"
 --local cr = cairo.Context()
@@ -239,7 +249,7 @@ beautiful.font = "Indie Flower Bold 12"
 
 
 -- This is used later as the default terminal and editor to run.
-terminal = "kitty"
+terminal = "term" -- symbolic link to the terminal you are currently using
 editor = os.getenv("EDITOR") or "vim"
 editor_cmd = terminal .. " -e " .. editor
 
@@ -380,9 +390,48 @@ local function set_wallpaper(s)
 end
 
 ----
-
-datewidget = wibox.widget.textbox()
-vicious.register(datewidget, vicious.widgets.date, "%m %d %H %M %S", 1)
+local dw = {}
+for i=1,5 do
+    dw[i] = wibox.widget.textbox()
+end
+vicious.register(dw[1], vicious.widgets.date, "%m")
+vicious.register(dw[2], vicious.widgets.date, "%d")
+vicious.register(dw[3], vicious.widgets.date, "%H")
+vicious.register(dw[4], vicious.widgets.date, "%M", 1)
+vicious.register(dw[5], vicious.widgets.date, "%S", 1)
+local spacer = {
+    {
+        {
+            color  = '#dddddd',
+            shape  = function (cr, width, height) gears.shape.powerline(cr, width/2, height, height/8) end,
+       	    widget = wibox.widget.separator,
+        },
+        layout = wibox.container.rotate,
+        direction = "east",
+    },
+    layout = wibox.layout.constraint,
+    strategy = "max",
+    height = 8,
+}
+local datewidget = {
+    spacing = -8,
+    layout = wibox.layout.fixed.vertical,
+}
+for k, v in pairs(dw) do
+    datewidget[k + 1] = {
+        spacer,
+	{
+		widget = wibox.container.margin,
+		left = -2,
+		{
+			widget=v,
+			align = "center",
+		}
+	},
+        layout = wibox.layout.fixed.vertical,
+	spacing = -4,
+    }
+end
 
 --memwidget = wibox.widget.textbox()
 --vicious.cache(vicious.widgets.mem)
@@ -582,32 +631,25 @@ s.mytaglist = awful.widget.taglist {
                         swapwidget,
                         cpuwidget,
 			            {
+			                {
                                 layout = wibox.container.rotate,
                                 direction = "east",
                                 mykeyboardlayout.widget,
 		                    },
-			{
-                            forced_width = 1,
-                            orientation = "vertical",
-	                    widget = wibox.widget.separator
-			},
-			{
-                            thickness = 0,
-			    forced_width = 6,
-                            orientation = "vertical",
-	                    widget = wibox.widget.separator
-			},
 			                {
                                 layout = wibox.container.rotate,
 			                    direction = "east",
                                 datewidget,
+    	    	            },
+	    	        	    layout = wibox.layout.fixed.horizontal,
+		    	            spacing = -5,
                         },
                         s.mylayoutbox,
                     },
                 },
             },
     	    {
-		layout = wibox.layout.constraint,
+        		layout = wibox.container.constraint,
 	        	{
 		            layout = wibox.layout.flex.horizontal,
                     {
@@ -744,6 +786,11 @@ clientkeys = gears.table.join(
     awful.key({ modkey,           }, "f",
         function (c)
             c.fullscreen = not c.fullscreen
+            if c.fullscreen then
+                c.shape = nil
+            else
+                c.shape = beautiful.shape
+            end
             c:raise()
         end,
         {description = "toggle fullscreen", group = "client"}),
@@ -772,6 +819,11 @@ clientkeys = gears.table.join(
     awful.key({ modkey,           }, "m",
         function (c)
             c.maximized = not c.maximized
+            if c.maximized then
+                c.shape = nil
+            else
+                c.shape = beautiful.shape
+            end
             c:raise()
         end ,
         {description = "(un)maximize", group = "client"}),
@@ -869,7 +921,10 @@ awful.rules.rules = {
                      keys = clientkeys,
                      buttons = clientbuttons,
                      screen = awful.screen.preferred,
-                     placement = awful.placement.no_overlap+awful.placement.no_offscreen
+                     placement = awful.placement.no_overlap+awful.placement.no_offscreen,
+		     maximized_horizontal = false,
+                     maximized_vertical = false,
+                     maximized = false,
      }
     },
 
@@ -921,7 +976,11 @@ client.connect_signal("manage", function (c)
     -- Set the windows at the slave,
     -- i.e. put it at the end of others instead of setting it master.
     -- if not awesome.startup then awful.client.setslave(c) end
+    if not (c.maximized or c.fullscreen) then
         c.shape = beautiful.shape
+    else
+        c.shape = nil
+    end
     if awesome.startup
       and not c.size_hints.user_position
       and not c.size_hints.program_position then

startup.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+XCURSOR_SIZE = 22
+xinput --set-prop "SYNA7DB5:01 06CB:CD41 Touchpad" $(xinput list-props $(xinput list | grep 'Touchpad' | cut -f 2 | cut -d'=' -f 2) | grep "Disable While Typing Enabled (" | cut -d'(' -f 2 | cut -d')' -f 1) 0
+xinput --set-prop "SYNA7DB5:01 06CB:CD41 Touchpad" $(xinput list-props $(xinput list | grep 'Touchpad' | cut -f 2 | cut -d'=' -f 2) | grep "Tapping Enabled (" | cut -d'(' -f 2 | cut -d')' -f 1) 1
+xinput --set-prop "SYNA7DB5:01 06CB:CD41 Touchpad" $(xinput list-props $(xinput list | grep 'Touchpad' | cut -f 2 | cut -d'=' -f 2) | grep "Natural Scrolling Enabled (" | cut -d'(' -f 2 | cut -d')' -f 1) 1
+xinput --set-prop "SYNA7DB5:01 06CB:CD41 Touchpad" $(xinput list-props $(xinput list | grep 'Touchpad' | cut -f 2 | cut -d'=' -f 2) | grep "Middle Emulation Enabled (" | cut -d'(' -f 2 | cut -d')' -f 1) 1
+#python ~/data/projects/startup/presence.py &
+#picom --experimental-backends --backend glx &
+#xsetroot -cursor_name qogir-manjaro
+cp ~/.gtkrc-2.0_default ~/.gtkrc-2.0

themes/blueish

@@ -0,0 +1 @@
+Subproject commit 27b186b8f25496c456221088300b178de5a4ef99

themes/zenburn/README.md

@@ -1,3 +0,0 @@
-Based on Zenburn
-
-modified by Surferlul

themes/zenburn/theme.lua

@@ -1,164 +0,0 @@
-----------------------------------------
---    "idk what yet" awesome theme    --
---       By Lukas B. (Surferlul)      --
---  based on "Zenburn" awesome theme  --
---        By Adrian C. (anrxc)        --
-----------------------------------------
-
-local themes_path = "/home/surferlul/.config/awesome/themes/"
-local dpi = require("beautiful.xresources").apply_dpi
-local beautiful = require("beautiful")
-local gears = require("gears")
-
-
--- {{{ Main
-local theme = {}
-theme.dir = themes_path.."zenburn/"
-theme.wallpaper = { theme.dir .. "dreams_1920x1080.png" , theme.dir .. "dreams.png" }
--- }}}
-
-
--- {{{ Styles
-theme.font      = "sans 8"
-
--- {{{ Colors
-theme.fg_normal  = "#EDEDDD"
-theme.fg_focus   = "#F0DFAF"
-theme.fg_urgent  = "#CC9393"
-theme.bg_normal  = "#4A3F9877"
-theme.bg_focus   = "#080811BB"
-theme.bg_urgent  = "#916A9D77"
-theme.bg_systray = theme.bg_normal
--- }}}
-
-theme.hotkeys_bg        = "#111122"
-theme.hotkeys_fg        = "#EEEEFF"
-theme.hotkeys_label_fg  = "#111122"
-theme.hotkeys_modifiers_fg = "#DD7777"
-theme.hotkeys_description_font = "Indie Flower Bold 10"
-theme.hotkeys_border_width = 2
-theme.hotkeys_border_color = "#6f6f6f55"
-theme.hotkeys_shape = function(cr, width, height) gears.shape.rounded_rect(cr, width, height, 15) end
-theme.menubar_bg_normal = "#111122CC"
-theme.menubar_tag_bg_normal = "#00000000"
-theme.menubar_fg_normal = "#FFBBBB"
-theme.menubar_bg_focus  = "#333344FF"
-theme.menubar_fg_focus  = "#BBBBFF"
-
-theme.menu_bg_normal = "#11112299"
-theme.menu_fg_normal = "#FFBBBB"
-theme.menu_bg_focus  = "#333344FF"
-theme.menu_fg_focus  = "#BBBBFF"
-
--- {{{ Borders
-theme.shape = function(cr, width, height) gears.shape.rounded_rect(cr, width, height, 4) end
-theme.useless_gap   = 2
-theme.border_width  = 2
-theme.border_width_focus = 2
-theme.border_normal = "#00000077" -- basically no border
-theme.border_focus = "#00000000" -- slightly more lit up than the shadow
-theme.border_marked = "#CC939355"
--- }}}
-
--- {{{ Titlebars
-theme.titlebar_bg_focus  = "#3F3F3F"
-theme.titlebar_bg_normal = "#3F3F3F"
--- }}}
-
--- There are other variable sets
--- overriding the default one when
--- defined, the sets are:
--- [taglist|tasklist]_[bg|fg]_[focus|urgent|occupied|empty|volatile]
--- titlebar_[normal|focus]
--- tooltip_[font|opacity|fg_color|bg_color|border_width|border_color]
--- Example:
---theme.taglist_bg_focus = "#CC9393"
--- }}}
-
--- {{{ Widgets
--- You can add as many variables as
--- you wish and access them by using
--- beautiful.variable in your rc.lua
---theme.fg_widget        = "#AECF96"
---theme.fg_center_widget = "#88A175"
---theme.fg_end_widget    = "#FF5656"
---theme.bg_widget        = "#494B4F"
---theme.border_widget    = "#3F3F3F"
--- }}}
-
--- {{{ Mouse finder
-theme.mouse_finder_color = "#CC9393"
--- 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 = dpi(15)
-theme.menu_width  = dpi(100)
--- }}}
-
--- {{{ Icons
--- {{{ Taglist
-theme.taglist_squares_sel   = theme.dir .. "taglist/squarefz.png"
-theme.taglist_squares_unsel = theme.dir .. "taglist/squarez.png"
---theme.taglist_squares_resize = "false"
--- }}}
-
--- {{{ Misc
-theme.awesome_icon           = theme.dir .. "awesome-icon.png"
-theme.menu_submenu_icon      = theme.dir .. "submenu.png"
--- }}}
-
--- {{{ Layout
-theme.layout_tile       = theme.dir .. "layouts/tile.png"
-theme.layout_tileleft   = theme.dir .. "layouts/tileleft.png"
-theme.layout_tilebottom = theme.dir .. "layouts/tilebottom.png"
-theme.layout_tiletop    = theme.dir .. "layouts/tiletop.png"
-theme.layout_fairv      = theme.dir .. "layouts/fairv.png"
-theme.layout_fairh      = theme.dir .. "layouts/fairh.png"
-theme.layout_spiral     = theme.dir .. "layouts/spiral.png"
-theme.layout_dwindle    = theme.dir .. "layouts/dwindle.png"
-theme.layout_max        = theme.dir .. "layouts/max.png"
-theme.layout_fullscreen = theme.dir .. "layouts/fullscreen.png"
-theme.layout_magnifier  = theme.dir .. "layouts/magnifier.png"
-theme.layout_floating   = theme.dir .. "layouts/floating.png"
-theme.layout_cornernw   = theme.dir .. "layouts/cornernw.png"
-theme.layout_cornerne   = theme.dir .. "layouts/cornerne.png"
-theme.layout_cornersw   = theme.dir .. "layouts/cornersw.png"
-theme.layout_cornerse   = theme.dir .. "layouts/cornerse.png"
--- }}}
-
--- {{{ Titlebar
-theme.titlebar_close_button_focus  = themes_path .. "zenburn/titlebar/close_focus.png"
-theme.titlebar_close_button_normal = themes_path .. "zenburn/titlebar/close_normal.png"
-
-theme.titlebar_minimize_button_normal = themes_path .. "default/titlebar/minimize_normal.png"
-theme.titlebar_minimize_button_focus  = themes_path .. "default/titlebar/minimize_focus.png"
-
-theme.titlebar_ontop_button_focus_active  = themes_path .. "zenburn/titlebar/ontop_focus_active.png"
-theme.titlebar_ontop_button_normal_active = themes_path .. "zenburn/titlebar/ontop_normal_active.png"
-theme.titlebar_ontop_button_focus_inactive  = themes_path .. "zenburn/titlebar/ontop_focus_inactive.png"
-theme.titlebar_ontop_button_normal_inactive = themes_path .. "zenburn/titlebar/ontop_normal_inactive.png"
-
-theme.titlebar_sticky_button_focus_active  = themes_path .. "zenburn/titlebar/sticky_focus_active.png"
-theme.titlebar_sticky_button_normal_active = themes_path .. "zenburn/titlebar/sticky_normal_active.png"
-theme.titlebar_sticky_button_focus_inactive  = themes_path .. "zenburn/titlebar/sticky_focus_inactive.png"
-theme.titlebar_sticky_button_normal_inactive = themes_path .. "zenburn/titlebar/sticky_normal_inactive.png"
-
-theme.titlebar_floating_button_focus_active  = themes_path .. "zenburn/titlebar/floating_focus_active.png"
-theme.titlebar_floating_button_normal_active = themes_path .. "zenburn/titlebar/floating_normal_active.png"
-theme.titlebar_floating_button_focus_inactive  = themes_path .. "zenburn/titlebar/floating_focus_inactive.png"
-theme.titlebar_floating_button_normal_inactive = themes_path .. "zenburn/titlebar/floating_normal_inactive.png"
-
-theme.titlebar_maximized_button_focus_active  = themes_path .. "zenburn/titlebar/maximized_focus_active.png"
-theme.titlebar_maximized_button_normal_active = themes_path .. "zenburn/titlebar/maximized_normal_active.png"
-theme.titlebar_maximized_button_focus_inactive  = themes_path .. "zenburn/titlebar/maximized_focus_inactive.png"
-theme.titlebar_maximized_button_normal_inactive = themes_path .. "zenburn/titlebar/maximized_normal_inactive.png"
--- }}}
--- }}}
-
-return theme
-
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80