Merge branch 'arch' into gentoo

home/.config/xmonad/xmonad.hs

@@ -115,10 +115,11 @@ myKeys =
     , ("M-S-<Return>", spawn "dmenu_run -i -p \"Run: \"")
 
     -- Screenshots
-    , ("<Print>",       spawn "screenshot --xmonad")        -- Full screenshot, file
+    , ("<Print>",       spawn "flameshot gui")
-    , ("M-<Print>",     spawn "screenshot --xmonad -c")     -- Full screenshot, clipboard
+    , ("M-<Print>",     spawn "flameshot screen -p ~/Pictures/Screenshots")
-    , ("S-<Print>",     spawn "screenshot --xmonad -s")     -- Selection screenshot, file
+    , ("M-S-<Print>",   spawn "flameshot screen -c")
-    , ("M-S-<Print>",   spawn "screenshot --xmonad -s -c")  -- Selection screenshot, clipboard
+    , ("C-<Print>",     spawn "flameshot full -p ~/Pictures/Screenshots")
+    , ("C-S-<Print>",   spawn "flameshot full -c")
 
     -- Script shortcuts
     , ("M-S-p",         spawn "setbg ~/Pictures/Wallpapers/Active")  -- Set random background
@@ -128,6 +129,10 @@ myKeys =
     , ("M-w", kill1)        -- Kill the currently focused client
     , ("M-S-w", killAll)    -- Kill all windows on current workspace
 
+    -- Compositor
+    , ("M-C-x",     spawn "picom -b")       -- Run picom compositor
+    , ("M-S-x",     spawn "killall picom")  -- Kill picom compositor
+
     -- Workspaces
     , ("M-.", nextScreen)   -- Switch focus to next monitor
     , ("M-,", prevScreen)   -- Switch focus to prev monitor

home/.local/bin/scripts/screenshot

@@ -1,63 +0,0 @@
-#!/bin/bash
-
-format="Screenshot_%Y%m%d_%H%M%S.png"
-destination="~/Pictures/Screenshots/"
-clipboard=0
-xmonad=0
-
-POSITIONAL=()
-while [[ $# -gt 0 ]] ;do
-    key=$1
-
-    case $key in
-        -c|--clipboard)
-            clipboard=1
-            shift
-            ;;
-        --xmonad)
-            xmonad=1
-            shift
-            ;;
-        -f|--format)
-            format=$2
-            shift
-            shift
-            ;;
-        -d|--destination)
-            destination=$2
-            shift
-            shift
-            ;;
-        -e|--exec)
-            echo "Can't use exec, already used by script"
-            exit 1
-            ;;
-        *)
-            POSITIONAL+=("$1")
-            shift
-            ;;
-    esac
-done
-
-set -- "${POSITIONAL[@]}" # restore positional parameters
-
-# Define the base command
-cmd="scrot '$format'"
-
-# Handle exec arg for img destination (clipboard/folder)
-if [ $clipboard -eq 1 ]; then
-    cmd+=" -e 'xclip -selection clipboard -t image/png -i \$f && rm \$f'"
-else
-    cmd+=" -e 'mv \$f $destination'"
-fi
-
-# For some reason, xmonad can't run this without first sleeping
-if [ $xmonad -eq 1 ]; then
-    cmd="sleep 0.2; $cmd"
-fi
-
-# Add user-defined arguments
-cmd+=" $@"
-
-# Execute the string command
-eval $cmd