Skip to content

Commit

Permalink
Updates
Browse files Browse the repository at this point in the history
  • Loading branch information
mylinuxforwork committed Jul 19, 2024
1 parent ed8e19b commit 5a2ae4c
Show file tree
Hide file tree
Showing 23 changed files with 248 additions and 80 deletions.
4 changes: 4 additions & 0 deletions .install/apps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,13 @@ echo -e "${GREEN}"
figlet "ML4W Apps"
echo -e "${NONE}"

# Create local applications folder if not exits
if [ ! -d $HOME/.local/share/applications/ ] ;then
mkdir $HOME/.local/share/applications
echo ":: $HOME/.local/share/applications created"
fi

# Copy desktop files to the correct locations
sed -i "s|HOME|${HOME}|g" $HOME/dotfiles/apps/ml4w-welcome.desktop
cp $HOME/dotfiles/apps/ml4w-welcome.desktop $HOME/.local/share/applications
echo ":: ML4W Welcome App installed successfully"
Expand All @@ -25,6 +27,8 @@ sed -i "s|HOME|${HOME}|g" $HOME/dotfiles/apps/ml4w-hyprland-settings.desktop
cp $HOME/dotfiles/apps/ml4w-hyprland-settings.desktop $HOME/.local/share/applications
echo ":: ML4W Hyprland Settings App installed successfully"
echo

