Merge branch 'master' of github.com:ChrisCochrun/.dotfiles

made changes to make bar prettier and ensure flameshot loads.

awesome/rc.lua

@@ -82,7 +82,7 @@ beautiful.init("/home/chris/.config/awesome/theme.lua")
 
 -- This is used later as the default terminal and editor to run.
 terminal = "alacritty"
-editor = os.getenv("EDITOR") or "emacs"
+editor = os.getenv("EDITOR") or "emacsclient -a emacs"
 editor_cmd = terminal .. " -e " .. editor
 
 -- Default modkey.
@@ -91,6 +91,7 @@ editor_cmd = terminal .. " -e " .. editor
 -- I suggest you to remap Mod4 to another key using xmodmap or other tools.
 -- However, you can use another modifier like Mod1, but it may interact with others.
 modkey = "Mod4"
+altkey = "Mod1"
 
 -- Table of layouts to cover with awful.layout.inc, order matters.
 awful.layout.layouts = {
@@ -142,6 +143,9 @@ mykeyboardlayout = awful.widget.keyboardlayout()
 -- Create a textclock widget
 mytextclock = wibox.widget.textclock(" %a %b %d, %l:%M %p ")
 
+-- Create a volume widget
+-- myvolumewidget = wibox.widget.button()
+
 -- Create a wibox for each screen and add it
 local taglist_buttons = gears.table.join(
                     awful.button({ }, 1, function(t) t:view_only() end),
@@ -292,6 +296,14 @@ awful.screen.connect_for_each_screen(function(s)
     -- s.volume = require('widget.volume-slider')()
     s.updater = require('widget.package-updater')()
 
+    s.myrightwidgets =
+        { -- Right widgets
+            layout = wibox.layout.ratio.horizontal,
+            s.mytasklist, -- Middle widget
+            s.mysystray,
+            s.mylayoutbox,
+            inner_fill_strategy = "right"
+        }
     -- Add widgets to the wibox
     s.mywibox:setup {
         layout = wibox.layout.align.horizontal,
@@ -299,6 +311,7 @@ awful.screen.connect_for_each_screen(function(s)
             layout = wibox.layout.fixed.horizontal,
             wibox.container.margin (s.mytaglist,25,0,0,0),
             s.mypromptbox,
+            spacing = 15
         },
         wibox.container.margin (s.mytasklist,35,35,0,0), -- Middle widget
         { -- Right widgets
@@ -311,6 +324,7 @@ awful.screen.connect_for_each_screen(function(s)
             mytextclock,
             wibox.container.margin (s.mylayoutbox,0,25,0,0),
         },
+        expand = "outside"
     }
 end)
 -- }}}
@@ -376,10 +390,10 @@ globalkeys = gears.table.join(
 
     -- Increase-Decrease Gap
 
-    awful.key({ modkey, Mod1   }, "k", function () awful.tag.incgap (  1, null)    end,
+    awful.key({ modkey, altkey }, "k", function () awful.tag.incgap (  1, null)    end,
       {description = "increase gap", group = "layout"}),
 
-    awful.key({ Mod1,  modkey   }, "j", function () awful.tag.incgap ( -1, null)    end,
+    awful.key({ modkey, altkey }, "j", function () awful.tag.incgap ( -1, null)    end,
       {description = "decrease gap", group = "layout"}),
 
 
@@ -619,7 +633,8 @@ awful.rules.rules = {
           "Tor Browser", -- Needs a fixed window size to avoid fingerprinting by screen size.
           "Wpa_gui",
           "veromix",
-          "xtightvncviewer"},
+          "xtightvncviewer",
+          "feh"},
 
         -- Note that the name property shown in xprop might be set slightly after creation of the client
         -- and the name shown there might not match defined rules here.
@@ -635,15 +650,19 @@ awful.rules.rules = {
 
     -- Add titlebars to normal clients and dialogs
     { rule_any = {type = { "normal", "dialog" }
-      }, properties = { titlebars_enabled = false }
+      }, properties = { titlebars_enabled = false}
     },
 
-    -- Set Firefox to always map on the tag named "2" on screen 1.
+    -- Set Firefox to never have titlebars
     { rule = { class = "Firefox" },
-      properties = { screen = 1, tag = "2",
-                     maximized_vertical = true,
-                     maximized_horizontal = true,
-    } },
+      properties = { requests_no_titlebar = true, titlebars_enabled = false }
+    },
+
+    -- Set Feh center
+    { rule = {class = "feh"},
+      properties = {
+          placement = awful.placement.centered
+    }},
 }
 -- }}}
 
