diff --git a/modules/user/lucid/lucid-keybinds-rias.json b/modules/user/lucid/lucid-keybinds-rias.json index feec909..12fa358 100644 --- a/modules/user/lucid/lucid-keybinds-rias.json +++ b/modules/user/lucid/lucid-keybinds-rias.json @@ -56,7 +56,7 @@ { "id": "keyboard-brightness-up", "keys": "SUPER + F3", "desc": "Keyboard backlight up", "category": "Displays", "type": "exec", "cmd": "brightnessctl -d *::kbd_backlight set +33%" }, { "id": "keyboard-brightness-down", "keys": "SUPER + F2", "desc": "Keyboard backlight down", "category": "Displays", "type": "exec", "cmd": "brightnessctl -d *::kbd_backlight set 33%-" }, { "id": "audio-mute", "keys": "XF86AudioMute", "desc": "Toggle audio mute", "category": "Media", "type": "exec", "cmd": "pamixer -t" }, - { "id": "microphone-mute", "keys": "XF86AudioMicMute", "desc": "Toggle microphone mute", "category": "Media", "type": "exec", "cmd": "pamixer --default-source -m" }, + { "id": "microphone-mute", "keys": "XF86AudioMicMute", "desc": "Toggle microphone mute", "category": "Media", "type": "exec", "cmd": "pamixer --default-source -t" }, { "id": "play-pause", "keys": "XF86AudioPlay", "desc": "Play or pause media", "category": "Media", "type": "exec", "cmd": "playerctl play-pause" }, { "id": "file-manager-media", "keys": "XF86Explorer", "desc": "File manager", "category": "Apps", "type": "exec", "cmd": "ghostty -e sh -c yazi" }, { "id": "email", "keys": "XF86Mail", "desc": "Email", "category": "Apps", "type": "exec", "cmd": "thunderbird" }, diff --git a/user/sweetbread/modules/lucid.nix b/user/sweetbread/modules/lucid.nix index 15cd191..621e9a0 100644 --- a/user/sweetbread/modules/lucid.nix +++ b/user/sweetbread/modules/lucid.nix @@ -3,16 +3,38 @@ let host = osConfig.networking.hostName; isRias = host == "Rias"; liveDecoder = if builtins.elem osConfig.networking.hostName [ "Rias" "Eclipse" ] then "cuda" else "vaapi"; - source = pkgs.fetchgit { - url = "https://github.com/Sn3akyy1/lucid.git"; - rev = "bdd7f79da18efd837f79dcecbe5d2ec178abc10c"; - hash = "sha256-b6qylKjCGYy2Yo64i1w9g4oGrYgcXf502jY9qNNWhSI="; - sparseCheckout = [ - "/*" - "!/wallpapers/*" - "!/assets/*.webp" - ]; - nonConeMode = true; + source = pkgs.applyPatches { + src = pkgs.fetchgit { + url = "https://github.com/Sn3akyy1/lucid.git"; + rev = "bdd7f79da18efd837f79dcecbe5d2ec178abc10c"; + hash = "sha256-b6qylKjCGYy2Yo64i1w9g4oGrYgcXf502jY9qNNWhSI="; + sparseCheckout = [ + "/*" + "!/wallpapers/*" + "!/assets/*.webp" + ]; + nonConeMode = true; + }; + patches = [ (pkgs.writeText "lucid-scratchpad-target.patch" '' + diff --git a/support/hypr/modules/specials.lua b/support/hypr/modules/specials.lua + --- a/support/hypr/modules/specials.lua + +++ b/support/hypr/modules/specials.lua + @@ -176,8 +176,11 @@ + function M.scratchpad() + return function() + if space(config(), "special").enabled == false then return end + - local shown = hl.get_active_special_workspace() + - local name = shown and (shown.name:gsub("^special:", "")) or "special" + - hl.dispatch(hl.dsp.workspace.toggle_special(name)) + + local shown = hl.get_active_special_workspace() + + if shown and shown.name == "special:special" then + + hl.dispatch(hl.dsp.workspace.toggle_special("special")) + + else + + hl.dispatch(hl.dsp.focus({ workspace = "special:special" })) + + end + end + end + '') ]; }; wallpaperDir = "${config.home.homeDirectory}/Wallpapers"; wallpaperScript = "${config.home.homeDirectory}/.config/hypr/scripts/wallpaper/set-wallpaper.sh";