This commit is contained in:
Stephan Raabe 2024-05-22 17:06:47 +02:00
parent 001a9b14e9
commit 55bf15494a
28 changed files with 441 additions and 47 deletions

View File

@ -46,7 +46,8 @@ alias ml4w='~/dotfiles/apps/ML4W_Welcome-x86_64.AppImage'
alias ml4w-settings='~/dotfiles/apps/ML4W_Dotfiles_Settings-x86_64.AppImage'
alias ml4w-sidebar='~/dotfiles/eww/ml4w-sidebar/launch.sh'
alias ml4w-hyprland='~/dotfiles/apps/ML4W_Hyprland_Settings-x86_64.AppImage'
alias ml4w-diagnosis='~/dotfiles/scripts/diagnosis.sh'
alias ml4w-hyprland-diagnosis='~/dotfiles/hypr/scripts/diagnosis.sh'
alias ml4w-qtile-diagnosis='~/dotfiles/qtile/scripts/diagnosis.sh'
# -----------------------------------------------------
# Window Managers

View File

@ -12,6 +12,7 @@ packagesPacman=(
"starship"
"mpv"
"thunar"
"nautilus"
"mousepad"
"noto-fonts"
"otf-font-awesome"

View File

@ -1 +1 @@
thunar
nautilus

View File

@ -3,4 +3,4 @@
# - vibrance
# - off
# get available filters with hyprshade ls
hyprshade_filter="blue-light-filter"
hyprshade_filter="grayscale"

View File

@ -1 +1 @@
2.9.1BETA2
2.9.1BETA3

View File

@ -6,8 +6,14 @@ https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.9
- Directory for wallpapers can be customized with new .settings/wallpaper-folder.sh
- Added hyprpicker and Keybinding SUPER+CTRL+P
- Replaced blueman with overskride to manage bluetooth devices
<<<<<<< HEAD
- Screen shading possible with hyprshade. SUPER+SHIFT+S to toggle hyprshade. The filter can be defined in ~/dotfiles/.settings/hyprshade.sh
For auto-activation at a dedicated time please set the filter to off and follow the instructions here https://github.com/loqusion/hyprshade
=======
- Screen shading possible with hyprshade. SUPER+SHIFT+S to toggle the hyprshade. The shader can be selected in the new Shader module in Waybar.
For individual customization and auto-activation at a dedicated time please set the filter to off and follow the instructions here https://github.com/loqusion/hyprshade
- Nautilus defined as new default file manager. Thunar available in addition.
>>>>>>> e633c2b (Updates)
Version 2.9
https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.9

View File

@ -1,4 +1,4 @@
# ML4W Dotfiles 2.9.1 BETA2
# ML4W Dotfiles 2.9.1 BETA3
An advanced configuration of Hyprland and Qtile for Arch Linux based distributions. This package includes an installation script to install and setup the required components.

Binary file not shown.

View File

@ -1,8 +1,44 @@
#!/bin/bash
# _ _ _ _
# | | | |_ _ _ __ _ __ ___| |__ __ _ __| | ___
# | |_| | | | | '_ \| '__/ __| '_ \ / _` |/ _` |/ _ \
# | _ | |_| | |_) | | \__ \ | | | (_| | (_| | __/
# |_| |_|\__, | .__/|_| |___/_| |_|\__,_|\__,_|\___|
# |___/|_|
#
if [[ "$1" == "rofi" ]]; then
# Open rofi to select the Hyprshade filter for toggle
# List all available shaders
option1="blue-light-filter"
option2="vibrance"
option3="invert-colors"
option4="off"
options="$option1\n"
options="$options$option2\n"
options="$options$option3\n$option4"
# Open rofi
choice=$(echo -e "$options" | rofi -dmenu -replace -config ~/dotfiles/rofi/config-hyprshade.rasi -i -no-show-icons -l 4 -width 30 -p "Hyprshade")
if [ ! -z $choice ] ;then
echo "hyprshade_filter=\"$choice\"" > ~/dotfiles/.settings/hyprshade.sh
dunstify "Changing Hyprshade to $choice" "Toggle shader with SUPER+SHIFT+S"
fi
else
# Toggle Hyprshade based on the selected filter
hyprshade_filter="blue-light-filter"
# Check if hyprshade.sh settings file exists and load
if [ -f ~/dotfiles/.settings/hyprshade.sh ] ;then
source ~/dotfiles/.settings/hyprshade.sh
fi
# Toggle Hyprshade
if [ "$hyprshade_filter" != "off" ] ;then
if [ -z $(hyprshade current) ] ;then
echo ":: hyprshade is not running"
@ -19,3 +55,5 @@ else
fi
echo ":: hyprshade turned off"
fi
fi

View File

@ -0,0 +1,8 @@
precision highp float;
varying vec2 v_texcoord;
uniform sampler2D tex;
void main() {
vec4 pixColor = texture2D(tex, v_texcoord);
gl_FragColor = vec4(1.0 - pixColor.r, 1.0 - pixColor.g, 1.0 - pixColor.b, pixColor.a);
}

37
qtile/scripts/diagnosis.sh Executable file
View File

@ -0,0 +1,37 @@
#!/bin/bash
clear
sleep 0.5
figlet "Diagnosis"
echo
echo "This script will check that essential packages and "
echo "execution commands are available on your system."
echo
_commandExists() {
package="$1";
if ! type $package > /dev/null 2>&1; then
echo ":: ERROR: $package doesn't exists. Please install it with yay -S $2"
else
echo ":: OK: $package found."
fi
}
_folderExists() {
folder="$1";
if [ ! -d $folder ]; then
echo ":: ERROR: $folder doesn't exists."
else
echo ":: OK: $folder found."
fi
}
_commandExists "rofi" "rofi-wayland"
_commandExists "dunst" "dunst"
_commandExists "wal" "python-pywal"
_commandExists "gum" "gum"
_commandExists "magick" "imagemagick"
_commandExists "figlet" "figlet"
echo
echo "Press return to exit"
read

View File

@ -9,11 +9,7 @@
# by Stephan Raabe (2023)
# -----------------------------------------------------
echo $XDG_SESSION_TYPE
if [ $XDG_SESSION_TYPE == "wayland" ]; then
lockapp=swaylock
else
lockapp=slock
fi
echo "Using $lockapp to lock the screen."
option1=" lock"

View File

@ -19,7 +19,8 @@ configuration {
display-run: "RUN";
display-filebrowser: "FILES";
display-window: "WINDOW";
hover-select: true;
hover-select: false;
scroll-method: 1;
me-select-entry: "";
me-accept-entry: "MousePrimary";
drun-display-format: "{name}";
@ -149,8 +150,8 @@ listview {
enabled: true;
columns: 1;
lines: 8;
cycle: true;
dynamic: true;
cycle: false;
dynamic: false;
scrollbar: false;
layout: vertical;
reverse: false;

262
rofi/config-hyprshade.rasi Normal file
View File

@ -0,0 +1,262 @@
/*
# ____ __ _
# | _ \ ___ / _(_)
# | |_) / _ \| |_| |
# | _ < (_) | _| |
# |_| \_\___/|_| |_|
#
# by Stephan Raabe (2023)
# -----------------------------------------------------
*/
/* ---- Configuration ---- */
configuration {
modi: "drun,run";
font: "Fira Sans 11";
show-icons: false;
icon-theme: "kora";
display-drun: "APPS";
display-run: "RUN";
display-filebrowser: "FILES";
display-window: "WINDOW";
hover-select: true;
me-select-entry: "";
me-accept-entry: "MousePrimary";
drun-display-format: "{name}";
window-format: "{w} · {c} · {t}";
}
/* ---- Load font ---- */
@import "~/dotfiles/.settings/rofi-font.rasi"
/* ---- Load pywal colors (custom wal template) ---- */
@import "~/.cache/wal/colors-rofi-pywal"
/* ---- Load wallpaper ---- */
@import "~/.cache/current_wallpaper.rasi"
/* ---- Load border width ---- */
@import "~/dotfiles/.settings/rofi-border.rasi"
/* ---- Window ---- */
window {
width: 400px;
x-offset: -14px;
y-offset: 65px;
spacing: 0px;
padding: 0px;
margin: 0px;
color: #FFFFFF;
border: @border-width;
border-color: #FFFFFF;
cursor: "default";
transparency: "real";
location: center;
anchor: center;
fullscreen: false;
enabled: true;
border-radius: 10px;
background-color: transparent;
}
/* ---- Mainbox ---- */
mainbox {
enabled: true;
orientation: horizontal;
spacing: 0px;
margin: 0px;
background-color: @background;
background-image: @current-image;
children: ["listbox"];
}
/* ---- Imagebox ---- */
imagebox {
padding: 18px;
background-color: transparent;
orientation: vertical;
children: [ "inputbar", "dummy", "mode-switcher" ];
}
/* ---- Listbox ---- */
listbox {
spacing: 20px;
background-color: transparent;
orientation: vertical;
children: [ "listview" ];
}
/* ---- Dummy ---- */
dummy {
background-color: transparent;
}
/* ---- Inputbar ---- */
inputbar {
enabled: true;
text-color: @foreground;
spacing: 10px;
padding: 15px;
border-radius: 0px;
border-color: @foreground;
background-color: @background;
children: [ "textbox-prompt-colon", "entry" ];
}
textbox-prompt-colon {
enabled: true;
expand: false;
padding: 0px 5px 0px 0px;
str: "";
background-color: transparent;
text-color: inherit;
}
entry {
enabled: true;
background-color: transparent;
text-color: inherit;
cursor: text;
placeholder: "Search";
placeholder-color: inherit;
}
/* ---- Mode Switcher ---- */
mode-switcher{
enabled: true;
spacing: 20px;
background-color: transparent;
text-color: @foreground;
}
button {
padding: 10px;
border-radius: 10px;
background-color: @background;
text-color: inherit;
cursor: pointer;
border: 0px;
}
button selected {
background-color: @color11;
text-color: @foreground;
}
/* ---- Listview ---- */
listview {
enabled: true;
columns: 1;
lines: 2;
cycle: true;
dynamic: true;
scrollbar: false;
layout: vertical;
reverse: false;
fixed-height: true;
fixed-columns: true;
spacing: 0px;
padding: 10px;
margin: 0px;
background-color: @background;
border:0px;
}
/* ---- Element ---- */
element {
enabled: true;
padding: 10px;
margin: 5px;
cursor: pointer;
background-color: @background;
border-radius: 10px;
border: @border-width;
}
element normal.normal {
background-color: inherit;
text-color: @foreground;
}
element normal.urgent {
background-color: inherit;
text-color: @foreground;
}
element normal.active {
background-color: inherit;
text-color: @foreground;
}
element selected.normal {
background-color: @color11;
text-color: @foreground;
}
element selected.urgent {
background-color: inherit;
text-color: @foreground;
}
element selected.active {
background-color: inherit;
text-color: @foreground;
}
element alternate.normal {
background-color: inherit;
text-color: @foreground;
}
element alternate.urgent {
background-color: inherit;
text-color: @foreground;
}
element alternate.active {
background-color: inherit;
text-color: @foreground;
}
element-icon {
background-color: transparent;
text-color: inherit;
size: 32px;
cursor: inherit;
}
element-text {
background-color: transparent;
text-color: inherit;
cursor: inherit;
vertical-align: 0.5;
horizontal-align: 0.0;
}
/*****----- Message -----*****/
message {
background-color: transparent;
border:0px;
margin:20px 0px 0px 0px;
padding:0px;
spacing:0px;
border-radius: 10px;
}
textbox {
padding: 15px;
margin: 0px;
border-radius: 0px;
background-color: @background;
text-color: @foreground;
vertical-align: 0.5;
horizontal-align: 0.0;
}
error-message {
padding: 15px;
border-radius: 20px;
background-color: @background;
text-color: @foreground;
}

View File

@ -19,12 +19,12 @@ configuration {
display-run: "RUN";
display-filebrowser: "FILES";
display-window: "WINDOW";
hover-select: true;
hover-select: false;
me-select-entry: "";
me-accept-entry: "MousePrimary";
drun-display-format: "{name}";
window-format: "{w} · {c} · {t}";
scroll-method: 1;
}
/* ---- Load font ---- */
@ -149,8 +149,8 @@ listview {
enabled: true;
columns: 1;
lines: 8;
cycle: true;
dynamic: true;
cycle: false;
dynamic: false;
scrollbar: false;
layout: vertical;
reverse: false;

View File

@ -14,12 +14,12 @@ configuration {
modi: "drun,run";
font: "Fira Sans 11";
show-icons: true;
hover-select: true;
hover-select: false;
me-select-entry: "";
me-accept-entry: "MousePrimary";
drun-display-format: "{name}";
window-format: "{w} · {c} · {t}";
scroll-method: 1;
}
/* ---- Load font ---- */
@ -143,8 +143,8 @@ listview {
enabled: true;
columns: 6;
lines: 3;
cycle: true;
dynamic: true;
cycle: false;
dynamic: false;
scrollbar: true;
layout: vertical;
reverse: false;

View File

@ -20,7 +20,8 @@ configuration {
display-filebrowser: "FILES";
display-window: "WINDOW";
drun-display-format: "{name}";
hover-select: true;
hover-select: false;
scroll-method: 1;
me-select-entry: "";
me-accept-entry: "MousePrimary";
window-format: "{w} · {c} · {t}";
@ -149,8 +150,8 @@ listview {
enabled: true;
columns: 1;
lines: 8;
cycle: true;
dynamic: true;
cycle: false;
dynamic: false;
scrollbar: false;
layout: vertical;
reverse: false;

View File

@ -196,6 +196,14 @@
"tooltip": false
},
// Hyprshade
"custom/hyprshade": {
"format": "",
"on-click": "sleep 0.1; ~/dotfiles/hypr/scripts/hyprshade.sh",
"on-click-right": "sleep 0.1; ~/dotfiles/hypr/scripts/hyprshade.sh rofi",
"tooltip": false
},
// Keyboard State
"keyboard-state": {
"numlock": true,

View File

@ -47,6 +47,7 @@
"group/hardware",
"custom/cliphist",
"idle_inhibitor",
"custom/hyprshade",
"tray",
"custom/exit",
"custom/ml4w-welcome",

View File

@ -163,6 +163,7 @@ window#waybar.empty #window {
#custom-settings,
#custom-wallpaper,
#custom-system,
#custom-hyprshade,
#custom-waybarthemes {
margin-right: 23px;
font-size: 20px;
@ -171,6 +172,11 @@ window#waybar.empty #window {
color: @iconcolor;
}
#custom-hyprshade {
margin-left:4px;
margin-right:12px;
}
#custom-system {
margin-right:15px;
}

View File

@ -45,6 +45,7 @@
"group/hardware",
"custom/cliphist",
"idle_inhibitor",
"custom/hyprshade",
"custom/exit",
"clock",
"tray",

View File

@ -134,6 +134,7 @@ window#waybar.empty #window {
#custom-settings,
#custom-wallpaper,
#custom-system,
#custom-hyprshade,
#custom-waybarthemes {
margin-right: 23px;
font-size: 14px;
@ -141,6 +142,11 @@ window#waybar.empty #window {
color: @iconcolor;
}
#custom-hyprshade {
margin-left:4px;
margin-right:12px;
}
#custom-settings {
margin-right: 15px;
}

View File

@ -47,6 +47,7 @@
"group/hardware",
"custom/cliphist",
"idle_inhibitor",
"custom/hyprshade",
"tray",
"custom/exit",
"custom/ml4w-welcome",

View File

@ -164,6 +164,7 @@ window#waybar.empty #window {
#custom-settings,
#custom-wallpaper,
#custom-system,
#custom-hyprshade,
#custom-waybarthemes {
margin-right: 23px;
font-size: 20px;
@ -172,6 +173,11 @@ window#waybar.empty #window {
color: @iconcolor;
}
#custom-hyprshade {
margin-left:4px;
margin-right:12px;
}
#custom-system {
margin-right:15px;
}

