From 3c985fd5b3d72c4c19203d17f8633a88c97fd332 Mon Sep 17 00:00:00 2001
From: ITmail-dk <48917593+ITmail-dk@users.noreply.github.com>
Date: Fri, 7 Jan 2022 15:26:38 +0100
Subject: [PATCH] apt + config

---
 config/bspwm/bspwmrc                    |   2 +-
 config/polybar/config                   | 114 +++++++-----------------
 install-scripts/apt-install-packages.sh |   2 +-
 3 files changed, 32 insertions(+), 86 deletions(-)

diff --git a/config/bspwm/bspwmrc b/config/bspwm/bspwmrc
index 479723a..e6b7ec6 100644
--- a/config/bspwm/bspwmrc
+++ b/config/bspwm/bspwmrc
@@ -12,7 +12,7 @@ pgrep -x sxhkd > /dev/null || sxhkd &
 # Run xrandr in the terminal.
 #xrandr -s 1920x1080 &
 
-bspc monitor -d 1 2 3 4 5 6 7 8 9 0
+bspc monitor -d 1 2 3 4 5 6 7 8 9 10
 
 bspc config border_width 1
 bspc config normal_border_color 	"#0A1B2A"
diff --git a/config/polybar/config b/config/polybar/config
index 27f5690..8086a23 100644
--- a/config/polybar/config
+++ b/config/polybar/config
@@ -65,18 +65,18 @@ fixed-center = false
 background = ${colors.background}
 foreground = ${colors.foreground}
 
-line-size = 3
+line-size = 1
 line-color = #dbdbdb
 
 ;# Ttransparent or Solid color border around Polybar. (Size in Pixels) 
 border-size = 0
 border-color = #00000000
 
-padding-left = 2
-padding-right = 2
+padding-left = 0
+padding-right = 1
 
 module-margin-left = 0
-module-margin-right = 3
+module-margin-right = 1
 
 ; Findt font name - fc-list | grep FONT NAME HER
 ; font-N = <fontconfig pattern>;<vertical offset>
@@ -137,104 +137,50 @@ label-mounted = %{F#0a81f5}%mountpoint%%{F-}: %percentage_used%%
 label-unmounted = %mountpoint% not mounted
 label-unmounted-foreground = ${colors.foreground-alt}
 
-; ########################
-; ##### BSPWM MODULE #####
-; ########################
+; ##############################
+; ##### BSPWM MODULE START #####
+; ##############################
 
 [module/bspwm]
 type = internal/bspwm
 pin-workspaces = true
 enable-scroll = false
 
-label-focused = %index%
+ws-icon-0 = 1;1
+ws-icon-1 = 2;2
+ws-icon-2 = 3;3
+ws-icon-3 = 4;4
+ws-icon-4 = 5;5
+ws-icon-5 = 6;6
+ws-icon-6 = 7;7
+ws-icon-7 = 8;8
+s-icon-8 = 9;9
+ws-icon-9 = 10;10
+ws-icon-default = ""
+
+label-focused = %icon%
 label-focused-background = ${colors.background-alt}
 label-focused-underline= ${colors.underline-c1}
-label-focused-padding = 2
+label-focused-padding = 1
 
-label-occupied = %index%
-label-occupied-padding = 2
+label-occupied = %icon%
+label-occupied-padding = 1
 
-label-urgent = %index%!
+label-urgent = %icon%!
 label-urgent-background = ${colors.alert}
-label-urgent-padding = 2
+label-urgent-padding = 1
 
-label-empty = %index%
+label-empty = %icon%
 label-empty-foreground = ${colors.foreground-alt}
-label-empty-padding = 2
+label-empty-padding = 1
 
 ; Separator in between workspaces ON / OFF
 ; label-separator = |
 
-; ########################
-; ##### BSPWM MODULE #####
-; ########################
+; ############################
+; ##### BSPWM MODULE END #####
+; ############################
 
-;##########################
-;# new bspwm module new + icons start
-;[module/bspwm]
-;type = internal/bspwm
-
-;enable-click = true
-;enable-scroll = true
-;reverse-scroll = true
-;pin-workspaces = true
-
-;ws-icon-0 = 1;
-;ws-icon-1 = 2;
-;ws-icon-2 = 3;
-;ws-icon-3 = 4;
-;ws-icon-4 = 5;
-;ws-icon-5 = 6;
-;ws-icon-6 = 7;
-;ws-icon-7 = 8;
-;ws-icon-8 = 9;
-;ws-icon-9 = 10;
-;ws-icon-default = ""
-
-
-;format = <label-state> <label-mode>
-
-;label-focused = %icon%
-;label-focused-background = ${colors.background}
-;label-focused-underline= ${colors.underline-c1}
-;label-focused-padding = 2
-;label-focused-foreground = ${colors.icon-c1}
-
-;label-occupied = %icon%
-;label-occupied-padding = 2
-;label-occupied-background = ${colors.background}
-
-;label-urgent = %icon%
-;label-urgent-padding = 2
-
-;label-empty = %icon%
-;label-empty-foreground = ${colors.foreground-alt}
-;label-empty-padding = 2
-;label-empty-background = ${colors.background}
-;label-monocle = "  "
-;label-monocle-foreground = ${colors.foreground}
-;label-tiled = "  "
-;label-tiled-foreground = ${colors.foreground}
-;label-fullscreen = "  "
-;label-fullscreen-foreground = ${colors.foreground}
-;label-floating = "  "
-;label-floating-foreground = ${colors.foreground}
-;label-pseudotiled = "  "
-;label-pseudotiled-foreground = ${colors.foreground}
-;label-locked = "  "
-;label-locked-foreground = ${colors.foreground}
-;label-sticky = "  "
-;label-sticky-foreground = ${colors.foreground}
-;label-private =  "     "
-;label-private-foreground = ${colors.foreground}
-
-; Separator in between workspaces
-;label-separator = |
-;label-separator-padding = 1
-;label-separator-foreground = #ffb52a
-
-;##########################
-;# new bspwm module new + icons end
 
 [module/mpd]
 type = internal/mpd
diff --git a/install-scripts/apt-install-packages.sh b/install-scripts/apt-install-packages.sh
index 73dafe0..fb61a71 100644
--- a/install-scripts/apt-install-packages.sh
+++ b/install-scripts/apt-install-packages.sh
@@ -16,7 +16,7 @@ sleep 3
 sudo apt update && sudo apt upgrade -y
 
 # Core packages to be installed
-sudo apt install -y xorg x11-xserver-utils arandr autorandr dialog bspwm sxhkd sddm picom polybar xautolock i3lock-fancy network-manager kitty psmisc rofi pcmanfm tlp font-manager gvfs-backends nitrogen emacs lxpolkit xbacklight lxappearance htop mc mpv feh sxiv pulseaudio pulsemixer npm curl imagemagick scrot firefox-esr
+sudo apt install -y xorg x11-xserver-utils arandr autorandr dialog bspwm sxhkd sddm picom polybar xautolock i3lock-fancy network-manager kitty psmisc rofi pcmanfm tlp font-manager gvfs-backends nitrogen emacs lxpolkit xbacklight lxappearance htop mc xarchiver mpv feh sxiv pulseaudio pulsemixer npm curl imagemagick scrot firefox-esr
 
 # Software & Packages
 sudo apt install -y ranger neovim flameshot cmus ncmpcpp notify-osd neofetch flatpak cava obs-studio