From e9e1cede40590b8e4d8e1e8930b9c830e0db4958 Mon Sep 17 00:00:00 2001 From: Andre Ramnitz Date: Wed, 27 Dec 2023 00:12:16 +0100 Subject: [PATCH] fish: add bash config, exec fish via bashrc, configure hyprland --- config/hypr/hyprland.conf | 4 +-- home/.bash_profile | 20 ++++++++++++++ home/.bashrc | 56 +++++++++++++++++++++++++++++++++++++++ restow_dots.sh | 1 + stow_dots.sh | 1 + unstow_dots.sh | 1 + 6 files changed, 81 insertions(+), 2 deletions(-) create mode 100644 home/.bash_profile create mode 100644 home/.bashrc diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf index 1d869be5..9a34c1a8 100644 --- a/config/hypr/hyprland.conf +++ b/config/hypr/hyprland.conf @@ -198,8 +198,8 @@ bind = $suremod, D, denywindowfromgroup, toggle bind = $suremod, V, togglefloating, # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more -bind = $mainmod, Return, exec, foot -L /usr/bin/fish -- -bind = $mainmod Shift, Return, exec, foot -w 1280x800 -a popup -L /usr/bin/fish -- +bind = $mainmod, Return, exec, foot +bind = $mainmod Shift, Return, exec, foot -w 1280x800 -a popup bind = $mainmod, C, exec, foot -w 640x400 -a popup -H hyprpicker bind = $mainmod, E, exec, dolphin bind = $mainmod, F, fullscreen,1 diff --git a/home/.bash_profile b/home/.bash_profile new file mode 100644 index 00000000..27a7acd4 --- /dev/null +++ b/home/.bash_profile @@ -0,0 +1,20 @@ +# /etc/skel/.bash_profile + +export VDPAU_DRIVER=radeonsi +export EDITOR="kcr edit" +export FZF_DEFAULT_OPTS='--multi --layout=reverse --preview-window=down:60%' + +# This file is sourced by bash for login shells. The following line +# runs your .bashrc and is recommended by the bash info pages. +if [[ -f ~/.bashrc ]] ; then + . ~/.bashrc +fi + +# autorun X11 +if [ -z $(pgrep X) ] ; then + #startx + #dbus-launch --exit-with-session /usr/bin/startplasma-wayland + #dbus-launch --exit-with-session Hyprland + tbsm +fi + diff --git a/home/.bashrc b/home/.bashrc new file mode 100644 index 00000000..6603ba09 --- /dev/null +++ b/home/.bashrc @@ -0,0 +1,56 @@ +#!/bin/bash +# /etc/skel/.bashrc +# +# This file is sourced by all *interactive* bash shells on startup, +# including some apparently interactive shells such as scp and rcp +# that can't tolerate any output. So make sure this doesn't display +# anything or bad things will happen ! + +export PATH="$PATH:/opt/android-sdk/platform-tools/" +export PATH="$PATH:~/.cargo/bin:~/.local/bin:~/Applications/" + +export BROWSER='qutebrowser "--untrusted-args %u"' +export EDITOR="kks edit" +export PAGER="less" +export VDPAU_DRIVER="radeonsi" +export XZ_OPT="--threads=16" + +alias grep='grep -i' +alias gcp="git cherry-pick" +alias glo="git log --oneline" +alias nano='nano -_qpT4 ' +alias free='free -h --si' + +alias ls='exa --icons --time-style=iso --group-directories-first' +alias ll='exa --icons --group --time-style=iso --group-directories-first -l' +alias l1='exa --icons --group -1 --grid --time-style=iso --group-directories-first' +alias la='ll -d && ll' +alias lw='exa --icons --group --long --grid --time-style=iso --group-directories-first' +alias lt='exa --icons --group --long --sort=mod -t=mod --time-style=iso --group-directories-first' + +alias emergelog='sudo cat /var/log/emerge.log | grep "started\|completed\|exiting"' + +alias K='kcr-fzf-shell' +alias KK='K --working-directory .' + +# Open files _from_ and _to_ a session. +# $ :f src +# $ f: mawww/kakoune +alias :f='kcr fzf files' +alias f:='KK kcr fzf files' +alias fm:='K sidetree --working-directory' + +alias :g='kcr fzf grep' +alias g:='KK kcr fzf grep' + +# Test for an interactive shell. There is no need to set anything +# past this point for scp and rcp, and it's important to refrain from +# outputting anything in those cases. +if [[ $- != *i* ]] ; then + # Shell is non-interactive. Be done now! + return +fi + +# Put your fun stuff here. +# +[ -x /bin/fish ] && SHELL=/bin/fish exec fish diff --git a/restow_dots.sh b/restow_dots.sh index db9982d4..d059aeb4 100755 --- a/restow_dots.sh +++ b/restow_dots.sh @@ -2,4 +2,5 @@ stow -t "$HOME/.config" -R config stow -t "$HOME/.local" -R local +stow -t "$HOME" -R home diff --git a/stow_dots.sh b/stow_dots.sh index 729e33ef..dc0e1b56 100755 --- a/stow_dots.sh +++ b/stow_dots.sh @@ -2,4 +2,5 @@ stow -t "$HOME/.config" -S config stow -t "$HOME/.local" -S local +stow -t "$HOME" -S home diff --git a/unstow_dots.sh b/unstow_dots.sh index f8827113..e13af4aa 100755 --- a/unstow_dots.sh +++ b/unstow_dots.sh @@ -2,4 +2,5 @@ stow -t "$HOME/.config" -D config stow -t "$HOME/.local" -D local +stow -t "$HOME" -D home -- 2.51.2