View File

@ -55,6 +55,7 @@
"group/hardware",
"custom/cliphist",
"idle_inhibitor",
"custom/hyprshade",
"tray",
"custom/exit",
"custom/ml4w-welcome",

View File

@ -65,6 +65,14 @@
"tooltip": false
},
// Hyprshade
"custom/hyprshade": {
"format": "",
"on-click": "sleep 0.1; ~/dotfiles/hypr/scripts/hyprshade.sh",
"on-click-right": "sleep 0.1; ~/dotfiles/hypr/scripts/hyprshade.sh rofi",
"tooltip": false
},
// Updates Count
"custom/updates": {
"format": " {}",

View File

@ -164,6 +164,7 @@ window#waybar.empty #window {
#custom-settings,
#custom-wallpaper,
#custom-system,
#custom-hyprshade,
#custom-waybarthemes {
margin-right: 23px;
font-size: 20px;
@ -171,11 +172,15 @@ window#waybar.empty #window {
color: @iconcolor;
}
#custom-hyprshade {
margin-left:4px;
margin-right:12px;
}
#custom-waybarthemes,#custom-system {
margin-right:15px;
}
#custom-ml4w-welcome {
margin-right: 15px;
background-image: url("../assets/ml4w-icon.png");
@ -396,7 +401,7 @@ window#waybar.empty #window {
* ----------------------------------------------------- */
#tray {
background-color: #2980b9;
margin:0px 10px 0px 0px;
}
#tray > .passive {