From 378dd535145954be0e101d8358890e79ddb7b601 Mon Sep 17 00:00:00 2001 From: askiiart Date: Mon, 18 Nov 2024 08:19:06 -0600 Subject: [PATCH] misc tiny updates i can't be bothered to list or split up into multiple commits --- claws-mail/clawsrc | 1 + fish/conf.d/aliases.fish | 75 +++++++++++++++++++--------------------- restore.sh | 1 + vscode/extensions.txt | 1 + vscode/settings.json | 3 ++ 5 files changed, 42 insertions(+), 39 deletions(-) diff --git a/claws-mail/clawsrc b/claws-mail/clawsrc index a7ba5b6..93cb62f 100644 --- a/claws-mail/clawsrc +++ b/claws-mail/clawsrc @@ -37,6 +37,7 @@ compose_subject_format= compose_body_format=Hello,\n show_compose_margin=0 type_any_header=0 +notify_pasted_attachments=1 linewrap_length=72 linewrap_quotation=1 linewrap_pastes=1 diff --git a/fish/conf.d/aliases.fish b/fish/conf.d/aliases.fish index d840440..dd57009 100644 --- a/fish/conf.d/aliases.fish +++ b/fish/conf.d/aliases.fish @@ -1,47 +1,46 @@ -if status is-interactive - # Stuff be used in init for any shell +# Stuff be used in init for any shell - # docker/podman stuff - #alias docker="sudo docker" - #alias docker="podman" - alias dcompose="docker compose up -d --remove-orphans" - alias ddu="docker compose down && dcompose" - alias adb="sudo adb" # Needed on Fedora, not on Debian, IDK about other distros +# docker/podman stuff +#alias docker="sudo docker" +alias docker="podman" +alias dcompose="docker compose up -d --remove-orphans" +alias ddu="docker compose down && dcompose" +alias adb="sudo adb" # Needed on Fedora, not on Debian, IDK about other distros - alias ls="ls --color=auto -CF" - alias ll="ls -l" - alias la="ls -a" +alias ls="ls --color=auto -CF" +alias ll="ls -l" +alias la="ls -a" - # lol - alias please="sudo" - alias pwease="please" - alias pls="please" +# lol +alias please="sudo" +alias pwease="please" +alias pls="please" - # kitty stuff - if [ $TERM = "xterm-kitty" ] - alias icat="kitten icat" - alias s="kitten ssh" - else - alias icat="wezterm imgcat" - alias s="ssh" - end +# kitty stuff +if [ $TERM = "xterm-kitty" ] + alias icat="kitten icat" + alias s="kitten ssh" +else + alias icat="wezterm imgcat" + alias s="ssh" +end - # NixOS - if type -q nixos-rebuild - alias nrs="sudo NIXPKGS_ALLOW_INSECURE=1 nixos-rebuild switch --upgrade-all" - alias nrb="sudo NIXPKGS_ALLOW_INSECURE=1 nixos-rebuild build --upgrade-all" - alias nrs-rb="sudo NIXPKGS_ALLOW_INSECURE=1 nixos-rebuild switch --upgrade-all --rollback" - alias nrb-rb="sudo NIXPKGS_ALLOW_INSECURE=1 nixos-rebuild build --upgrade-all --rollback" - alias hms="NIXPKGS_ALLOW_INSECURE=1 home-manager switch" - alias hmb="NIXPKGS_ALLOW_INSECURE=1 home-manager build" - end +# NixOS +if type -q nixos-rebuild + alias nrs="sudo NIXPKGS_ALLOW_INSECURE=1 nixos-rebuild switch --upgrade-all" + alias nrb="sudo NIXPKGS_ALLOW_INSECURE=1 nixos-rebuild build --upgrade-all" + alias nrs-rb="sudo NIXPKGS_ALLOW_INSECURE=1 nixos-rebuild switch --upgrade-all --rollback" + alias nrb-rb="sudo NIXPKGS_ALLOW_INSECURE=1 nixos-rebuild build --upgrade-all --rollback" + alias hms="NIXPKGS_ALLOW_INSECURE=1 home-manager switch" + alias hmb="NIXPKGS_ALLOW_INSECURE=1 home-manager build" +end - # git - alias git-us="git submodule update --init --recursive" +# git +alias git-us="git submodule update --init --recursive" - # switch between SSH and HTTPS remotes - alias git-remote-switch="python3 -c \"import subprocess +# switch between SSH and HTTPS remotes +alias git-remote-switch="python3 -c \"import subprocess remote = subprocess.getoutput('git branch -vv') remote = remote[remote.find('[') + 1 : remote.find('/')] @@ -58,6 +57,4 @@ else: exit(subprocess.getstatusoutput(f'git remote set-url {remote} {new_url}')[0])\"" - # misc - alias py-add-venv="set PATH $(pwd)/.venv/bin/:$PATH" -end +alias tf2='cd ~/.local/share/Steam/steamapps/common/Team\ Fortress\ 2/; ~/.steam/steam/ubuntu12_64/steam-runtime-sniper/run ./tf.sh -- -windowed -w 1280 -h 720 -secure -steam' diff --git a/restore.sh b/restore.sh index b5b60c4..4f4256b 100755 --- a/restore.sh +++ b/restore.sh @@ -98,6 +98,7 @@ fi # to make sure a profile exists to apply this to if [ $(find ~/.librewolf -mindepth 1 -maxdepth 1 -type d -name "*.*" | wc -l) -eq 0 ]; then librewolf & + sleep 1 pkill librewolf sleep 1 fi diff --git a/vscode/extensions.txt b/vscode/extensions.txt index 27d0381..b5e12d6 100644 --- a/vscode/extensions.txt +++ b/vscode/extensions.txt @@ -93,6 +93,7 @@ procratstinator.gray-formatter raynigon.nginx-formatter rdnlsmith.linux-themes redhat.java +redhat.vscode-xml redhat.vscode-yaml robbowen.synthwave-vscode rokoroku.vscode-theme-darcula diff --git a/vscode/settings.json b/vscode/settings.json index d01038c..944a502 100644 --- a/vscode/settings.json +++ b/vscode/settings.json @@ -113,5 +113,8 @@ "editor.fontLigatures": true, "[rust]": { "editor.defaultFormatter": "rust-lang.rust-analyzer" + }, + "[yaml]": { + "editor.defaultFormatter": "redhat.vscode-yaml" } }