diff --git a/install.sh b/install.sh index 32e9238..d152654 100755 --- a/install.sh +++ b/install.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + if test -z "$1"; then printf "Usage: %s machine\n" "$0" 1>&2 exit 64 # sysexits.h(3) EX_USAGE @@ -22,6 +24,5 @@ do ln -sf "$PWD/$item" "$XDG_CONFIG_HOME/$inst_path" done +ln -sf "$PWD/$MACHINE/zshrc" "$HOME/.zshrc" ln -sf "$PWD/$MACHINE/profile" "$HOME/.profile" - -printf "%s: Please set \$ZDOTDIR to \$XDG_CONFIG_HOME/zsh\n" "$0" 1>&2 diff --git a/noire-carnation/config/nvim/.gitignore b/noire-carnation/config/nvim/.gitignore new file mode 100644 index 0000000..060f79b --- /dev/null +++ b/noire-carnation/config/nvim/.gitignore @@ -0,0 +1 @@ +plugged/ diff --git a/noire-carnation/config/sway/config b/noire-carnation/config/sway/config index d964c27..e2a692a 100644 --- a/noire-carnation/config/sway/config +++ b/noire-carnation/config/sway/config @@ -81,14 +81,16 @@ mode "screenshot" { bindsym Escape mode "default"; exec swayflashy } -#bindsym $mod+i mode "j: japanese; t: toki pona; esc: english" -# -#mode "j: japanese; t: toki pona; esc: english" { -# bindsym j exec ibus engine anthy; mode "default" -# bindsym t exec ibus engine table:tokipona; mode "default" -# bindsym Return exec ibus engine xkb:us::eng; mode "default" -# bindsym Escape exec ibus engine xkb:us::eng; mode "default" -#} +bindsym $mod+i mode "language" + +# language selection mode + +mode "language" { + bindsym t exec ibus engine table:tokipona; mode "default" + bindsym e exec ibus engine xkb:us::eng; mode "default" + bindsym Return exec ibus engine xkb:us::eng; mode "default" + bindsym Escape mode "default" +} # window actions @@ -195,7 +197,9 @@ exec keepassxc exec syncthing exec sleep 120 && noisetorch -i exec discord +exec ibus-daemon -rxR # window rules for_window [app_id="org.kde.polkit-kde-authentication-agent-1"] floating enable for_window [app_id="org.freedesktop.impl.portal.desktop.kde"] floating enable +for_window [title="meower"] floating enable; resize set 600 450; diff --git a/noire-carnation/config/zathurarc b/noire-carnation/config/zathurarc new file mode 100644 index 0000000..1fb168b --- /dev/null +++ b/noire-carnation/config/zathurarc @@ -0,0 +1,50 @@ +# ISC License +# +# Copyright by maksim +# +# Permission to use, copy, modify, and/or distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH +# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +# AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, +# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR +# OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. + +# Huge thanks to u/demusxd for making this config! (i just recolored everything to everforest :P) + +set default-bg "#4b565c" +set default-fg "#d3c6aa" + +set statusbar-fg "#d3c6aa" +set statusbar-bg "#2b3339" + +set inputbar-bg "#2b3339" +set inputbar-fg "#d3c6aa" + +set notification-bg "#2b3339" +set notification-fg "#d3c6aa" + +set notification-error-bg "#2b3339" +set notification-error-fg "#d3c6aa" + +set notification-warning-bg "#2b3339" +set notification-warning-fg "#d3c6aa" + +set highlight-color "#4b565c" +set highlight-active-color "#e67e80" + +set completion-bg "#2b3339" +set completion-fg "#d3c6aa" + +set completion-highlight-fg "#4b565c" +set completion-highlight-bg "#2b3339" + +set recolor-lightcolor "#2b3339" +set recolor-darkcolor "#d3c6aa" + +set recolor "true" +set recolor-keephue "false" diff --git a/noire-carnation/profile b/noire-carnation/profile index c0e52de..279265d 100644 --- a/noire-carnation/profile +++ b/noire-carnation/profile @@ -39,8 +39,9 @@ LIBVA_DRIVER_NAME=radeonsi; export LIBVA_DRIVER_NAME MOZ_ENABLE_WAYLAND=1; export MOZ_ENABLE_WAYLAND QT_QPA_PLATFORM=wayland; export QT_QPA_PLATFORM QT_QPA_PLATFORMTHEME=qt5ct; export QT_QPA_PLATFORMTHEME -GTK_IM_MODULE=ibus -QT_IM_MODULE=ibus +GTK_IM_MODULE=ibus; export GTK_IM_MODULE +QT_IM_MODULE=ibus; export QT_IM_MODULE +XMODIFIERS=@im=ibus; export XMODIFIERS # functions bmv() { @@ -58,6 +59,14 @@ bmv() { done } +ix() { + curl -F 'f:1=<-' ix.io +} + +myip() { + curl icanhazip.com +} + paclean() { for package in `pacman -Qtq`; do pacman -Qi "$package" @@ -76,9 +85,6 @@ paclean() { su -c "pacman -Rns $packages" } -myip() { - curl icanhazip.com -} sc() { if test -z "$1"; then diff --git a/noire-carnation/config/zsh/.zshrc b/noire-carnation/zshrc similarity index 100% rename from noire-carnation/config/zsh/.zshrc rename to noire-carnation/zshrc