diff --git a/.bashrc b/.bashrc index 0667b09..79939fb 100644 --- a/.bashrc +++ b/.bashrc @@ -10,25 +10,10 @@ alias grep='grep --color=auto' alias config='/usr/bin/git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME' PS1='[\u@\h \W]\$ ' -# pnpm -export PNPM_HOME="/home/pmcc/.local/share/pnpm" -case ":$PATH:" in - *":$PNPM_HOME:"*) ;; - *) export PATH="$PNPM_HOME:$PATH" ;; -esac -# pnpm end - eval "$(starship init bash)" alias reboot-to-windows='sudo grub-reboot "Windows Boot Manager (on /dev/nvme1n1p1)" && sudo reboot' export PATH=~/.npm-global/bin:~/.local/bin:$PATH export SSH_AUTH_SOCK=~/.1password/agent.sock -if uwsm check may-start; then - exec uwsm start sway.desktop -fi - -#if [ -z "$WAYLAND_DISPLAY" ] && [ -n "$XDG_VTNR" ] && [ "$XDG_VTNR" -eq 1 ] ; then -# exec sway -#fi -alias claude="/home/pmcc/.config/claude/local/claude" +alias claude="/home/pmcc/.claude/local/claude" diff --git a/.config/environment.d/cursor.conf b/.config/environment.d/cursor.conf new file mode 100644 index 0000000..00c0539 --- /dev/null +++ b/.config/environment.d/cursor.conf @@ -0,0 +1,2 @@ +XCURSOR_THEME="catppuccin-latte-peach-cursors" +XCURSOR_SIZE=32 diff --git a/.config/environment.d/proton.conf b/.config/environment.d/proton.conf new file mode 100644 index 0000000..8839a06 --- /dev/null +++ b/.config/environment.d/proton.conf @@ -0,0 +1,2 @@ +PROTON_ENABLE_WAYLAND=1 +PROTON_USE_NTSYNC=1 diff --git a/.config/ghostty/config b/.config/ghostty/config new file mode 100644 index 0000000..fc398b9 --- /dev/null +++ b/.config/ghostty/config @@ -0,0 +1,44 @@ +# This is the configuration file for Ghostty. +# +# This template file has been automatically created at the following +# path since Ghostty couldn't find any existing config files on your system: +# +# /home/pmcc/.config/ghostty/config +# +# The template does not set any default options, since Ghostty ships +# with sensible defaults for all options. Users should only need to set +# options that they want to change from the default. +# +# Run `ghostty +show-config --default --docs` to view a list of +# all available config options and their default values. +# +# Additionally, each config option is also explained in detail +# on Ghostty's website, at https://ghostty.org/docs/config. + +# Config syntax crash course +# ========================== +# # The config file consists of simple key-value pairs, +# # separated by equals signs. +# font-family = Iosevka +# window-padding-x = 2 +# +# # Spacing around the equals sign does not matter. +# # All of these are identical: +# key=value +# key= value +# key =value +# key = value +# +# # Any line beginning with a # is a comment. It's not possible to put +# # a comment after a config option, since it would be interpreted as a +# # part of the value. For example, this will have a value of "#123abc": +# background = #123abc +# +# # Empty values are used to reset config keys to default. +# key = +# +# # Some config options have unique syntaxes for their value, +# # which is explained in the docs for that config option. +# # Just for example: +# resize-overlay-duration = 4s 200ms +theme = catppuccin-mocha diff --git a/.config/sway/config b/.config/sway/config index 9990ea6..a4a6df0 100644 --- a/.config/sway/config +++ b/.config/sway/config @@ -14,7 +14,7 @@ set $down j set $up k set $right l # Your preferred terminal emulator -set $term alacritty +set $term ghostty # Your preferred application launcher set $menu rofi -show drun @@ -149,4 +149,6 @@ bindsym $mod+r mode "resize" #xwayland disable +seat * xcursor_theme catppuccin-latte-peach-cursors 32 + include ~/.config/sway/config.d/* diff --git a/.config/sway/config.d/keybinds.conf b/.config/sway/config.d/keybinds.conf index ff1af30..5eaa6ca 100644 --- a/.config/sway/config.d/keybinds.conf +++ b/.config/sway/config.d/keybinds.conf @@ -42,4 +42,5 @@ bindsym $mod+Shift+f floating toggle bindsym $mod+tab layout tabbed ## Utils -bindsym Print exec ~/.local/bin/snag -d ~/screenshots/ +bindsym Print exec bash -c 'file=$(~/.local/bin/snag -d ~/screenshots/) && wl-copy < $file' +bindsym Print+Ctrl exec bash -c 'file=$(~/.local/bin/snag -r -d ~/screenshots/) && wl-copy < $file' diff --git a/.config/sway/config.d/outputs.conf b/.config/sway/config.d/outputs.conf index bbb6f40..b4383f0 100644 --- a/.config/sway/config.d/outputs.conf +++ b/.config/sway/config.d/outputs.conf @@ -1,3 +1,3 @@ output DP-1 mode 3840x2160@240.000Hz pos 0 0 scale 1.6 adaptive_sync on allow_tearing yes -output DP-2 mode 2560x1440@240.000Hz pos 2400 0 scale 1.25 transform 90 adaptive_sync off +output DP-2 mode 2560x1440@240.000Hz pos 2400 -145 scale 1.25 transform 90 adaptive_sync off output * max_render_time off diff --git a/.config/sway/config.d/windows.conf b/.config/sway/config.d/windows.conf index 0931278..bd672ff 100644 --- a/.config/sway/config.d/windows.conf +++ b/.config/sway/config.d/windows.conf @@ -3,3 +3,8 @@ for_window [shell="xwayland"] title_format "[XWayland] %title" assign [class="Unity"] workspace number 2 for_window [title="Unity"] no_focus, move position 400 400 for_window [title="Picture-in-Picture"] floating enable +for_window [class="org.kde.haruna"] floating enable +for_window [title=".*\.PopupWindow"] floating enable +for_window [class="Unity" title="Project Settings"] floating enable +for_window [class="Unity" title=".*\.AnnotationWindow"] floating enable +for_window [class="Unity" title="Color"] floating enable diff --git a/.config/waybar/config b/.config/waybar/config index f0eb97c..64fe4c3 100644 --- a/.config/waybar/config +++ b/.config/waybar/config @@ -5,7 +5,7 @@ // Choose the order of the modules "modules-left": ["sway/workspaces"], "modules-center": ["pulseaudio", "clock"], - "modules-right": ["tray"], + "modules-right": ["tray", "memory"], "sway/workspaces": { "disable-scroll": true, "sort-by-name": true, @@ -31,7 +31,7 @@ "clock": { "timezone": "America/Montreal", "tooltip-format": "{:%Y %B}\n{calendar}", - "format": " {:%H:%M %d/%m/%y} " + "format": "🕐 {:%H:%M 📅 %d/%m/%y} " }, "backlight": { "device": "intel_backlight",