Update awesome config with submodules

5 files changed, 14 insertions, 8 deletions

diff --git a/.gitignore b/.gitignore
index 08fd080..73f7d24 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
 vim/.cache/vim
 vim/.vim/.netrwhist
 vim/.vim/plugged
-awesome/.config/awesome/vicious/
 nix/.config/gtk-3.0/settings.ini
 nix/.gtkrc-2.0
 __pycache__
diff --git a/.gitmodules b/.gitmodules
index 831cd1f..b37091e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,9 @@
 [submodule "debian/.urxvt/ext"]
 	path = debian/.urxvt/ext
 	url = https://github.com/majutsushi/urxvt-font-size
+[submodule "awesome/.config/awesome/freedesktop"]
+	path = awesome/.config/awesome/freedesktop
+	url = https://github.com/lcpz/awesome-freedesktop
+[submodule "awesome/.config/awesome/vicious"]
+	path = awesome/.config/awesome/vicious
+	url = https://github.com/vicious-widgets/vicious
diff --git a/awesome/.config/awesome/freedesktop b/awesome/.config/awesome/freedesktop
new file mode 160000
+Subproject e4ac597ea809cbc4b08be1d0dfdb871b6b0db9c
diff --git a/awesome/.config/awesome/rc.lua b/awesome/.config/awesome/rc.lua
index fd12b07..11140c7 100644
--- a/awesome/.config/awesome/rc.lua
+++ b/awesome/.config/awesome/rc.lua
@@ -54,13 +54,12 @@ local python = terminal .. " -e python"
 local guile = terminal .. " -e guile"
 local clojure = terminal .. " -e clojure"
 local aerc = terminal .. " -e aerc"
+local amfora = terminal .. " -e amfora"
 local atom = terminal .. " -e newsboat"
 local emacs = "emacs"
 local slock_suspend = "slock systemctl --ignore-inhibitors suspend"
 
 -- Audacious media player
-local audacious_main_window = "audacious --show-main-window"
-local audacious_jump_box = "audacious --show-jump-box"
 local play_pause = "playerctl play-pause"
 local rewind = "playerctl previous"
 local forward = "playerctl next"
@@ -469,8 +468,10 @@ local globalkeys = awful.util.table.join(
             {description = "open Emacs", group = "launcher"}),
   awful.key({modkey}, "e", spawner(aerc),
             {description = "open aerc", group = "launcher"}),
-  awful.key({modkey}, "a", spawner(atom),
-            {description = "open atom feed", group = "launcher"}),
+  awful.key({modkey}, "a", spawner(amfora),
+            {description = "open Amfora Gemini browser", group = "launcher"}),
+  awful.key({modkey, "Shift"}, "a", spawner(atom),
+            {description = "open Atom feed", group = "launcher"}),
   awful.key({modkey, "Control"}, "a", spawner"arandr",
             {description = "open arandr", group = "launcher"}),
   awful.key({modkey}, "f", spawner"firefox",
@@ -499,11 +500,11 @@ local globalkeys = awful.util.table.join(
             {description = "lock screen", group = "launcher"}),
   awful.key({modkey, "Shift"}, "s", spawner(slock_suspend),
             {description = "lock screen then suspend", group = "launcher"}),
-  awful.key({modkey}, "m", spawner("nheko"),
+  awful.key({modkey}, "m", spawner"nheko",
             {description = "open Nheko", group = "launcher"}),
-  awful.key({modkey, "Shift"}, "m", spawner("tootle"),
+  awful.key({modkey, "Shift"}, "m", spawner"tootle",
             {description = "open Tootle", group = "launcher"}),
-  awful.key({modkey, "Shift"}, "-", spawner(audacious_jump_box),
+  awful.key({modkey, "Shift"}, "-", spawner"audacious",
             {description = "Audacious: jump-to-song", group = "multimedia"}),
   awful.key({modkey}, "=", spawner(play_pause),
             {description = "Audacious: play/pause", group = "multimedia"}),
diff --git a/awesome/.config/awesome/vicious b/awesome/.config/awesome/vicious
new file mode 160000
+Subproject 150864a76d4b18c97da1459f355c6a86540a086