diff --git a/.dotter/global.toml b/.dotter/global.toml index bc923f5..f25e72b 100644 --- a/.dotter/global.toml +++ b/.dotter/global.toml @@ -65,6 +65,7 @@ depends = ["wayland"] [personal-laptop.files] "personal-laptop/config" = "~/.config" +"personal-laptop/bin" = "~/.local/bin" [personal-laptop.variables] diff --git a/default/bashrc.d/default b/default/bashrc.d/default index d6729a3..5876fda 100755 --- a/default/bashrc.d/default +++ b/default/bashrc.d/default @@ -5,7 +5,7 @@ if [[ -z ${ZELLIJ} ]] && command -v zellij; then fi -if [[ -f /usr/share/terminfo/a/alacritty ]];then +if [[ ! -f /usr/share/terminfo/a/alacritty ]];then export TERM=xterm-256color fi @@ -207,9 +207,11 @@ alias apple-a2337="ssh pogmommy-apple-a2337" #Git env vars export GIT_AUTHOR_NAME="Penelope Gwen" export GIT_AUTHOR_EMAIL="penelope@pogmom.me" -export GIT_EDITOR="/usr/bin/nano" [[ -d $HOME/.local/bin ]] && export PATH="$HOME/.local/bin:$PATH" +if [[ -d $HOME/.cargo/bin ]] && [[ ! ":$PATH:" == *":$HOME/.cargo:"* ]];then + export PATH="$HOME/.cargo/bin:$PATH" +fi #[[ -d $HOME/.rustup/toolchains/nightly-$(uname -m)-unknown-linux-gnu/bin ]] && export PATH="$HOME/.rustup/toolchains/nightly-$(uname -m)-unknown-linux-gnu/bin:$PATH" [[ -d $HOME/.local/share/gem/ruby/3.3.0/bin ]] && export PATH="$HOME/.local/share/gem/ruby/3.3.0/bin:$PATH" @@ -219,9 +221,12 @@ if [ "$TERM" = alacritty ]; then PROMPT_COMMAND='pwd|sed "s|${HOME}|~|"|perl -pe "s/(?/dev/null 2>&1;then eval "$(starship init bash)" else + MISSING_CMDS+=("starship") TPUT_RED="$(tput setaf 1)$(tput setab 0)" TPUT_MAGENTA_BG="$(tput setab 5)$(tput setaf 0)" TPUT_MAGENTA="$(tput sgr0)$(tput setaf 5)" @@ -243,11 +248,15 @@ fi if type hx >/dev/null 2>&1;then EDITOR=$(which hx) + GIT_EDITOR="$(which hx)" else + MISSING_CMDS+=("hx") EDITOR=$(which nano) + GIT_EDITOR="$(which nano)" fi export EDITOR +export GIT_EDITOR export SUDO_EDITOR=${EDITOR} export VISUAL="${EDITOR}" @@ -256,5 +265,10 @@ bind 'set completion-ignore-case on' if type hyfetch >/dev/null 2>&1;then hyfetch 2>/dev/null +else + MISSING_CMDS+=("hyfetch") fi +if [[ "${#MISSING_CMDS[@]}" -gt 0 ]];then + printf "Missing commands: %s\n" ${MISSING_CMDS[@]} +fi diff --git a/graphical/config/kdeglobals b/graphical/config/kdeglobals index 2a52f10..afb635c 100644 --- a/graphical/config/kdeglobals +++ b/graphical/config/kdeglobals @@ -4,6 +4,9 @@ update_info=filepicker.upd:filepicker-remove-old-previews-entry [AdaptiveTransparency] enabled=true +[Colors:View] +BackgroundNormal=215,175,175,0 + [ContrastEffect] contrast=0.2 enabled=false diff --git a/graphical/config/mc-server-info/config.toml b/graphical/config/mc-server-info/config.toml index a0c5c00..5028c68 100644 --- a/graphical/config/mc-server-info/config.toml +++ b/graphical/config/mc-server-info/config.toml @@ -5,5 +5,9 @@ address = "ian.hotn.gay" edition = "java" [[servers]] - address = "wedontownit.duckdns.org" + address = "mc.eugenesca.com" edition = "java" +[[servers]] + address = "mc.eugenesca.com" + edition = "bedrock" + diff --git a/personal-laptop/bin/macos-kb-fix.sh b/personal-laptop/bin/macos-kb-fix.sh new file mode 100755 index 0000000..7c9513e --- /dev/null +++ b/personal-laptop/bin/macos-kb-fix.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +echo 0 | sudo tee /sys/module/hid_apple/parameters/swap_fn_leftctrl &>/dev/null diff --git a/wayland/config/sway-de-utils/config.toml b/wayland/config/sway-de-utils/config.toml index 1628662..a0507d7 100644 --- a/wayland/config/sway-de-utils/config.toml +++ b/wayland/config/sway-de-utils/config.toml @@ -142,7 +142,7 @@ suspend_cmd = ["systemctl", "suspend"] [[profiles.scripts]] name = "LM-1-OFFICE-SERVER" icon = "" - command = "ssh-agent-handler.sh pogmommy@LM-1-OFFICE-SERVER " + command = "ssh-agent-handler.sh pogmommy@192.168.1.2 " [[profiles]] name = "Work"