diff --git a/default.conf.yaml b/default.conf.yaml index 8497d1e..ad379d1 100644 --- a/default.conf.yaml +++ b/default.conf.yaml @@ -20,6 +20,7 @@ ~/bin: general/bin ~/.i3/config: general/i3config ~/.i3/pad.png: general/pad.png + ~/.nbxrc: general/nbxrc ~/.compton.conf: general/compton.conf ~/.tmux.conf: general/tmux.conf ~/.tmux.conf.local: general/tmux.conf.local diff --git a/general/compton.conf b/general/compton.conf index 3bc7298..401b6e7 100644 --- a/general/compton.conf +++ b/general/compton.conf @@ -114,7 +114,7 @@ inactive-opacity = 0.7; active-opacity = 0.9; frame-opacity = 0.7; inactive-opacity-override = false; -alpha-step = 0.06; +# alpha-step = 0.06; # Dim inactive windows. (0.0 - 1.0) # inactive-dim = 0.2; @@ -133,12 +133,14 @@ blur-background-exclude = [ opacity-rule = [ "99:class_g = 'Firefox'", + "99:class_g = 'Nightly'", "99:class_g = 'Google-chrome'", "99:class_g = 'factorio'", "99:class_g = 'Vivaldi-stable'", "99:class_g ~= 'notion-nativefier.*'", - - "99:class_g = 'Vlc'" + "99:class_g ~= 'Minecraft.*'", + "99:class_g = 'Vlc'", + "99:class_g = 'zoom'" ]; @@ -201,7 +203,7 @@ vsync = "opengl-swc"; # Reported to have no effect, though. dbe = false; # Painting on X Composite overlay window. Recommended. -paint-on-overlay = true; +# paint-on-overlay = true; # Limit compton to repaint at most once every 1 / refresh_rate second to boost performance. # This should not be used with --vsync drm/opengl/opengl-oml as they essentially does --sw-opti's job already, diff --git a/general/gitconfig b/general/gitconfig index 433e18d..54f79b5 100644 --- a/general/gitconfig +++ b/general/gitconfig @@ -27,3 +27,7 @@ insteadOf = git:// [commit] gpgsign = true +[pull] + rebase = false +[init] + defaultBranch = main diff --git a/general/i3config b/general/i3config index f914219..d0fec06 100644 --- a/general/i3config +++ b/general/i3config @@ -82,7 +82,7 @@ bindsym $mod+shift+t exec xfce4-terminal -e ranger bindsym $mod+p exec rofi -show run -terminal termite -lines 5 -eh 3 -width 100 -padding 285 -opacity 80 -bw 0 -font "Monoid Nerd Font 11" # start dmenu (a program launcher) -#bindsym $mod+shift+p exec --no-startup-id sh ~/scripts//dmenu-run.sh ' +#bindsym $mod+shift+p edxec --no-startup-id sh ~/scripts//dmenu-run.sh ' bindsym $mod+d exec i3-dmenu-desktop --dmenu='rofi -dmenu -show run -location 1 -xoffset 14 -p "Applications:" -sidebar-mode' # lock screen @@ -215,9 +215,10 @@ exec --no-startup-id feh --bg-scale ~/.dotfiles/wall.jpg #exec --no-startup-id xautolock -time 10 -locker /home/mathieu/scripts/lock.sh -secure #exec --no-startup-id ~/scripts/random_wallpaper.sh exec --no-startup-id xautolock -time 10 -locker ~/scripts/lock.sh -secure -exec --no-startup-id exec compton -cb --config .compton.conf -exec --no-startup-id exec compton -cb --config .compton.conf +exec --no-startup-id exec picom -cb --config .compton.conf +exec --no-startup-id exec picom -cb --config .compton.conf exec --no-startup-id flameshot +exec --no-startup-id pasystray exec --no-startup-id jetbrains-toolbox --minimize --disable-seccomp-filter-sandbox exec_always --no-startup-id $HOME/.config/polybar/launch.sh exec xrdb ~/.Xresources diff --git a/general/nbxrc b/general/nbxrc new file mode 100644 index 0000000..7a7af03 --- /dev/null +++ b/general/nbxrc @@ -0,0 +1,6 @@ +{ + "git": { + "user": "Nicolas Beaussart", + "email": "nic.beaussart@gmail.com" + } +} diff --git a/general/polybar.config b/general/polybar.config index 4ad16f4..4963a26 100644 --- a/general/polybar.config +++ b/general/polybar.config @@ -64,7 +64,7 @@ modules-center = modules-right = wlan xbacklight battery cpu memory voltage temperature tray-detached = false -tray-position = right +tray-position = ${env:TRAY_POSITION:} [bar/default] monitor = ${env:MONITOR:} @@ -87,10 +87,38 @@ font-0 = ${shared.font} font-1 = ${shared.font2} font-2 = ${shared.font3} -modules-left = i3 +modules-left = i3 red yellow green modules-center = xwindow modules-right = volume pkg date background Shutdown + +[module/red] +type = custom/script +exec = echo "" +click-left = node ~/perso/projects/blinkstick/index.js red +click-right = node ~/perso/projects/blinkstick/index.js red +click-middle = node ~/perso/projects/blinkstick/index.js red +format-padding = 0 +format-foreground = #e33232 + +[module/yellow] +type = custom/script +exec = echo "" +click-left = node ~/perso/projects/blinkstick/index.js yellow +click-right = node ~/perso/projects/blinkstick/index.js yellow +click-middle = node ~/perso/projects/blinkstick/index.js yellow +format-padding = 0 +format-foreground = #e3ce32 + +[module/green] +type = custom/script +exec = echo "" +click-left = node ~/perso/projects/blinkstick/index.js green +click-right = node ~/perso/projects/blinkstick/index.js green +click-middle = node ~/perso/projects/blinkstick/index.js green +format-padding = 0 +format-foreground = #32e361 + [module/vpncheck] type = custom/script exec = pgrep openvpn @@ -194,6 +222,7 @@ label-empty-padding = 2 type = internal/i3 format = index-sort = true +pin-workspaces = true wrapping-scroll = false strip-wsnumbers = true @@ -287,7 +316,7 @@ format-connected-underline = #9f78e1 ;label-connected = %essid% %{F#66}%local_ip% %{F#ff}%{T6} %upspeed% %downspeed%%{T-} label-connected = %essid% %{F#66} %upspeed:8%  %downspeed:8% -format-disconnected =  not connected +format-disconnected =  Not connected ;format-disconnected = ;format-disconnected-underline = ${self.format-connected-underline} ;label-disconnected = %ifname% disconnected diff --git a/general/polybar.launch.sh b/general/polybar.launch.sh index aabd5f8..c383fac 100755 --- a/general/polybar.launch.sh +++ b/general/polybar.launch.sh @@ -10,7 +10,9 @@ WIFI_CARD=$(iw dev | awk '$1=="Interface"{print $2}') # Launch bar1 and bar2 if type "xrandr"; then for m in $(xrandr --query | grep " connected" | cut -d" " -f1); do - MONITOR=$m WIFI_CARD=$WIFI_CARD polybar downbar & + [[ $m = eDP1 ]] && tray="right" || tray="" + echo $m $tray $WIFI_CARD + MONITOR=$m WIFI_CARD=$WIFI_CARD TRAY_POSITION=$tray polybar downbar & MONITOR=$m WIFI_CARD=$WIFI_CARD polybar default & done else diff --git a/general/scripts/init_workspace.sh b/general/scripts/init_workspace.sh index 11d28bd..ad758c7 100755 --- a/general/scripts/init_workspace.sh +++ b/general/scripts/init_workspace.sh @@ -28,10 +28,10 @@ workspace7="7:" # App you want to start : apps=( - #if you're using urxvt then replace st with that "notion" "telegram-desktop" - "google-chrome-stable" + "termite" + #"google-chrome-stable" "termite" "termite" "slack" diff --git a/general/zshrc b/general/zshrc index 5083d68..c4d4b79 100644 --- a/general/zshrc +++ b/general/zshrc @@ -98,17 +98,13 @@ ENHANCD_FILTER=fzf; export ENHANCD_FILTER source $ZSH/oh-my-zsh.sh # Load nvm init script -if [ -f /usr/share/nvm/init-nvm.sh ]; then - source /usr/share/nvm/init-nvm.sh -fi +[ -f /usr/share/nvm/init-nvm.sh ] && source /usr/share/nvm/init-nvm.sh # added by travis gem [ -f /home/beaussan/.travis/travis.sh ] && source /home/beaussan/.travis/travis.sh # Load git flow completion -if [ -f /usr/share/zsh/site-functions/git-flow-completion.zsh ]; then - source /usr/share/zsh/site-functions/git-flow-completion.zsh -fi +[ -f /usr/share/zsh/site-functions/git-flow-completion.zsh ] && source /usr/share/zsh/site-functions/git-flow-completion.zsh ###### Overides diff --git a/setupStd.conf.yaml b/setupStd.conf.yaml index 24f43ec..d09de25 100644 --- a/setupStd.conf.yaml +++ b/setupStd.conf.yaml @@ -4,66 +4,60 @@ create: true force: true - - shell: - - - command : yay --needed --noconfirm -S pacman-contrib ttf-monoid ttf-unifont ttf-font-awesome nerd-fonts-complete noto-fonts-emoji - description: Installing fonts - stdin: true - stdout: true - stderr: true - - - command : yay --needed --noconfirm -S gnu-netcat rofi-git zsh feh fzf i3-gaps-next-git xautolock polybar termite tree i3lock-fancy-git cower compton checkupdates+aur checkupdates-aur lsd bat ranger-git rofi-git pygmentize fzy xclip evince perl-file-mimeinfo openssh thunar-archive-plugin thunar - description: Installing base software - stdin: true - stdout: true - stderr: true - - - command : yay --needed --noconfirm -S yarn gitflow-avh gitflow-zshcompletion-avh nodejs jetbrains-toolbox npm nvm neovim - description: Installing codding tools - stdin: true - stdout: true - stderr: true - - - command : yay --needed --noconfirm -S telegram-desktop spotify-dev slack-desktop - description: Installing other software - stdin: true - stdout: true - stderr: true - - - command : yay --needed --noconfirm -S docker docker-compose && sudo systemctl enable docker && sudo systemctl start docker && sudo groupadd docker && sudo usermod -a -G docker $USER - description: Installing docker - stdin: true - stdout: true - stderr: true - - - command : yay --needed --noconfirm -S jdk8-openjdk openjdk8-doc openjdk8-src - description: Installing java software - stdin: true - stdout: true - stderr: true - - - command : sudo sh -c 'echo "JAVA_HOME=/usr/lib/jvm/java-8-openjdk/" > /etc/profile.d/jdk.sh ' && source /etc/profile.d/jdk.sh - description: "Setup JAVA_HOME for arch" - stdin: true - stdout: true - stderr: true - - - command: mkdir -p ~/.local/share/fonts/monoid_nerd && cp ~/.dotfiles/fonts/monid_nerd/* ~/.local/share/fonts/monoid_nerd && sudo fc-cache - description: "Installing custom fonts" - stdin: true - stdout: true - stderr: true - - - command: ssh-keygen -t rsa -b 4096 - description: Generating ssh key - stdin: true - stdout: true - stderr: true - - - command: yarn global add gitmoji-cli tldr wallhaven-fetcher - description: "Installing global tools via yarn" - stdin: true - stdout: true - stderr: true - - source ~/.zshrc || true \ No newline at end of file + - command: yay --needed --noconfirm -S pacman-contrib ttf-monoid ttf-unifont ttf-font-awesome nerd-fonts-complete noto-fonts-emoji + description: Installing fonts + stdin: true + stdout: true + stderr: true + - command: yay --needed --noconfirm -S termite lsd bat + description: Installing fonts + stdin: true + stdout: true + stderr: true + - command: yay --needed --noconfirm -S gnu-netcat rofi-git zsh feh fzf i3-gaps-next-git xautolock polybar tree i3lock-fancy-git cower compton checkupdates+aur checkupdates-aur ranger-git rofi-git pygmentize fzy xclip evince perl-file-mimeinfo openssh thunar-archive-plugin thunar + description: Installing base software + stdin: true + stdout: true + stderr: true + - command: yay --needed --noconfirm -S yarn gitflow-avh gitflow-zshcompletion-avh nodejs jetbrains-toolbox npm nvm neovim + description: Installing codding tools + stdin: true + stdout: true + stderr: true + - command: yay --needed --noconfirm -S telegram-desktop spotify-dev slack-desktop + description: Installing other software + stdin: true + stdout: true + stderr: true + - command: yay --needed --noconfirm -S docker docker-compose && sudo systemctl enable docker && sudo systemctl start docker && sudo groupadd docker && sudo usermod -a -G docker $USER + description: Installing docker + stdin: true + stdout: true + stderr: true + - command: yay --needed --noconfirm -S jdk8-openjdk openjdk8-doc openjdk8-src + description: Installing java software + stdin: true + stdout: true + stderr: true + - command: sudo sh -c 'echo "JAVA_HOME=/usr/lib/jvm/java-8-openjdk/" > /etc/profile.d/jdk.sh ' && source /etc/profile.d/jdk.sh + description: "Setup JAVA_HOME for arch" + stdin: true + stdout: true + stderr: true + - command: mkdir -p ~/.local/share/fonts/monoid_nerd && cp ~/.dotfiles/fonts/monid_nerd/* ~/.local/share/fonts/monoid_nerd && sudo fc-cache + description: "Installing custom fonts" + stdin: true + stdout: true + stderr: true + - command: ssh-keygen -t rsa -b 4096 + description: Generating ssh key + stdin: true + stdout: true + stderr: true + - command: yarn global add gitmoji-cli tldr wallhaven-fetcher + description: "Installing global tools via yarn" + stdin: true + stdout: true + stderr: true + - source ~/.zshrc || true diff --git a/wall_1.jpg b/wall_1.jpg new file mode 100644 index 0000000..a261883 Binary files /dev/null and b/wall_1.jpg differ