diff --git a/dots/.config/hypr/hyprland/execs.lua b/dots/.config/hypr/hyprland/execs.lua index df26881bb..4c277af67 100644 --- a/dots/.config/hypr/hyprland/execs.lua +++ b/dots/.config/hypr/hyprland/execs.lua @@ -2,9 +2,9 @@ hl.on("hyprland.start", function () -- Bar, wallpaper - hl.exec_cmd("~/.config/hypr/hyprland/scripts/start_geoclue_agent.sh") + hl.exec_cmd("$HOME/.config/hypr/hyprland/scripts/start_geoclue_agent.sh") hl.exec_cmd("qs -c $qsConfig") - hl.exec_cmd("~/.config/hypr/custom/scripts/__restore_video_wallpaper.sh") + hl.exec_cmd("$HOME/.config/hypr/custom/scripts/__restore_video_wallpaper.sh") -- Core components (authentication, lock screen, notification daemon) hl.exec_cmd("gnome-keyring-daemon --start --components=secrets") diff --git a/dots/.config/hypr/hyprland/keybinds.lua b/dots/.config/hypr/hyprland/keybinds.lua index 7f13b84e0..0bc929902 100644 --- a/dots/.config/hypr/hyprland/keybinds.lua +++ b/dots/.config/hypr/hyprland/keybinds.lua @@ -14,9 +14,9 @@ hl.bind("SUPER + SUPER_R", hl.dsp.global("quickshell:search hl.bind("SUPER + SUPER_L", hl.dsp.exec_cmd("qs -c $qsConfig ipc call TEST_ALIVE || pkill fuzzel || fuzzel") ) -- # [hidden] Launcher (fallback) hl.bind("SUPER + SUPER_R", hl.dsp.exec_cmd("qs -c $qsConfig ipc call TEST_ALIVE || pkill fuzzel || fuzzel") ) -- # [hidden] Launcher (fallback) -- This is required for catchall to work -hl.define_submap("global", function() -- can't seem to get it to work when adding SUPER - hl.bind("catchall", hl.dsp.global("quickshell:searchToggleReleaseInterrupt"), {ignore_mods = true, transparent = true, non_consuming = true} ) -- # [hidden] -end) +--hl.define_submap("global", function() -- can't seem to get it to work when adding SUPER +-- hl.bind("catchall", hl.dsp.global("quickshell:searchToggleReleaseInterrupt"), {ignore_mods = true, transparent = true, non_consuming = true} ) -- # [hidden] +--end) hl.bind("CTRL + SUPER_L", hl.dsp.global("quickshell:searchToggleReleaseInterrupt") ) -- # [hidden] hl.bind("CTRL + SUPER_R", hl.dsp.global("quickshell:searchToggleReleaseInterrupt") ) -- # [hidden] hl.bind("SUPER + mouse:272", hl.dsp.global("quickshell:searchToggleReleaseInterrupt") ) -- # [hidden] @@ -225,10 +225,10 @@ hl.bind("CTRL + SUPER + Up", hl.dsp.window.move({workspace = hl.bind("CTRL + SUPER + Down", hl.dsp.window.move({workspace = "r+5"}) ) -- # [hidden] --##! Virtual machines -hl.bind("SUPER + ALT + F1", hl.dsp.exec_cmd("notify-send 'Entered Virtual Machine submap' 'Keybinds disabled. Hit SUPER+ALT+F1 to escape' -a 'Hyprland' && hyprctl dispatch submap virtual-machine") ) -- Disable keybinds -hl.define_submap("virtual-machine", function() end) -hl.bind("SUPER + ALT + F1", hl.dsp.exec_cmd("notify-send 'Exited Virtual Machine submap' 'Keybinds re-enabled' -a 'Hyprland' && hyprctl dispatch submap global") ) -- # [hidden] -hl.define_submap("global", function() end) +--hl.bind("SUPER + ALT + F1", hl.dsp.exec_cmd("notify-send 'Entered Virtual Machine submap' 'Keybinds disabled. Hit SUPER+ALT+F1 to escape' -a 'Hyprland' && hyprctl dispatch submap virtual-machine") ) -- Disable keybinds +--hl.define_submap("virtual-machine", function() end) +--hl.bind("SUPER + ALT + F1", hl.dsp.exec_cmd("notify-send 'Exited Virtual Machine submap' 'Keybinds re-enabled' -a 'Hyprland' && hyprctl dispatch submap global") ) -- # [hidden] +--hl.define_submap("global", function() end) --#! --# Testing diff --git a/dots/.config/hypr/hyprland/variables.lua b/dots/.config/hypr/hyprland/variables.lua index 4dae25b03..8292af04a 100644 --- a/dots/.config/hypr/hyprland/variables.lua +++ b/dots/.config/hypr/hyprland/variables.lua @@ -1,23 +1,24 @@ -- Default variables --- Copy these to ~/.config/hypr/custom/variables.lua to make changes in a dotfiles-update-friendly manner +-- Copy these to $HOME/.config/hypr/custom/variables.lua to make changes in a dotfiles-update-friendly manner --- The folder within ~/.config/quickshell containing the config -local qsConfig = "ii" +-- The folder within $HOME/.config/quickshell containing the config +hl.env("qsConfig", "ii") -- Apps -- PULL REQUESTS ADDING MORE WILL NOT BE ACCEPTED, CONFIG FOR YOURSELF -local terminal = "~/.config/hypr/hyprland/scripts/launch_first_available.sh 'kitty -1' 'foot' 'alacritty' 'wezterm' 'konsole' 'kgx' 'uxterm' 'xterm'" -local fileManager = "~/.config/hypr/hyprland/scripts/launch_first_available.sh 'dolphin' 'nautilus' 'nemo' 'thunar' 'kitty -1 fish -c yazi'" -local browser = "~/.config/hypr/hyprland/scripts/launch_first_available.sh 'google-chrome-stable' 'zen-browser' 'firefox' 'brave' 'chromium' 'microsoft-edge-stable' 'opera' 'librewolf'" -local codeEditor = "~/.config/hypr/hyprland/scripts/launch_first_available.sh 'antigravity' 'code' 'codium' 'cursor' 'zed' 'zedit' 'zeditor' 'kate' 'gnome-text-editor' 'emacs' 'command -v nvim && kitty -1 nvim' 'command -v micro && kitty -1 micro'" -local officeSoftware = "~/.config/hypr/hyprland/scripts/launch_first_available.sh 'wps' 'onlyoffice-desktopeditors' 'libreoffice'" -local textEditor = "~/.config/hypr/hyprland/scripts/launch_first_available.sh 'kate' 'gnome-text-editor' 'emacs'" -local volumeMixer = "~/.config/hypr/hyprland/scripts/launch_first_available.sh 'pavucontrol-qt' 'pavucontrol'" -local settingsApp = "XDG_CURRENT_DESKTOP=gnome ~/.config/hypr/hyprland/scripts/launch_first_available.sh 'qs -p ~/.config/quickshell/" .. qsConfig .. "/settings.qml' 'systemsettings' 'gnome-control-center' 'better-control'" -local taskManager = "~/.config/hypr/hyprland/scripts/launch_first_available.sh 'gnome-system-monitor' 'plasma-systemmonitor --page-name Processes' 'command -v btop && kitty -1 fish -c btop'" +hl.env("terminal", "$HOME/.config/hypr/hyprland/scripts/launch_first_available.sh 'kitty -1' 'foot' 'alacritty' 'wezterm' 'konsole' 'kgx' 'uxterm' 'xterm'") +hl.env("fileManager", "$HOME/.config/hypr/hyprland/scripts/launch_first_available.sh 'dolphin' 'nautilus' 'nemo' 'thunar' 'kitty -1 fish -c yazi'") +hl.env("browser", "$HOME/.config/hypr/hyprland/scripts/launch_first_available.sh 'google-chrome-stable' 'zen-browser' 'firefox' 'brave' 'chromium' 'microsoft-edge-stable' 'opera' 'librewolf'") +hl.env("codeEditor", "$HOME/.config/hypr/hyprland/scripts/launch_first_available.sh 'antigravity' 'code' 'codium' 'cursor' 'zed' 'zedit' 'zeditor' 'kate' 'gnome-text-editor' 'emacs' 'command -v nvim && kitty -1 nvim' 'command -v micro && kitty -1 micro'") +hl.env("officeSoftware", "$HOME/.config/hypr/hyprland/scripts/launch_first_available.sh 'wps' 'onlyoffice-desktopeditors' 'libreoffice'") +hl.env("textEditor", "$HOME/.config/hypr/hyprland/scripts/launch_first_available.sh 'kate' 'gnome-text-editor' 'emacs'") +hl.env("volumeMixer", "$HOME/.config/hypr/hyprland/scripts/launch_first_available.sh 'pavucontrol-qt' 'pavucontrol'") +hl.env("settingsApp", "XDG_CURRENT_DESKTOP=gnome $HOME/.config/hypr/hyprland/scripts/launch_first_available.sh 'qs -p $HOME/.config/quickshell/$qsConfig/settings.qml' 'systemsettings' 'gnome-control-center' 'better-control'") +hl.env("taskManager", "$HOME/.config/hypr/hyprland/scripts/launch_first_available.sh 'gnome-system-monitor' 'plasma-systemmonitor --page-name Processes' 'command -v btop && kitty -1 fish -c btop'") + -- Leave blank like this to load default config. Set to anything to not. -local dontLoadDefaultExecs = "" -local dontLoadDefaultGeneral = "" -local dontLoadDefaultRules = "" -local dontLoadDefaultKeybinds = "" +global dontLoadDefaultExecs = "" +global dontLoadDefaultGeneral = "" +global dontLoadDefaultRules = "" +global dontLoadDefaultKeybinds = ""