extern/zaneyos
1
0
Fork 1
mirror of https://gitlab.com/Zaney/zaneyos.git synced 2025-06-26 06:52:01 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix breaking in wallsetter as well as improve install script

Browse Source
This commit is contained in:
Tyler Kelley 2024-03-02 15:22:08 -06:00
commit a8bb1e8e25
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/home/waybar.nix
View File

@ -15,7 +15,7 @@ in with lib; {
modules-center = [ "hyprland/workspaces" ] ; modules-center = [ "hyprland/workspaces" ] ;
modules-left = [ "custom/startmenu" "hyprland/window" "pulseaudio" "cpu" "memory"]; modules-left = [ "custom/startmenu" "hyprland/window" "pulseaudio" "cpu" "memory"];
modules-right = [ "custom/hyprbindings" "custom/exit" "idle_inhibitor" "custom/themeselector" "custom/notification" "clock" "tray" ]; modules-right = [ "custom/hyprbindings" "custom/exit" "idle_inhibitor" "custom/themeselector" "custom/notification" "battery" "clock" "tray" ];
"hyprland/workspaces" = { "hyprland/workspaces" = {
format = if bar-number == true then "{name}" else "{icon}"; format = if bar-number == true then "{name}" else "{icon}";
@ -196,7 +196,7 @@ in with lib; {
opacity: 0.5; opacity: 0.5;
transition: ${betterTransition}; transition: ${betterTransition};
'' else if simplebar == true then '' '' else if simplebar == true then ''
color: #${config.colorScheme.colors.base03}; color: #${palette.base03};
background: #${palette.base00}; background: #${palette.base00};
margin: 4px 3px; margin: 4px 3px;
opacity: 1; opacity: 1;
@ -260,7 +260,7 @@ in with lib; {
opacity: 0.8; opacity: 0.8;
transition: ${betterTransition}; transition: ${betterTransition};
'' else if simplebar == true then '' '' else if simplebar == true then ''
color: #${config.colorScheme.colors.base05}; color: #${palette.base05};
border: 0px; border: 0px;
border-radius: 15px; border-radius: 15px;
transition: ${betterTransition}; transition: ${betterTransition};

12
config/scripts/wallsetter.nix
View File

@ -12,15 +12,17 @@ pkgs.writeShellScriptBin "wallsetter" ''
if [ -d ${wallpaperDir} ]; then if [ -d ${wallpaperDir} ]; then
num_files=$(ls -1 ${wallpaperDir} | wc -l) num_files=$(ls -1 ${wallpaperDir} | wc -l)
if [ $num_files -eq 0 ]; then if [ $num_files -lt 1 ]; then
notify-send "The wallpaper folder is empty. Exiting Wallsetter." notify-send -t 9000 "The wallpaper folder is expected to have more than 1 image. Exiting Wallsetter."
exit
elif [ $num_files -eq 1 ]; then
notify-send "The wallpaper folder has only one file. Exiting Wallsetter."
exit exit
else else
cd ${wallpaperDir} cd ${wallpaperDir}
if [ -d ".git" ]; then
git pull git pull
else
notify-send -t 9000 "The wallpaper directory is expected to be a Git repository. Exiting Wallsetter."
exit
fi
fi fi
else else
${pkgs.git}/bin/git clone ${wallpaperGit} ${wallpaperDir} ${pkgs.git}/bin/git clone ${wallpaperGit} ${wallpaperDir}

4
install-zaneyos.sh
View File

@ -36,7 +36,7 @@ if [ $persistState -eq 0 ]; then
sleep 1 sleep 1
else else
echo "Creating the backups folder & moving ZaneyOS to it." echo "Creating the backups folder & moving ZaneyOS to it."
mkdir .config/zaneyos-backups mkdir -p .config/zaneyos-backups
mv $HOME/zaneyos .config/zaneyos-backups/$backupname mv $HOME/zaneyos .config/zaneyos-backups/$backupname
sleep 1 sleep 1
fi fi
@ -61,7 +61,7 @@ cd zaneyos
echo "-----" echo "-----"
installusername=$(echo $USER) installusername=$(echo $USER)
read -p "Enter Your Username [ $installusername ]: " userName read -p "Enter Your Username: [ $installusername ] " userName
if [ -z "$userName" ]; then if [ -z "$userName" ]; then
userName=$(echo $USER) userName=$(echo $USER)
else else