fix: more keybind cleanup, remove hyprlock
This commit is contained in:
@@ -9,9 +9,9 @@
|
||||
#██████████████ █████ ████████████████████████████████████████████████████████████████████████████████████████████████ ██
|
||||
|
||||
general {
|
||||
lock_cmd = hyprlock
|
||||
lock_cmd = dms ipc call lock lock
|
||||
unlock_cmd = loginctl unlock-session
|
||||
before_sleep_cmd = hyprlock
|
||||
before_sleep_cmd = dms ipc call lock lock
|
||||
inhibit_sleep = 3
|
||||
}
|
||||
|
||||
|
||||
@@ -1,12 +1,8 @@
|
||||
-- Determine current platform
|
||||
local is_docked = false
|
||||
local laptop_config = false
|
||||
local read_platform = pcall(function()
|
||||
io.popen("cat ~/.config/janishutz/platform-laptop")
|
||||
end)
|
||||
local read_docked = pcall(function()
|
||||
io.popen("cat ~/.config/janishutz/docked")
|
||||
end)
|
||||
local read_platform = io.popen("cat ~/.config/janishutz/platform-laptop") == "l"
|
||||
local read_docked = io.popen("cat ~/.config/janishutz/docked") == "y"
|
||||
|
||||
if read_platform then
|
||||
laptop_config = true
|
||||
@@ -46,7 +42,7 @@ require("hyprland.workspacerules.main")
|
||||
require("hyprland.monitors")(laptop_config, is_docked)
|
||||
|
||||
-- Execs
|
||||
require("hyprland.execs")
|
||||
require("hyprland.execs")(laptop_config)
|
||||
|
||||
hl.device({
|
||||
name = "pnp0c50:00-093a:0255-touchpad",
|
||||
|
||||
@@ -2,6 +2,14 @@ local function exit_submap()
|
||||
hl.dispatch(hl.dsp.submap("reset"))
|
||||
end
|
||||
|
||||
hl.bind("code:232", hl.dsp.exec_cmd(""))
|
||||
-- bind = ,code:232, exec, light -U 5 && notify-send 'Display brightness decreased by 5%'
|
||||
-- bind = ,code:233, exec, light -A 5 && notify-send 'Display brightness increased by 5%'
|
||||
|
||||
hl.bind("code:123", hl.dsp.exec_cmd("pamixer -i 5"))
|
||||
hl.bind("code:122", hl.dsp.exec_cmd("pamixer -d 5"))
|
||||
hl.bind("code:121", hl.dsp.exec_cmd("pamixer t"))
|
||||
|
||||
hl.define_submap("device", function()
|
||||
hl.bind("m", function()
|
||||
hl.dispatch(hl.dsp.exec_cmd("wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"))
|
||||
|
||||
@@ -2,38 +2,51 @@ local function exit_submap()
|
||||
hl.dispatch(hl.dsp.submap("reset"))
|
||||
end
|
||||
|
||||
hl.bind("SUPER + mouse:272", hl.dsp.window.move())
|
||||
hl.bind("SUPER + mouse:273", hl.dsp.window.resize())
|
||||
|
||||
hl.define_submap("window", function()
|
||||
-- Close window
|
||||
hl.bind("x", function()
|
||||
hl.dispatch(hl.dsp.exit())
|
||||
hl.dispatch(hl.dsp.window.close())
|
||||
exit_submap()
|
||||
end)
|
||||
|
||||
hl.bind("q", function()
|
||||
hl.dispatch(hl.dsp.exit())
|
||||
hl.dispatch(hl.dsp.window.close())
|
||||
exit_submap()
|
||||
end)
|
||||
|
||||
-- Fullscreen
|
||||
hl.bind("f", function()
|
||||
hl.dispatch(hl.dsp.window.fullscreen({ mode = "fullscreen" }))
|
||||
exit_submap()
|
||||
end)
|
||||
|
||||
-- Floating
|
||||
hl.bind("v", function()
|
||||
hl.dispatch(hl.dsp.window.float())
|
||||
exit_submap()
|
||||
end)
|
||||
|
||||
-- Center
|
||||
hl.bind("c", function()
|
||||
hl.dispatch(hl.dsp.window.center())
|
||||
exit_submap()
|
||||
end)
|
||||
|
||||
-- Kill
|
||||
hl.bind("SHIFT + K", function()
|
||||
hl.dispatch(hl.dsp.exec_cmd("notify-send 'Insta-Kill activated' --app-name='Hyprtclt'"))
|
||||
hl.dispatch(hl.dsp.exec_cmd("hyprctl kill"))
|
||||
exit_submap()
|
||||
end)
|
||||
|
||||
-- Resize
|
||||
hl.bind("l", hl.dsp.window.resize({ x = 10, y = 0 }))
|
||||
hl.bind("h", hl.dsp.window.resize({ x = -10, y = 0 }))
|
||||
hl.bind("j", hl.dsp.window.resize({ x = 0, y = 10 }))
|
||||
hl.bind("k", hl.dsp.window.resize({ x = 0, y = -10 }))
|
||||
|
||||
hl.bind("Escape", function()
|
||||
exit_submap()
|
||||
end)
|
||||
|
||||
@@ -1,24 +1,19 @@
|
||||
hl.config({
|
||||
general = {
|
||||
col = {
|
||||
active_border = "rgba(ffaabbcc) rgba(ffaabbcc) rgba(ffaabbcc) 45deg",
|
||||
active_border = { colors = { "rgba(ffaabbcc)", "rgba(ffaabbcc)", "rgba(ffaabbcc)" }, angle = "45deg" },
|
||||
inactive_border = "rgba(ffaabb33)",
|
||||
},
|
||||
},
|
||||
group = {
|
||||
col = {
|
||||
active_border = "rgba(ffaabb77)",
|
||||
inactive_border = "rgba(ffaabb33)",
|
||||
border_active = "rgba(ffaabb77)",
|
||||
border_inactive = "rgba(ffaabb33)",
|
||||
},
|
||||
},
|
||||
decoration = {
|
||||
shadow = {
|
||||
color = "rgba(ffffff20)",
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
hl.window_rule({
|
||||
match = { pin = 1 },
|
||||
border_color = "rgba(ffffffaa) rgba(ffffff77)",
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
--- @param swap_escape boolean
|
||||
return function(swap_escape)
|
||||
--- @param laptop_config boolean
|
||||
return function(laptop_config)
|
||||
hl.config({
|
||||
input = {
|
||||
-- kb_options = swap_escape and "caps:swapescape" or "",
|
||||
kb_options = laptop_config and "caps:swapescape" or "",
|
||||
kb_layout = "us",
|
||||
kb_variant = "altgr-intl",
|
||||
natural_scroll = true,
|
||||
@@ -21,7 +21,7 @@ return function(swap_escape)
|
||||
scroll_factor = 4,
|
||||
},
|
||||
|
||||
focus_on_close = 1,
|
||||
focus_on_close = true,
|
||||
|
||||
sensitivity = 0,
|
||||
},
|
||||
|
||||
@@ -1,4 +1,7 @@
|
||||
hl.on("hyprland.start", function()
|
||||
return function(is_laptop)
|
||||
hl.env("QT_QPA_PLATFORM", "wayland")
|
||||
hl.env("QT_QPA_PLATFORM_THEME", "qt6ct")
|
||||
hl.on("hyprland.start", function()
|
||||
-- hl.exec_cmd("~/.config/hypr/xdg-portal-hyprland")
|
||||
-- hl.exec_cmd("dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP XAUTHORITY DISPLAY")
|
||||
-- hl.exec_cmd("systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP")
|
||||
@@ -9,5 +12,11 @@ hl.on("hyprland.start", function()
|
||||
hl.exec_cmd("nm-applet")
|
||||
hl.exec_cmd("nextcloud --background")
|
||||
hl.exec_cmd("dms run")
|
||||
hl.exec_cmd("wl-paste --type text --watch cliphist store")
|
||||
end)
|
||||
hl.exec_cmd("wl-paste --watch cliphist store")
|
||||
if is_laptop then
|
||||
hl.exec_cmd("hyprctl setcursor oreo_spark_blue_cursors 36")
|
||||
else
|
||||
hl.exec_cmd("hyprctl setcursor oreo_spark_blue_cursors 24")
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
hl.window_rule({
|
||||
match = {
|
||||
title = "Bitwarden|secret",
|
||||
},
|
||||
no_screen_share = true
|
||||
})
|
||||
|
||||
hl.window_rule({
|
||||
match = {
|
||||
class = "nm-connection-editor|[aA]uthentication",
|
||||
},
|
||||
no_screen_share = true
|
||||
})
|
||||
@@ -1,7 +1,14 @@
|
||||
hl.config({
|
||||
general = {
|
||||
col = {
|
||||
active_border = "rgba({{colors.primary.default.hex_stripped}}cc) rgba({{colors.secondary.default.hex_stripped}}cc) rgba({{colors.tertiary.default.hex_stripped}}cc) 45deg",
|
||||
active_border = {
|
||||
colors = {
|
||||
"rgba({{colors.primary.default.hex_stripped}}cc)",
|
||||
"rgba({{colors.secondary.default.hex_stripped}}cc)",
|
||||
"rgba({{colors.tertiary.default.hex_stripped}}cc)",
|
||||
},
|
||||
angle = 45,
|
||||
},
|
||||
inactive_border = "rgba({{colors.surface_container_low.default.hex_stripped}}33)",
|
||||
},
|
||||
},
|
||||
@@ -14,11 +21,6 @@ hl.config({
|
||||
decoration = {
|
||||
shadow = {
|
||||
color = "rgba({{colors.shadow.default.hex_stripped}}20)",
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
hl.window_rule({
|
||||
match = { pin = 1 },
|
||||
border_color = "rgba({{colors.primary.default.hex_stripped}}AA) rgba({{colors.primary.default.hex_stripped}}77)",
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user