From 42d792bd4cbf07721758fe8bbe3365cc326cc93e Mon Sep 17 00:00:00 2001 From: ngoomie Date: Mon, 1 May 2023 17:51:42 -0600 Subject: [PATCH] varied awesome changes --- awesome/binding/clientkeys.lua | 8 +- awesome/binding/globalkeys.lua | 11 +- awesome/main/layouts.lua | 16 +-- awesome/main/menu.lua | 187 +++++++++++++++----------- awesome/main/rules.lua | 8 +- awesome/main/signals.lua | 3 - awesome/main/tags.lua | 15 +-- awesome/main/user-variables.lua | 15 +-- awesome/themes/spacestation/theme.lua | 16 +-- 9 files changed, 149 insertions(+), 130 deletions(-) diff --git a/awesome/binding/clientkeys.lua b/awesome/binding/clientkeys.lua index b4fbec2..9ea8014 100644 --- a/awesome/binding/clientkeys.lua +++ b/awesome/binding/clientkeys.lua @@ -53,11 +53,11 @@ function _M.get() c.maximized_horizontal = not c.maximized_horizontal c:raise() end , - {description = "(un)maximize horizontally", group = "client"}), + {description = "(un)maximize horizontally", group = "client"}) - cyclefocus.key({modkey, }, "Tab", { - cycle_filters = { cyclefocus.filters.same_screen, cyclefocus.filters.common_tag }}, - {description = "cycle through clients from the same screen and tag", group = "client"}) + -- cyclefocus.key({modkey, }, "Tab", { + -- cycle_filters = { cyclefocus.filters.same_screen, cyclefocus.filters.common_tag }}, + -- {description = "cycle through clients from the same screen and tag", group = "client"}) ) return clientkeys diff --git a/awesome/binding/globalkeys.lua b/awesome/binding/globalkeys.lua index 501d20f..13e9a6f 100644 --- a/awesome/binding/globalkeys.lua +++ b/awesome/binding/globalkeys.lua @@ -142,9 +142,16 @@ function _M.get() -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- Menubar - awful.key({ modkey }, "p", function() menubar.show() end, - {description = "show the menubar", group = "launcher"}) + --awful.key({ modkey }, "p", function() menubar.show() end, + -- {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 diff --git a/awesome/main/layouts.lua b/awesome/main/layouts.lua index bcc4688..dfbe2d7 100644 --- a/awesome/main/layouts.lua +++ b/awesome/main/layouts.lua @@ -8,7 +8,7 @@ local _M = {} function _M.get () -- Table of layouts to cover with awful.layout.inc, order matters. local layouts = { - awful.layout.suit.floating, -- 1: + awful.layout.suit.floating, -- 1: awful.layout.suit.tile, -- 2: awful.layout.suit.tile.left, -- 3: @@ -16,19 +16,9 @@ function _M.get () awful.layout.suit.tile.top, -- 5: awful.layout.suit.fair, -- 6: - awful.layout.suit.fair.horizontal, -- 7: + awful.layout.suit.fair.horizontal, -- 7: --- awful.layout.suit.spiral, --- 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, + awful.layout.suit.max, -- 8: } return layouts diff --git a/awesome/main/menu.lua b/awesome/main/menu.lua index 8a4af52..5ec5083 100644 --- a/awesome/main/menu.lua +++ b/awesome/main/menu.lua @@ -1,117 +1,154 @@ --- Standard awesome library -local awful = require("awful") +-- standard awesome library ----------------------------------------- +local awful = require("awful") local hotkeys_popup = require("awful.hotkeys_popup").widget --- Theme handling library -local beautiful = require("beautiful") -- for awesome.icon +-- theme handling library ------------------------------------------ +local beautiful = require("beautiful") -- for awesome.icon -local M = {} -- menu +local M = {} -- menu local _M = {} -- module --- reading --- https://awesomewm.org/apidoc/popups%20and%20bars/awful.menu.html +--------------------------------------------------------------------- --- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - --- This is used later as the default terminal and editor to run. +-- import terminal variable from rc.lua ----------------------------- local terminal = RC.vars.terminal --- Variable definitions --- This is used later as the default terminal and editor to run. -local editor = os.getenv("EDITOR") or "nano" +-- import editor variable from OS environment ----------------------- +local editor = os.getenv("EDITOR") or "nano" local editor_cmd = terminal .. " -e " .. editor --- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- +--------------------------------------------------------------------- --- this is an attempt to make it harder to quit awesome accidentally. --- my hand likes to twitch sometimes so i've accidentally quit on more --- than one occasion -M.quitmenu = { - { "i mean it!", function() awesome.quit() end } -} +-- make it harder to quit awesome accidentally ---------------------- +M.quitmenu = + { + { "i mean it!", function() awesome.quit() end } + } +-- "awesome" menu --------------------------------------------------- M.awesome = { - { "hotkeys", function() - hotkeys_popup.show_help(nil, awful.screen.focused()) - end }, - { "manual", terminal .. " -e man awesome" }, - { "edit config", editor_cmd .. " " .. awesome.conffile }, - { "terminal", terminal }, - { "restart", awesome.restart }, - { "quit", M.quitmenu } + { "hotkeys" , function() hotkeys_popup.show_help(nil,awful.screen.focused()) + end }, + { "manual" , terminal + .. " -e man awesome" }, + { "edit config" , editor_cmd + .. " " + .. awesome.conffile }, + { "terminal" , terminal }, + { "restart" , awesome.restart }, + { "quit" , M.quitmenu } } +-- browsers and other network-oriented software --------------------- M.network = { - { "firefox", "firefox" }, - { "discord", "flatpak run com.discordapp.Discord" }, - { "thunderbird", "thunderbird" }, - { "steam", "flatpak run com.valvesoftware.Steam" }, - { "qbittorrent", "qbittorrent" }, - { "keepassxc", "keepassxc" }, + { "firefox" , "firefox" }, + { "discord" , "flatpak run\ + com.discordapp.Discord" }, + { "thunderbird" , "thunderbird" }, + { "steam" , "steam" }, + { "qbittorrent" , "qbittorrent" }, + { "keepassxc" , "keepassxc" } } +-- DEVELOPERS, DEVELOPERS, DEVELOPERS, DEVELOPERS ------------------- M.develop = { - { "vs code", "flatpak run com.visualstudio.code" }, - { "bless", "bless" }, - { "beekeeper studio", "flatpak run io.beekeeperstudio.Studio" }, - { "sqlite browser", "sqlitebrowser" } + { "vs code" , "flatpak run\ + com.visualstudio.code" }, + { "bless" , "bless" }, + { "beekeeper studio" , "flatpak run\ + io.beekeeperstudio.Studio" }, + { "sqlite browser" , "sqlitebrowser" } } +-- emulators -------------------------------------------------------- M.emulators = { - { "citra", "flatpak run org.citra_emu.citra" }, - { "dolphin", "flatpak run org.DolphinEmu.dolphin-emu" }, - { "yuzu", "flatpak run org.yuzu_emu.yuzu" }, - { "duckstation", "flatpak run org.duckstation.DuckStation" }, - { "PPSSPP", "flatpak run org.ppsspp.PPSSPP" } + { "citra" , "flatpak run\ + org.citra_emu.citra" }, + { "dolphin" , "flatpak run\ + org.DolphinEmu.dolphin-emu" }, + { "yuzu" , "flatpak run\ + org.yuzu_emu.yuzu" }, + { "duckstation" , "flatpak run\ + org.duckstation.DuckStation" }, + { "PPSSPP" , "flatpak run\ + org.ppsspp.PPSSPP" } } -M.vtgstry = { - { "latest", "mono /home/nu/ApplicationData/vintagestory/Vintagestory.exe" }, - { "flatpak", "flatpak run at.vintagestory.VintageStory" } +-- vintage story [different versions of VS for mods] ---------------- +M.vtgstry ={ + { "latest" , "vintagestory" }, + { "flatpak" , "flatpak run\ + at.vintagestory.VintageStory" } } +-- videogames ------------------------------------------------------- M.games = { - { "emulators", M.emulators }, - { "vintage story", M.vtgstry }, - { "team fortress 2", "steam steam://rungameid/440" }, - { "ballisticNG", "steam steam://rungameid/473770" }, - { "them's fightin' herds", "steam steam://rungameid/574980"}, - { "osu!", "flatpak run sh.ppy.osu" }, - { "minecraft", "flatpak run org.prismlauncher.PrismLauncher" }, + { "emulators" , M.emulators }, + { "vintage story" , M.vtgstry }, + { "team fortress 2" , "steam\ + steam://rungameid/440" }, + { "ballisticNG" , "steam\ + steam://rungameid/473770" }, + { "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 = { - { "catfish", "catfish" }, - { "anki", "flatpak run net.ankiweb.Anki" }, - { "text pieces", "flatpak run com.github.liferooter.textpieces" }, - { "menulibre", "menulibre" }, - { "flatseal", "flatpak run com.github.tchx84.Flatseal" }, - { "piper", "piper" } + { "catfish" , "catfish" }, + { "anki" , "flatpak run net.ankiweb.Anki" }, + { "text pieces" , "flatpak run\ + com.github.liferooter.textpieces" }, + { "alacarte" , "alacarte" }, + { "flatseal" , "flatpak run com.github.tchx84.Flatseal" }, + { "xarchiver" , "xarchiver" }, + { "piper" , "piper" }, + { "wally" , "wally" } } +-- "media" programs [image viewers, video players, etc] ------------- M.media = { - { "hydrus", "flatpak run io.github.hydrusnetwork.hydrus" }, - { "youtube", "/usr/lib64/chromium-browser/chromium-browser.sh --profile-directory=Default --app-id=agimnkijcaahngcdmfeangaknmldooml"}, - { "spotify", "flatpak run com.spotify.Client" } + { "hydrus" , "flatpak run io.github.hydrusnetwork.hydrus" }, + { "youtube" , "/usr/lib64/chromium-browser/chromium-browser.sh\ + --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() - -- Main Menu - local menu_items = { - { "awesome", M.awesome, beautiful.awesome_subicon }, - { "terminal", terminal }, - { "thunar", "Thunar" }, - { "www", M.network }, - { "media", M.media }, - { "dev", M.develop }, - { "games", M.games }, - { "utils", M.utils } - } +-- main menu -------------------------------------------------------- +local menu_items = { + { "awesome" , M.awesome, + beautiful.awesome_subicon }, + { "terminal" , terminal }, + { "thunar" , "Thunar" }, + { "www" , M.network }, + { "media" , M.media }, + { "dev" , M.develop }, + { "art" , M.vis }, + { "games" , M.games }, + { "utils" , M.utils } +} return menu_items end --- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- +--------------------------------------------------------------------- return setmetatable({}, { __call = function(_, ...) return _M.get(...) end }) diff --git a/awesome/main/rules.lua b/awesome/main/rules.lua index 1f242f3..84152ab 100644 --- a/awesome/main/rules.lua +++ b/awesome/main/rules.lua @@ -34,16 +34,16 @@ function _M.get(clientkeys, clientbuttons) "pinentry", }, class = { - "MessageWin", -- kalarm. "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 -- and the name shown there might not match defined rules here. name = { - "Event Tester", -- xev. - "Steam", + "Friends List", "infinitefusion", -- Pokémon Infinite Fusion + "Picture-in-picture" }, role = { "AlarmWindow", -- Thunderbird's calendar. diff --git a/awesome/main/signals.lua b/awesome/main/signals.lua index a38f882..5f196a4 100644 --- a/awesome/main/signals.lua +++ b/awesome/main/signals.lua @@ -11,9 +11,6 @@ local beautiful = require("beautiful") -- Custom Local Library: Common Functional Decoration require("deco.titlebar") --- reading --- https://awesomewm.org/apidoc/classes/signals.html - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- {{{ Signals diff --git a/awesome/main/tags.lua b/awesome/main/tags.lua index e082244..e30f120 100644 --- a/awesome/main/tags.lua +++ b/awesome/main/tags.lua @@ -9,19 +9,16 @@ function _M.get () local tags = {} awful.tag.add("➊ home", - { - layout = awful.layout.suit.floating, - }) + { layout = awful.layout.suit.floating, }) awful.tag.add("➋ code", - { - layout = awful.layout.suit.tile, - }) + { layout = awful.layout.suit.tile, }) 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 end diff --git a/awesome/main/user-variables.lua b/awesome/main/user-variables.lua index 2f2c592..d4111f9 100644 --- a/awesome/main/user-variables.lua +++ b/awesome/main/user-variables.lua @@ -1,18 +1,9 @@ --- {{{ Global Variable Definitions --- moved here in module as local variable --- }}} - local home = os.getenv("HOME") local _M = { - -- This is used later as the default terminal and editor to run. - terminal = "alacritty", - - -- Default modkey. - modkey = "Mod4", - - -- user defined wallpaper - wallpaper = "/usr/share/backgrounds/custom/space_station.jpg", + terminal = "alacritty", + modkey = "Mod4", + wallpaper = "/usr/share/backgrounds/custom/space_station.jpg" } return _M diff --git a/awesome/themes/spacestation/theme.lua b/awesome/themes/spacestation/theme.lua index 00cebf3..348071a 100644 --- a/awesome/themes/spacestation/theme.lua +++ b/awesome/themes/spacestation/theme.lua @@ -15,14 +15,14 @@ theme.font = "Fira Code 9" theme.bg_normal = "#ffffff4f" theme.bg_focus = "#e1b661" -theme.bg_urgent = "#233871" +theme.bg_urgent = "#0f2356" theme.bg_minimize = "#ffffff00" theme.bg_systray = "#ffffff00" -theme.fg_normal = "#233871" -theme.fg_focus = "#233871" +theme.fg_normal = "#0f2356" +theme.fg_focus = "#0f2356" theme.fg_urgent = "#e1b661" -theme.fg_minimize = "#23387180" +theme.fg_minimize = "#0f235680" theme.border_width = 0 theme.border_normal = "#f0eef1" @@ -32,12 +32,12 @@ theme.border_marked = "#ff8e9d" theme.taglist_bg_focus = "#e1b661" theme.notification_bg = "#ffffff4f" -theme.notification_fg = "#233871" -theme.notification_border_color = "#233871" +theme.notification_fg = "#0f2356" +theme.notification_border_color = "#0f2356" -theme.tooltip_fg_color = "#233871" +theme.tooltip_fg_color = "#0f2356" theme.tooltip_bg_color = "#ffffff4f" -theme.tooltip_border_color = "#233871" +theme.tooltip_border_color = "#0f2356" theme.prompt_bg = "#ffffff4f"