varied awesome changes

This commit is contained in:
ngoomie 2023-05-01 17:51:42 -06:00
parent 261292251d
commit 42d792bd4c
9 changed files with 149 additions and 130 deletions

View File

@ -53,11 +53,11 @@ function _M.get()
c.maximized_horizontal = not c.maximized_horizontal c.maximized_horizontal = not c.maximized_horizontal
c:raise() c:raise()
end , end ,
{description = "(un)maximize horizontally", group = "client"}), {description = "(un)maximize horizontally", group = "client"})
cyclefocus.key({modkey, }, "Tab", { -- cyclefocus.key({modkey, }, "Tab", {
cycle_filters = { cyclefocus.filters.same_screen, cyclefocus.filters.common_tag }}, -- cycle_filters = { cyclefocus.filters.same_screen, cyclefocus.filters.common_tag }},
{description = "cycle through clients from the same screen and tag", group = "client"}) -- {description = "cycle through clients from the same screen and tag", group = "client"})
) )
return clientkeys return clientkeys

View File

@ -142,9 +142,16 @@ function _M.get()
-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-- Menubar -- Menubar
awful.key({ modkey }, "p", function() menubar.show() end, --awful.key({ modkey }, "p", function() menubar.show() end,
{description = "show the menubar", group = "launcher"}) -- {description = "show the menubar", group = "launcher"})
awful.key({ modkey, }, "p", function()
awful.util.spawn("rofi -show combi -modes combi,filebrowser -combi-modes \"drun,filebrowser,run\"") end,
{description = "open rofi runner", group = "launcher"}),
awful.key({ modkey, }, "y", function()
awful.util.spawn("scrot") end,
{description = "scrot", group = "launcher"})
) )
return globalkeys return globalkeys

View File

@ -18,17 +18,7 @@ function _M.get ()
awful.layout.suit.fair, -- 6: awful.layout.suit.fair, -- 6:
awful.layout.suit.fair.horizontal, -- 7: awful.layout.suit.fair.horizontal, -- 7:
-- awful.layout.suit.spiral, awful.layout.suit.max, -- 8:
-- awful.layout.suit.spiral.dwindle,
-- awful.layout.suit.max,
-- awful.layout.suit.max.fullscreen,
-- awful.layout.suit.magnifier,
-- awful.layout.suit.corner.nw
-- awful.layout.suit.corner.ne,
-- awful.layout.suit.corner.sw,
-- awful.layout.suit.corner.se,
} }
return layouts return layouts

View File

