From 4785af65e070a1312dddcd8e2c2292df4a5de549 Mon Sep 17 00:00:00 2001 From: Antoine Phan Date: Fri, 26 Jul 2024 16:08:18 +0700 Subject: [PATCH] More updates --- .config/alacritty/alacritty.toml | 4 ++-- .config/gtk-3.0/bookmarks | 6 +++--- .config/hypr/hyprland.conf | 16 ++++++++++---- .config/hypr/hyprpaper.conf | 7 +++--- .config/swaylock/config | 2 +- .config/waybar/config | 4 ++-- .config/waybar/style.css | 37 ++++---------------------------- .zshrc | 9 +++++++- 8 files changed, 36 insertions(+), 49 deletions(-) diff --git a/.config/alacritty/alacritty.toml b/.config/alacritty/alacritty.toml index 97c1e1b..299d4de 100644 --- a/.config/alacritty/alacritty.toml +++ b/.config/alacritty/alacritty.toml @@ -1,5 +1,5 @@ import = [ - "~/.config/alacritty/themes/themes/iterm.toml" + "~/.config/alacritty/themes/themes/catppuccin_mocha.toml" ] [colors.cursor] @@ -37,7 +37,7 @@ decorations = "none" decorations_theme_variant = "Dark" dynamic_padding = false dynamic_title = true -opacity = 0.7 +opacity = 0.8 title = "Alacritty" [window.dimensions] diff --git a/.config/gtk-3.0/bookmarks b/.config/gtk-3.0/bookmarks index d55ec6a..1191f42 100644 --- a/.config/gtk-3.0/bookmarks +++ b/.config/gtk-3.0/bookmarks @@ -1,11 +1,11 @@ +file:///home/antoine/Partage/McGill/Extracurricular/ECSESS +file:///home/antoine/Partage/Pictures file:///home/antoine/Partage/Housing file:///home/antoine/Documents/DoingTaxes file:///home/antoine/Partage/SchengenVisa -file:///home/antoine/.local/share/SuperCollider -file:///home/antoine/Partage/McGill/U2-W2024 +file:///home/antoine/Partage/ECHOES file:///home/antoine/Music file:///home/antoine/Documents -file:///home/antoine/Partage/ECHOES file:///home/antoine/Partage/McGill/Extracurricular/IEEE file:///home/antoine/Partage file:///home/antoine/Downloads diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf index cce6ebc..944c207 100644 --- a/.config/hypr/hyprland.conf +++ b/.config/hypr/hyprland.conf @@ -1,10 +1,15 @@ # https://wiki.hyprland.org/Configuring/Monitors\ monitor=eDP-1,1920x1080@60,0x0,1 -# - Home monitor settings - -monitor=,1920x1080@165,auto,1 +# --- Second monitor via HDMI-A --- +# Automatic/To the right +# monitor=,1920x1080@165,auto,1 + +# Second monitor on the left +monitor=,1920x1080@165, -1920x0, 1 # monitor = , highres, 0x-1080, 1 + # Enabling mirror # monitor=HDMI-A-1, 1920x1080@60, 0x0, 1, mirror, eDP-1 @@ -19,7 +24,7 @@ exec-once=dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRE # Set programs that you use $terminal = alacritty $fileManager = nautilus -$menu = wofi --show drun +$menu = wofi # Some default env vars. env = XCURSOR_SIZE,12 @@ -99,7 +104,6 @@ dwindle { master { # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more - new_is_master = true } gestures { @@ -142,6 +146,7 @@ windowrulev2 = tile, title:(Wine) $mainMod = SUPER # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more +bind = $mainMod, T, exec, $terminal bind = $mainMod, RETURN, exec, $terminal bind = $mainMod_SHIFT, Q, killactive, # bind = $mainMod_SHIFT, M, exit, @@ -218,6 +223,9 @@ bind = $mainMod SHIFT, P, movetoworkspace, r-1 bind = $mainMod, N, workspace, m+1 bind = $mainMod, P, workspace, m-1 +# Swap windows from different monitors +bind = $mainMod, S, swapactiveworkspaces,0 1 + # Move/resize windows with mainMod + LMB/RMB and dragging bindm = $mainMod, mouse:272, movewindow bindm = $mainMod, mouse:273, resizewindow diff --git a/.config/hypr/hyprpaper.conf b/.config/hypr/hyprpaper.conf index 7c63ff9..8da5c47 100644 --- a/.config/hypr/hyprpaper.conf +++ b/.config/hypr/hyprpaper.conf @@ -1,8 +1,9 @@ -preload = ~/.wallpaper/Rocksketto-2.png +preload = ~/.wallpaper/StevenUniverse-1.png +preload = ~/.wallpaper/PaintingStudio-03.png # preload = ~/.wallpaper/*.png -wallpaper = eDP-1,~/.wallpaper/Rocksketto-2.png -wallpaper = HDMI-A-1, ~/.wallpaper/Rocksketto-2.png +wallpaper = eDP-1,~/.wallpaper/StevenUniverse-1.png +wallpaper = HDMI-A-1, ~/.wallpaper/PaintingStudio-03.png #set the default wallpaper(s) seen on initial workspace(s) --depending on the number of monitors used # wallpaper = monitor1,/path/to/image.png #if more than one monitor in use, can load a 2nd image diff --git a/.config/swaylock/config b/.config/swaylock/config index 61b16b3..1dd2726 100644 --- a/.config/swaylock/config +++ b/.config/swaylock/config @@ -1,4 +1,4 @@ -image=~/Pictures/org_wholesome2.png +image=~/Partage/Pictures/org_wholesome2.png # clock ignore-empty-password font=FiraCode Nerd Font diff --git a/.config/waybar/config b/.config/waybar/config index b37478a..5b9bea0 100644 --- a/.config/waybar/config +++ b/.config/waybar/config @@ -62,8 +62,8 @@ } }, "pulseaudio": { - "format": "{icon} {volume:2}%", - "format-bluetooth": "{icon} {volume:2}% ", + "format": "{icon} {volume:2}%", + "format-bluetooth": "{icon} {volume:2}% ", "format-muted": "🔇 MUTED", "format-icons": { "headphones": "", diff --git a/.config/waybar/style.css b/.config/waybar/style.css index d61c2d7..c7372be 100644 --- a/.config/waybar/style.css +++ b/.config/waybar/style.css @@ -16,10 +16,13 @@ window#waybar { #pulseaudio, #memory, #cpu, #network, #mpd, #battery, #disk, #backlight, #tray, #keyboard-state { - background: rgba(12, 12, 12, 0.5); + background: rgba(12, 12, 12, 0.64); + text-shadow: 2px 3px 2px rgba(20, 20, 20, 0.3); + /* background: rgba(12, 12, 12, 0.7); */ padding: 0 12px; margin-left: 2px; margin-right: 2px; + color: white; } #window { @@ -54,35 +57,3 @@ window#waybar.empty #window { text-shadow: inherit; } -#pulseaudio { - color: #268bd2; -} -#backlight { - color: #a3f281; -} -#memory { - color: #2aa198; -} -#cpu { - color: #6c71c4; -} -#battery { - color: #859900; -} - -#battery.charging { - color: #00f923; -} - -#disk { - color: #b58900; -} - -#network { - color: #155aa4; -} - -#keyboard-state { - color: #ba3ba3; -} - diff --git a/.zshrc b/.zshrc index f4b4a19..ea54812 100644 --- a/.zshrc +++ b/.zshrc @@ -97,7 +97,7 @@ if [ -z $DISPLAY ] && [ $(tty) = /dev/tty1 ] then # Autostart Hyprland export GTK_THEME=adw-gtk3-dark:dark - exec Hyprland >> ~/hyprland_log + exec Hyprland elif [ -z $DISPLAY ] && [ $(tty) = /dev/tty2 ] then # Autostart X at login for tty2, using i3 WM @@ -138,6 +138,9 @@ alias enable-nvidia='export __NV_PRIME_RENDER_OFFLOAD=1 __GLX_VENDOR_LIBRARY_NAM alias weather="curl https://wttr.in" alias cal='cal -m' alias please='sudo' + +alias ibus-en='ibus engine xkb:us:intl:eng' +alias ibus-vn='ibus engine Bamboo' export GTK_IM_MODULE=ibus export QT_IM_MODULE=ibus export XMODIFIERS=@im=ibus @@ -152,3 +155,7 @@ export BUN_INSTALL="$HOME/.bun" export PATH="$BUN_INSTALL/bin:$PATH" eval "$(zoxide init --cmd cd zsh)" + + + +if [ -e /home/antoine/.nix-profile/etc/profile.d/nix.sh ]; then . /home/antoine/.nix-profile/etc/profile.d/nix.sh; fi # added by Nix installer