diff --git a/rc.lua b/rc.lua index 6c79627..d94d6f6 100644 --- a/rc.lua +++ b/rc.lua @@ -240,7 +240,7 @@ 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() @@ -249,7 +249,7 @@ beautiful.font = "Indie Flower Bold 12" -- This is used later as the default terminal and editor to run. -terminal = "konsole" +terminal = "term" -- symbolic link to the terminal you are currently using editor = os.getenv("EDITOR") or "vim" editor_cmd = terminal .. " -e " .. editor @@ -786,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"}), @@ -814,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"}), @@ -966,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 - c.shape = beautiful.shape + 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 diff --git a/startup.sh b/startup.sh index 4ec5667..b60d18c 100755 --- a/startup.sh +++ b/startup.sh @@ -1,8 +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 ~/user/projects/startup/presence.py & -picom --experimental-backends --backend glx & +python ~/data/projects/startup/presence.py & +#picom --experimental-backends --backend glx & +#xsetroot -cursor_name qogir-manjaro cp ~/.gtkrc-2.0_default ~/.gtkrc-2.0 diff --git a/themes/zenburn/README.md b/themes/blueish/README.md similarity index 100% rename from themes/zenburn/README.md rename to themes/blueish/README.md diff --git a/themes/zenburn/artix_wallpaper.png b/themes/blueish/artix_wallpaper.png similarity index 100% rename from themes/zenburn/artix_wallpaper.png rename to themes/blueish/artix_wallpaper.png diff --git a/themes/zenburn/awesome-icon.png b/themes/blueish/awesome-icon.png similarity index 100% rename from themes/zenburn/awesome-icon.png rename to themes/blueish/awesome-icon.png diff --git a/themes/zenburn/coding-wallpaper-3440x1440.jpg b/themes/blueish/coding-wallpaper-3440x1440.jpg similarity index 100% rename from themes/zenburn/coding-wallpaper-3440x1440.jpg rename to themes/blueish/coding-wallpaper-3440x1440.jpg diff --git a/themes/zenburn/colorful_bubbles.jpg b/themes/blueish/colorful_bubbles.jpg similarity index 100% rename from themes/zenburn/colorful_bubbles.jpg rename to themes/blueish/colorful_bubbles.jpg diff --git a/themes/zenburn/cpu.jpg b/themes/blueish/cpu.jpg similarity index 100% rename from themes/zenburn/cpu.jpg rename to themes/blueish/cpu.jpg diff --git a/themes/zenburn/dreams.png b/themes/blueish/dreams.png similarity index 100% rename from themes/zenburn/dreams.png rename to themes/blueish/dreams.png diff --git a/themes/zenburn/dreams.webp b/themes/blueish/dreams.webp similarity index 100% rename from themes/zenburn/dreams.webp rename to themes/blueish/dreams.webp diff --git a/themes/zenburn/dreams_1920x1080.png b/themes/blueish/dreams_1920x1080.png similarity index 100% rename from themes/zenburn/dreams_1920x1080.png rename to themes/blueish/dreams_1920x1080.png diff --git a/themes/zenburn/fluid.png b/themes/blueish/fluid.png similarity index 100% rename from themes/zenburn/fluid.png rename to themes/blueish/fluid.png diff --git a/themes/zenburn/fluid_dark.png b/themes/blueish/fluid_dark.png similarity index 100% rename from themes/zenburn/fluid_dark.png rename to themes/blueish/fluid_dark.png diff --git a/themes/zenburn/layouts/cornerne.png b/themes/blueish/layouts/cornerne.png similarity index 100% rename from themes/zenburn/layouts/cornerne.png rename to themes/blueish/layouts/cornerne.png diff --git a/themes/zenburn/layouts/cornernw.png b/themes/blueish/layouts/cornernw.png similarity index 100% rename from themes/zenburn/layouts/cornernw.png rename to themes/blueish/layouts/cornernw.png diff --git a/themes/zenburn/layouts/cornerse.png b/themes/blueish/layouts/cornerse.png similarity index 100% rename from themes/zenburn/layouts/cornerse.png rename to themes/blueish/layouts/cornerse.png diff --git a/themes/zenburn/layouts/cornersw.png b/themes/blueish/layouts/cornersw.png similarity index 100% rename from themes/zenburn/layouts/cornersw.png rename to themes/blueish/layouts/cornersw.png diff --git a/themes/zenburn/layouts/dwindle.png b/themes/blueish/layouts/dwindle.png similarity index 100% rename from themes/zenburn/layouts/dwindle.png rename to themes/blueish/layouts/dwindle.png diff --git a/themes/zenburn/layouts/fairh.png b/themes/blueish/layouts/fairh.png similarity index 100% rename from themes/zenburn/layouts/fairh.png rename to themes/blueish/layouts/fairh.png diff --git a/themes/zenburn/layouts/fairv.png b/themes/blueish/layouts/fairv.png similarity index 100% rename from themes/zenburn/layouts/fairv.png rename to themes/blueish/layouts/fairv.png diff --git a/themes/zenburn/layouts/floating.png b/themes/blueish/layouts/floating.png similarity index 100% rename from themes/zenburn/layouts/floating.png rename to themes/blueish/layouts/floating.png diff --git a/themes/zenburn/layouts/fullscreen.png b/themes/blueish/layouts/fullscreen.png similarity index 100% rename from themes/zenburn/layouts/fullscreen.png rename to themes/blueish/layouts/fullscreen.png diff --git a/themes/zenburn/layouts/magnifier.png b/themes/blueish/layouts/magnifier.png similarity index 100% rename from themes/zenburn/layouts/magnifier.png rename to themes/blueish/layouts/magnifier.png diff --git a/themes/zenburn/layouts/max.png b/themes/blueish/layouts/max.png similarity index 100% rename from themes/zenburn/layouts/max.png rename to themes/blueish/layouts/max.png diff --git a/themes/zenburn/layouts/spiral.png b/themes/blueish/layouts/spiral.png similarity index 100% rename from themes/zenburn/layouts/spiral.png rename to themes/blueish/layouts/spiral.png diff --git a/themes/zenburn/layouts/tile.png b/themes/blueish/layouts/tile.png similarity index 100% rename from themes/zenburn/layouts/tile.png rename to themes/blueish/layouts/tile.png diff --git a/themes/zenburn/layouts/tilebottom.png b/themes/blueish/layouts/tilebottom.png similarity index 100% rename from themes/zenburn/layouts/tilebottom.png rename to themes/blueish/layouts/tilebottom.png diff --git a/themes/zenburn/layouts/tileleft.png b/themes/blueish/layouts/tileleft.png similarity index 100% rename from themes/zenburn/layouts/tileleft.png rename to themes/blueish/layouts/tileleft.png diff --git a/themes/zenburn/layouts/tiletop.png b/themes/blueish/layouts/tiletop.png similarity index 100% rename from themes/zenburn/layouts/tiletop.png rename to themes/blueish/layouts/tiletop.png diff --git a/themes/zenburn/lowpoly.png b/themes/blueish/lowpoly.png similarity index 100% rename from themes/zenburn/lowpoly.png rename to themes/blueish/lowpoly.png diff --git a/themes/zenburn/lowpoly_dp.png b/themes/blueish/lowpoly_dp.png similarity index 100% rename from themes/zenburn/lowpoly_dp.png rename to themes/blueish/lowpoly_dp.png diff --git a/themes/zenburn/lowpoly_dp.xcf b/themes/blueish/lowpoly_dp.xcf similarity index 100% rename from themes/zenburn/lowpoly_dp.xcf rename to themes/blueish/lowpoly_dp.xcf diff --git a/themes/zenburn/lowpoly_invert.png b/themes/blueish/lowpoly_invert.png similarity index 100% rename from themes/zenburn/lowpoly_invert.png rename to themes/blueish/lowpoly_invert.png diff --git a/themes/zenburn/material-color-lowpoly-scalable.svg b/themes/blueish/material-color-lowpoly-scalable.svg similarity index 100% rename from themes/zenburn/material-color-lowpoly-scalable.svg rename to themes/blueish/material-color-lowpoly-scalable.svg diff --git a/themes/zenburn/submenu.png b/themes/blueish/submenu.png similarity index 100% rename from themes/zenburn/submenu.png rename to themes/blueish/submenu.png diff --git a/themes/zenburn/taglist/squarefz.png b/themes/blueish/taglist/squarefz.png similarity index 100% rename from themes/zenburn/taglist/squarefz.png rename to themes/blueish/taglist/squarefz.png diff --git a/themes/zenburn/taglist/squarefz_orig.png b/themes/blueish/taglist/squarefz_orig.png similarity index 100% rename from themes/zenburn/taglist/squarefz_orig.png rename to themes/blueish/taglist/squarefz_orig.png diff --git a/themes/zenburn/taglist/squarez.png b/themes/blueish/taglist/squarez.png similarity index 100% rename from themes/zenburn/taglist/squarez.png rename to themes/blueish/taglist/squarez.png diff --git a/themes/zenburn/taglist/squarez_orig.png b/themes/blueish/taglist/squarez_orig.png similarity index 100% rename from themes/zenburn/taglist/squarez_orig.png rename to themes/blueish/taglist/squarez_orig.png diff --git a/themes/zenburn/theme.lua b/themes/blueish/theme.lua similarity index 95% rename from themes/zenburn/theme.lua rename to themes/blueish/theme.lua index f31e1e5..d42d98d 100644 --- a/themes/zenburn/theme.lua +++ b/themes/blueish/theme.lua @@ -13,7 +13,7 @@ local gears = require("gears") -- {{{ Main local theme = {} -theme.dir = themes_path.."zenburn/" +theme.dir = themes_path.."blueish/" theme.wallpaper = { theme.dir .. "dreams_1920x1080.png" , theme.dir .. "dreams.png" } -- }}} @@ -39,7 +39,7 @@ 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_bg_normal = "#111122" --CC" theme.menubar_tag_bg_normal = "#00000000" theme.menubar_fg_normal = "#FFBBBB" theme.menubar_bg_focus = "#333344FF" @@ -53,10 +53,12 @@ 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_width = 1 +theme.border_width_focus = 1 +--theme.border_normal = "#00000077" -- basically no border +--theme.border_focus = "#00000000" -- slightly more lit up than the shadow +theme.border_normal = "#554477" +theme.border_focus = "#332244" theme.border_marked = "#CC939355" -- }}} diff --git a/themes/zenburn/titlebar/close_focus.png b/themes/blueish/titlebar/close_focus.png similarity index 100% rename from themes/zenburn/titlebar/close_focus.png rename to themes/blueish/titlebar/close_focus.png diff --git a/themes/zenburn/titlebar/close_normal.png b/themes/blueish/titlebar/close_normal.png similarity index 100% rename from themes/zenburn/titlebar/close_normal.png rename to themes/blueish/titlebar/close_normal.png diff --git a/themes/zenburn/titlebar/floating_focus_active.png b/themes/blueish/titlebar/floating_focus_active.png similarity index 100% rename from themes/zenburn/titlebar/floating_focus_active.png rename to themes/blueish/titlebar/floating_focus_active.png diff --git a/themes/zenburn/titlebar/floating_focus_inactive.png b/themes/blueish/titlebar/floating_focus_inactive.png similarity index 100% rename from themes/zenburn/titlebar/floating_focus_inactive.png rename to themes/blueish/titlebar/floating_focus_inactive.png diff --git a/themes/zenburn/titlebar/floating_normal_active.png b/themes/blueish/titlebar/floating_normal_active.png similarity index 100% rename from themes/zenburn/titlebar/floating_normal_active.png rename to themes/blueish/titlebar/floating_normal_active.png diff --git a/themes/zenburn/titlebar/floating_normal_inactive.png b/themes/blueish/titlebar/floating_normal_inactive.png similarity index 100% rename from themes/zenburn/titlebar/floating_normal_inactive.png rename to themes/blueish/titlebar/floating_normal_inactive.png diff --git a/themes/zenburn/titlebar/maximized_focus_active.png b/themes/blueish/titlebar/maximized_focus_active.png similarity index 100% rename from themes/zenburn/titlebar/maximized_focus_active.png rename to themes/blueish/titlebar/maximized_focus_active.png diff --git a/themes/zenburn/titlebar/maximized_focus_inactive.png b/themes/blueish/titlebar/maximized_focus_inactive.png similarity index 100% rename from themes/zenburn/titlebar/maximized_focus_inactive.png rename to themes/blueish/titlebar/maximized_focus_inactive.png diff --git a/themes/zenburn/titlebar/maximized_normal_active.png b/themes/blueish/titlebar/maximized_normal_active.png similarity index 100% rename from themes/zenburn/titlebar/maximized_normal_active.png rename to themes/blueish/titlebar/maximized_normal_active.png diff --git a/themes/zenburn/titlebar/maximized_normal_inactive.png b/themes/blueish/titlebar/maximized_normal_inactive.png similarity index 100% rename from themes/zenburn/titlebar/maximized_normal_inactive.png rename to themes/blueish/titlebar/maximized_normal_inactive.png diff --git a/themes/zenburn/titlebar/ontop_focus_active.png b/themes/blueish/titlebar/ontop_focus_active.png similarity index 100% rename from themes/zenburn/titlebar/ontop_focus_active.png rename to themes/blueish/titlebar/ontop_focus_active.png diff --git a/themes/zenburn/titlebar/ontop_focus_inactive.png b/themes/blueish/titlebar/ontop_focus_inactive.png similarity index 100% rename from themes/zenburn/titlebar/ontop_focus_inactive.png rename to themes/blueish/titlebar/ontop_focus_inactive.png diff --git a/themes/zenburn/titlebar/ontop_normal_active.png b/themes/blueish/titlebar/ontop_normal_active.png similarity index 100% rename from themes/zenburn/titlebar/ontop_normal_active.png rename to themes/blueish/titlebar/ontop_normal_active.png diff --git a/themes/zenburn/titlebar/ontop_normal_inactive.png b/themes/blueish/titlebar/ontop_normal_inactive.png similarity index 100% rename from themes/zenburn/titlebar/ontop_normal_inactive.png rename to themes/blueish/titlebar/ontop_normal_inactive.png diff --git a/themes/zenburn/titlebar/sticky_focus_active.png b/themes/blueish/titlebar/sticky_focus_active.png similarity index 100% rename from themes/zenburn/titlebar/sticky_focus_active.png rename to themes/blueish/titlebar/sticky_focus_active.png diff --git a/themes/zenburn/titlebar/sticky_focus_inactive.png b/themes/blueish/titlebar/sticky_focus_inactive.png similarity index 100% rename from themes/zenburn/titlebar/sticky_focus_inactive.png rename to themes/blueish/titlebar/sticky_focus_inactive.png diff --git a/themes/zenburn/titlebar/sticky_normal_active.png b/themes/blueish/titlebar/sticky_normal_active.png similarity index 100% rename from themes/zenburn/titlebar/sticky_normal_active.png rename to themes/blueish/titlebar/sticky_normal_active.png diff --git a/themes/zenburn/titlebar/sticky_normal_inactive.png b/themes/blueish/titlebar/sticky_normal_inactive.png similarity index 100% rename from themes/zenburn/titlebar/sticky_normal_inactive.png rename to themes/blueish/titlebar/sticky_normal_inactive.png