diff --git a/assets/icons.lua b/assets/icons.lua index 127c42d..4ed2e15 100755 --- a/assets/icons.lua +++ b/assets/icons.lua @@ -7,9 +7,6 @@ return { submenu = conf_dir .. "assets/icons/submenu.svg", launcher = conf_dir .. "assets/icons/arch.svg", - -- Used for i3lock, MUST be a png. - lockicon = conf_dir .. "assets/icons/arch.png", - music = { grey = { playing = conf_dir .. "assets/icons/music/pause-grey.svg", diff --git a/config-template.lua b/config-template.lua index 7d292e7..55dce40 100755 --- a/config-template.lua +++ b/config-template.lua @@ -6,6 +6,7 @@ config.simple_widgets = { enabled = true } config.launcher = { enabled = true } config.screenshot = { enabled = true } config.keymap_popup = { enabled = true } +config.lock = { enabled = true, type = "i3lock"} config.core = { wallpaper = "/home/assets/wallpapers/Themed/Stellaris/Gigapixel/City.png", diff --git a/modules/launcher/launcher.rasi b/modules/launcher/launcher.rasi index fd1a629..fddd076 100755 --- a/modules/launcher/launcher.rasi +++ b/modules/launcher/launcher.rasi @@ -1,5 +1,5 @@ configuration { - font: "Inter Regular 10"; + font: "Inter Regular 25"; show-icons: true; icon-theme: "Papirus"; drun-display-format: "{name}"; @@ -31,8 +31,8 @@ window { anchor: southwest; x-offset: 4px; y-offset: -50px; - height: 500px; - width: 400px; + height: 800px; + width: 800px; orientation: vertical; border-radius: 5px; } @@ -44,7 +44,7 @@ prompt { button { action: "ok"; str: " "; - font: "FantasqueSansMono Nerd Font 11"; + font: "FantasqueSansMono Nerd Font 25"; expand: false; text-color: @foreground; background-color: @transparent; @@ -53,7 +53,7 @@ button { } entry { - font: "Inter Regular 11"; + font: "Inter Regular 25"; background-color: @transparent; text-color: @foreground; expand: true; diff --git a/assets/icons/arch.png b/modules/lock/arch.png similarity index 100% rename from assets/icons/arch.png rename to modules/lock/arch.png diff --git a/modules/lock/dm-tool.bash b/modules/lock/dm-tool.bash new file mode 100755 index 0000000..f6cb1b2 --- /dev/null +++ b/modules/lock/dm-tool.bash @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +dm-tool lock diff --git a/modules/i3lock/lock.fish b/modules/lock/i3lock.bash similarity index 89% rename from modules/i3lock/lock.fish rename to modules/lock/i3lock.bash index 0701bb5..1936127 100755 --- a/modules/i3lock/lock.fish +++ b/modules/lock/i3lock.bash @@ -1,9 +1,8 @@ #!/usr/bin/env bash -icon=$1 +icon="./arch.png" tmpbg="/tmp/lockscreen.png" tmpic="/tmp/lockscreenicon.png" -#(( $# )) && { icon=$1; } scrot --overwrite "$tmpbg" convert "$icon" -scale 25% "$tmpic" diff --git a/modules/i3lock/init.lua b/modules/lock/init.lua similarity index 54% rename from modules/i3lock/init.lua rename to modules/lock/init.lua index 386bb62..185655b 100644 --- a/modules/i3lock/init.lua +++ b/modules/lock/init.lua @@ -1,11 +1,11 @@ -local script = conf_dir .. "modules/i3lock/lock.fish" -script = script .. " " - return { keybinds = gears.table.join( awful.key( {"Mod4"}, "l", function () - awful.spawn(script .. beautiful.icons.lockicon, false) + awful.spawn( + conf_dir .. "modules/lock/" .. config.lock.type .. ".bash", + false + ) end, {