diff --git a/laptop/configs/home/.zshrc b/laptop/configs/home/.zshrc index 6626187..60ad499 100644 --- a/laptop/configs/home/.zshrc +++ b/laptop/configs/home/.zshrc @@ -6,9 +6,12 @@ setopt inc_append_history share_history [[ -s /jbx/.autojump/etc/profile.d/autojump.sh ]] && source /jbx/.autojump/etc/profile.d/autojump.sh . ~/docs/polyglot/polyglot.sh +. ~/.cargo/env + export PATH=$PATH:~/go/bin export PATH=$PATH:~/.local/bin -export PATH=$PATH:/jbx/.spicetify +export PATH=$PATH:~/.spicetify +export PATH=$PATH:~/.local/share/gem/ruby/3.3.0/bin alias v=nvim alias ls="~/scripts/elash.sh" @@ -23,23 +26,52 @@ alias reboot="loginctl reboot" alias poweroff="loginctl poweroff" alias hi="loginctl hibernate" alias lg="lazygit" +alias g="git" +alias cop="wl-copy" +alias kvm="~/scripts/kvm.sh & disown" +alias eix="apk search" export BAT_THEME="Solarized (dark)" export EDITOR=nvim export LS_COLORS="$(~/.local/bin/vivid generate solarized-dark)" export TERMINAL=alacritty +export DOCKER_HOST=unix://$XDG_RUNTIME_DIR/podman/podman.sock autoload -U compinit && compinit -u zstyle ':completion:*' matcher-list 'm:{a-z}={A-Za-z}' zstyle ':completion:*' menu select +zmodload zsh/complist +autoload -Uz history-search-end +bindkey '^[[A' history-search-backward +bindkey '^[[B' history-search-forward bindkey '^[[1;5D' backward-word bindkey '^[[1;5C' forward-word ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=#344146" source ~/docs/zsh-autosuggestions/zsh-autosuggestions.zsh -source /jbx/docs/fast-syntax-highlighting/fast-syntax-highlighting.plugin.zsh +source ~/docs/fast-syntax-highlighting/fast-syntax-highlighting.plugin.zsh +source ~/docs/zsh-history-substring-search/zsh-history-substring-search.zsh + +pst() { + local file + if [[ -p /dev/stdin ]]; then + file=$(mktemp) + cat > "$file" + elif [[ -n $1 ]]; then + file="$1" + else + echo "Usage: pst [file]" + return 1 + fi + + curl -F "file=@$file" -H "X-Auth: $(cat ~/.key)" https://paste.jabuxas.xyz/upload + + if [[ -p /dev/stdin ]]; then + rm "$file" + fi +} if [ -z "${WAYLAND_DISPLAY}" ] && [ "${XDG_VTNR}" -eq 1 ]; then export XDG_CURRENT_DESKTOP="sway" - dbus-run-session sway + sway fi diff --git a/laptop/configs/sway/.config/sway/settings/binds b/laptop/configs/sway/.config/sway/settings/binds index a56e6ee..6b0e7c8 100644 --- a/laptop/configs/sway/.config/sway/settings/binds +++ b/laptop/configs/sway/.config/sway/settings/binds @@ -78,9 +78,10 @@ bindsym $mod+Control+Return move scratchpad # If there are multiple scratchpad windows, this command cycles through them. bindsym $mod+Control+s scratchpad show -bindsym $mod+Shift+s exec steam --noverifyfiles +bindsym $mod+Shift+s exec flatpak run com.valvesoftware.Steam bindsym $mod+e exec pcmanfm bindsym Home exec ~/.local/bin/way-print.sh p +bindsym $mod+Home exec ~/.local/bin/print-tmp.sh bindsym Shift+Home exec ~/.local/bin/way-print.sh s bindsym Control+Shift+Home exec ~/.local/bin/way-print.sh t bindsym Control+Home exec ~/.local/bin/print-window.sh diff --git a/laptop/configs/sway/.config/sway/settings/config b/laptop/configs/sway/.config/sway/settings/config index 3b8e702..e694ad2 100644 --- a/laptop/configs/sway/.config/sway/settings/config +++ b/laptop/configs/sway/.config/sway/settings/config @@ -1,4 +1,5 @@ output { + LVDS-1 pos 0 0 } default_border pixel 2 @@ -11,11 +12,10 @@ no_focus [window_role="pop-up"] gaps inner 10 mouse_warping none -input "2362:9523:Gaming_Mouse" { - accel_profile flat +input "2:14:ETPS/2_Elantech_Touchpad" { + accel_profile adaptive dwt enabled middle_emulation enabled - pointer_accel 0.5 } input "1:1:AT_Translated_Set_2_keyboard" { @@ -24,8 +24,10 @@ input "1:1:AT_Translated_Set_2_keyboard" { xkb_options ctrl:nocaps } -input "1356:2508:Wireless_Controller_Touchpad" { - map_to_output DISABLED +input "1241:6185:LogoTech_Gaming_Keyboard" { + xkb_layout br + xkb_variant abnt2 + xkb_options ctrl:nocaps } # vim: ts=2 sts=2 sw=2 ft=swayconfig diff --git a/laptop/configs/sway/.config/sway/settings/init b/laptop/configs/sway/.config/sway/settings/init index 8a59bc0..b26f5e2 100644 --- a/laptop/configs/sway/.config/sway/settings/init +++ b/laptop/configs/sway/.config/sway/settings/init @@ -1,16 +1,17 @@ set $gnome-schema org.gnome.desktop.interface exec_always { - # gsettings set $gnome-schema gtk-theme 'Gruvbox-Dark-BL-LB' - # gsettings set $gnome-schema icon-theme 'Nordzy-green-dark' - # gsettings set $gnome-schema cursor-theme 'oreo_white_cursors' - gsettings set $gnome-schema font-name 'CartographCF Nerd Font 11' + gsettings set $gnome-schema gtk-theme 'NumixSolarizedDarkCyan' + gsettings set $gnome-schema icon-theme 'Numix-Circle' + gsettings set $gnome-schema cursor-theme 'Simp1e' + gsettings set $gnome-schema font-name 'Lilex Nerd Font Mono 14' + } exec { waybar & autotiling & - gammastep -t 4500:3500 -l -23.5475:-46.63611 -b 1.0:0.6 & - dbus-update-activation-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway + gammastep -t 4500:3500 -l -23.5475:-46.63611 & + dbus-update-activation-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway DISPLAY rm -rf ~/tmp/* ~/scripts/swww.sh otd-daemon diff --git a/laptop/configs/sway/.config/sway/settings/rules b/laptop/configs/sway/.config/sway/settings/rules index 8a025fd..fcb4ea8 100644 --- a/laptop/configs/sway/.config/sway/settings/rules +++ b/laptop/configs/sway/.config/sway/settings/rules @@ -7,6 +7,7 @@ for_window [class="Steam"] move to workspace 8 for_window [class="Spotify"] move to workspace 4 for_window [class="steam"] move to workspace 8 for_window [class=".*jetbrains.*"] move to workspace 5 +for_window [class="jetbrains-idea"] move to workspace 5 for_window [app_id="lutris"] move to workspace 7 for_window [class="heroic"] move to workspace 7 for_window [class="explorer.exe"] move to workspace 9