Added new wallpaper

CMakeLists.txt

@@ -7,12 +7,12 @@ set(POSITION_INDEPENDENT_CODE YES)
 set(C_STANDARD 11)
 add_compile_options(-Wall -Wextra)
 
-pkg_check_modules(CONSTRAIN REQUIRED luajit x11 xi xfixes xrandr)
+pkg_check_modules(CONSTRAIN REQUIRED lua54 x11 xi xfixes xrandr)
 add_library(constrain SHARED lib/constrain.c)
 target_link_libraries(constrain ${CONSTRAIN_LIBRARIES})
 target_include_directories(constrain PUBLIC ${CONSTRAIN_INCLUDE_DIRS})
 
-pkg_check_modules(PWCALL REQUIRED luajit gobject-2.0)
+pkg_check_modules(PWCALL REQUIRED lua54 gobject-2.0)
 add_library(pwcall SHARED lib/pwcall.cxx)
 target_link_libraries(pwcall ${PWCALL_LIBRARIES})
 target_include_directories(pwcall PUBLIC ${PWCALL_INCLUDE_DIRS})

lib/lain/widget/fs.lua

@@ -9,6 +9,7 @@
 
 local helpers = require('lain.helpers')
 local Gio = require('lgi').Gio
+local GioUnix = require('lgi').GioUnix
 local focused = require('awful.screen').focused
 local wibox = require('wibox')
 local naughty = require('naughty')
@@ -83,11 +84,11 @@ local function factory(args)
 		fs_now = {}
 
 		local notifypaths = {}
-		for _, mount in ipairs(Gio.unix_mounts_get()) do
+		for _, mount in ipairs(GioUnix.mounts_get()) do
 			local info, path
-			local fs_ty = Gio.unix_mount_get_fs_type(mount)
+			local fs_ty = GioUnix.mount_get_fs_type(mount)
 			if fs_ty ~= 'autofs' and fs_ty ~= 'efivarfs' and fs_ty ~= 'tmpfs' then
-				path = Gio.unix_mount_get_mount_path(mount)
+				path = GioUnix.mount_get_mount_path(mount)
 				local root = Gio.File.new_for_path(path)
 				info = root:query_filesystem_info(query)
 			end

lib/layout-machi/editor.lua

@@ -292,9 +292,10 @@ function module.create(data)
 
         local function cleanup()
             infobox.visible = false
-            if prev_layout ~= nil then
+            if prev_layout ~= nil and (not to_apply) then
                 awful.layout.set(prev_layout, tag)
             end
+            prev_layout = nil
         end
 
         local function draw_info(context, cr, width, height)
@@ -540,15 +541,8 @@ function module.create(data)
                             if to_apply then
                                 layout.machi_set_cmd(get_final_cmd(), tag)
                                 awful.layout.arrange(screen)
-                                gears.timer{
-                                    timeout = 1,
-                                    autostart = true,
-                                    singleshot = true,
-                                    callback = cleanup,
-                                }
-                            else
-                                cleanup()
                             end
+                            cleanup()
                         end
                 end)
 

lib/sol.hpp

@@ -6752,7 +6752,7 @@ namespace sol {
 			static_assert(std::is_constructible<T, Args&&...>::value, "T must be constructible with Args");
 
 			*this = nullopt;
-			this->construct(std::forward<Args>(args)...);
+			new (static_cast<void*>(this)) optional(std::in_place, std::forward<Args>(args)...);
 		}
 
 		/// Swaps this optional with the other.

src/client/rules.lua

@@ -34,7 +34,7 @@ rules.append_rules({
         },
         properties = { floating = true }
     }, {
-        rule_any = { class = { 'firefox', 'factorio', 'Blender', 'Godot' } },
+        rule_any = { class = { 'firefox', 'factorio', 'Blender', 'Godot', 'kdiff3' } },
         properties = { opacity = 1, maximized = false, floating = false },
     }, {
         rule_any = { class = { 'mpv', 'jellyfinmediaplayer' } },
@@ -45,7 +45,7 @@ rules.append_rules({
             floating = true,
             border_width = 0,
             x = 0,
-            y = 1080,
+            y = 1120,
             no_border = true,
         }
     },

src/global_keys.lua

@@ -104,7 +104,7 @@ local globalkeys = gears.table.join(
 	awful.key({ modkey }, 'space', function() awful.layout.inc(1) end, { description = 'select next', group = 'layout' }),
 	awful.key({ modkey, 'Shift' }, 'space', function() awful.layout.inc(-1) end, { description = 'select previous', group = 'layout' }),
 	awful.key({ modkey }, '.', function () machi.default_editor.start_interactive() end, { description = 'start machi editor', group = 'layout' }),
-	awful.key({ modkey }, '+', function () machi.default_editor.start_interactive() end, { description = 'switch between windows for a machi', group = 'layout' }),
+	awful.key({ modkey }, '+', function () machi.switcher.start(client.focus).ui() end, { description = 'switch between windows for a machi', group = 'layout' }),
 
 	---- AUDIO KEYS ----
 	awful.key({}, "XF86AudioMute", volume.toggle_mute),

src/theme/init.lua

@@ -31,8 +31,8 @@ return {
     confdir = confdir,
     wallpaper = confdir .. '/wallpapers/' .. (settings.wallpaper or 'wall.png'),
     vallpaper = confdir .. '/wallpapers/' .. (settings.vallpaper or 'vall0.png'),
-    font = 'Terminus 8',
-    font_mono = 'Mononoki Nerd Font Mono 10',
+    font = 'IosevkaM Extended Medium 8',
+    font_mono = 'IosevkaM Extended Light 10',
     bg_normal = '#000000',
     bg_focus = '#000000',
     bg_urgent = '#000000',

src/widgets/init.lua

@@ -1,6 +1,10 @@
 local gears = require('gears')
 local theme = require('src.theme')
 
+-- idk what the fuck
+require('src.widgets.8_mpris')
+-- required, because otherwise the require call on line 16 gets turned to a string
+
 return gears.table.join(
     require('src.widgets.1_clock'),
     require('src.widgets.2_fs'),