From 744a7b01b8c5e7e84056ac71cc770b51f02cb333 Mon Sep 17 00:00:00 2001 From: SALVIJER Date: Tue, 10 Sep 2024 10:16:14 +0200 Subject: [PATCH] splitting config for work or home --- links/i3wm/config | 4 +- links/i3wm/work | 46 ++++++++++++++++++++ links/polybar/config.ini | 4 +- links/polybar/work.ini | 92 +++++++++++++++++++++++++++++++++++++++ links/rofi/launcher.rasi | 1 + scripts/bookmarks | 20 ++++++++- scripts/mpv.sh | 2 +- scripts/update.sh | 22 ++++++++-- scripts/variables.example | 2 + 9 files changed, 182 insertions(+), 11 deletions(-) diff --git a/links/i3wm/config b/links/i3wm/config index 2ea83d2..86dd272 100644 --- a/links/i3wm/config +++ b/links/i3wm/config @@ -50,7 +50,7 @@ bindsym F6 exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +5% # Workspaces # ############## -include /etc/i3/home +include /etc/i3/work ########################### #Design @@ -99,11 +99,9 @@ client.background $bg ########### # Startup # ########### -#exec --no-startup-id xrandr --output eDP-1 --primary --output DP-5 --left-of eDP-1 --output DP-4 --left-of DP-5 exec_always --no-startup-id /usr/local/share/dotfiles/scripts/wallpapers.sh exec_always --no-startup-id "killall picom ; picom" exec_always --no-startup-id "killall dunst ; dunst" -exec_always --no-startup-id "killall polybar ; polybar HDMI-1 & polybar HDMI-0 &" ################# # Apps shortcut # diff --git a/links/i3wm/work b/links/i3wm/work index e69de29..a66d495 100644 --- a/links/i3wm/work +++ b/links/i3wm/work @@ -0,0 +1,46 @@ +set $monitor0 DP-4 +set $monitor1 DP-5 +set $monitor2 eDP-1 + +set $ws1 "1" +set $ws2 "2" +set $ws3 "3" +set $ws4 "4" +set $ws5 "5" +set $ws6 "6" +set $ws7 "7" +set $ws8 "8" +set $ws9 "9" + +workspace $ws1 output $monitor0 +workspace $ws2 output $monitor0 +workspace $ws3 output $monitor0 +workspace $ws4 output $monitor1 +workspace $ws5 output $monitor1 +workspace $ws6 output $monitor1 +workspace $ws7 output $monitor2 +workspace $ws8 output $monitor2 +workspace $ws9 output $monitor2 + +bindsym $mod+mod2+KP_1 workspace $ws1 +bindsym $mod+mod2+KP_2 workspace $ws2 +bindsym $mod+mod2+KP_3 workspace $ws3 +bindsym $mod+mod2+KP_4 workspace $ws4 +bindsym $mod+mod2+KP_5 workspace $ws5 +bindsym $mod+mod2+KP_6 workspace $ws6 +bindsym $mod+mod2+KP_7 workspace $ws7 +bindsym $mod+mod2+KP_8 workspace $ws8 +bindsym $mod+mod2+KP_9 workspace $ws9 + +bindsym $mod+Control+mod2+KP_1 move container to workspace $ws1 +bindsym $mod+Control+mod2+KP_2 move container to workspace $ws2 +bindsym $mod+Control+mod2+KP_3 move container to workspace $ws3 +bindsym $mod+Control+mod2+KP_4 move container to workspace $ws4 +bindsym $mod+Control+mod2+KP_5 move container to workspace $ws5 +bindsym $mod+Control+mod2+KP_6 move container to workspace $ws6 +bindsym $mod+Control+mod2+KP_7 move container to workspace $ws7 +bindsym $mod+Control+mod2+KP_8 move container to workspace $ws8 +bindsym $mod+Control+mod2+KP_9 move container to workspace $ws9 + +exec --no-startup-id xrandr --output DP-5 --primary --mode 1920x1080 --scale 1x1 --output eDP-1 --right-of DP-5 --mode 1920x1200 --scale 1x1 --output DP-4 --left-of DP-5 --mode 1920x1080 --scale 1x1 +exec_always --no-startup-id "killall polybar ; polybar DP-5 & polybar DP-4 & polybar eDP-1" diff --git a/links/polybar/config.ini b/links/polybar/config.ini index 9c77aa1..8cfacd8 100644 --- a/links/polybar/config.ini +++ b/links/polybar/config.ini @@ -17,7 +17,7 @@ ;========================================================== include-file = /etc/polybar/colors.ini -include-file = /etc/polybar/home.ini +include-file = /etc/polybar/work.ini [module/separator] type = custom/text @@ -122,7 +122,7 @@ label-indicator-background = ${colors.primary} [module/memory] type = internal/memory interval = 2 -format-prefix = " " +format-prefix = " " format-prefix-font = 3 format-prefix-foreground = ${colors.primary} label = %percentage_used:2%% diff --git a/links/polybar/work.ini b/links/polybar/work.ini index e69de29..f58cf14 100644 --- a/links/polybar/work.ini +++ b/links/polybar/work.ini @@ -0,0 +1,92 @@ +[bar/DP-4] +monitor = DP-4 + +width = 100% +height = 30px +radius = 0 + +background = ${colors.background} +foreground = ${colors.foreground} + +line-size = 3px + +border-size = 0pt + +padding-left = 10px +padding-right = 0px + +font-0 = ComicShannsMono Nerd Font:size=14;2 +font-1 = ComicShannsMono Nerd Font:size=14;1 +font-2 = ComicShannsMono Nerd Font:size=14;0 + +fixed-center = true +modules-left = arch separator cpu separator memory separator filesystemprefix filesystem separator eth separator ethspeed separator pulseaudio +modules-center = i3 +modules-right = xkeyboard separator dateprefix date + +cursor-click = pointer +cursor-scroll = ns-resize + +enable-ipc = true + +[bar/DP-5] +monitor = DP-5 + +width = 100% +height = 30px +radius = 0 + +background = ${colors.background} +foreground = ${colors.foreground} + +line-size = 3px + +border-size = 0pt + +padding-left = 10px +padding-right = 0px + +font-0 = ComicShannsMono Nerd Font:size=14;2 +font-1 = ComicShannsMono Nerd Font:size=14;1 +font-2 = ComicShannsMono Nerd Font:size=14;0 + +fixed-center = true +modules-left = arch separator cpu separator memory separator filesystemprefix filesystem separator eth separator ethspeed separator pulseaudio +modules-center = i3 +modules-right = pacman separator xkeyboard separator dateprefix date systray + +cursor-click = pointer +cursor-scroll = ns-resize + +enable-ipc = true + +[bar/eDP-1] +monitor = eDP-1 + +width = 100% +height = 30px +radius = 0 + +background = ${colors.background} +foreground = ${colors.foreground} + +line-size = 3px + +border-size = 0pt + +padding-left = 10px +padding-right = 0px + +font-0 = ComicShannsMono Nerd Font:size=14;2 +font-1 = ComicShannsMono Nerd Font:size=14;1 +font-2 = ComicShannsMono Nerd Font:size=14;0 + +fixed-center = true +modules-left = arch separator cpu separator memory separator filesystemprefix filesystem separator eth separator ethspeed separator pulseaudio +modules-center = i3 +modules-right = xkeyboard separator dateprefix date + +cursor-click = pointer +cursor-scroll = ns-resize + +enable-ipc = true diff --git a/links/rofi/launcher.rasi b/links/rofi/launcher.rasi index 5f8879b..c373aea 100644 --- a/links/rofi/launcher.rasi +++ b/links/rofi/launcher.rasi @@ -86,6 +86,7 @@ listview { background-color: @transparent; border: 1px; border-color: @blue; + columns: 2; } element { diff --git a/scripts/bookmarks b/scripts/bookmarks index 6498a84..964a89f 100644 --- a/scripts/bookmarks +++ b/scripts/bookmarks @@ -2,6 +2,24 @@ https://gta.grandbesancon.fr (Etempo) http://s-ipam-p1 (Ipam) https://teams.microsoft.com (Teams) +https://support.grandbesancon.fr (Glpi) +https://courrier.grandbesancon.fr/owa (Xchange) +https://web.openrainbow.com (Rainbow) +https://dokuwiki.grandbesancon.fr (Dokuwiki) +https://172.18.228.25:8445 (ISMSVA) +https://s-vcenter6-p1.ville.besancon (VSphere) +https://s-ocum-p1.ville.besancon (Ocum) +https://172.18.227.110 (Netapp) +https://supervision.grandbesancon.fr (Centrifion) +https://s-trenddeep-p1:4119 (Trend) +http://s-aptcacher-p1:3142 (Aptcacher) +https://kemp.grandbesancon.fr/ (Kemp) +https://proxyint.grandbesancon.fr (Proxyint) +https://proxyext.grandbesancon.fr (Proxyext) +https://git.grandbesancon.fr/ (Gitea) +https://wiki.grandbesancon.fr/ (WikiJS) +https://orchestrator.grandbesancon.fr (Semaphore) +https://portainer.grandbesancon.fr (Portainer) ### Unixyourbrain bookmarks https://unixyourbrain.org (Heimdall) https://accounts.unixyourbrain.org (Authelia) @@ -15,7 +33,7 @@ https://passbolt.unixyourbrain.org (Passbolt) https://wiki.unixyourbrain.org (Wikijs) https://git.unixyourbrain.org (Gitea) https://rutorrent.unixyourbrain.org (Rutorrent) -http://10.0.0.1:4447 (Downloads) +http://10.0.0.1:2013 (Downloads) https://nextcloud.unixyourbrain.org (Nextcloud) http://192.168.0.254/ (Freebox) ### diff --git a/scripts/mpv.sh b/scripts/mpv.sh index 462f16c..1df3451 100755 --- a/scripts/mpv.sh +++ b/scripts/mpv.sh @@ -29,4 +29,4 @@ if [[ "$_RESULT" =~ .*/$ ]]; then exit 0 fi -mpv "http://10.0.0.1:4447/$_RESULT" +mpv "http://10.0.0.1:2013/$_RESULT" diff --git a/scripts/update.sh b/scripts/update.sh index 5a0fc17..28ef61d 100755 --- a/scripts/update.sh +++ b/scripts/update.sh @@ -9,7 +9,7 @@ source ./scripts/functions ### Global variables _DIRNAME="$(pwd)" -_PACKAGES=(arc-icon-theme chromium code curl discord dmenu dunst egl-wayland feh flameshot flatpak firefox htop hyprland i3lock i3-wm imagemagick lxappearance mpv nwg-look otf-comicshanns-nerd pavucontrol pipewire pipewire-jack pipewire-pulse polybar neofetch numlockx papirus-icon-theme picom plocate polybar remmina ttf-dejavu-nerd wget wireguard-tools xdg-desktop-portal xorg xorg-xinit) +_PACKAGES=(arc-gtk-theme chromium code curl discord dmenu dunst egl-wayland feh flameshot flatpak firefox htop hyprland i3lock i3-wm imagemagick lxappearance mpv nwg-look otf-comicshanns-nerd pavucontrol pipewire pipewire-jack pipewire-pulse polybar neofetch numlockx papirus-icon-theme picom plocate polybar remmina ttf-dejavu-nerd wget wireguard-tools xdg-desktop-portal xorg xorg-xinit) ### Configure pacman and install needeed packages _info "Configuring and updateing packages" @@ -82,9 +82,23 @@ mkdir -p ~/.config/kitty ln -sf "$_DIRNAME/links/kitty/kitty.conf" ~/.config/kitty/kitty.conf ln -sf "$_DIRNAME/links/kitty/current-theme.conf" ~/.config/kitty/current-theme.conf -### work vs home include home or work -#https://i3wm.org/docs/userguide.html#include -#https://github.com/polybar/polybar/wiki/Configuration#file-inclusion +### Qwerty fr +cp /usr/share/X11/xkb/symbols/us /usr/share/X11/xkb/symbols/us_qwerty-fr +curl https://raw.githubusercontent.com/qwerty-fr/qwerty-fr/master/linux/us_qwerty-fr >> /usr/share/X11/xkb/symbols/us_qwerty-fr + +if [[ $_LOCATION == "work" ]] +then + _info "Configuring for work" + sed -i "s|^include /etc/i3.*|include /etc/i3/work|" ./links/i3wm/config + sed -i "s|^include-file = /etc/polybar/home.ini|include-file = /etc/polybar/work.ini|" ./links/polybar/config.ini +fi +if [[ $_LOCATION == "home" ]] +then + _info "Configuring for work" + sed -i "s|^include /etc/i3.*|include /etc/i3/home|" ./links/i3wm/config + sed -i "s|^include-file = /etc/polybar/work.ini|include-file = /etc/polybar/home.ini|" ./links/polybar/config.ini +fi + ### nvidia vs amd ### Print kernel cmdline diff --git a/scripts/variables.example b/scripts/variables.example index 9e21257..9dcc9d5 100644 --- a/scripts/variables.example +++ b/scripts/variables.example @@ -1,4 +1,6 @@ ### Globals +# Location home|work +_LOCATION= # GPU : nvidia|amd _GPU= ### Colors