From 2fd5124f9773c2d93b5603c7ea3e288b9cc4599e Mon Sep 17 00:00:00 2001 From: Antoine Phan Date: Tue, 18 Nov 2025 13:49:38 -0500 Subject: [PATCH] Fix configs of hyprland and niri and waybar --- alacritty/.config/alacritty/alacritty.yml | 2 +- bash/.bashrc | 2 ++ hypr/.config/hypr/hyprland.conf | 14 +++++----- niri/.config/niri/config.kdl | 34 +++++++++++++++++++++-- waybar/.config/waybar/config | 25 ++++++++++++----- wofi/.config/wofi/style.css | 32 +++++++++++++++------ xinit/.xinitrc | 8 +++--- zsh/.zshrc | 23 +++++++++++++++ 8 files changed, 110 insertions(+), 30 deletions(-) diff --git a/alacritty/.config/alacritty/alacritty.yml b/alacritty/.config/alacritty/alacritty.yml index e49059d..cc0a946 100644 --- a/alacritty/.config/alacritty/alacritty.yml +++ b/alacritty/.config/alacritty/alacritty.yml @@ -120,7 +120,7 @@ window: font: normal: # Font family - family: FiraCode Nerd Font + family: Fira Code # The `style` can be specified to pick a specific face. style: Medium diff --git a/bash/.bashrc b/bash/.bashrc index f779444..03800c8 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -155,3 +155,5 @@ export XMODIFIERS=@im=ibus alias mcgillvpn='/opt/cisco/anyconnect/bin/vpnui &' alias mcgillvpn='/opt/cisco/anyconnect/bin/vpnui &' + +. "$HOME/.local/bin/env" diff --git a/hypr/.config/hypr/hyprland.conf b/hypr/.config/hypr/hyprland.conf index 39ba83b..0b0df7c 100644 --- a/hypr/.config/hypr/hyprland.conf +++ b/hypr/.config/hypr/hyprland.conf @@ -100,12 +100,12 @@ animations { # Some default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more # bezier = myBezier, 0.05, 0.9, 0.1, 1.05 - bezier = myBezier, .72,.39,.25,.92 +# bezier = myBezier, .72,.39,.25,.92 - animation = windows, 1, 4, myBezier + animation = windows, 1, 4, default animation = windowsOut, 1, 4, default, popin 100% - # animation = windowsOut, 1, 3, myBezier - animation = border, 1, 3, myBezier + animation = windowsOut, 1, 3, default + animation = border, 1, 3, default animation = borderangle, 1, 8, default animation = fade, 1, 7, default # animation = workspaces, 1, 6, default @@ -123,10 +123,10 @@ master { # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more } -gestures { +# gestures { # See https://wiki.hyprland.org/Configuring/Variables/ for more - workspace_swipe = yes -} +# workspace_swipe = yes +#} misc { # See https://wiki.hyprland.org/Configuring/Variables/ for more diff --git a/niri/.config/niri/config.kdl b/niri/.config/niri/config.kdl index 44f8174..3905fb5 100644 --- a/niri/.config/niri/config.kdl +++ b/niri/.config/niri/config.kdl @@ -37,13 +37,34 @@ output "GIGA-BYTE TECHNOLOGY CO., LTD. G27F 2 23030B002769" { mode "1920x1080@170" scale 1 // Second monitor to the right - position x=1920 y=0 + position x=-1920 y=0 } output "Dell Inc. DELL U2412M YMYH14450KRL" { position x=0 y=-1200 } +// At work monitor +output "Dell Inc. DELL E2418HN GXY2M8BJ1T9B" { + position x=0 y=-1080 +} + +// Trottier 5th floor monitors +output "Dell Inc. DELL P2422HE 4MMLLQ3" { + position x=0 y=-1080 // on top +} + +// 1B45, mirror +output "Crestron Electronics, Inc. Crestron Unknown" { + position x=0 y=0 +} + +// The Factory +output "Microstep MSI G274QPF CC2H633602149" { + mode "2560x1440@60.000" + position x=0 y=-1440 +} + output "HDMI-A-1" { mode "1920x1080@60" position x=0 y=0 @@ -128,11 +149,13 @@ layout { // Mod+Shift+R preset-window-heights { proportion 0.5 + proportion 1.0 } // The windows themselves will decide their initial width. default-column-width { - proportion 0.6 + // proportion 0.5 + } focus-ring { @@ -243,7 +266,7 @@ animations { // Slow down all animations by this factor. Values below 1 speed them up instead. slowdown 2.0 window-open { - duration-ms 150 + duration-ms 240 curve "ease-out-cubic" } @@ -544,3 +567,8 @@ binds { // moving the mouse or pressing any other key. // Mod+Shift+L { power-off-monitors; } } + +// Make the backdrop light. +overview { + backdrop-color "#232337" +} diff --git a/waybar/.config/waybar/config b/waybar/.config/waybar/config index 3e4fd17..498a029 100644 --- a/waybar/.config/waybar/config +++ b/waybar/.config/waybar/config @@ -87,8 +87,8 @@ "numlock": "NL {icon}" }, "format-icons": { - "locked": "", - "unlocked": "" + "locked": "🔳", + "unlocked": "⚪" } }, "pulseaudio": { @@ -116,17 +116,28 @@ "memory": { "interval": 5, - "format": "Mem {:2}%" + "format": "{used:0.2f}/{total:0.2f} GB" }, "cpu": { - "interval": 5, - "format": "CPU {usage:2}%" - }, + "interval": 1, + "format": "{icon0}{icon1}{icon2}{icon3}{icon4}{icon5}{icon6}{icon7}", + "format-icons": [ + "▁", // pastel purple (low) + "▂", // pastel blue + "▃", // pastel cyan + "▄", // pastel green + "▅", // pastel yellow + "▆", // pastel orange + "▇", // light pastel red + "█" // deeper pastel red (high) + ] + }, + "battery": { "states": { "good": 80, "warning": 42, - "critical": 20 + "critical": 24 }, "format": "{icon} {capacity}%", "format-charging": " {icon} {capacity}%", diff --git a/wofi/.config/wofi/style.css b/wofi/.config/wofi/style.css index 2ac20b0..7b275c6 100644 --- a/wofi/.config/wofi/style.css +++ b/wofi/.config/wofi/style.css @@ -1,10 +1,16 @@ window { border: 0px solid #ca93f9; - font-family: FiraCode Nerd Font; + font-family: 'Fira Code Retina'; font-size: 16px; border-radius: 12px; padding: 10px; - background: linear-gradient(#e66465, #9198e5); + background: linear-gradient(#346af5, #31efc5); +} + +#outer-box { + margin: 5px; + border-radius: 12px; + background-color: #282a36; } #input { @@ -14,6 +20,10 @@ window { background-color: #44475a; } +#scroll { + +} + #inner-box { margin: 5px; border: none; @@ -21,22 +31,28 @@ window { background-color: #282a36; } -#outer-box { - margin: 5px; - border-radius: 12px; - background-color: #282a36; +#img { + } #text { margin: 5px; border: none; color: #f8f8f2; -} +} + +#unselected { + +} #entry { border-radius: 12px; } #entry:selected { - background-color: #ab3452; + background-color: #3366cc; +} + +#expander-box { + } diff --git a/xinit/.xinitrc b/xinit/.xinitrc index eaea2b7..ce894df 100644 --- a/xinit/.xinitrc +++ b/xinit/.xinitrc @@ -35,10 +35,10 @@ fi # unset f #fi -exec numlockx & -exec ibus-daemon -rxR & -export GTK_THEME=adw-gtk3-dark:dark +# exec numlockx & +# exec ibus-daemon -rxR & +# export GTK_THEME=adw-gtk3-dark:dark exec i3 -c /home/antoine/.config/i3/config -exec autorandr --change +# exec autorandr --change exec autotiling & diff --git a/zsh/.zshrc b/zsh/.zshrc index 7bab917..cdbfaf2 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -165,3 +165,26 @@ alias brb="bun run build" alias brp="bun run preview" alias pecha="sleep 20 && echo \"KUCHA\"" + +# The next line updates PATH for the Google Cloud SDK. +if [ -f '/home/antoine/Downloads/google-cloud-sdk/path.zsh.inc' ]; then . '/home/antoine/Downloads/google-cloud-sdk/path.zsh.inc'; fi + +# The next line enables shell command completion for gcloud. +if [ -f '/home/antoine/Downloads/google-cloud-sdk/completion.zsh.inc' ]; then . '/home/antoine/Downloads/google-cloud-sdk/completion.zsh.inc'; fi + +# CD Player +alias playcd='cdda2wav -D /dev/sr0 -t 1+ -B - | pw-play --rate 44100 --quality 15 -' + +# Load Angular CLI autocompletion. +# source <(ng completion script) + +. "$HOME/.local/bin/env" + +alias dcb="docker compose build" +alias dcu="docker compose up" +alias dcud="docker compose up -d" +alias dcd="docker compose down" +alias dcuw="docker compose up --watch" + + +alias intellij="exec $HOME/Applications/idea-IU-252.26830.84/bin/idea &"