fixed keybindings to change to other monitor

5 files changed, 54 insertions, 28 deletions

diff --git a/.config/XMonad/lib/Keybindings.hs b/.config/XMonad/lib/Keybindings.hs
index b0bffa6..b0f582f 100644
--- a/.config/XMonad/lib/Keybindings.hs
+++ b/.config/XMonad/lib/Keybindings.hs
@@ -27,6 +27,8 @@ import Defaults
 import TreeSelect
 import Scratchpads
 
+myMonitorKeys = [xK_m, xK_b]
+
 myMouseKeybindings :: [((ButtonMask, Button), Window -> X ())]
 myMouseKeybindings = [
     ((myModMask,        4), \w -> prevWS)
@@ -108,7 +110,7 @@ myKeybindings = [
     , ((myModMask .|. myModShiftMask', xK_k), sendMessage $ ShrinkFrom U)
   ] ++ [
     -- workspace switching
-    ((myModMask, key), windows $ W.greedyView ws) 
+    ((myModMask, key), windows $ W.view ws) 
     | (key,ws) <- myExtraWorkspaces
   ] ++ [
     -- moving window to workspace
@@ -116,19 +118,18 @@ myKeybindings = [
     | (key,ws) <- myExtraWorkspaces
   ] ++ [
     -- to swap workspace
-    -- TODO: try to change this into a key chord
     ((myModShiftMask', key), windows $ swapWithCurrent ws) 
     | (key, ws) <- zip [xK_1, xK_2, xK_3, xK_4, xK_5, xK_6, xK_7, xK_8, xK_8, xK_0] myWorkspaces
-  -- ] ++ [
-  --   -- copy
-  --   ((m .|. myModMask, key), windows $ f ws) | (key, ws) <- myWorkspaces, (f, m) <- [(copy, myModShiftMask')]
-  -- ] ++ [
-  --   -- for not swapping tags while using multihead
-  --   ((m .|. myModMask, key), windows $ f ws) | (key, ws) <- myWorkspaces, (f, m) <- [(W.view, 0), (W.shift, shiftMask)]
-  ] ++ [ -- directly focus monitors instead of cycling
-    ((m .|. myModMask, key), screenWorkspace sc >>= flip whenJust (windows . f))
-    | (key, sc) <- zip [xK_m, xK_w] [0..]
-    , (f, m) <- [(W.view, 0), (W.shift, shiftMask)]
+  ] ++ [
+    -- copy windows to other workspaces
+    ((myModShiftMask .|. controlMask, key), windows $ copy ws)
+    | (key, ws) <- zip [xK_1, xK_2, xK_3, xK_4, xK_5, xK_6, xK_7, xK_8, xK_8, xK_0] myWorkspaces
+  ] ++ [ -- focusing another monitor
+    ((myModMask, key), screenWorkspace sc >>= flip whenJust (windows . W.view))
+    | (key, sc) <- zip myMonitorKeys [0..]
+  ] ++ [ -- moving window to another monitor
+    ((myModMask .|. shiftMask, key), screenWorkspace sc >>= flip whenJust (windows . \x -> W.view x . W.shift x))
+    | (key, sc) <- zip myMonitorKeys [0..]
   ]
 
 myKeybindingsP :: [(String, X())]
diff --git a/.config/mpd/database b/.config/mpd/database
index 0a09bf8..fd7f756 100644
--- a/.config/mpd/database
+++ b/.config/mpd/database
diff --git a/.config/mpd/mpd.conf b/.config/mpd/mpd.conf
index e13748b..c2f881a 100644
--- a/.config/mpd/mpd.conf
+++ b/.config/mpd/mpd.conf
@@ -1,8 +1,8 @@
 pid_file           "/home/zt/.local/share/mpd/pid"
-#state_file         "/home/zt/.local/share/mpd/state"
+state_file         "/home/zt/.local/share/mpd/state"
 db_file            "/home/zt/.config/mpd/database"
 playlist_directory "/home/zt/.config/mpd/playlists"
-music_directory    "/home/zt/hdd/Music/Songs"
+music_directory    "/home/zt/hdd/Audio/Songs"
 port "6600"
 auto_update "yes"
 log_file           "syslog"
@@ -12,9 +12,9 @@ audio_output {
   name            "PipeWire Sound Server"
 }
 
-audio_output {
-  type            "fifo"
-  name            "Visualizer feed"
-  path            "/tmp/mpd.fifo"
-  format          "44100:16:2"
-}
+#audio_output {
+#  type            "fifo"
+#  name            "Visualizer feed"
+#  path            "/tmp/mpd.fifo"
+#  format          "44100:16:2"
+#}
diff --git a/.config/mpd/playlists/main.m3u b/.config/mpd/playlists/main.m3u
deleted file mode 100644
index 0fce2b6..0000000
--- a/.config/mpd/playlists/main.m3u
+++ /dev/null
@@ -1,8 +0,0 @@
-heeriye.opus
-pasoori.opus
-i_do.opus
-alibi.opus
-bad_habits.opus
-bbibbi.opus
-uchiyage_hanabi.opus
-the_feels.opus
diff --git a/.config/mpd/playlists/vibez.m3u b/.config/mpd/playlists/vibez.m3u
new file mode 100644
index 0000000..a0eec08
--- /dev/null
+++ b/.config/mpd/playlists/vibez.m3u
@@ -0,0 +1,33 @@
+arabella.mp3
+hall_of_fame.mp3
+everybody_dies_in_their_nightmares.mp3
+you_need_me_i_dont_need_you.mp3
+bloodstream.mp3
+do_i_wanna_know.mp3
+i_wanna_be_yours.mp3
+one_for_the_road.mp3
+r_u_mine.mp3
+snap_out_of_it.mp3
+stop_the_world_i_wanna_get_off_with_you.mp3
+why_you_only_call_me_when_youre_high.mp3
+all_we_know.mp3
+play_date.mp3
+closer.mp3
+idfc.mp3
+death_bed.mp3
+cursed_night.mp3
+double_take.mp3
+bellyache.mp3
+rude.mp3
+heat_waves.mp3
+levitating.mp3
+glad_you_came.mp3
+riptide.mp3
+paris.mp3
+tightrope.mp3
+delicate.mp3
+reminder.mp3
+running.mp3
+gaslight.mp3
+sex_drugs_etc.mp3
+leave_before_you_love_me.mp3