diff --git a/1-install.sh b/1-install.sh index 6a064ae..bf1e4bb 100755 --- a/1-install.sh +++ b/1-install.sh @@ -44,13 +44,11 @@ done echo "" echo "-> Install main packages" -packagesPacman=("alacritty" "scrot" "nitrogen" "picom" "starship" "slock" "neomutt" "neovim" "rofi" "dunst" "ueberzug" "mpv" "freerdp" "spotifyd" "xfce4-power-manager" "python-pip" "thunar" "mousepad" "ttf-font-awesome" "ttf-fira-sans" "ttf-fira-code" "ttf-firacode-nerd" "figlet" "cmatrix" "lxappearance" "polybar" "breeze" "breeze-gtk" "rofi-calc" "vlc"); +packagesPacman=("alacritty" "scrot" "nitrogen" "picom" "starship" "slock" "neovim" "rofi" "dunst" "mpv" "freerdp" "xfce4-power-manager" "thunar" "mousepad" "ttf-font-awesome" "ttf-fira-sans" "ttf-fira-code" "ttf-firacode-nerd" "figlet" "lxappearance" "polybar" "breeze" "breeze-gtk" "rofi-calc" "vlc"); packagesYay=("brave-bin" "pfetch" "bibata-cursor-theme"); # pywal installation below - -packagesPip=("psutil" "rich" "click"); - + # ------------------------------------------------------ # Function: Is package installed # ------------------------------------------------------ @@ -76,16 +74,6 @@ _isInstalledYay() { return; #false } -_isInstalledPip() { - package="$1"; - check="$(pip list | grep "${package} ")"; - if [ -n "${check}" ] ; then - echo 0; - else - echo 1; - fi -} - # ------------------------------------------------------ # Function Install all package if not installed # ------------------------------------------------------ @@ -131,33 +119,11 @@ _installPackagesYay() { yay --noconfirm -S "${toInstall[@]}"; } -_installPackagesPip() { - toInstall=(); - - for pkg; do - if [[ $(_isInstalledPip "${pkg}") == 0 ]]; then - echo "${pkg} is already installed."; - continue; - fi; - - toInstall+=("${pkg}"); - done; - - if [[ "${toInstall[@]}" == "" ]] ; then - # echo "All packages are already installed."; - return; - fi; - - printf "Pip packages not installed:\n%s\n" "${toInstall[@]}"; - pip install "${toInstall[@]}"; -} - # ------------------------------------------------------ # Install required packages # ------------------------------------------------------ _installPackagesPacman "${packagesPacman[@]}"; _installPackagesYay "${packagesYay[@]}"; -_installPackagesPip "${packagesPip[@]}"; # pywal requires dedicated installation if [ -f /usr/bin/wal ]; then @@ -166,11 +132,6 @@ else yay --noconfirm -S pywal fi -# ------------------------------------------------------ -# Enable services -# ------------------------------------------------------ -sudo systemctl enable preload - # ------------------------------------------------------ # Create .config folder # ------------------------------------------------------ @@ -212,11 +173,8 @@ _installSymLink() { _installSymLink ~/.config/qtile ~/dotfiles/qtile/ ~/.config _installSymLink ~/.config/alacritty ~/dotfiles/alacritty/ ~/.config -_installSymLink ~/.config/neomutt ~/dotfiles/neomutt/ ~/.config _installSymLink ~/.config/picom ~/dotfiles/picom/ ~/.config -_installSymLink ~/.config/ranger ~/dotfiles/ranger/ ~/.config _installSymLink ~/.config/rofi ~/dotfiles/rofi/ ~/.config -_installSymLink ~/.config/spotifyd ~/dotfiles/spotifyd/ ~/.config _installSymLink ~/.config/vim ~/dotfiles/vim/ ~/.config _installSymLink ~/.config/nvim ~/dotfiles/nvim/ ~/.config _installSymLink ~/.config/polybar ~/dotfiles/polybar/ ~/.config diff --git a/polybar/config.ini b/polybar/config.ini index 98e5b54..13f0af0 100644 --- a/polybar/config.ini +++ b/polybar/config.ini @@ -7,6 +7,7 @@ ; ; by Stephan Raabe (2023) ; ----------------------------------------------------- +; Icons: https://fontawesome.com/search?o=r&m=free [colors] background = #aa000000 @@ -24,20 +25,20 @@ background = ${colors.background} foreground = ${colors.foreground} border-size = 0pt border-color = #00000000 -padding-left = 0 +padding-left = 2 padding-right = 1 module-margin = 2 separator = "" separator-foreground = ${colors.disabled} font-0 = "Fira Sans SemiBold:size=11;2" font-1 = "Font Awesome 6 Free Solid:pixelsize=11;2" -modules-left = xworkspaces mychatgpt scrcpy mymenu +modules-left = appmenu xworkspaces outlook teams calculator chatgpt modules-center = xwindow -modules-right = battery xkeyboard mycalculator mysystem filesystem pulseaudio memory cpu date myexit +modules-right = battery xkeyboard mysystem filesystem pulseaudio memory cpu date exit cursor-click = pointer cursor-scroll = ns-resize enable-ipc = true -; tray-position = right +tray-position = right ;[module/mynews] ;type = custom/text @@ -45,9 +46,21 @@ enable-ipc = true ;content = "" ;click-left="alacritty" -[module/mymenu] +[module/outlook] type = custom/text -content-foreground = ${colors.primary} +content-foreground = ${colors.foreground} +content = "" +click-left = "brave --app=https://outlook.office.com/mail/" + +[module/teams] +type = custom/text +content-foreground = ${colors.foreground} +content = "" +click-left = "brave --app=https://outlook.office.com/mail/" + +[module/appmenu] +type = custom/text +content-foreground = ${colors.foreground} content = "" click-left = "~/dotfiles/scripts/applauncher.sh" @@ -57,21 +70,21 @@ content-foreground = ${colors.foreground} content = "Pixel" click-left = "scrcpy -d" -[module/mychatgpt] +[module/chatgpt] type = custom/text content-foreground = ${colors.foreground} -content = "ChatGPT" +content = "" click-left = "brave --app=https://chat.openai.com" -[module/mycalculator] +[module/calculator] type = custom/text -content-foreground = ${colors.primary} +content-foreground = ${colors.foreground} content = "" click-left = "~/dotfiles/scripts/calculator.sh" -[module/myexit] +[module/exit] type = custom/text -content-foreground = ${colors.primary} +content-foreground = ${colors.foreground} content = " " click-left = "~/dotfiles/scripts/powermenu.sh" @@ -80,9 +93,10 @@ type = internal/xworkspaces icon1=3 icon-default = "" label-active = %name% -label-active-background = ${colors.primary} +label-active-background = ${colors.foreground} label-active-padding = 2 label-active-foreground = #FF000000 +; label-active-foreground = ${color.foreground} label-occupied = %name% label-occupied-padding = 2 label-occupied-foreground = #FFFFFF diff --git a/scripts/launchvm.sh b/scripts/launchvm.sh index 2e9b403..78219ae 100755 --- a/scripts/launchvm.sh +++ b/scripts/launchvm.sh @@ -17,7 +17,7 @@ then exit else echo "Starting xfreerdp now..." - xfreerdp -grab-keyboard /t:"Windows 11" /v:192.168.122.42 /size:100% /u:raabe /p:SECRET /d: /dynamic-resolution /gfx-h264:avc444 +gfx-progressive & + xfreerdp -grab-keyboard /v:192.168.122.42 /size:100% /cert-ignore /u:raabe /p:SECRET /d: /dynamic-resolution /gfx-h264:avc444 +gfx-progressive & exit fi