diff options
| -rwxr-xr-x | install.sh | 23 | ||||
| -rw-r--r-- | shell/.profile | 9 | ||||
| -rwxr-xr-x | sway/init.sh | 2 | ||||
| -rw-r--r-- | sway/outputs | 27 | ||||
| -rwxr-xr-x | yay/yay | 5 |
5 files changed, 44 insertions, 22 deletions
@@ -20,12 +20,9 @@ install_python_venv() { VENV_DIR=$(cd ~/opt; pwd)/$PYTHON$MAJOR$MINOR VENV_PYTHON=$VENV_DIR/bin/$PYTHON VENV_PIP=$VENV_DIR/bin/pip - VENV_DOIT=$VENV_DIR/bin/doit BIN_DIR=$(cd ~/bin; pwd) BIN_PYTHON=$BIN_DIR/$PYTHON$MAJOR.$MINOR - BIN_PIP=$BIN_DIR/pip-$PYTHON$MAJOR.$MINOR - BIN_DOIT=$BIN_DIR/doit-$PYTHON$MAJOR.$MINOR $PYTHON_CMD -m venv --system-site-packages $VENV_DIR $VENV_PIP -q install -U -r $REQUIREMENTS @@ -35,17 +32,14 @@ install_python_venv() { symlink $BIN_PYTHON $BIN_DIR/$PYTHON$MAJOR symlink $BIN_DIR/$PYTHON$MAJOR $BIN_DIR/$PYTHON - symlink $VENV_PIP $BIN_PIP - symlink $BIN_PIP $BIN_DIR/pip$MAJOR - symlink $BIN_DIR/pip$MAJOR $BIN_DIR/pip - - symlink $VENV_DOIT $BIN_DOIT - symlink $BIN_DOIT $BIN_DIR/doit + symlink $VENV_PIP $BIN_DIR/pip + echo -e "#!/bin/sh\\nexec $VENV_PYTHON -m doit \"\$@\"" > $BIN_DIR/doit } mkdir -p ~/bin mkdir -p ~/opt mkdir -p ~/repos +mkdir -p ~/.config mkdir -p ~/.local/share/applications mkdir -p ~/.local/share/icons/hicolor/128x128/apps symlink $(cd $(dirname "$0"); pwd -P) ~/.dotfiles @@ -80,14 +74,6 @@ symlink ~/.dotfiles/git/.gitconfig ~/.gitconfig # i3 symlink ~/.dotfiles/i3 ~/.config/i3 -# janet -# if [ ! -d ~/repos/janet ]; then -# (cd ~/repos; git clone https://github.com/janet-lang/janet.git) -# fi -# if [ ! -d ~/opt/janet ]; then -# (cd ~/repos/janet; make install PREFIX=$(cd ~/opt; pwd -P)/janet) -# fi - # lein symlink ~/.dotfiles/lein/lein ~/bin/lein @@ -191,3 +177,6 @@ symlink ~/.dotfiles/xorg/.xinitrc ~/.xinitrc symlink ~/.dotfiles/xorg/.Xresources ~/.Xresources symlink ~/.dotfiles/xorg/loadxresources ~/bin/loadxresources symlink ~/.dotfiles/xorg/setwallpaper ~/bin/setwallpaper + +# yay +symlink ~/.dotfiles/yay/yay ~/bin/yay diff --git a/shell/.profile b/shell/.profile index 04f755a..1e48f8e 100644 --- a/shell/.profile +++ b/shell/.profile @@ -19,18 +19,17 @@ prepend_path () { # export SWEETHOME3D_JAVA3D=1.6 # export WLR_DRM_NO_MODIFIERS=1 export EDITOR=nvim +export LIBGL_ALWAYS_SOFTWARE=1 export QT_QPA_PLATFORMTHEME=qt5ct export SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/ssh-agent.socket export VISUAL=nvim - -prepend_path ~/opt/janet/bin prepend_path ~/opt/python310/bin prepend_path ~/bin export PATH -nix_profile_sh=~/.nix-profile/etc/profile.d/nix.sh -[ -e $nix_profile_sh ] && . $nix_profile_sh -export LOCALE_ARCHIVE=~/.nix-profile/lib/locale/locale-archive +# nix_profile_sh=~/.nix-profile/etc/profile.d/nix.sh +# [ -e $nix_profile_sh ] && . $nix_profile_sh +# export LOCALE_ARCHIVE=~/.nix-profile/lib/locale/locale-archive diff --git a/sway/init.sh b/sway/init.sh index e61a7bb..da76f9c 100755 --- a/sway/init.sh +++ b/sway/init.sh @@ -18,6 +18,8 @@ swaymsg workspace 6:s output ${secondary:-$primary} swaymsg workspace 7:d output ${secondary:-$primary} swaymsg workspace 8:f output ${secondary:-$primary} +swaymsg input type:touchpad tap enable + swaymsg font "pango:Inter Medium 12" swaymsg floating_modifier $mod swaymsg default_border pixel 4 diff --git a/sway/outputs b/sway/outputs new file mode 100644 index 0000000..9a26dc2 --- /dev/null +++ b/sway/outputs @@ -0,0 +1,27 @@ +output "eDP-1" { + mode 1920x1080@59.999Hz + pos 0 0 + transform normal + scale 1.0 + scale_filter nearest + adaptive_sync off + dpms on +} +output "DP-5" { + mode 2560x1440@59.951Hz + pos 1920 0 + transform normal + scale 1.0 + scale_filter nearest + adaptive_sync off + dpms on +} +output "DP-3" { + mode 1920x1080@60.0Hz + pos 4480 0 + transform normal + scale 1.0 + scale_filter nearest + adaptive_sync off + dpms on +} @@ -0,0 +1,5 @@ +#!/bin/sh + +export PATH="/usr/bin:$PATH" + +exec /usr/bin/yay "$@" |