From 1c9f79e8c5d80d46e30b2ec6a81de93b5c283c20 Mon Sep 17 00:00:00 2001 From: "Gu://em_" Date: Fri, 4 Apr 2025 17:42:36 +0200 Subject: [PATCH] Beta 25.04.04-2: made setup functionnal again --- config/.config/hypr/config/input-en.conf | 42 ++++++------- .../hypr/config/{input.conf => input-fr.conf} | 0 config/.config/hypr/config/monitors.conf | 10 --- .../.config/hypr/config/monitors_default.conf | 3 +- config/.config/hypr/hyprland.conf | 2 +- setup.sh | 62 ++++++++++++------- 6 files changed, 62 insertions(+), 57 deletions(-) rename config/.config/hypr/config/{input.conf => input-fr.conf} (100%) delete mode 100644 config/.config/hypr/config/monitors.conf diff --git a/config/.config/hypr/config/input-en.conf b/config/.config/hypr/config/input-en.conf index 9669207..09a7df3 100644 --- a/config/.config/hypr/config/input-en.conf +++ b/config/.config/hypr/config/input-en.conf @@ -74,28 +74,28 @@ bind = $mainMod, T, togglefloating, bind = $mainMod, H, pseudo, # Toggle pseudo-tiling # Switch workspaces with mainMod + [0-9] -bind = $mainMod, ampersand, workspace, 1 -bind = $mainMod, eacute, workspace, 2 -bind = $mainMod, quotedbl, workspace, 3 -bind = $mainMod, apostrophe, workspace, 4 -bind = $mainMod, parenleft, workspace, 5 -bind = $mainMod, minus, workspace, 6 -bind = $mainMod, egrave, workspace, 7 -bind = $mainMod, underscore, workspace, 8 -bind = $mainMod, ccedilla, workspace, 9 -bind = $mainMod, agrave, workspace, 10 +bind = $mainMod, 1, workspace, 1 +bind = $mainMod, 2, workspace, 2 +bind = $mainMod, 3, workspace, 3 +bind = $mainMod, 4, workspace, 4 +bind = $mainMod, 5, workspace, 5 +bind = $mainMod, 6, workspace, 6 +bind = $mainMod, 7, workspace, 7 +bind = $mainMod, 8, workspace, 8 +bind = $mainMod, 9, workspace, 9 +bind = $mainMod, 0, workspace, 10 # Move active window to a workspace with mainMod + SHIFT + [0-9] -bind = $mainMod SHIFT, ampersand, movetoworkspace, 1 -bind = $mainMod SHIFT, eacute, movetoworkspace, 2 -bind = $mainMod SHIFT, quotedbl, movetoworkspace, 3 -bind = $mainMod SHIFT, apostrophe, movetoworkspace, 4 -bind = $mainMod SHIFT, parenleft, movetoworkspace, 5 -bind = $mainMod SHIFT, minus, movetoworkspace, 6 -bind = $mainMod SHIFT, egrave, movetoworkspace, 7 -bind = $mainMod SHIFT, underscore, movetoworkspace, 8 -bind = $mainMod SHIFT, ccedilla, movetoworkspace, 9 -bind = $mainMod SHIFT, agrave, movetoworkspace, 10 +bind = $mainMod SHIFT, 1, movetoworkspace, 1 +bind = $mainMod SHIFT, 2, movetoworkspace, 2 +bind = $mainMod SHIFT, 3, movetoworkspace, 3 +bind = $mainMod SHIFT, 4, movetoworkspace, 4 +bind = $mainMod SHIFT, 5, movetoworkspace, 5 +bind = $mainMod SHIFT, 6, movetoworkspace, 6 +bind = $mainMod SHIFT, 7, movetoworkspace, 7 +bind = $mainMod SHIFT, 8, movetoworkspace, 8 +bind = $mainMod SHIFT, 9, movetoworkspace, 9 +bind = $mainMod SHIFT, 0, movetoworkspace, 10 # Example special workspace (scratchpad) bind = $mainMod, S, togglespecialworkspace, magic @@ -146,5 +146,5 @@ bind = , Print, exec, ~/.config/hypr/scripts/screenshot.sh ### CONTROL keys, this is why there are present here bind = SUPER CONTROL, XF86TouchpadToggle, exec, ~/.config/hypr/scripts/toggle-touchpad.sh -## Testing +## Overview #bind = $mainMod, TAB, overview:toggle, toggle diff --git a/config/.config/hypr/config/input.conf b/config/.config/hypr/config/input-fr.conf similarity index 100% rename from config/.config/hypr/config/input.conf rename to config/.config/hypr/config/input-fr.conf diff --git a/config/.config/hypr/config/monitors.conf b/config/.config/hypr/config/monitors.conf deleted file mode 100644 index bd5511c..0000000 --- a/config/.config/hypr/config/monitors.conf +++ /dev/null @@ -1,10 +0,0 @@ -################ -### MONITORS ### -################ - -# See https://wiki.hyprland.org/Configuring/Monitors/ -monitor=,preferred,auto,auto -monitor=eDP-1,preferred,0x0,1 # Laptop screen -monitor=DP-1, preferred, 0x-1080, 1 # HP Home monitor -monitor=DP-2, preferred, 0x-1080, 1 # HP Home monitor -monitor=HDMI-A-1, preferred, 0x-1440, 1 # Dell monitor diff --git a/config/.config/hypr/config/monitors_default.conf b/config/.config/hypr/config/monitors_default.conf index 5f2c2d4..6ecd178 100644 --- a/config/.config/hypr/config/monitors_default.conf +++ b/config/.config/hypr/config/monitors_default.conf @@ -3,5 +3,4 @@ ################ # See https://wiki.hyprland.org/Configuring/Monitors/ -monitor=,preferred,auto,auto -monitor=eDP-1,preferred,0x0,1 # Laptop screen +monitor=,preferred,auto,auto \ No newline at end of file diff --git a/config/.config/hypr/hyprland.conf b/config/.config/hypr/hyprland.conf index 82cde83..11f8322 100644 --- a/config/.config/hypr/hyprland.conf +++ b/config/.config/hypr/hyprland.conf @@ -8,7 +8,7 @@ #source = ~/.config/hypr/config/monitors_default.conf source = ~/.config/hypr/config/monitors.conf source = ~/.config/hypr/config/environment.conf -source = ~/.config/hypr/config/input.conf +source = ~/.config/hypr/config/input-fr.conf source = ~/.config/hypr/config/appearance.conf source = ~/.config/hypr/config/plugins.conf #source = ~/.config/hypr/config/minimalist-mod.conf diff --git a/setup.sh b/setup.sh index 040bef6..1c71e8e 100644 --- a/setup.sh +++ b/setup.sh @@ -1,7 +1,7 @@ #!/bin/sh -version="Beta 25.04.04" +version="Beta 25.04.04-2" -echo "Atlas Desktop Installer - ${version}\n" +echo -e "Atlas Desktop Installer - ${version}\n" # Definitions @@ -15,14 +15,14 @@ dotfiles_path="~/.dotfiles" ## Functions function install() { - echo "Downloading $1 packages" - # sudo pacman -Syu --noconfirm --color auto $(cat $pkgs_path/$1.pkgs) - echo "Done" + echo -e "\nDownloading $1 packages...\n" + sudo pacman -Syu --noconfirm --color auto $(cat $pkgs_path/$1.pkgs) + echo -e "\n\nDone\n" } -function install-aur() { - echo "Downloading $1 packages" - # paru -Syu --noconfirm $(cat $pkgs_path/$1.pkgs) - echo "Done" +function install_aur() { + echo -e "\nDownloading $1 packages...\n" + paru -Syu --noconfirm --color auto $(cat $pkgs_path/$1.pkgs) + echo -e "\nDone\n" } @@ -36,61 +36,76 @@ if [ $? != 0 ]; then fi ## Scripts presence -if [ ! -d $pkgs_path ]; then +if [ ! -d "$pkgs_path" ]; then echo "Couldn't find 'packages' folder inside ${script_path}" exit 1 fi -if [ ! -d $config_path ]; then +if [ ! -d "$config_path" ]; then echo "Couldn't find 'config' folder inside ${script_path}" exit 1 fi -# Install packages -echo "--- Downloading packages ---" -## +# Installation + +echo "--- Installation ---" + +## Main packages install core install cli-dev-tools install fonts install desktop install theming -## Install vendor specific software +## Vendor specific packages if [ $CPU_vendor == "Genuine Intel" ]; then install intel fi -## Install paru +## Paru git clone https://aur.archlinux.org/paru.git /tmp/paru && +echo "Installing paru" && cd /tmp/paru && makepkg -si cd $script_path -install-aur aur +## AUR packages +install_aur aur + # Configuration +echo -e "\n--- Configuration ---\n" + ## Dotfiles +echo "Copying configuration files" cp $config_path $dotfiles_path && cd $dotfiles_path && stow . cd $script_path +## Install launcher theme (albert) +sudo ln -s .config/albert/schemes/Seventy\ Eight.qss /usr/share/albert/widgetsboxmodel/themes/ + ## Swap (Zram) is_zram_active=$(sudo systemctl is-active systemd-zram-setup@zram0.service) if [ is_zram_active != "active" ]; then - ... + echo -e "\n========================================" + echo "WARNING: you don't have Zram enabled" + echo "Since this script is not yet capable of activating zram, you'll have to do it yourself" + echo "Please refer to https://wiki.archlinux.org/title/Zram#Using_zram-generator" + echo -e "========================================\n" fi ## Mandatory Access Control (Apparmor) is_aa_active=$(sudo systemctl is-active apparmor.service) if [ is_aa_active != "active" ]; then - echo "========================================" - echo "WARNING: you don't have apparmor enabled" - echo "Since this script is not yet capable to handle kernel parameters, you'll have to do it yourself" + echo -e "\n========================================" + echo "WARNING: you don't have AppArmor enabled" + echo "Since this script is not yet capable of managing kernel parameters, you'll have to do it yourself" echo "Please refer to https://wiki.archlinux.org/title/AppArmor" - echo "========================================" + echo -e "========================================\n" fi ## Display manager (Greetd) @@ -106,4 +121,5 @@ fastfetch echo echo "Installation finished" echo "Please check the previous outputs for warnings" -echo "You can make final adjustements before rebooting" \ No newline at end of file +echo "You can make final adjustements before rebooting" +echo "- In particular, if you are using a qwerty keyboard, changing input-fr to input-en in ~/.config/hypr/hyprland.conf" \ No newline at end of file