fix: minor fixs and removed n3 to use spf

This commit is contained in:
oxypomme
2025-02-12 10:05:19 +01:00
parent 30a8c16816
commit 8b162be7d1
6 changed files with 66 additions and 55 deletions

View File

@@ -85,17 +85,28 @@ echo "💻 docker configured\n"
flatpak install flathub org.mozilla.Thunderbird
echo "📧 thunderbird installed\n"
VIVALDI_VER=6.5.3206.57-1
curl -o "vivaldi-stable_${VIVALDI_VER}_amd64.deb" "https://downloads.vivaldi.com/stable/vivaldi-stable_${VIVALDI_VER}_amd64.deb"
sudo dpkg -i "vivaldi-stable_${VIVALDI_VER}_amd64.deb"
rm "vivaldi-stable_${VIVALDI_VER}_amd64.deb"
echo "🌐 vivaldi installed\n"
bash -c "$(curl -sLo- https://superfile.netlify.app/install.sh)"
echo "📁 superfile installed\n"
# VIVALDI_VER=6.5.3206.57-1
# curl -o "vivaldi-stable_${VIVALDI_VER}_amd64.deb" "https://downloads.vivaldi.com/stable/vivaldi-stable_${VIVALDI_VER}_amd64.deb"
# sudo dpkg -i "vivaldi-stable_${VIVALDI_VER}_amd64.deb"
# rm "vivaldi-stable_${VIVALDI_VER}_amd64.deb"
# echo "🌐 vivaldi installed\n"
# CONTOUR_VER=0.4.3.6442
# curl -o "contour-${CONTOUR_VER}-ubuntu20.04-amd64.deb" "https://github.com/contour-terminal/contour/releases/download/v${CONTOUR_VER}/contour-${CONTOUR_VER}-ubuntu20.04-amd64.deb"
# sudo dpkg -i "contour-${CONTOUR_VER}-ubuntu20.04-amd64.deb"
# rm "contour-${CONTOUR_VER}-ubuntu20.04-amd64.deb"
# sudo apt install -y "libqt5-*"
# sudo apt install -y "qml-module-*"
# sudo apt remove -y "qml-module-org-kde*"
# sudo apt autoremove -y
# echo "💻 contour installed\n"
echo "Still need to build:\n"
echo "- contour"
echo "- rofi"
echo "- polybar"
echo "- i3lock"
echo "- dunst"
echo "- nnn"
echo "- ugrep"

18
.zshrc
View File

@@ -10,7 +10,7 @@ fi
export DENO_INSTALL="/home/sublet/.deno"
export GO_INSTALL="/usr/local/go"
export PATH="$GO_INSTALL/bin:$DENO_INSTALL/bin:$PATH"
export PATH="$GO_INSTALL/bin:$DENO_INSTALL/bin:$HOME/AppImages:$PATH"
# Path to your oh-my-zsh installation.
export ZSH="$HOME/.oh-my-zsh"
@@ -99,7 +99,6 @@ plugins=(
fzf
fzf-tab
zsh-autosuggestions
# zsh-autocomplete
zsh-syntax-highlighting
)
@@ -131,12 +130,13 @@ prompt_context() {}
export PYTHONPATH=/usr/bin/python3
# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
typeset -g POWERLEVEL9K_INSTANT_PROMPT=quiet
[[ ! -f "${ZSH}/custom/scripts/n.zsh" ]] || source $ZSH/custom/scripts/n.zsh # nnn config
[[ ! -f "${HOME}/.p10k.zsh" ]] || source "${HOME}/.p10k.zsh"
[[ ! -f "${ZSH}/custom/scripts/i3lock.zsh" ]] || source $ZSH/custom/scripts/i3lock.zsh # i3lock
[[ ! -f "${HOME}/.config/tabtab/zsh/__tabtab.zsh" ]] || source ~/.config/tabtab/zsh/__tabtab.zsh # tabtab
EZREEPORT_ADMIN_AC_ZSH_SETUP_PATH="${HOME}/.cache/ezreeport-admin/autocomplete/zsh_setup" && test -f $EZREEPORT_ADMIN_AC_ZSH_SETUP_PATH && source $EZREEPORT_ADMIN_AC_ZSH_SETUP_PATH; # ezreeport-admin autocomplete setup
# nvm
# zstyle ':omz:plugins:nvm' autoload yes
@@ -151,7 +151,6 @@ typeset -g POWERLEVEL9K_INSTANT_PROMPT=quiet
# alias ohmyzsh="mate ~/.oh-my-zsh"
alias "docker-compose"="docker compose"
alias nnn="n"
alias ls="/bin/eza --icons"
alias tree="/bin/eza --icons -T"
@@ -162,7 +161,6 @@ alias curl="curlie"
alias df="duf"
alias grep="ugrep"
alias ping="prettyping"
alias find="fzf"
# Set personal aliases with autocomplete
# kssh() {
@@ -187,3 +185,11 @@ setopt HIST_IGNORE_SPACE # Dont record an entry starting with a space
setopt HIST_SAVE_NO_DUPS # Dont write duplicate entries in the history file
setopt SHARE_HISTORY # Share history between all sessions
unsetopt HIST_VERIFY # Execute commands using history (e.g.: using !$) immediatel
# pnpm
export PNPM_HOME="/home/sublet/.local/share/pnpm"
case ":$PATH:" in
*":$PNPM_HOME:"*) ;;
*) export PATH="$PNPM_HOME:$PATH" ;;
esac
# pnpm end

