Move dmm menu definitions to ~/.config/dmm folder

abysssol · Apr 17, 2024 · 7133a45 · 7133a45
1 parent 76735cb
commit 7133a45
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 17 deletions.
diff --git a/.config/xmonad/common.toml → .config/dmm/common.toml b/.config/xmonad/common.toml → .config/dmm/common.toml
@@ -3,6 +3,8 @@ music = "alacritty -e mpv --shuffle --loop-playlist ~/Music/{music, nightcore, o
 steam = true
 heroic = true
 prismlauncher = true
+keepassxc = true
+element = "element-desktop"
 
 [config.dmenu]
 prompt = "common:"
diff --git a/.config/xmonad/run.toml → .config/dmm/run.toml b/.config/xmonad/run.toml → .config/dmm/run.toml
diff --git a/.config/dmm/sway-system.toml b/.config/dmm/sway-system.toml
@@ -0,0 +1,9 @@
+[menu]
+poweroff = "systemctl poweroff"
+reboot = "systemctl reboot"
+suspend = "lock-sway & systemctl suspend"
+hibernate = { run = "lock-sway & systemctl hibernate", group = -1 }
+
+
+[config.dmenu]
+prompt = "system:"
diff --git a/.config/xmonad/system.toml → .config/dmm/system.toml b/.config/xmonad/system.toml → .config/dmm/system.toml
diff --git a/.config/sway/config b/.config/sway/config
@@ -17,9 +17,9 @@ set $term alacritty
 set $browser librewolf
 
 # Application launchers
-set $run dmm ~/.config/xmonad/run.toml
-set $common dmm ~/.config/xmonad/common.toml
-set $system dmm ~/.config/sway/system.toml
+set $run dmm ~/.config/dmm/run.toml
+set $common dmm ~/.config/dmm/common.toml
+set $system dmm ~/.config/dmm/sway-system.toml
 
 #
 ### Theme

diff --git a/.config/sway/system.toml b/.config/sway/system.toml
diff --git a/.config/xmonad/startup.fish b/.config/xmonad/startup.fish
@@ -4,7 +4,7 @@ xrandr --output DisplayPort-0 --mode 2560x1440 --rate 165 --pos 0x0 --primary \
     --output HDMI-A-0 --mode 1920x1080 --rate 60 --pos 2560x360
 xsetroot -cursor_name left_ptr
 
-feh --no-fehbg --bg-max ~/.config/xmonad/background
+feh --no-fehbg --bg-max ~/Pictures/background
 
 pkill unclutter
 unclutter --timeout 5 --jitter 16 &

diff --git a/.config/xmonad/xmonad.hs b/.config/xmonad/xmonad.hs
@@ -53,7 +53,7 @@ browser = "librewolf"
 
 screenLocker = "slock"
 
-dmm script = concat ["dmm ~/.config/xmonad/", script, ".toml"]
+dmm script = concat ["dmm ~/.config/dmm/", script, ".toml"]
 
 myWorkspaces = ["web", "dev", "doc", "launch", "5", "6", "7", "8", "9", "0"]
 
@@ -64,7 +64,7 @@ wsKeys = [xK_1 .. xK_9] ++ [xK_grave]
 -- mod + monitorKey ;; move focus to monitor
 -- mod + shift + monitorKey ;; move focused window to monitor
 -- mod + control + monitorKey ;; swap workspace with monitor
-monitorKeys = [xK_h, xK_l]
+monitorKeys = [xK_Left, xK_Right]
 
 myStartupHook = spawn "~/.config/xmonad/startup.fish"
 
@@ -107,10 +107,10 @@ myKeys conf@(XConfig {XMonad.modMask = modMask}) =
       ((m_s, xK_r), spawn $ dmm "common"),
       ((m, xK_r), spawn $ dmm "run"),
       -- Window Control
-      ((m, xK_Left), windows W.focusMaster),
+      ((m, xK_m), windows W.focusMaster),
       ((m, xK_Down), windows W.focusDown),
       ((m, xK_Up), windows W.focusUp),
-      ((m_s, xK_Left), windows W.swapMaster),
+      ((m_s, xK_m), windows W.swapMaster),
       ((m_s, xK_Down), windows W.swapDown),
       ((m_s, xK_Up), windows W.swapUp),
       ((m_s, xK_c), kill),