diff --git a/roles/xmonad/files/xmobarrc_t460p b/roles/xmonad/files/xmobarrc_t460p index 4b82bac..138f77e 100644 --- a/roles/xmonad/files/xmobarrc_t460p +++ b/roles/xmonad/files/xmobarrc_t460p @@ -13,10 +13,9 @@ Config { font = "xft:Iosevka-Regular:size=11:antialias=true" , Run MultiCpu ["-t", "CPU: %"] 10 , Run Com "uname" ["-r"] "" 0 , Run Com "pamixer" ["--get-volume-human"] "vol" 1 - , Run Com "pamixer" ["--default-source", "--get-mute"] "mic" 1 , Run StdinReader ] , sepChar = "%" , alignSep = "}{" - , template = " | %StdinReader% }{ %dynnetwork% | %multicpu% | %memory% | %uname% | %kbd% | %battery% | Vol: %vol% | MicMute: %mic% | %date% | " + , template = " | %StdinReader% }{ %dynnetwork% | %multicpu% | %memory% | %uname% | %kbd% | %battery% | Vol: %vol% | %date% | " } diff --git a/roles/xmonad/files/xmonad_t460p.hs b/roles/xmonad/files/xmonad_t460p.hs index 2859b36..ead40c0 100644 --- a/roles/xmonad/files/xmonad_t460p.hs +++ b/roles/xmonad/files/xmonad_t460p.hs @@ -154,7 +154,7 @@ myAdditionalKeys = , ("M-n", namedScratchpadAction myScratchpads "nnn") , ("M-S-a", namedScratchpadAction myScratchpads "keepassxc") , ("M-s v", namedScratchpadAction myScratchpads "vimwiki") - , ("M-s-a", namedScratchpadAction myScratchpads "pavucontrol") + , ("M-s a", namedScratchpadAction myScratchpads "pavucontrol") -- open terminal , ("M-S-", spawnShell) @@ -168,10 +168,12 @@ myAdditionalKeys = , ("M-S-f", withFocused $ windows . W.sink) -- media keys - , ("", spawn "pamixer -t") + , ("", spawn "pamixer -t" *> spawn "brightnessctl -q -d platform::mute s $((1-$(brightnessctl -d platform::mute g)))") , ("", spawn "pamixer -d 5") , ("", spawn "pamixer -i 5") - , ("", spawn "pamixer --default-source -t") + , ("", spawn "pamixer --default-source -t" *> spawn "brightnessctl -q -d platform::micmute s $((1-$(brightnessctl -d platform::micmute g)))") + , ("", spawn "brightnessctl -q -- s '-10%'") + , ("", spawn "brightnessctl -q -- s '+10%'") -- lock screen , ("M-S-l", spawn "slock") diff --git a/roles/xmonad/tasks/main.yml b/roles/xmonad/tasks/main.yml index 3ab44b9..ef750b2 100644 --- a/roles/xmonad/tasks/main.yml +++ b/roles/xmonad/tasks/main.yml @@ -1,5 +1,5 @@ --- -- name: Install xmonad and xmobar packages +- name: Install general packages ansible.builtin.package: name: - xmonad @@ -11,6 +11,15 @@ become: true tags: pc +- name: Install t460p specifig packages + ansible.builtin.package: + name: + - pavucontrol + - pamixer + - brightnessctl + state: present + tags: t460p + # - name: Build and install custom st, dmenu and slock # tags: pc