diff --git a/install-sway.sh b/install-sway.sh index cea2af655f50c771114007853f27da484c7e2400..38fd7424c3c4308f4d96ed5f8a9de752c338ccf2 100755 --- a/install-sway.sh +++ b/install-sway.sh @@ -6,3 +6,10 @@ else fi +if test -d ~/Pictures; then + echo "Pictures directory already exist" + mv ./wallpaper ~/Pictures/ +else + mkdir ~/Pictures + mv ./wallpaper ~/Pictures +fi diff --git a/setup-tui.sh b/setup-tui.sh deleted file mode 100755 index 0d2c584bda0fcb5420caf6ba4efdb490e2480082..0000000000000000000000000000000000000000 --- a/setup-tui.sh +++ /dev/null @@ -1,54 +0,0 @@ -# #!/bin/bash - -# PS3='Quelle distribution Linux utilisez-vous? ' -# options=("Debian" "Arch" "Quitter") -# select opt in "${options[@]}" -# do -# case $opt in -# "Debian") -# echo "Exécution du script Debian" -# ./script-deb.sh -# break -# ;; -# "Arch") -# echo "Exécution du script Arch" -# ./script-arch.sh -# break -# ;; -# "Quitter") -# break -# ;; -# *) echo "Option non valide";; -# esac -# done - -#!/bin/bash - -# Initialisation de ncurses -initscr - -# Désactivation de l'affichage des saisies -noecho - -# Activation des touches de déplacement -cbreak - -# Affichage du menu -distro=$(whiptail --title "Distribution Linux" --menu "Quelle distribution Linux utilisez-vous?" 15 60 4 \ -"Debian" "Utilisez apt pour installer les programmes" \ -"Arch" "Utilisez pacman pour installer les programmes" \ -"Quitter" "Quitter" 3>&1 1>&2 2>&3) - -# Exécution du script en fonction de la réponse de l'utilisateur -if [ "$distro" == "Debian" ]; then - echo "Exécution du script Debian" - ./script-deb.sh -elif [ "$distro" == "Arch" ]; then - echo "Exécution du script Arch" - ./script-arch.sh -else - echo "Quitter" -fi - -# Fermeture de ncurses -endwin \ No newline at end of file diff --git a/setup.sh b/setup.sh index af2d629904aabe8e36d5fa83d9c0760d11ff4b70..2e9344c98343a096498ea3aea9062a35c513e0b8 100755 --- a/setup.sh +++ b/setup.sh @@ -26,7 +26,7 @@ if [ "$distro" == "Debian" ]; then read yn if [ "$yn" == 'y' ]; then # dwm depedencies - sudo apt install sway brightnessctl foot + sudo apt install sway brightnessctl foot swaylock swayidle swayimg #install bemenu git clone https://github.com/Cloudef/bemenu && cd bemenu && make && sudo make install && cd .. && sudo rm -rf bemenu chmod +x install-sway.sh diff --git a/sway/config b/sway/config index e25f6ba3b718feaf6a7ebab1ea058e786311d1d4..55bd19da8f4393c355b5b2f8b73f02b6681cbfc8 100644 --- a/sway/config +++ b/sway/config @@ -18,7 +18,7 @@ set $term foot # Your preferred application launcher # Note: pass the final command to swaymsg so that the resulting window can be opened # on the original workspace that the command was run on. -set $menu dmenu_path | bemenu-run | xargs swaymsg exec -- +set $menu dmenu_path | dmenu_run | xargs swaymsg exec -- input * { xkb_layout "fr" @@ -28,7 +28,7 @@ input * { ### Output configuration # # Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/) -output * bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill +output * bg /home/alexis/Pictures/Wallpaper/nasa/ISS.jpg fill # # Example configuration: # @@ -37,14 +37,11 @@ output * bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill # You can get the names of your outputs by running: swaymsg -t get_outputs ### Idle configuration -# -# Example configuration: -# -# exec swayidle -w \ -# timeout 300 'swaylock -f -c 000000' \ -# timeout 600 'swaymsg "output * power off"' resume 'swaymsg "output * power on"' \ -# before-sleep 'swaylock -f -c 000000' -# +exec swayidle -w \ + timeout 300 'swaylock -f -c 000000' \ + timeout 600 'swaymsg "output * power off"' resume 'swaymsg "output * power on"' \ + before-sleep 'swaylock -f -c 000000' + # This will lock your screen after 300 seconds of inactivity, then turn off # your displays after another 300 seconds, and turn your screens back on when # resumed. It will also lock your screen before your computer goes to sleep. @@ -53,12 +50,12 @@ output * bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill # # Example configuration: # -# input "2:14:SynPS/2_Synaptics_TouchPad" { -# dwt enabled -# tap enabled -# natural_scroll enabled -# middle_emulation enabled -# } + input type:touchpad { + dwt enabled + tap enabled + natural_scroll enabled + #middle_emulation enabled + } # # You can get the names of your inputs by running: swaymsg -t get_inputs # Read `man 5 sway-input` for more information about this section. @@ -75,6 +72,7 @@ output * bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill # Start your launcher bindsym $mod+d exec $menu + #-i' -l '~/.local/share/Steam' '~/Games/Steam' # Drag floating windows by holding down $mod and left mouse button. # Resize them with right mouse button + $mod. @@ -88,6 +86,11 @@ output * bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill # Exit sway (logs you out of your Wayland session) bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -B 'Yes, exit sway' 'swaymsg exit' + + # Lock sway + # bindsym $mod+Shift+l exec swaylock + bindswitch --reload --locked lid:on exec swaylock -c 2F2E2E + # # Brightness bindsym XF86MonBrightnessDown exec brightnessctl set 10%- @@ -131,9 +134,9 @@ output * bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill bindsym $mod+quotedbl workspace 3 bindsym $mod+apostrophe workspace 4 bindsym $mod+parenleft workspace 5 - bindsym $mod+minus workspace 6 # +section on Apple keyboards + bindsym $mod+minus workspace 6 bindsym $mod+egrave workspace 7 - bindsym $mod+underscore workspace 8 # +exclam on Apple keyboards + bindsym $mod+underscore workspace 8 bindsym $mod+ccedilla workspace 9 bindsym $mod+agrave workspace 10 @@ -221,12 +224,13 @@ bar { # When the status_command prints a new line to stdout, swaybar updates. # The default just shows the current date and time. + status_command while date +'%d-%m-%Y %H:%M'; do sleep 1; done colors { statusline #ffffff background #323232 - inactive_workspace #32323200 #32323200 #5c5c5c + inactive_workspace #32323200 #32323200 #828282 } } diff --git a/sway/config.save b/sway/config.save deleted file mode 100644 index 16e67c0c9638976fa9522e1e06cbeb6d3867ce53..0000000000000000000000000000000000000000 --- a/sway/config.save +++ /dev/null @@ -1,227 +0,0 @@ -# Default config for sway -# -# Copy this to ~/.config/sway/config and edit it to your liking. -# -# Read `man 5 sway` for a complete reference. - -### Variables -# -# Logo key. Use Mod1 for Alt. -set $mod Mod4 -# Home row direction keys, like vim -set $left h -set $down j -set $up k -set $right l -# Your preferred terminal emulator -set $term foot -# Your preferred application launcher -# Note: pass the final command to swaymsg so that the resulting window can be opened -# on the original workspace that the command was run on. -set $menu dmenu_path | dmenu_run | xargs swaymsg exec -- - -input * { - xkb_layout "fr" -} - - -### Output configuration -# -# Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/) -output * bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill -# -# Example configuration: -# -# output HDMI-A-1 resolution 1920x1080 position 1920,0 -# -# You can get the names of your outputs by running: swaymsg -t get_outputs - -### Idle configuration -# -# Example configuration: -# -# exec swayidle -w \ -# timeout 300 'swaylock -f -c 000000' \ -# timeout 600 'swaymsg "output * power off"' resume 'swaymsg "output * power on"' \ -# before-sleep 'swaylock -f -c 000000' -# -# This will lock your screen after 300 seconds of inactivity, then turn off -# your displays after another 300 seconds, and turn your screens back on when -# resumed. It will also lock your screen before your computer goes to sleep. - -### Input configuration -# -# Example configuration: -# -# input "2:14:SynPS/2_Synaptics_TouchPad" { -# dwt enabled -# tap enabled -# natural_scroll enabled -# middle_emulation enabled -# } -# -# You can get the names of your inputs by running: swaymsg -t get_inputs -# Read `man 5 sway-input` for more information about this section. - -### Key bindings -# -# Basics: -# - # Start a terminal - bindsym $mod+Return exec $term - - # Kill focused window - bindsym $mod+Shift+q kill - - # Start your launcher - bindsym $mod+d exec $menu - - # Drag floating windows by holding down $mod and left mouse button. - # Resize them with right mouse button + $mod. - # Despite the name, also works for non-floating windows. - # Change normal to inverse to use left mouse button for resizing and right - # mouse button for dragging. - floating_modifier $mod normal - - # Reload the configuration file - bindsym $mod+Shift+c reload - - # Exit sway (logs you out of your Wayland session) - bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -B 'Yes, exit sway' 'swaymsg exit' -# -# Brightness -bindsym XF86MonBrightnessDown exec light -U 2 -bindsym XF86MonBrightnessUp exec light -A 4 -# -# Moving around: -# - # Move your focus around - bindsym $mod+$left focus left - bindsym $mod+$down focus down - bindsym $mod+$up focus up - bindsym $mod+$right focus right - # Or use $mod+[up|down|left|right] - bindsym $mod+Left focus left - bindsym $mod+Down focus down - bindsym $mod+Up focus up - bindsym $mod+Right focus right - - # Move the focused window with the same, but add Shift - bindsym $mod+Shift+$left move left - bindsym $mod+Shift+$down move down - bindsym $mod+Shift+$up move up - bindsym $mod+Shift+$right move right - # Ditto, with arrow keys - bindsym $mod+Shift+Left move left - bindsym $mod+Shift+Down move down - bindsym $mod+Shift+Up move up - bindsym $mod+Shift+Right move right -# -# Workspaces: -# - # Switch to workspace - bindsym $mod+ampersand workspace 1 - bindsym $mod+eacute workspace 2 - bindsym $mod+quotedbl workspace 3 - bindsym $mod+apostrophe workspace 4 - bindsym $mod+parenleft workspace 5 - bindsym $mod+minus workspace 6 # +section on Apple keyboards - bindsym $mod+egrave workspace 7 - bindsym $mod+underscore workspace 8 # +exclam on Apple keyboards - bindsym $mod+ccedilla workspace 9 - bindsym $mod+agrave workspace 10 - - # Move focused container to workspace - bindsym $mod+Shift+ampersand move container to workspace number 1 - bindsym $mod+Shift+eacute move container to workspace number 2 - bindsym $mod+Shift+quotedbl move container to workspace number 3 - bindsym $mod+Shift+apostrophe move container to workspace number 4 - bindsym $mod+Shift+parenleft move container to workspace number 5 - bindsym $mod+Shift+minus move container to workspace number 6 - bindsym $mod+Shift+egrave move container to workspace number 7 - bindsym $mod+Shift+underscore move container to workspace number 8 - bindsym $mod+Shift+ccedilla move container to workspace number 9 - bindsym $mod+Shift+agrave move container to workspace number 10 - # Note: workspaces can have any name you want, not just numbers. - # We just use 1-10 as the default. -# -# Layout stuff: -# - # You can "split" the current object of your focus with - # $mod+b or $mod+v, for horizontal and vertical splits - # respectively. - bindsym $mod+b splith - bindsym $mod+v splitv - - # Switch the current container between different layout styles - bindsym $mod+s layout stacking - bindsym $mod+w layout tabbed - bindsym $mod+e layout toggle split - - # Make the current focus fullscreen - bindsym $mod+f fullscreen - - # Toggle the current focus between tiling and floating mode - bindsym $mod+Shift+space floating toggle - - # Swap focus between the tiling area and the floating area - bindsym $mod+space focus mode_toggle - - # Move focus to the parent container - bindsym $mod+a focus parent -# -# Scratchpad: -# - # Sway has a "scratchpad", which is a bag of holding for windows. - # You can send windows there and get them back later. - - # Move the currently focused window to the scratchpad - #bindsym $mod+Shift+minus move scratchpad - - # Show the next scratchpad window or hide the focused scratchpad window. - # If there are multiple scratchpad windows, this command cycles through them. - #bindsym $mod+minus scratchpad show -# -# Resizing containers: -# -mode "resize" { - # left will shrink the containers width - # right will grow the containers width - # up will shrink the containers height - # down will grow the containers height - bindsym $left resize shrink width 10px - bindsym $down resize grow height 10px - bindsym $up resize shrink height 10px - bindsym $right resize grow width 10px - - # Ditto, with arrow keys - bindsym Left resize shrink width 10px - bindsym Down resize grow height 10px - bindsym Up resize shrink height 10px - bindsym Right resize grow width 10px - - # Return to default mode - bindsym Return mode "default" - bindsym Escape mode "default" -} -bindsym $mod+r mode "resize" - -# -# Status Bar: -# -# Read `man 5 sway-bar` for more information about this section. -bar { - position bottom - - # When the status_command prints a new line to stdout, swaybar updates. - # The default just shows the current date and time. - status_command while date +'%d-%m-%Y %H:%M'; do sleep 1; done - - colors { - statusline #ffffff - background #323232 - inactive_workspace #32323200 #32323200 #5c5c5c - } -} - -include /etc/sway/config.d/* diff --git a/tui.sh b/tui.sh deleted file mode 100755 index 49e43cc9c496165204200db7834c3794de106e66..0000000000000000000000000000000000000000 --- a/tui.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash - -distro="" -yn="" - -# ncurses tui menu -distro=$(whiptail --inputbox "What GNU/Linux distribution are you using ? Enter 'Debian' or 'Arch'" 8 78 --title "GNU/Linux Distribution" 3>&1 1>&2 2>&3) - -if [ "$distro" == "Debian" ]; then - sudo apt update - - yn=$(whiptail --yesno "Install and setup DWM ?" 8 78 --title "DWM Installation" 3>&1 1>&2 2>&3) - if [ "$yn" == 0 ]; then - # dwm dependencies - sudo apt install build-essential libx11-dev libxft-dev libxinerama-dev libfreetype6-dev libfontconfig1-dev\ - xbacklight alsa-utils - ./install-dwm.sh - ./fix-screen-tearing.sh - fi - - yn=$(whiptail --yesno "Install recommended programs ?" 8 78 --title "Programs Installation" 3>&1 1>&2 2>&3) - if [ "$yn" == 0 ]; then - # programs - sudo apt install network-manager chromium newsboat thunderbird libreoffice pandoc texlive-full xss-lock slock xbacklight neofetch ranger htop - sudo systemctl enable --now NetworkManager - - yn=$(whiptail --yesno "Install VScode ?" 8 78 --title "VScode Installation" 3>&1 1>&2 2>&3) - if [ "$yn" == 0 ]; then - # vscode - curl https://go.microsoft.com/fwlink/?LinkID=760868 && sudo apt install ./code*.deb - fi - - yn=$(whiptail --yesno "Install Mullvad VPN ?" 8 78 --title "Mullvad Installation" 3>&1 1>&2 2>&3) - if [ "$yn" == 0 ]; then - # mullvad - curl https://mullvad.net/download/app/deb/latest/ && sudo apt install ./Mullvad*.deb && sudo systemctl enable --now mullvad-daemon - fi - fi - -elif [ "$distro" == "Arch" ]; then - sudo pacman -Sy - sudo pacman -S base-devel libx11 libxft libxinerama freetype2 fontconfig -else - echo "Non recognized distribution" - echo "Quitting" -fi diff --git a/wallpaper/ISS.jpg b/wallpaper/ISS.jpg new file mode 100755 index 0000000000000000000000000000000000000000..8db5f77559e7fcb31263d5f60d454aeea3208b14 Binary files /dev/null and b/wallpaper/ISS.jpg differ