# Execute hyprctl from the Settings app
if [ -f ~/.config/ml4w-hyprland-settings/hyprctl.sh ] ;then
echo ":: Starting restore from ML4W Hyprland Settings App"
~/.config/ml4w-hyprland-settings/hyprctl.sh
Expand Down
2 changes: 1 addition & 1 deletion .install/packages/general-packages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ packagesPacman=(
"tumbler"
"papirus-icon-theme"
"breeze-icons"
"polkit-kde-agent"
"polkit-gnome"
"brightnessctl"
"gum"
"man-pages"
Expand Down
5 changes: 2 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
Version 2.9.2.2
https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.9.2.2
Version 2.9.3
https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.9.3
--------------------------------------------------------
- ML4W .bashrc can be extended by adding a file .bashrc_custom in your home directory to create custom aliases and more
- Adding Missioncontrol as new systeminfo app
- New animation variation animations-dynamic.conf. Requires some resources and is therefore not recommended for installations on virtual machines or slower systems. Can be selected in the ML4W Dotfiles Settings app.
- New repository folder structure. All configuration dotfiles are now separated from the installer in the folder dotfiles
- Switched from polkit-gnome to polkit-kde-agent due to it's recommendation on Hyprland Wiki

Version 2.9.2.1
https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.9.2.1
Expand Down
24 changes: 12 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
# ML4W Hyprland Dotfiles 2.9.2.2 RC4
# ML4W Hyprland Dotfiles 2.9.3

An advanced configuration of Hyprland for Arch Linux based distributions. This package includes an installation script to install and setup the required components.

[![Screenshot](https://gitlab.com/stephan-raabe/dotfiles/-/wikis/uploads/5402287acd05825a9581e8bb261c465c/image.png "Screenshot")](![screenshots/screenshot2.png](https://gitlab.com/stephan-raabe/dotfiles/-/wikis/uploads/5402287acd05825a9581e8bb261c465c/image.png))

The ML4W Dotfiles are available as

- main release (Official release): [https://gitlab.com/stephan-raabe/dotfiles](https://gitlab.com/stephan-raabe/dotfiles)
- rolling release (Development release): [https://gitlab.com/stephan-raabe/dotfiles/-/tree/dev](https://gitlab.com/stephan-raabe/dotfiles/-/tree/dev)
[![Screenshot](https://gitlab.com/stephan-raabe/dotfiles/-/wikis/uploads/964d54d46d1a602bb414311df48b1695/image.png "Screenshot")](![screenshots/screenshot2.png](hhttps://gitlab.com/stephan-raabe/dotfiles/-/wikis/uploads/964d54d46d1a602bb414311df48b1695/image.png))

YouTube Video [https://youtu.be/HMxHUvN6VGo](https://youtu.be/GHYk1Iv4GkY)

## Installation

The installation should work on all Arch Linux based distributions. [You can find more information here](https://gitlab.com/stephan-raabe/dotfiles/-/wikis/home).
The installation should work on all Arch Linux based distributions. [You can find more information here](hhttps://github.com/mylinuxforwork/dotfiles/wiki).

The easiest way is to use the setup.sh script. The script will download all files from GitLab and start the installation automatically.

Just copy/enter the following command into your terminal.

```
bash <(curl -s https://gitlab.com/stephan-raabe/dotfiles/-/raw/main/setup.sh)
bash <(curl -s https://raw.githubusercontent.com/mylinuxforwork/dotfiles/main/setup.sh)
```

The installer will ask you to select between:

- main release (Latest official release): [https://github.com/mylinuxforwork/dotfiles/releases/latest](https://github.com/mylinuxforwork/dotfiles/releases/latest)
- rolling release (Development release): [https://github.com/mylinuxforwork/dotfiles](https://github.com/mylinuxforwork/dotfiles)

> PLEASE NOTE: Every Linux distribution, setup and personal configuration can be different. Therefore, I cannot guarantee that the ML4W Dotfiles will work everywhere. Installation at your own risk.
## Documentation (Wiki)

You can find the complete documentation of the ML4W Dotfiles in the Wiki. <b>[Open the Wiki here](https://gitlab.com/stephan-raabe/dotfiles/-/wikis/home)</b>
You can find the complete documentation of the ML4W Dotfiles in the Wiki. <b>[Open the Wiki here](https://github.com/mylinuxforwork/dotfiles/wiki)</b>

## Contributing

Thanks for using the ML4W Dotfiles on your system. If you find a problem or a bug, please [report your issue on this page](https://gitlab.com/stephan-raabe/dotfiles/-/issues/?sort=created_date&state=opened).
Thanks for using the ML4W Dotfiles on your system. If you find a problem or a bug, please [report your issue on this page](https://github.com/mylinuxforwork/dotfiles/issues).

You can also visit the [ML4W Discord Server](https://discord.gg/c4fJK7Za3g) to start a discussion with other users.

Expand All @@ -41,7 +41,7 @@ You can also visit the [ML4W Discord Server](https://discord.gg/c4fJK7Za3g) to s

## Wallpaper repository

You can find my wallpaper collection in the repository https://gitlab.com/stephan-raabe/wallpaper
You can find my wallpaper collection in the repository https://github.com/mylinuxforwork/wallpaper

## Special Thanks

Expand Down
2 changes: 1 addition & 1 deletion dotfiles/.version/name
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.9.2.2RC4
2.9.3
43 changes: 41 additions & 2 deletions dotfiles/.version/update.sh
Original file line number Diff line number Diff line change
@@ -1,10 +1,49 @@
#!/bin/bash

repo="mylinuxforwork/dotfiles"

# Get latest tag from GitHub
get_latest_release() {
curl --silent "https://api.github.com/repos/$repo/releases/latest" | # Get latest release from GitHub api
grep '"tag_name":' | # Get tag line
sed -E 's/.*"([^"]+)".*/\1/' # Pluck JSON value
}

# Calculate version string
calc_latest_version() {
latest_release=$(get_latest_release "mylinuxforwork/hyprland-dotfiles")
IFS='.' read -r -a array <<< "$latest_release"

# version pos 1
v1="${array[0]}"

# version pos 2
v2="${array[1]}"
l2=${#v2}
if [ $l2 -eq 1 ] ;then
v2="00$v2"
elif [ $l2 -eq 2 ] ;then
v2="0$v2"
fi

# version pos 3
v3="${array[2]}"
l3=${#v3}
if [ $l3 -eq 1 ] ;then
v3="00$v3"
elif [ $l3 -eq 2 ] ;then
v3="0$v3"
fi

echo "$v1$v2$v3"
}

# Check for internet connection
if ping -q -c 1 -W 1 google.com >/dev/null; then

version=$(cat ~/dotfiles/.version/version)
online=$(curl -s https://gitlab.com/stephan-raabe/dotfiles/-/raw/main/.version/version?ref_type=heads)
if [ "$version" -lt "$online" ]; then
online=$(calc_latest_version)
if [ $((version)) -lt $((online)) ]; then
# Update available
echo "0"
else
Expand Down
2 changes: 1 addition & 1 deletion dotfiles/.version/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2922
2009003
Binary file modified dotfiles/apps/ML4W_Dotfiles_Settings-x86_64.AppImage
Binary file not shown.
Binary file modified dotfiles/apps/ML4W_Hyprland_Settings-x86_64.AppImage
Binary file not shown.
Binary file modified dotfiles/apps/ML4W_Welcome-x86_64.AppImage
Binary file not shown.
8 changes: 4 additions & 4 deletions dotfiles/eww/ml4w-sidebar/eww.yuck
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@
;; ** Windows *************************************************************************

(defwindow close
:geometry (geometry :x "1px"
:y "-1px"
:geometry (geometry :x "20px"
:y "20px"
:width "44px"
:height "44px"
:anchor "top right")
Expand All @@ -82,8 +82,8 @@
(close))

(defwindow ml4wlauncher
:geometry (geometry :x "13px"
:y "10px"
:geometry (geometry :x "30px"
:y "30px"
:width "480px"
:anchor "top right")
:stacking "fg"
Expand Down
3 changes: 2 additions & 1 deletion dotfiles/hypr/conf/autostart.conf
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
exec-once = ~/dotfiles/hypr/scripts/xdg.sh

# Start Polkit
exec-once=/usr/lib/polkit-kde-authentication-agent-1
# Test Polkit pkexec --user username alacritty
exec-once=/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1

# Load Dunst Notification Manager
exec-once = dunst
Expand Down
5 changes: 4 additions & 1 deletion dotfiles/hypr/conf/environments/kvm.conf
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,7 @@

# KVM Environment
env = WLR_RENDERER_ALLOW_SOFTWARE, 1
env = WLR_NO_HARDWARE_CURSORS, 1

cursor {
no_hardware_cursors = true
}
6 changes: 5 additions & 1 deletion dotfiles/hypr/conf/environments/nvidia.conf
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,8 @@ env = LIBVA_DRIVER_NAME,nvidia
env = GBM_BACKEND,nvidia-drm
env = __GLX_VENDOR_LIBRARY_NAME,nvidia
# env = __GL_VRR_ALLOWED,1
# env = WLR_DRM_NO_ATOMIC,1
# env = WLR_DRM_NO_ATOMIC,1

cursor {
no_hardware_cursors = true
}
21 changes: 20 additions & 1 deletion dotfiles/hypr/conf/ml4w.conf
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
windowrulev2 = float,class:(.*org.pulseaudio.pavucontrol.*)
windowrulev2 = size 700 600,class:(.*org.pulseaudio.pavucontrol.*)
windowrulev2 = center,class:(.*org.pulseaudio.pavucontrol.*)
windowrulev2 = pin,class:(.*org.pulseaudio.pavucontrol.*)

# OpenAI ChatGPT floating
windowrulev2 = float,title:(ChatGPT.*)

windowrulev2 = float,title:(.*chat.openai.com.*)
windowrulev2 = size 500 50%,title:(.*chat.openai.com.*)
windowrulev2 = move 20 70,title:(.*chat.openai.com.*)
Expand All @@ -18,33 +18,52 @@ windowrulev2 = move 20 70,title:(.*chat.openai.com.*)
windowrulev2 = float,class:(.*waypaper.*)
windowrulev2 = size 800 700,class:(.*waypaper.*)
windowrulev2 = center,class:(.*waypaper.*)
windowrulev2 = pin,class:(.*waypaper.*)

# ML4W Welcome App floating
windowrulev2 = float,class:(com.ml4w.welcome)
windowrulev2 = size 700 600,class:(com.ml4w.welcome)
windowrulev2 = center,class:(com.ml4w.welcome)
windowrulev2 = pin,class:(com.ml4w.welcome)

windowrulev2 = float,class:(ml4w-welcome.py)
windowrulev2 = size 400 500,class:(ml4w-welcome.py)
windowrulev2 = center,class:(ml4w-welcome.py)
windowrulev2 = pin,class:(ml4w-welcome.py)

# ML4W Settings App floating
windowrulev2 = float,class:(com.ml4w.dotfilessettings)
windowrulev2 = size 700 600,class:(com.ml4w.dotfilessettings)
windowrulev2 = move 10% 20%,class:(com.ml4w.dotfilessettings)
windowrulev2 = pin,class:(com.ml4w.dotfilessettings)

windowrulev2 = float,class:(ml4w-dotfiles-settings.py)
windowrulev2 = size 400 500,class:(ml4w-dotfiles-settings.py)
windowrulev2 = move 10% 20%,class:(ml4w-dotfiles-settings.py)
windowrulev2 = pin,class:(ml4w-dotfiles-settings.py)

# ML4W Hyprland App floating
windowrulev2 = float,class:(com.ml4w.hyprland.settings)
windowrulev2 = size 700 600,class:(com.ml4w.hyprland.settings)
windowrulev2 = center,class:(com.ml4w.hyprland.settings)
windowrulev2 = pin,class:(com.ml4w.hyprland.settings)

windowrulev2 = float,class:(ml4w-hyprland-settings.py)
windowrulev2 = size 700 600,class:(ml4w-hyprland-settings.py)
windowrulev2 = center,class:(ml4w-hyprland-settings.py)
windowrulev2 = pin,class:(ml4w-hyprland-settings.py)

# System Mission Center
windowrulev2 = float, title:^(Mission Center)$
windowrulev2 = pin, title:^(Mission Center)$
windowrulev2 = center, title:^(Mission Center)$
windowrulev2 = size 900 600, title:^(Mission Center)$

# Hyprland Share Picker
windowrulev2 = float, class:(hyprland-share-picker)
windowrulev2 = pin, class:(hyprland-share-picker)
windowrulev2 = center, title:class:(hyprland-share-picker)
windowrulev2 = size 600 400,class:(hyprland-share-picker)

# General floating
windowrulev2 = float,class:(dotfiles-floating)
Expand Down
5 changes: 5 additions & 0 deletions dotfiles/hypr/conf/windowrules/default.conf
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,8 @@ windowrule = float,^(pavucontrol)$
windowrule = float,^(blueman-manager)$
windowrule = float,^(nm-connection-editor)$
windowrule = float,^(qalculate-gtk)$

# Browser Picture in Picture
windowrulev2 = float, title:^(Picture-in-Picture)$
windowrulev2 = pin, title:^(Picture-in-Picture)$
windowrulev2 = move 69.5% 4%, title:^(Picture-in-Picture)$
2 changes: 1 addition & 1 deletion dotfiles/hypr/hyprlock.conf
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ label {
color = rgba(200, 200, 200, 1.0)
font_size = 55
font_family = Fira Semibold
position = -100, -40
position = -100, 70
halign = right
valign = bottom
shadow_passes = 5
Expand Down
1 change: 1 addition & 0 deletions dotfiles/hypr/scripts/toggleallfloat.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@
# -----------------------------------------------------

hyprctl dispatch workspaceopt allfloat
notify-send "Windows on this workspace toggled to floating/tiling"
5 changes: 5 additions & 0 deletions dotfiles/hypr/scripts/wallpaper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,11 @@ output=${wal_tpl//WALLPAPER/$used_wallpaper}
echo "$output" > $HOME/dotfiles/hypr/hyprpaper.conf
hyprpaper & > /dev/null 2>&1

# -----------------------------------------------------
# Reload Waybar
# -----------------------------------------------------
~/dotfiles/waybar/launch.sh

# -----------------------------------------------------
# Created blurred wallpaper
# -----------------------------------------------------
Expand Down
7 changes: 7 additions & 0 deletions dotfiles/waybar/themes/ml4w-blur/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,13 @@ window#waybar.empty #window {
padding: 0px 5px 0px 5px;
}

#taskbar.empty {
background:transparent;
border:0;
padding:0;
margin:0;
}

/* -----------------------------------------------------
* Modules
* ----------------------------------------------------- */
Expand Down
7 changes: 7 additions & 0 deletions dotfiles/waybar/themes/ml4w/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,13 @@ window#waybar.empty #window {
padding: 0px 5px 0px 5px;
}

#taskbar.empty {
background:transparent;
border:0;
padding:0;
margin:0;
}

/* -----------------------------------------------------
* Modules
* ----------------------------------------------------- */
Expand Down
Loading

0 comments on commit 5a2ae4c

Please sign in to comment.