@ -1,117 +1,154 @@
-- Standard awesome library -- standard awesome library -----------------------------------------
local awful = require("awful") local awful = require("awful")
local hotkeys_popup = require("awful.hotkeys_popup").widget local hotkeys_popup = require("awful.hotkeys_popup").widget
-- Theme handling library -- theme handling library ------------------------------------------
local beautiful = require("beautiful") -- for awesome.icon local beautiful = require("beautiful") -- for awesome.icon
local M = {} -- menu local M = {} -- menu
local _M = {} -- module local _M = {} -- module
-- reading ---------------------------------------------------------------------
-- https://awesomewm.org/apidoc/popups%20and%20bars/awful.menu.html
-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- import terminal variable from rc.lua -----------------------------
-- This is used later as the default terminal and editor to run.
local terminal = RC.vars.terminal local terminal = RC.vars.terminal
-- Variable definitions -- import editor variable from OS environment -----------------------
-- This is used later as the default terminal and editor to run.
local editor = os.getenv("EDITOR") or "nano" local editor = os.getenv("EDITOR") or "nano"
local editor_cmd = terminal .. " -e " .. editor local editor_cmd = terminal .. " -e " .. editor
-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ---------------------------------------------------------------------
-- this is an attempt to make it harder to quit awesome accidentally. -- make it harder to quit awesome accidentally ----------------------
-- my hand likes to twitch sometimes so i've accidentally quit on more M.quitmenu =
-- than one occasion {
M.quitmenu = {
{ "i mean it!", function() awesome.quit() end } { "i mean it!", function() awesome.quit() end }
} }
-- "awesome" menu ---------------------------------------------------
M.awesome = { M.awesome = {
{ "hotkeys", function() { "hotkeys" , function() hotkeys_popup.show_help(nil,awful.screen.focused())
hotkeys_popup.show_help(nil, awful.screen.focused())
end }, end },
{ "manual", terminal .. " -e man awesome" }, { "manual" , terminal
{ "edit config", editor_cmd .. " " .. awesome.conffile }, .. " -e man awesome" },
{ "terminal", terminal }, { "edit config" , editor_cmd
{ "restart", awesome.restart }, .. " "
{ "quit", M.quitmenu } .. awesome.conffile },
{ "terminal" , terminal },
{ "restart" , awesome.restart },
{ "quit" , M.quitmenu }
} }
-- browsers and other network-oriented software ---------------------
M.network = { M.network = {
{ "firefox", "firefox" }, { "firefox" , "firefox" },
{ "discord", "flatpak run com.discordapp.Discord" }, { "discord" , "flatpak run\
{ "thunderbird", "thunderbird" }, com.discordapp.Discord" },
{ "steam", "flatpak run com.valvesoftware.Steam" }, { "thunderbird" , "thunderbird" },
{ "qbittorrent", "qbittorrent" }, { "steam" , "steam" },
{ "keepassxc", "keepassxc" }, { "qbittorrent" , "qbittorrent" },
{ "keepassxc" , "keepassxc" }
} }
-- DEVELOPERS, DEVELOPERS, DEVELOPERS, DEVELOPERS -------------------
M.develop = { M.develop = {
{ "vs code", "flatpak run com.visualstudio.code" }, { "vs code" , "flatpak run\
{ "bless", "bless" }, com.visualstudio.code" },
{ "beekeeper studio", "flatpak run io.beekeeperstudio.Studio" }, { "bless" , "bless" },
{ "sqlite browser", "sqlitebrowser" } { "beekeeper studio" , "flatpak run\
io.beekeeperstudio.Studio" },
{ "sqlite browser" , "sqlitebrowser" }
} }
-- emulators --------------------------------------------------------
M.emulators = { M.emulators = {
{ "citra", "flatpak run org.citra_emu.citra" }, { "citra" , "flatpak run\
{ "dolphin", "flatpak run org.DolphinEmu.dolphin-emu" }, org.citra_emu.citra" },
{ "yuzu", "flatpak run org.yuzu_emu.yuzu" }, { "dolphin" , "flatpak run\
{ "duckstation", "flatpak run org.duckstation.DuckStation" }, org.DolphinEmu.dolphin-emu" },
{ "PPSSPP", "flatpak run org.ppsspp.PPSSPP" } { "yuzu" , "flatpak run\
org.yuzu_emu.yuzu" },
{ "duckstation" , "flatpak run\
org.duckstation.DuckStation" },
{ "PPSSPP" , "flatpak run\
org.ppsspp.PPSSPP" }
} }
M.vtgstry = { -- vintage story [different versions of VS for mods] ----------------
{ "latest", "mono /home/nu/ApplicationData/vintagestory/Vintagestory.exe" }, M.vtgstry ={
{ "flatpak", "flatpak run at.vintagestory.VintageStory" } { "latest" , "vintagestory" },
{ "flatpak" , "flatpak run\
at.vintagestory.VintageStory" }
} }
-- videogames -------------------------------------------------------
M.games = { M.games = {
{ "emulators", M.emulators }, { "emulators" , M.emulators },
{ "vintage story", M.vtgstry }, { "vintage story" , M.vtgstry },
{ "team fortress 2", "steam steam://rungameid/440" }, { "team fortress 2" , "steam\
{ "ballisticNG", "steam steam://rungameid/473770" }, steam://rungameid/440" },
{ "them's fightin' herds", "steam steam://rungameid/574980"}, { "ballisticNG" , "steam\
{ "osu!", "flatpak run sh.ppy.osu" }, steam://rungameid/473770" },
{ "minecraft", "flatpak run org.prismlauncher.PrismLauncher" }, { "them's fightin' herds" , "steam\
steam://rungameid/574980" },
{ "osu!" , "flatpak run\
sh.ppy.osu" },
{ "minecraft" , "flatpak run\
org.prismlauncher.PrismLauncher" }
} }
-- utilities [kind of a misc category] ------------------------------
M.utils = { M.utils = {
{ "catfish", "catfish" }, { "catfish" , "catfish" },
{ "anki", "flatpak run net.ankiweb.Anki" }, { "anki" , "flatpak run net.ankiweb.Anki" },
{ "text pieces", "flatpak run com.github.liferooter.textpieces" }, { "text pieces" , "flatpak run\
{ "menulibre", "menulibre" }, com.github.liferooter.textpieces" },
{ "flatseal", "flatpak run com.github.tchx84.Flatseal" }, { "alacarte" , "alacarte" },
{ "piper", "piper" } { "flatseal" , "flatpak run com.github.tchx84.Flatseal" },
{ "xarchiver" , "xarchiver" },
{ "piper" , "piper" },
{ "wally" , "wally" }
} }
-- "media" programs [image viewers, video players, etc] -------------
M.media = { M.media = {
{ "hydrus", "flatpak run io.github.hydrusnetwork.hydrus" }, { "hydrus" , "flatpak run io.github.hydrusnetwork.hydrus" },
{ "youtube", "/usr/lib64/chromium-browser/chromium-browser.sh --profile-directory=Default --app-id=agimnkijcaahngcdmfeangaknmldooml"}, { "youtube" , "/usr/lib64/chromium-browser/chromium-browser.sh\
{ "spotify", "flatpak run com.spotify.Client" } --profile-directory=Default\
--app-id=agimnkijcaahngcdmfeangaknmldooml" },
{ "spotify" , "flatpak run com.spotify.Client" }
}
-- "visual arts" stuff ----------------------------------------------
M.vis = {
{ "blender" , "steam\
steam://rungameid/365670" },
{ "krita" , "krita" },
{ "GIMP" , "gimp-2.10" },
{ "beeref" , "flatpak run\
org.beeref.BeeRef" }
} }
-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
---------------------------------------------------------------------
function _M.get() function _M.get()
-- Main Menu -- main menu --------------------------------------------------------
local menu_items = { local menu_items = {
{ "awesome", M.awesome, beautiful.awesome_subicon }, { "awesome" , M.awesome,
{ "terminal", terminal }, beautiful.awesome_subicon },
{ "thunar", "Thunar" }, { "terminal" , terminal },
{ "www", M.network }, { "thunar" , "Thunar" },
{ "media", M.media }, { "www" , M.network },
{ "dev", M.develop }, { "media" , M.media },
{ "games", M.games }, { "dev" , M.develop },
{ "utils", M.utils } { "art" , M.vis },
} { "games" , M.games },
{ "utils" , M.utils }
}
return menu_items return menu_items
end end
-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ---------------------------------------------------------------------
return setmetatable({}, { __call = function(_, ...) return _M.get(...) end }) return setmetatable({}, { __call = function(_, ...) return _M.get(...) end })

View File

@ -34,16 +34,16 @@ function _M.get(clientkeys, clientbuttons)
"pinentry", "pinentry",
}, },
class = { class = {
"MessageWin", -- kalarm.
"Tor Browser", -- Needs a fixed window size to avoid fingerprinting by screen size. "Tor Browser", -- Needs a fixed window size to avoid fingerprinting by screen size.
"steamwebhelper",
}, },
-- Note that the name property shown in xprop might be set slightly after creation of the client -- 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. -- and the name shown there might not match defined rules here.
name = { name = {
"Event Tester", -- xev. "Friends List",
"Steam",
"infinitefusion", -- Pokémon Infinite Fusion "infinitefusion", -- Pokémon Infinite Fusion
"Picture-in-picture"
}, },
role = { role = {
"AlarmWindow", -- Thunderbird's calendar. "AlarmWindow", -- Thunderbird's calendar.

View File

@ -11,9 +11,6 @@ local beautiful = require("beautiful")
-- Custom Local Library: Common Functional Decoration -- Custom Local Library: Common Functional Decoration
require("deco.titlebar") require("deco.titlebar")
-- reading
-- https://awesomewm.org/apidoc/classes/signals.html
-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-- {{{ Signals -- {{{ Signals

View File

@ -9,19 +9,16 @@ function _M.get ()
local tags = {} local tags = {}
awful.tag.add("➊ home", awful.tag.add("➊ home",
{ { layout = awful.layout.suit.floating, })
layout = awful.layout.suit.floating,
})
awful.tag.add("➋ code", awful.tag.add("➋ code",
{ { layout = awful.layout.suit.tile, })
layout = awful.layout.suit.tile,
})
awful.tag.add("➌ art", awful.tag.add("➌ art",
{ { layout = awful.layout.suit.floating, })
layout = awful.layout.suit.floating,
}) awful.tag.add("➍ games",
{ layout = awful.layout.suit.floating, })
return tags return tags
end end

View File

@ -1,18 +1,9 @@
-- {{{ Global Variable Definitions
-- moved here in module as local variable
-- }}}
local home = os.getenv("HOME") local home = os.getenv("HOME")
local _M = { local _M = {
-- This is used later as the default terminal and editor to run.
terminal = "alacritty", terminal = "alacritty",
-- Default modkey.
modkey = "Mod4", modkey = "Mod4",
wallpaper = "/usr/share/backgrounds/custom/space_station.jpg"
-- user defined wallpaper
wallpaper = "/usr/share/backgrounds/custom/space_station.jpg",
} }
return _M return _M

View File

@ -15,14 +15,14 @@ theme.font = "Fira Code 9"
theme.bg_normal = "#ffffff4f" theme.bg_normal = "#ffffff4f"
theme.bg_focus = "#e1b661" theme.bg_focus = "#e1b661"
theme.bg_urgent = "#233871" theme.bg_urgent = "#0f2356"
theme.bg_minimize = "#ffffff00" theme.bg_minimize = "#ffffff00"
theme.bg_systray = "#ffffff00" theme.bg_systray = "#ffffff00"
theme.fg_normal = "#233871" theme.fg_normal = "#0f2356"
theme.fg_focus = "#233871" theme.fg_focus = "#0f2356"
theme.fg_urgent = "#e1b661" theme.fg_urgent = "#e1b661"
theme.fg_minimize = "#23387180" theme.fg_minimize = "#0f235680"
theme.border_width = 0 theme.border_width = 0
theme.border_normal = "#f0eef1" theme.border_normal = "#f0eef1"
@ -32,12 +32,12 @@ theme.border_marked = "#ff8e9d"
theme.taglist_bg_focus = "#e1b661" theme.taglist_bg_focus = "#e1b661"
theme.notification_bg = "#ffffff4f" theme.notification_bg = "#ffffff4f"
theme.notification_fg = "#233871" theme.notification_fg = "#0f2356"
theme.notification_border_color = "#233871" theme.notification_border_color = "#0f2356"
theme.tooltip_fg_color = "#233871" theme.tooltip_fg_color = "#0f2356"
theme.tooltip_bg_color = "#ffffff4f" theme.tooltip_bg_color = "#ffffff4f"
theme.tooltip_border_color = "#233871" theme.tooltip_border_color = "#0f2356"
theme.prompt_bg = "#ffffff4f" theme.prompt_bg = "#ffffff4f"