From d78504b8c7b399e02eead0ba28d37ae8c42ace12 Mon Sep 17 00:00:00 2001 From: Pedro Rey Anca Date: Mon, 29 Jul 2024 12:33:14 +0200 Subject: [PATCH 1/4] Change lock command --- modules/home/swaync/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/home/swaync/config.json b/modules/home/swaync/config.json index 18af8c3..e0698f5 100644 --- a/modules/home/swaync/config.json +++ b/modules/home/swaync/config.json @@ -100,7 +100,7 @@ "actions": [ { "label": " Lock", - "command": "swaylock" + "command": "loginctl lock-session" }, { "label": " Reboot", From bc29f3735443e11524dec6dd35f627b55b811951 Mon Sep 17 00:00:00 2001 From: Pedro Rey Anca Date: Mon, 29 Jul 2024 13:45:25 +0200 Subject: [PATCH 2/4] Change prompts --- modules/home/scripts/scripts/screenshot-menu.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/home/scripts/scripts/screenshot-menu.sh b/modules/home/scripts/scripts/screenshot-menu.sh index 8f8eaa1..7802cf9 100755 --- a/modules/home/scripts/scripts/screenshot-menu.sh +++ b/modules/home/scripts/scripts/screenshot-menu.sh @@ -21,7 +21,7 @@ option_time_5="60s" #### Initial menu to decide wether a timer is wanted want_timer_cmd() { - echo -e "$option_1\n$option_2" | fuzzel --dmenu -p 'Screenshot' + echo -e "$option_1\n$option_2" | fuzzel --dmenu -p 'Screenshot: ' } #### @@ -30,7 +30,7 @@ want_timer_cmd() { #### Choose Timer seconds timer_cmd() { - echo -e "$option_time_1\n$option_time_2\n$option_time_3\n$option_time_4\n$option_time_5" | fuzzel --dmenu -p 'Choose timer:' + echo -e "$option_time_1\n$option_time_2\n$option_time_3\n$option_time_4\n$option_time_5" | fuzzel --dmenu -p 'Choose timer: ' } timer_menu() { @@ -59,7 +59,7 @@ timer_menu() { #### Chose Screenshot Type type_screenshot_cmd() { - echo -e "$option_capture_1\n$option_capture_2\n$option_capture_3" | fuzzel --dmenu -p 'Type Of Screenshot:' + echo -e "$option_capture_1\n$option_capture_2\n$option_capture_3" | fuzzel --dmenu -p 'Type of screenshot: ' } type_screenshot_menu() { From 741848482049401c174a3ac6fad636b01eb170d3 Mon Sep 17 00:00:00 2001 From: Pedro Rey Anca Date: Mon, 29 Jul 2024 14:09:46 +0200 Subject: [PATCH 3/4] Change empty workspaces keybinds --- modules/home/hyprland/config.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/home/hyprland/config.nix b/modules/home/hyprland/config.nix index 28e3ffe..416c0c6 100644 --- a/modules/home/hyprland/config.nix +++ b/modules/home/hyprland/config.nix @@ -172,7 +172,10 @@ 10 ) ) - ++ ["$mainMod CTRL, c, movetoworkspace, empty"] + ++ [ + "$mainMod CTRL, c, workspace, empty" + "$mainMod SHIFT, c, movetoworkspace, empty" + ] ++ ( # Window focus, movement and control builtins.concatLists ( From 3fc6414afa0b1d46752d921797962cc438730396 Mon Sep 17 00:00:00 2001 From: Pedro Rey Anca Date: Mon, 29 Jul 2024 14:09:55 +0200 Subject: [PATCH 4/4] Change swaync menu --- modules/home/swaync/config.json | 30 +++++++++++------------------- modules/home/swaync/swaync.nix | 2 +- 2 files changed, 12 insertions(+), 20 deletions(-) diff --git a/modules/home/swaync/config.json b/modules/home/swaync/config.json index e0698f5..76b3d40 100644 --- a/modules/home/swaync/config.json +++ b/modules/home/swaync/config.json @@ -58,39 +58,31 @@ } ] }, - "menu#screenshot": { + "menu#screenshotnrecord": { "label": "  ", "position": "left", "actions": [ { - "label": "󰹑 Whole screen", - "command": "grimblast --notify --cursor --freeze copy output" + "label": "󰹑 Screenshot", + "command": "bash -c 'swaync-client -t; screenshot-menu'" }, { - "label": "󰩭 Window / Region", - "command": "grimblast --notify --cursor --freeze copy area" + "label": "󰕧 Record screen", + "command": "bash -c 'swaync-client -t; kooha'" } ] }, - "menu#record": { - "label": " 󰕧 ", + "menu#wallpaper": { + "label": "  ", "position": "left", "actions": [ { - "label": " Record screen", - "command": "record screen & ; swaync-client -t" + "label": "Set Bing POtD as Wallpaper", + "command": "setbg-bpotd" }, { - "label": " Record selection", - "command": "record area & ; swaync-client -t" - }, - { - "label": " Record GIF", - "command": "record gif & ; swaync-client -t" - }, - { - "label": "󰻃 Stop", - "command": "record stop" + "label": "Set NASA APOtD as Wallpaper", + "command": "setbg-apotd" } ] }, diff --git a/modules/home/swaync/swaync.nix b/modules/home/swaync/swaync.nix index f6d0884..b0c4da2 100644 --- a/modules/home/swaync/swaync.nix +++ b/modules/home/swaync/swaync.nix @@ -1,5 +1,5 @@ {pkgs, ...}: { - home.packages = with pkgs; [swaynotificationcenter]; + home.packages = with pkgs; [swaynotificationcenter kooha]; xdg.configFile."swaync/style.css".source = ./style.css; xdg.configFile."swaync/config.json".source = ./config.json; }