From 53db17c838c8309bbde0e8414a1f424855ec52da Mon Sep 17 00:00:00 2001
From: Calin8u <alexis.calin9@etu.univ-lorraine.fr>
Date: Sun, 29 Jan 2023 18:04:03 +0100
Subject: [PATCH] updated setup and added amixer command in dwm

---
 README.md    |  15 ++++++++++++++-
 dwm/config.h |   6 +++---
 dwm/dwm      | Bin 67104 -> 67104 bytes
 dwm/dwm.o    | Bin 57200 -> 57104 bytes
 setup.sh     |  26 ++++++++++++++------------
 5 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index 584e785..bdde737 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,20 @@ Auto Gnu/Linux setup
 
 This repository contains dots file for dwm with french keyboard shortcuts and a script to setup the system how I like.
 
-Programs
+# Installation
+
+On a fresh debian or arch install the script can be executed:
+```
+bash setup.sh
+```
+
+if you just want to setup dwm you can launch:
+```
+bash install-dwm.sh
+```
+
+# Programs
+
 Here are the main programs:
 
 - dwm – the main graphical environment
diff --git a/dwm/config.h b/dwm/config.h
index 97bd756..e4c148a 100644
--- a/dwm/config.h
+++ b/dwm/config.h
@@ -97,9 +97,9 @@ static Key keys[] = {
 	TAGKEYS(                        0xe7,                      8)
 	{ MODKEY|ShiftMask,             XK_e,      quit,           {0} },
 
-	{ 0, XF86XK_AudioMute,		spawn,		SHCMD("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle; kill -44 $(pidof dwmblocks)") },
-	{ 0, XF86XK_AudioRaiseVolume,	spawn,		SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 3%+; kill -44 $(pidof dwmblocks)") },
-	{ 0, XF86XK_AudioLowerVolume,	spawn,		SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 3%-; kill -44 $(pidof dwmblocks)") },
+	{ 0, XF86XK_AudioMute,		spawn,		SHCMD("amixer set Master toggle") },
+	{ 0, XF86XK_AudioRaiseVolume,	spawn,		SHCMD("amixer -D default sset Master Playback 10%+") },
+	{ 0, XF86XK_AudioLowerVolume,	spawn,		SHCMD("amixer -D default sset Master Playback 10%-") },
 	{ 0, XF86XK_MonBrightnessUp,	spawn,		{.v = (const char*[]){ "xbacklight", "-inc", "15", NULL } } },
 	{ 0, XF86XK_MonBrightnessDown,	spawn,		{.v = (const char*[]){ "xbacklight", "-dec", "15", NULL } } },
 	{ 0, XF86XK_Sleep,		spawn,		{.v = (const char*[]){ "systemctl", "suspend", NULL } } },
diff --git a/dwm/dwm b/dwm/dwm
index 02b4e5a1eb9cb9b6e7245b6ee92a2edf7a8eb7a6..0f3ea664cadb2e5af719802770656377859e2552 100755
GIT binary patch
delta 3172
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
V?_y#!<4jlqaZSSZpG=JE%m8AU64n3!

delta 3335
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
HqdGGH0x2Y=

diff --git a/dwm/dwm.o b/dwm/dwm.o
index 6e2fa9979d16409ae1e115a18eab832d810c0fbf..2d3c03854de6fa3345208a6798bf05f1bda00c3e 100644
GIT binary patch
delta 653
zcmeyck9opA<_Q{%6E<q*Sk))yW>%yYDd@T=q@<=LmgbZw6c?wKDEKB8m!uXc1mq-E
zCM70kD;OH6>M{_oRvV@k$*hw6^z@umhT;;2l-$(3()gm%JO<s(mDcVYljpmzPJVD#
zVDkm%9UY8`lRMA2Gxkotct+f48508-G;o0_21W)320;b}hLuq94m9!2Op~R~>M?C&
zn(TE}k7*av<f^lJO#7H7uR5#8bckv4t+RSe$CxH_o!ck%0%`)pTn4zwr<f)`I;SUf
z4l1nxm4{h;iD|OddA<5;P-zb|=^Ie-05tJiQ1J*f@jFoQ1T^t`Q1J{j@dprbXNCea
ziAN9#h6*(CCs6SQH1TIlo24$~aWQ60?!0xJ=@--Fpxb7QQIk7w+cR2BK6%@oF<~<2
z9ec)t$)0!YnHKm>?z&^gSTOnI9k9e*d!`KmlfCZRF`WpQ+;!KE=}f@nQ+Mr{z64C3
x=pr^*;hqN5kATTu_v{!2CU@SmXL=Dg`P4l-Muo|o_w6|k+<-Xc)MUYX@&JlNpBMlD

delta 732
zcmbQRkNLws<_Q{%A2w>{Sk;#oB$wnU6sMNxmgVP^=B6q*xVXAGhWdoWJBGS=`o{-*
z`guDj7^~`9D`aQp<S6Kxm?)@d6lA94rzxbA=O*RkCubLHG7xKwHkvVEIL*l|Ey3ZK
zlKk}aoK!S}P|exQY8}S0Il=iv2V>1-%`@(dhbI@F5jWyyW&nc*E-=Nw$iToL$iTqB
z2Nmx?6PI9~yz7h}lQi?>S7-E?<e4W+oz-JfW}fVIR*y-Yd2-cRJtl4D$*a!plk$a{
z05O*VZn8e}<fe0aQpQke1*kmCVsqxnr_SlsTSKKi(4=jl;sI#l_E7N%G;v3$cmkTZ
zGgLeSP23eC?#xhtCgBc|V5mS7_k@Z!pox1kZ{Br2kBjldWX)U0nc|rzf4XJHxPP+d
zZF|NUlQVDIGai_{^0qzWg~=~(+cPovPu99)$9Q3K<{hxa9eXB$z{#)f*fD7YPS(0>
z$D|WDIqR++Q%K-sLl?2h2kvSxMFdWMb=QuuV6x^tdnS+g$yxX87#k+9yl2m;a1-K`
KQ<FE|l?MPFn5Z}a

diff --git a/setup.sh b/setup.sh
index cd11dff..3aa840b 100644
--- a/setup.sh
+++ b/setup.sh
@@ -25,21 +25,23 @@ if [ "$distro" == "Debian" ]; then
         # programs
         sudo apt install network-manager chromium newsboat thunderbird libreoffice pandoc texlive-full xss-lock slock xbacklight neofetch ranger htop
         sudo systemctl enable --now NetworkManager && echo 'Enabled Network Manager'
-    fi
 
-    echo 'Install VScode ? (y or n)'
-    read yn
-    if [ "$yn" == 'y' ]; then
-        # vscode
-        curl https://go.microsoft.com/fwlink/?LinkID=760868 && sudo apt install ./code*.deb
+        echo 'Install VScode ? (y or n)'
+        read yn
+        if [ "$yn" == 'y' ]; then
+            # vscode
+            curl https://go.microsoft.com/fwlink/?LinkID=760868 && sudo apt install ./code*.deb
+        fi
+
+        echo 'Install Mullvad vpn ? (y or n)'
+        read yn
+        if [ "$yn" == 'y' ]; then
+            # vscode
+            curl https://mullvad.net/download/app/deb/latest/ && sudo apt install ./Mullvad*.deb && sudo systemctl enable --now mullvad-daemon
+        fi
     fi
 
-    echo 'Install Mullvad vpn ? (y or n)'
-    read yn
-    if [ "$yn" == 'y' ]; then
-        # vscode
-        curl https://mullvad.net/download/app/deb/latest/ && sudo apt install ./Mullvad*.deb && sudo systemctl enable --now mullvad-daemon
-    fi
+    
 
 elif [ "$distro" == "Arch" ]; then
 
-- 
GitLab