@@ -714,6 +733,7 @@ client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_n
 
 -- Autostart Applications
 awful.spawn.with_shell("picom")
-awful.spawn.with_shell("feh --bg-fill /home/chris/Pictures/royalking.png")
 awful.spawn.with_shell("libinput-gestures-setup start")
 awful.spawn.with_shell("flameshot")
+awful.spawn.with_shell("feh --bg-fill ~/Pictures/wallpapers/RoyalKing.png")
+awful.spawn.with_shell("/usr/lib/polkit-kde-authentication-agent-1")

awesome/theme.lua

@@ -9,12 +9,11 @@ local gears = require('gears')
 
 local gfs = require("gears.filesystem")
 local themes_path = gfs.get_themes_dir()
--- local theme_dir = filesystem.get_configuration_dir() .. '/theme'
+local wallpaperdir = "/home/chris/Pictures/wallpapers"
 
 local theme = {}
 
-theme.font          = "VictorMono Nerd Font 10"
--- theme.icons = theme_dir .. '/icons/'
+theme.font          = "VictorMono Nerd Font SemiBold 10"
 
 theme.bg_normal     = "#282a36"
 theme.bg_focus      = "#43454f"
@@ -86,8 +85,9 @@ theme.menu_width  = dpi(100)
 -- wibar
 theme.wibar_shape = gears.shape.rounded_bar
 theme.wibar_bg = theme.bg_normal
+theme.wibar_fg = theme.fg_normal
 -- theme.wibar_y = 1030
-theme.wibar_x = 0
+-- theme.wibar_x = 0
 -- theme.wibar_stretch = false
 theme.wibar_border_width = dpi(5)
 theme.wibar_border_color = nil
@@ -96,9 +96,8 @@ theme.wibar_border_color = nil
 theme.wibar_opacity = 0.7
 -- theme.wibar_type = nil
 theme.wibar_width = dpi(1900)
--- theme.wibar_height = nil
+theme.wibar_height = dpi(30)
 -- theme.wibar_bgimage = nil
--- theme.wibar_fg = nil
 
 -- Define the image to load
 theme.titlebar_bg_normal = "#282A36FF"
@@ -129,7 +128,7 @@ theme.titlebar_maximized_button_focus_inactive  = themes_path.."default/titlebar
 theme.titlebar_maximized_button_normal_active = themes_path.."default/titlebar/maximized_normal_active.png"
 theme.titlebar_maximized_button_focus_active  = themes_path.."default/titlebar/maximized_focus_active.png"
 
-theme.wallpaper = themes_path.."default/background.png"
+theme.wallpaper = wallpaperdir.."RoyalKing.png"
 
 -- You can use your own layout icons like this:
 theme.layout_fairh = themes_path.."default/layouts/fairhw.png"
@@ -149,6 +148,8 @@ theme.layout_cornerne = themes_path.."default/layouts/cornernew.png"
 theme.layout_cornersw = themes_path.."default/layouts/cornersww.png"
 theme.layout_cornerse = themes_path.."default/layouts/cornersew.png"
 
+-- Notifications
+
 -- Generate Awesome icon:
 theme.awesome_icon = theme_assets.awesome_icon(
     theme.menu_height, theme.bg_focus, theme.fg_focus