View File

@@ -1,33 +0,0 @@
n ()
{
# Block nesting of nnn in subshells
if [[ "${NNNLVL:-0}" -ge 1 ]]; then
echo "nnn is already running"
return
fi
export KITTY_LISTEN_ON="$TMPDIR/kitty"
export NNN_FIFO=/tmp/nnn.fifo
export NNN_PLUG='p:preview-tui'
# The behaviour is set to cd on quit (nnn checks if NNN_TMPFILE is set)
# If NNN_TMPFILE is set to a custom path, it must be exported for nnn to
# see. To cd on quit only on ^G, remove the "export" and make sure not to
# use a custom path, i.e. set NNN_TMPFILE *exactly* as follows:
# NNN_TMPFILE="${XDG_CONFIG_HOME:-$HOME/.config}/nnn/.lastd"
export NNN_TMPFILE="${XDG_CONFIG_HOME:-$HOME/.config}/nnn/.lastd"
# Unmask ^Q (, ^V etc.) (if required, see `stty -a`) to Quit nnn
# stty start undef
# stty stop undef
# stty lwrap undef
# stty lnext undef
# The backslash allows one to alias n to nnn if desired without making an
# infinitely recursive alias
\nnn "$@"
if [ -f "$NNN_TMPFILE" ]; then
. "$NNN_TMPFILE"
rm -f "$NNN_TMPFILE" > /dev/null
fi
}

View File

@@ -94,7 +94,7 @@ inherit = common
modules-left = date dunst
modules-center =
modules-right = pulseaudio battery cpu temperature memory eth wlan vpn
modules-right = pulseaudio battery cpu temperature memory eth eth-usb wlan vpn vpn-home
; ============ MODULES ============
@@ -290,7 +290,7 @@ inherit = powerline-templates/right-to-left-item
background = ${colors.module-bg}
background-next = ${colors.module-bg-alt}
format-connected = " "
format-connected = " "
format-connected-foreground = ${colors.foreground-alt}
format-connected-background = ${colors.module-bg}
format-connected-font = 4
@@ -301,13 +301,27 @@ format-disconnected =
type = internal/network
interface = enxc84bd64ef53d
interval = 3
inherit = powerline-templates/right-to-left-item
background = ${colors.module-bg}
background-next = ${colors.module-bg-alt}
format-connected = " 󰈀 "
format-connected-foreground = ${colors.foreground-alt}
format-connected-background = ${colors.module-bg}
format-connected-font = 2
format-disconnected = "D"
[module/eth-usb]
type = internal/network
interface = usb0
unknown-as-up = true
inherit = powerline-templates/right-to-left-item
background = ${colors.module-bg}
background-next = ${colors.module-bg-alt}
format-connected = " "
format-connected = " 󰕓 "
format-connected-foreground = ${colors.foreground-alt}
format-connected-background = ${colors.module-bg}
format-connected-font = 2
@@ -317,9 +331,8 @@ format-disconnected =
[module/vpn]
type = internal/network
interface = tun0
interval = 3
format-connected = " "
format-connected = "  "
format-connected-foreground = ${colors.success}
format-connected-background = ${colors.module-bg}
format-connected-font = 1
@@ -328,6 +341,18 @@ format-connected-font = 1
format-disconnected =
[module/vpn-home]
type = internal/network
interface = home
unknown-as-up = true
format-connected = "  "
format-connected-foreground = ${colors.success}
format-connected-background = ${colors.module-bg}
format-connected-font = 1
format-disconnected =
[module/date]
type = internal/date
interval = 5
@@ -439,7 +464,7 @@ format-discharging-background = ${colors.module-bg}
format-low-prefix-foreground = ${colors.module-bg}
format-low-prefix-background = ${colors.module-bg-alt}
format-low-prefix = ""
format-low = "<animation-low> <animation-low> "
format-low = "<animation-low> <label-discharging> "
format-low-background = ${colors.module-bg}
format-full = "%{T2} %{T-} <label-full> "

View File

@@ -6,8 +6,8 @@ status=$(dunstctl history | jq '.data[0] | length' || echo '?')
if [ "$status" = '?' ]; then
echo "$status"
elif [ "$status" -gt 0 ]; then
echo "%{F#4B8783}%{F-} $status"
echo "%{F#4B8783}%{F-} $status"
else
echo "%{F#4B8783}%{F-}"
echo "%{F#4B8783}%{F-}"
fi

View File

@@ -7,6 +7,8 @@ exec --no-startup-id greenclip daemon &
exec_always --no-startup-id $HOME/.config/dunst/start.sh &
# lockscreen
exec xss-lock --transfer-sleep-lock -- $HOME/.config/regolith3/i3/scripts/i3lock.sh &
# discord
exec --no-startup-id $HOME/discord.sh &
# Workspace config
workspace "$ws1" output eDP1 DP1-1