diff options
| -rw-r--r-- | hypr/hyprland.conf | 10 | ||||
| -rw-r--r-- | scroll/config | 62 | ||||
| -rw-r--r-- | scroll/config.d/swaysome.conf | 69 | ||||
| -rw-r--r-- | scroll/scripts/scratchpad.lua | 12 | ||||
| -rw-r--r-- | waybar/config | 300 |
5 files changed, 174 insertions, 279 deletions
diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 25b7460..6dbbef6 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -250,11 +250,13 @@ $secdMod = ALT # hyprscrolling layout binds #bind = $mainMod+SHIFT, H, layoutmsg, move -1 #HYPRSCROLLING #bind = $mainMod+SHIFT, L, layoutmsg, move +1 #HYPRSCROLLING -bind = $mainMod+CTRL, H, layoutmsg, movewindowto l #HYPRSCROLLING -bind = $mainMod+CTRL, L, layoutmsg, movewindowto r #HYPRSCROLLING +bind = $mainMod+SHIFT, H, layoutmsg, movewindowto l #HYPRSCROLLING +bind = $mainMod+SHIFT, J, layoutmsg, movewindowto d #HYPRSCROLLING +bind = $mainMod+SHIFT, K, layoutmsg, movewindowto u #HYPRSCROLLING +bind = $mainMod+SHIFT, L, layoutmsg, movewindowto r #HYPRSCROLLING #bind = $mainMod+SHIFT, H, movewindow, l #HYPRSCROLLING -bind = $mainMod+SHIFT, L, movewindow, r #HYPRSCROLLING -bind = $mainMod+SHIFT, K, movewindow, u #HYPRSCROLLING +#bind = $mainMod+SHIFT, L, movewindow, r #HYPRSCROLLING +#bind = $mainMod+SHIFT, K, movewindow, u #HYPRSCROLLING #bind = $mainMod+SHIFT, J, movewindow, d #HYPRSCROLLING bind = $mainMod, H, layoutmsg, focus l #HYPRSCROLLING bind = $mainMod, J, layoutmsg, focus d #HYPRSCROLLING diff --git a/scroll/config b/scroll/config index 4fd9991..29c8cab 100644 --- a/scroll/config +++ b/scroll/config @@ -6,7 +6,10 @@ # # Read `man 5 scroll` for a complete reference. -include ~/.config/scroll/config.d/* +include /etc/scroll/config.d/* + +# This includes config.d/user.conf, which should set the $home variable +include ~/.config/scroll/config.d/user.conf ### Variables # @@ -123,6 +126,9 @@ animations { # Start your launcher bindsym $mod+e exec $rmenu bindsym $mod+d exec $dmenu + + # Start restart menu + bindsym $mod+r exec rs # Launch your file manager bindsym $mod+Alt+f exec $filemanager @@ -179,36 +185,38 @@ animations { bindsym $mod+Shift+j focus output down bindsym $mod+Shift+k focus output up bindsym $mod+Shift+l focus output right -# -# Workspaces: -# - # Switch to workspace - bindsym $mod+1 workspace number 1 - bindsym $mod+2 workspace number 2 - bindsym $mod+3 workspace number 3 - bindsym $mod+4 workspace number 4 - bindsym $mod+5 workspace number 5 - bindsym $mod+6 workspace number 6 - bindsym $mod+7 workspace number 7 - bindsym $mod+8 workspace number 8 - bindsym $mod+9 workspace number 9 - # Move focused container to workspace - bindsym $mod+Shift+1 move container to workspace number 1; workspace number 1 - bindsym $mod+Shift+2 move container to workspace number 2; workspace number 2 - bindsym $mod+Shift+3 move container to workspace number 3; workspace number 3 - bindsym $mod+Shift+4 move container to workspace number 4; workspace number 4 - bindsym $mod+Shift+5 move container to workspace number 5; workspace number 5 - bindsym $mod+Shift+6 move container to workspace number 6; workspace number 6 - bindsym $mod+Shift+7 move container to workspace number 7; workspace number 7 - bindsym $mod+Shift+8 move container to workspace number 8; workspace number 8 - bindsym $mod+Shift+9 move container to workspace number 9; workspace number 9 - # Note: workspaces can have any name you want, not just numbers. - # We just use 1-10 as the default. + # Move window to other monitors bindsym $mod+Shift+Ctrl+h move container to output left bindsym $mod+Shift+Ctrl+j move container to output down bindsym $mod+Shift+Ctrl+k move container to output up bindsym $mod+Shift+Ctrl+l move container to output right +## +## Workspaces: +## NOW USING SWAYSOME +## +# # Switch to workspace +# bindsym $mod+1 workspace number 1 +# bindsym $mod+2 workspace number 2 +# bindsym $mod+3 workspace number 3 +# bindsym $mod+4 workspace number 4 +# bindsym $mod+5 workspace number 5 +# bindsym $mod+6 workspace number 6 +# bindsym $mod+7 workspace number 7 +# bindsym $mod+8 workspace number 8 +# bindsym $mod+9 workspace number 9 +# # Move focused container to workspace +# bindsym $mod+Shift+1 move container to workspace number 1; workspace number 1 +# bindsym $mod+Shift+2 move container to workspace number 2; workspace number 2 +# bindsym $mod+Shift+3 move container to workspace number 3; workspace number 3 +# bindsym $mod+Shift+4 move container to workspace number 4; workspace number 4 +# bindsym $mod+Shift+5 move container to workspace number 5; workspace number 5 +# bindsym $mod+Shift+6 move container to workspace number 6; workspace number 6 +# bindsym $mod+Shift+7 move container to workspace number 7; workspace number 7 +# bindsym $mod+Shift+8 move container to workspace number 8; workspace number 8 +# bindsym $mod+Shift+9 move container to workspace number 9; workspace number 9 +# # Note: workspaces can have any name you want, not just numbers. +# # We just use 1-10 as the default. # Scaling # Workspace @@ -579,4 +587,4 @@ bar { #} } # -include /etc/scroll/config.d/* +include ~/.config/scroll/config.d/* diff --git a/scroll/config.d/swaysome.conf b/scroll/config.d/swaysome.conf new file mode 100644 index 0000000..eebf6a3 --- /dev/null +++ b/scroll/config.d/swaysome.conf @@ -0,0 +1,69 @@ +# vim: ft=swayconfig +# +# Use (un)bindcode or (un)bindsym, depending on what you used in your main sway config file. +# The `--no-warn` setting is only added to shortcuts that exist in the default config. You may want to add or remove +# that flag on some bindings depending on your config. + + +# Change focus between workspaces +bindsym --no-warn $mod+1 exec "swaysome focus 1" +bindsym --no-warn $mod+2 exec "swaysome focus 2" +bindsym --no-warn $mod+3 exec "swaysome focus 3" +bindsym --no-warn $mod+4 exec "swaysome focus 4" +bindsym --no-warn $mod+5 exec "swaysome focus 5" +bindsym --no-warn $mod+6 exec "swaysome focus 6" +bindsym --no-warn $mod+7 exec "swaysome focus 7" +bindsym --no-warn $mod+8 exec "swaysome focus 8" +bindsym --no-warn $mod+9 exec "swaysome focus 9" +#bindsym --no-warn $mod+0 exec "swaysome focus 0" + +# Move containers between workspaces +bindsym --no-warn $mod+Shift+1 exec "swaysome move 1" +bindsym --no-warn $mod+Shift+2 exec "swaysome move 2" +bindsym --no-warn $mod+Shift+3 exec "swaysome move 3" +bindsym --no-warn $mod+Shift+4 exec "swaysome move 4" +bindsym --no-warn $mod+Shift+5 exec "swaysome move 5" +bindsym --no-warn $mod+Shift+6 exec "swaysome move 6" +bindsym --no-warn $mod+Shift+7 exec "swaysome move 7" +bindsym --no-warn $mod+Shift+8 exec "swaysome move 8" +bindsym --no-warn $mod+Shift+9 exec "swaysome move 9" +#bindsym --no-warn $mod+Shift+0 exec "swaysome move 0" + +# Focus workspace groups +bindsym $mod+Alt+1 exec "swaysome focus-group 1" +bindsym $mod+Alt+2 exec "swaysome focus-group 2" +bindsym $mod+Alt+3 exec "swaysome focus-group 3" +bindsym $mod+Alt+4 exec "swaysome focus-group 4" +bindsym $mod+Alt+5 exec "swaysome focus-group 5" +bindsym $mod+Alt+6 exec "swaysome focus-group 6" +bindsym $mod+Alt+7 exec "swaysome focus-group 7" +bindsym $mod+Alt+8 exec "swaysome focus-group 8" +bindsym $mod+Alt+9 exec "swaysome focus-group 9" +#bindsym $mod+Alt+0 exec "swaysome focus-group 0" + +# Move containers to other workspace groups +bindsym $mod+Alt+Shift+1 exec "swaysome move-to-group 1" +bindsym $mod+Alt+Shift+2 exec "swaysome move-to-group 2" +bindsym $mod+Alt+Shift+3 exec "swaysome move-to-group 3" +bindsym $mod+Alt+Shift+4 exec "swaysome move-to-group 4" +bindsym $mod+Alt+Shift+5 exec "swaysome move-to-group 5" +bindsym $mod+Alt+Shift+6 exec "swaysome move-to-group 6" +bindsym $mod+Alt+Shift+7 exec "swaysome move-to-group 7" +bindsym $mod+Alt+Shift+8 exec "swaysome move-to-group 8" +bindsym $mod+Alt+Shift+9 exec "swaysome move-to-group 9" +#bindsym $mod+Alt+Shift+0 exec "swaysome move-to-group 0" + +# Move focused container to next output +bindsym $mod+o exec "swaysome next-output" +# Move focused container to previous output +bindsym $mod+Shift+o exec "swaysome prev-output" + +# Move focused workspace group to next output +bindsym $mod+Alt+o exec "swaysome workspace-group-next-output" +# Move focused workspace group to previous output +bindsym $mod+Alt+Shift+o exec "swaysome workspace-group-prev-output" + +# Init workspaces for every screen +exec "swaysome init 1" + + diff --git a/scroll/scripts/scratchpad.lua b/scroll/scripts/scratchpad.lua index 6972843..0afaa97 100644 --- a/scroll/scripts/scratchpad.lua +++ b/scroll/scripts/scratchpad.lua @@ -6,12 +6,14 @@ local command = nil for i, arg in ipairs(args) do if i <= 1 then id = arg + if #args == 1 then + command = arg + end elseif i == 2 then if (arg == "kitty") then terminal = true else command = arg - --terminal = true end elseif (terminal == true) then command = arg @@ -19,21 +21,21 @@ for i, arg in ipairs(args) do end end ---scroll.command(nil, "exec notify-send \"Spawn command\" \"" .. command .. "\"") +command = command or "kitty" local function exists(id) - local is_in_array = false + local is_in_scratchpad = false local cons = scroll.scratchpad_get_containers() for _, con in ipairs(cons) do local views = scroll.container_get_views(con) for _, view in ipairs(views) do local app_id = scroll.view_get_app_id(view) if (app_id == id) then - is_in_array = true + is_in_scratchpad = true end end end - return is_in_array + return is_in_scratchpad end local function is_focused(id) diff --git a/waybar/config b/waybar/config index 0a409a6..c6cb9f5 100644 --- a/waybar/config +++ b/waybar/config @@ -1,13 +1,15 @@ -[{ +{ "layer": "bottom", "position": "top", "height": 36, - "output": "DP-2", + //"output": "%%DISPLAY%%", "spacing": 4, + //"margin-top": 5, + //"margin-bottom": 5, // Choose the order of the modules - "modules-left":[ "hyprland/workspaces", "custom/launcher", "hyprland/window"], + "modules-left":[ "sway/workspaces", "custom/launcher", "sway/window"], "modules-center":[], "modules-right":[ "tray", "mpd", "idle_inhibitor", "temperature#cpu0", "temperature#cpu1", "temperature#gpu0", "temperature#gpu1", "temperature#gpu2", "wireplumber", "cpu", "memory", "network", "clock", "custom/power"], @@ -16,17 +18,57 @@ "sway/workspaces": { "all-outputs": false, "persistent-workspaces": { - "1": ["DP-2"], - "2": ["DP-2"], - "3": ["DP-2"], - "4": ["DP-2"], - "5": ["DP-2"], - "6": ["DP-2"], - "7": ["DP-2"], - "8": ["DP-2"], - "9": ["DP-2"], + "11": ["DP-2"], + "12": ["DP-2"], + "13": ["DP-2"], + "14": ["DP-2"], + "15": ["DP-2"], + "16": ["DP-2"], + "17": ["DP-2"], + "18": ["DP-2"], + "19": ["DP-2"], + "21": ["HDMI-A-1"], + "22": ["HDMI-A-1"], + "23": ["HDMI-A-1"], + "24": ["HDMI-A-1"], + "25": ["HDMI-A-1"], + "26": ["HDMI-A-1"], + "27": ["HDMI-A-1"], + "28": ["HDMI-A-1"], + "29": ["HDMI-A-1"], + }, + "format": "{icon}", + "format-icons": { + "1": "1", + "2": "2", + "3": "3", + "4": "4", + "5": "5", + "6": "6", + "7": "7", + "8": "8", + "9": "9", + "10": "0", + "11": "1", + "12": "2", + "13": "3", + "14": "4", + "15": "5", + "16": "6", + "17": "7", + "18": "8", + "19": "9", + "20": "0", + "21": "1", + "22": "2", + "23": "3", + "24": "4", + "25": "5", + "26": "6", + "27": "7", + "28": "8", + "29": "9", }, - "format": "{value}", }, "niri/workspaces": { "format": "{value}", @@ -59,7 +101,7 @@ }, "persistent-workspaces": { "DP-2": [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ], - //"DP-2": [ 10, 11, 12, 13, 14, 15, 16, 17, 18 ], + "HDMI-A-1": [ 10, 11, 12, 13, 14, 15, 16, 17, 18 ], }, "on-scroll-up": "hyprctl dispatch split:workspace r+1", "on-scroll-down": "hyprctl dispatch split:workspace r-1", @@ -214,232 +256,4 @@ "format": " ", "on-click": "grimshot --notify save area $HOME/Pictures/$(zenity --entry --text 'Set filename:' --entry-text '.png')" } -}, -{ - "layer": "bottom", - "position": "top", - "height": 36, - "output": "HDMI-A-1", - "spacing": 4, - - // Choose the order of the modules - - "modules-left":[ "hyprland/workspaces", "custom/launcher", "hyprland/window"], - "modules-center":[], - "modules-right":[ "tray", "mpd", "idle_inhibitor", "temperature#cpu0", "temperature#cpu1", "temperature#gpu0", "temperature#gpu1", "temperature#gpu2", "wireplumber", "cpu", "memory", "network", "clock", "custom/power"], - - // Modules configuration - - "sway/workspaces": { - "all-outputs": false, - "persistent-workspaces": { - "1": ["HDMI-A-1"], - "2": ["HDMI-A-1"], - "3": ["HDMI-A-1"], - "4": ["HDMI-A-1"], - "5": ["HDMI-A-1"], - "6": ["HDMI-A-1"], - "7": ["HDMI-A-1"], - "8": ["HDMI-A-1"], - "9": ["HDMI-A-1"], - }, - "format": "{value}", - }, - "niri/workspaces": { - "format": "{value}", - "all-outputs": false, - "on-click": "activate" - }, - "hyprland/workspaces": { - "format": "{icon}", - "active-only": false, - "all-outputs": false, - "format-icons": { - "1": "1", - "2": "2", - "3": "3", - "4": "4", - "5": "5", - "6": "6", - "7": "7", - "8": "8", - "9": "9", - "10": "1", - "11": "2", - "12": "3", - "13": "4", - "14": "5", - "15": "6", - "16": "7", - "17": "8", - "18": "9", - }, - "persistent-workspaces": { - //"HDMI-A-1": [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ], - "HDMI-A-1": [ 10, 11, 12, 13, 14, 15, 16, 17, 18 ], - }, - "on-scroll-up": "hyprctl dispatch split:workspace r+1", - "on-scroll-down": "hyprctl dispatch split:workspace r-1", - "on-click": "activate" - }, - "sway/window": { - "separate-outputs": true, - "icon": true, - "format": "{title}", - "expand": true - }, - "niri/window": { - "separate-outputs": true, - "icon": true, - "format": "{title}", - "expand": true - }, - "hyprland/window": { - "separate-outputs": true, - "icon": true, - "format": "{title}", - "expand": true - }, - "keyboard-state": { - "numlock": true, - "capslock": true, - "format": " {name} {icon}", - "format-icons": { - "locked": "", - "unlocked": "" - } - }, - "mpd": { - "format": "{artist} - {title}", - "format-stopped": "", - "format-paused": "{artist} - {title}", - "format-disconnected": "", - "artist-len": 15, - "title-len": 15, - //"album-len": 15, - //"max-length": 200, - "on-click": "mpc toggle" - }, - "idle_inhibitor": { - "format": "{icon}", - "format-icons": { - "activated": "", - "deactivated": "" - } - }, - "tray": { - "icon-size": 20, - "spacing": 10 - }, - "clock": { - // "timezone": "America/New_York", - "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>", - "format-alt": "{:%Y-%m-%d}" - }, - "cpu": { - "format": "{usage}% ", - "tooltip": false - }, - "memory": { - "format": "{}% " - }, - "battery": { - "bat": "BAT0", - "interval": 60, - "state": { - "warning": 30, - "critical": 15 - }, - "format": "{capacity}%", - "max-length": 25 - }, - "temperature#cpu0": { - // "thermal-zone": 2, - "hwmon-path": "/sys/class/hwmon/hwmon3/temp1_input", - "critical-threshold": 80, - "format-critical": "CPU TCT {temperatureC}°C {icon}", - "format": "", - "format-icons": ["", "", ""] - }, - "temperature#cpu1": { - // "thermal-zone": 2, - "hwmon-path": "/sys/class/hwmon/hwmon3/temp3_input", - "critical-threshold": 80, - "format-critical": "CPU TCC {temperatureC}°C {icon}", - "format": "", - "format-icons": ["", "", ""] - }, - "temperature#gpu0": { - // "thermal-zone": 2, - "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input", - "critical-threshold": 100, - "format-critical": "GPU EDG {temperatureC}°C {icon}", - "format": "", - "format-icons": ["", "", ""] - }, - "temperature#gpu1": { - // "thermal-zone": 2, - "hwmon-path": "/sys/class/hwmon/hwmon2/temp2_input", - "critical-threshold": 110, - "format-critical": "GPU JUN {temperatureC}°C {icon}", - "format": "", - "format-icons": ["", "", ""] - }, - "temperature#gpu2": { - // "thermal-zone": 2, - "hwmon-path": "/sys/class/hwmon/hwmon2/temp3_input", - "critical-threshold": 105, - "format-critical": "GPU MEM {temperatureC}°C {icon}", - "format": "", - "format-icons": ["", "", ""] - }, - "backlight": { - // "device": "acpi_video1", - "format": "{percent}%" - //"format-icons": ["", ""] - }, - "network": { - // "interface": "wlp2*", // (Optional) To force the use of this interface - "format-wifi": "{essid} ({signalStrength}%) ", - "format-ethernet": "Connected ", - "tooltip-format": "{ifname} via {gwaddr} ", - "format-linked": "{ifname} (No IP) ", - "format-disconnected": "Disconnected ⚠", - "format-alt": "{ifname}: {ipaddr}/{cidr}", - "max-length": 22, - "on-click-right": "bash ~/.config/rofi/wifi_menu/rofi_wifi_menu" - }, - "pulseaudio": { - // "scroll-step": 1, // %, can be a float - "format": "{volume}% {icon}", - "format-bluetooth": "{volume}% {icon}", - "format-bluetooth-muted": "{icon} {format_source}", - "format-muted": "{format_source}", - "format-source": "", - "format-source-muted": "", - "format-icons": { - "headphone": "", - "hands-free": "", - "headset": "", - "phone": "", - "portable": "", - "car": "", - "default": ["", "", ""] - }, - "on-click": "pavucontrol" - }, - "custom/launcher":{ - "format": "", - "on-click": "exec $(tofi-drun)", - "on-click-right": "killall tofi" - }, - "custom/power":{ - "format": " ", - "on-click": "nwg-bar", - "on-click-right": "killall nwg-bar" - }, - "custom/snip":{ - "format": " ", - "on-click": "grimshot --notify save area $HOME/Pictures/$(zenity --entry --text 'Set filename:' --entry-text '.png')" - } -}] +} |