diff --git a/.bashrc b/.bashrc index c6e4045..074d7c8 100644 --- a/.bashrc +++ b/.bashrc @@ -22,8 +22,6 @@ alias feh='feh --bg-fill' alias ytdl='yt-dlp -o "~/Vids/%(title)s.%(ext)s"' alias ytdlm='yt-dlp -x --audio-format opus --audio-quality 32K -o "/home/m/Music/%(title)s.%(ext)s"' alias vifm='$HOME/.config/vifm/scripts/vifmrun' -alias gitmika='git config user.name "Mika Elias Richter" && git config user.email "mika-elias.richter@tuilmenau.de"' -alias gitMulti='git config user.name "Multiiiiii" && git config user.email "multimitamiensaft@gmail.com"' alias gitconf='git config user.name && git config user.email' source /usr/share/autojump/autojump.bash diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0598fde --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +slstatus/config.h +slstatus/config.dev.h diff --git a/.scripts/screenoff b/.scripts/screenoff new file mode 100755 index 0000000..aa8294b --- /dev/null +++ b/.scripts/screenoff @@ -0,0 +1,11 @@ +#!/bin/bash + +outputs=$(xrandr | awk '/ disconnected/{print $1}') + +selected_output=$(printf "%s\n" "${outputs[@]}" | dmenu -l $(echo "$outputs" | wc -l) -i -p "Select output to disconnect:") + + +if [ -n "$selected_output" ]; then + xrandr --output "$selected_output" --off +fi + diff --git a/.scripts/wificonnect b/.scripts/wificonnect new file mode 100755 index 0000000..aca26cc --- /dev/null +++ b/.scripts/wificonnect @@ -0,0 +1,23 @@ +#!/bin/bash + +check_escape() { + if [ $? -ne 0 ]; then + exit 0 # Exit the script + fi +} + +available_networks=$(nmcli device wifi list | awk 'match($0, /.{5}(.*?)In/, m) {print substr($0, RSTART+27, RLENGTH-29)}') + +check_escape + +selected_network=$(printf "%s\n" "${available_networks[@]}" | dmenu -l $(echo "$available_networks" | wc -l) -i -p "Select network:") + +check_escape + +password=$(echo "" | dmenu -p "Enter the password:") + + + +if [ -n "$selected_network"]; then + nmcli device wifi connect "$selected_network" password "$password" +fi diff --git a/Scripts/Brightness.sh b/Scripts/Brightness.sh new file mode 100755 index 0000000..ee81b1b --- /dev/null +++ b/Scripts/Brightness.sh @@ -0,0 +1,2 @@ + +echo "$(brightnessctl get | awk '{print int(100*($1/64764))}')" diff --git a/Scripts/Vpn.sh b/Scripts/Vpn.sh index 4b6e687..841c164 100755 --- a/Scripts/Vpn.sh +++ b/Scripts/Vpn.sh @@ -6,7 +6,7 @@ vpn_status=$(mullvad status -v) if [[ $vpn_status == *"Connected"* ]]; then # Extract location from the status output - location=$(echo "$vpn_status" | awk '/Connected/ {print $6, $7}') + location=$(echo "$vpn_status" | awk '/Visible location/ {print $3 $4}') echo " $location" else echo "" diff --git a/debpkginstall.sh b/debpkginstall.sh new file mode 100755 index 0000000..8c91cc3 --- /dev/null +++ b/debpkginstall.sh @@ -0,0 +1,58 @@ + +#!/bin/bash + +# Update the package list and upgrade installed packages +sudo apt update && sudo apt upgrade -y + +# Read the package list +while IFS= read -r package; do + # Check if the package is available in the official repositories + if apt-cache show "$package" >/dev/null 2>&1; then + echo "Installing $package with apt..." + sudo apt install -y "$package" + else + echo "$package is not available in the official repositories." + fi +done < <(cat < 0 */ static unsigned int lines = 10; @@ -29,4 +30,4 @@ static unsigned int columns = 1; static const char worddelimiters[] = " "; /* Size of the window border */ -static const unsigned int border_width = 0; +static const unsigned int border_width = 2; diff --git a/dmenu/dmenu b/dmenu/dmenu deleted file mode 100755 index 5a691b3..0000000 Binary files a/dmenu/dmenu and /dev/null differ diff --git a/dmenu/dmenu.o b/dmenu/dmenu.o deleted file mode 100644 index ec12e19..0000000 Binary files a/dmenu/dmenu.o and /dev/null differ diff --git a/dmenu/drw.o b/dmenu/drw.o deleted file mode 100644 index 6022adb..0000000 Binary files a/dmenu/drw.o and /dev/null differ diff --git a/dmenu/stest b/dmenu/stest deleted file mode 100755 index 8fc1f4d..0000000 Binary files a/dmenu/stest and /dev/null differ diff --git a/dmenu/stest.o b/dmenu/stest.o deleted file mode 100644 index 63f314a..0000000 Binary files a/dmenu/stest.o and /dev/null differ diff --git a/dmenu/util.o b/dmenu/util.o deleted file mode 100644 index 8e55fa1..0000000 Binary files a/dmenu/util.o and /dev/null differ diff --git a/dwm/config.h b/dwm/config.h index afe4316..98c05de 100755 --- a/dwm/config.h +++ b/dwm/config.h @@ -41,15 +41,15 @@ static const Rule rules[] = { /* class instance title tags mask switchtotag isfloating isterminal noswallow monitor */ { "Gimp", NULL, NULL, 0, 0, 1, 0, 0, -1 }, { "warp-share",NULL, NULL, 0, 0, 1, 0, 0, -1 }, - { "waterfox", NULL, NULL, 1 << 8, 1, 0, 0, 0, -1 }, + { "firedragon", NULL, NULL, 1 << 8, 1, 0, 0, 0, -1 }, { "thunderbird", NULL, NULL, 1 << 4, 1, 0, 0, 0, -1 }, { "ArmCord", NULL, NULL, 1 << 2, 0, 0, 0, 0, -1 }, { "St", NULL, NULL, 0, 0, 0, 1, 0, -1 }, { NULL, NULL, "Event Tester", 0, 0, 0, 0, 1, -1 }, { NULL, NULL, "ncspot", 1 << 3, 1, 0, 0, 0, -1 }, { NULL, NULL, "vifm", 1 << 1, 1, 0, 1, 0, -1 }, - { "mpv", NULL, NULL, 1 << 7, 1, 0, 0, 0, -1 }, - { NULL, "sxiv", NULL, 1 << 6, 1, 0, 0, 0, -1 }, + { "mpv", NULL, NULL, 1 << 7, 0, 0, 0, 0, -1 }, + { NULL, "sxiv", NULL, 1 << 6, 0, 0, 0, 0, -1 }, }; /* layout(s) */ static const float mfact = 0.55; /* factor of master area size [0.05..0.95] */ @@ -100,12 +100,12 @@ static const char *volupcmd[] = { "pactl", "set-sink-volume", "@DEFAULT_SINK@", static const char *voldowncmd[] = { "pactl", "set-sink-volume", "@DEFAULT_SINK@", "-1000", NULL }; static const char *mutevolcmd[] = { "pactl", "set-sink-mute", "@DEFAULT_SINK@", "toggle", NULL }; static const char *mutemiccmd[] = { "pactl", "set-source-mute", "@DEFAULT_SOURCE@", "toggle", NULL }; -static const char *brightupcmd[] = { "xbacklight", "-inc", "10", NULL }; -static const char *brightdowncmd[] = { "xbacklight", "-dec", "10", NULL }; +static const char *brightupcmd[] = { "brightnessctl", "set", "+10", NULL }; +static const char *brightdowncmd[] = { "brightnessctl", "set", "10-", NULL }; static const char *nextcmd[] = { "playerctl", "next", NULL }; static const char *prevcmd[] = { "playerctl", "previous", NULL }; static const char *lockcmd[] = { "betterlockscreen", "-l", NULL }; -static const char *browsercmd[] = { "waterfox", NULL }; +static const char *browsercmd[] = { "firedragon", NULL }; static const char *filemanagercmd[] = { "st", "./.config/vifm/scripts/vifmrun", NULL }; static const char *ncpsotcmd[] = { "st", "ncspot", NULL }; static const char *discordcmd[] = { "armcord", NULL }; diff --git a/dwm/drw.o b/dwm/drw.o index 9ea9d6d..13c4fca 100644 Binary files a/dwm/drw.o and b/dwm/drw.o differ diff --git a/dwm/dwm b/dwm/dwm index 7e127fc..fbfb010 100755 Binary files a/dwm/dwm and b/dwm/dwm differ diff --git a/dwm/dwm.o b/dwm/dwm.o index ea20975..9386437 100644 Binary files a/dwm/dwm.o and b/dwm/dwm.o differ diff --git a/dwm/util.o b/dwm/util.o index 3125a97..0493952 100644 Binary files a/dwm/util.o and b/dwm/util.o differ diff --git a/install.sh b/install.sh index 1449dd5..f56a218 100755 --- a/install.sh +++ b/install.sh @@ -1,17 +1,30 @@ #!/bin/bash -read -p "Is this a minimal intsall (no wm)? [Y/n]" yn -: ${yn:=y} -if [[ $yn == [Yy]* ]]; then - - echo "Skipping..." - -else - sudo mv dwm.desktop /usr/share/xsessions/ - sudo mv dwm.sh /usr/local/bin/ -fi - +echo "Choose your distribution:" +echo "1) Debian" +echo "2) Arch" +echo "3) other" + +read -p "Enter your choice: " choice + +case $choice in + 1) + echo "You chose Debian." + ./debpkginstall.sh + ;; + 2) + echo "You use Arch btw." + paru + chaos + pkg_arch + ;; + *) + echo "Figure it out I guess" + ;; +esac + +paru() { read -p "Do you have Paru? [y/N]" yn : ${yn:=n} if [[ $yn == [Yy]* ]]; then @@ -29,7 +42,9 @@ else " ./getparu.sh fi +} +chaos(){ read -p "Do you have ChaoticAUR? [y/N]" yn : ${yn:=n} if [[ $yn == [Yy]* ]]; then @@ -52,7 +67,9 @@ else " sudo ./ChaoticAUR.sh fi +} +pkg_arch(){ read -p "Do you have the nessesary packages? [y/N]" yn : ${yn:=n} if [[ $yn == [Yy]* ]]; then @@ -76,6 +93,7 @@ else " ./pkginstall.sh fi +} echo " _ _ _ diff --git a/packages.txt b/packages.txt index 45bf167..0d6e684 100644 --- a/packages.txt +++ b/packages.txt @@ -1,4 +1,3 @@ -armcord-bin autojump base base-devel diff --git a/slstatus/components/battery.o b/slstatus/components/battery.o index 4c63c60..3bc1fae 100644 Binary files a/slstatus/components/battery.o and b/slstatus/components/battery.o differ diff --git a/slstatus/components/cat.o b/slstatus/components/cat.o index 3b50ebc..8a69b11 100644 Binary files a/slstatus/components/cat.o and b/slstatus/components/cat.o differ diff --git a/slstatus/components/cpu.o b/slstatus/components/cpu.o index 969d09c..3ef3a1b 100644 Binary files a/slstatus/components/cpu.o and b/slstatus/components/cpu.o differ diff --git a/slstatus/components/datetime.o b/slstatus/components/datetime.o index 0353444..a0bd58c 100644 Binary files a/slstatus/components/datetime.o and b/slstatus/components/datetime.o differ diff --git a/slstatus/components/disk.o b/slstatus/components/disk.o index 5ec5c0a..60031ca 100644 Binary files a/slstatus/components/disk.o and b/slstatus/components/disk.o differ diff --git a/slstatus/components/entropy.o b/slstatus/components/entropy.o index 6af57ba..19cb1f7 100644 Binary files a/slstatus/components/entropy.o and b/slstatus/components/entropy.o differ diff --git a/slstatus/components/hostname.o b/slstatus/components/hostname.o index 4384f7c..b04aa0c 100644 Binary files a/slstatus/components/hostname.o and b/slstatus/components/hostname.o differ diff --git a/slstatus/components/ip.o b/slstatus/components/ip.o index 22f306d..0cc4873 100644 Binary files a/slstatus/components/ip.o and b/slstatus/components/ip.o differ diff --git a/slstatus/components/kernel_release.o b/slstatus/components/kernel_release.o index be0be90..64fbbf6 100644 Binary files a/slstatus/components/kernel_release.o and b/slstatus/components/kernel_release.o differ diff --git a/slstatus/components/keyboard_indicators.o b/slstatus/components/keyboard_indicators.o index 001b37f..46b200a 100644 Binary files a/slstatus/components/keyboard_indicators.o and b/slstatus/components/keyboard_indicators.o differ diff --git a/slstatus/components/keymap.o b/slstatus/components/keymap.o index b9c0bca..32d8a82 100644 Binary files a/slstatus/components/keymap.o and b/slstatus/components/keymap.o differ diff --git a/slstatus/components/load_avg.o b/slstatus/components/load_avg.o index 0861fb7..a86d9b0 100644 Binary files a/slstatus/components/load_avg.o and b/slstatus/components/load_avg.o differ diff --git a/slstatus/components/netspeeds.o b/slstatus/components/netspeeds.o index fe9aca1..2c6f098 100644 Binary files a/slstatus/components/netspeeds.o and b/slstatus/components/netspeeds.o differ diff --git a/slstatus/components/num_files.o b/slstatus/components/num_files.o index 15d1365..09cd2f7 100644 Binary files a/slstatus/components/num_files.o and b/slstatus/components/num_files.o differ diff --git a/slstatus/components/ram.o b/slstatus/components/ram.o index 2dbd845..38dd4f5 100644 Binary files a/slstatus/components/ram.o and b/slstatus/components/ram.o differ diff --git a/slstatus/components/run_command.o b/slstatus/components/run_command.o index 7addb38..5eba564 100644 Binary files a/slstatus/components/run_command.o and b/slstatus/components/run_command.o differ diff --git a/slstatus/components/swap.o b/slstatus/components/swap.o index eff037e..80638d5 100644 Binary files a/slstatus/components/swap.o and b/slstatus/components/swap.o differ diff --git a/slstatus/components/temperature.o b/slstatus/components/temperature.o index 0856c7b..88a9b6b 100644 Binary files a/slstatus/components/temperature.o and b/slstatus/components/temperature.o differ diff --git a/slstatus/components/uptime.o b/slstatus/components/uptime.o index ee47012..03e4e44 100644 Binary files a/slstatus/components/uptime.o and b/slstatus/components/uptime.o differ diff --git a/slstatus/components/user.o b/slstatus/components/user.o index 83bb561..bc05baa 100644 Binary files a/slstatus/components/user.o and b/slstatus/components/user.o differ diff --git a/slstatus/components/volume.o b/slstatus/components/volume.o index 73b3122..418e127 100644 Binary files a/slstatus/components/volume.o and b/slstatus/components/volume.o differ diff --git a/slstatus/components/wifi.o b/slstatus/components/wifi.o index 91e1508..487e2c4 100644 Binary files a/slstatus/components/wifi.o and b/slstatus/components/wifi.o differ diff --git a/slstatus/config.h b/slstatus/config.h index 49d600c..ae0fa64 100644 --- a/slstatus/config.h +++ b/slstatus/config.h @@ -65,18 +65,17 @@ static const char unknown_str[] = ""; */ static const struct arg args[] = { /* function format argument */ - { wifi_perc, "[ %s%% ", "wlp3s0"}, - { netspeed_rx, "%sB/s] ", "wlp3s0" }, + { netspeed_tx, "[ %sB/s ", "wlp1s0" }, + { wifi_perc, "  %s%% ", "wlp1s0"}, + { netspeed_rx, " %sB/s] ", "wlp1s0" }, { run_command, "[%s ]", "./Suckless/Scripts/Vpn.sh"}, { run_command, "[ %s", "./Suckless/Scripts/Batterystatus.sh"}, { battery_perc, "%s%%", "BAT0"}, { battery_remaining, " %s] ", "BAT0"}, { cpu_perc, "[ %s%%] ", NULL }, { ram_perc, "[ %s%%] ", NULL }, - //{ temp, "TEMP:%s° ", "/sys/class/thermal/thermal_zone1" }, - //{ temp, ",%s° ", "/sys/class/thermal/thermal_zone0" }, { run_command, "[%s] ", "./Suckless/Scripts/Volume.sh"}, { run_command, "[%s] ", "./Suckless/Scripts/Mic.sh"}, - { run_command, "[ %s%%] ", "xbacklight -get | awk '{print int($1)}'" }, + { run_command, "[ %s%%] ", "./Suckless/Scripts/Brightness.sh" }, { datetime, "[ %s", "%F][ %T] " }, }; diff --git a/slstatus/slstatus b/slstatus/slstatus index cbcd803..7d80b3b 100755 Binary files a/slstatus/slstatus and b/slstatus/slstatus differ diff --git a/slstatus/slstatus.o b/slstatus/slstatus.o index 4464a8d..1779ceb 100644 Binary files a/slstatus/slstatus.o and b/slstatus/slstatus.o differ diff --git a/slstatus/util.o b/slstatus/util.o index 361d63f..1c2d430 100644 Binary files a/slstatus/util.o and b/slstatus/util.o differ diff --git a/st/config.h b/st/config.h index 7aa4361..67cba3f 100644 --- a/st/config.h +++ b/st/config.h @@ -257,9 +257,7 @@ static Shortcut shortcuts[] = { { TERMMOD, XK_Home, zoomreset, {.f = 0} }, { TERMMOD, XK_C, clipcopy, {.i = 0} }, { TERMMOD, XK_V, clippaste, {.i = 0} }, - { MODKEY, XK_c, clipcopy, {.i = 0} }, { ShiftMask, XK_Insert, clippaste, {.i = 0} }, - { MODKEY, XK_v, clippaste, {.i = 0} }, { ShiftMask, XK_Insert, selpaste, {.i = 0} }, { TERMMOD, XK_Num_Lock, numlock, {.i = 0} }, { ShiftMask, XK_Page_Up, kscrollup, {.i = -1} },