From ed8ffcf2878cb09967059be8375f0cb494087aa9 Mon Sep 17 00:00:00 2001 From: Tyler Starr Date: Sun, 21 May 2023 17:12:28 -0700 Subject: [PATCH] general clean up --- home/bin/executable_linux-backup-kestrel | 3 +- home/bin/executable_linux-monitor | 2 +- home/bin/executable_linux-mount-engi | 4 +- home/bin/executable_task-make-grocery | 2 +- home/bin/executable_task-tag-fleeting | 2 +- home/bin/executable_void-doctor | 39 ------ home/bin/executable_void-list-packages | 3 - home/bin/executable_wayland-rofi | 20 --- home/devel/work/dot_gitconfig.work | 12 +- home/dot_Xresources | 1 - home/dot_bash_profile | 12 +- home/dot_bashrc | 12 +- .../nvim/after/plugin/keymap/oil.lua | 10 ++ home/dot_config/nvim/lua/tstarr/init.lua | 1 + home/dot_config/nvim/lua/tstarr/nvim-tree.lua | 16 +++ home/dot_config/nvim/lua/tstarr/packer.lua | 3 +- home/dot_gitconfig | 12 +- .../share/applications/SuperSlicer.desktop | 6 - home/dot_nbrc | 27 ---- home/dot_tmux.conf | 10 ++ home/dot_xinitrc | 2 + home/dot_xmodmap | 5 - home/dot_zprofile | 9 -- home/dot_zshrc | 132 ++++-------------- 24 files changed, 117 insertions(+), 228 deletions(-) delete mode 100644 home/bin/executable_void-doctor delete mode 100644 home/bin/executable_void-list-packages delete mode 100644 home/bin/executable_wayland-rofi delete mode 100644 home/dot_Xresources create mode 100644 home/dot_config/nvim/after/plugin/keymap/oil.lua create mode 100644 home/dot_config/nvim/lua/tstarr/nvim-tree.lua delete mode 100644 home/dot_local/share/applications/SuperSlicer.desktop delete mode 100644 home/dot_nbrc delete mode 100644 home/dot_xmodmap delete mode 100644 home/dot_zprofile diff --git a/home/bin/executable_linux-backup-kestrel b/home/bin/executable_linux-backup-kestrel index 9e86cf66..12751816 100644 --- a/home/bin/executable_linux-backup-kestrel +++ b/home/bin/executable_linux-backup-kestrel @@ -1,5 +1,4 @@ -#!/bin/bash -# +#!/usr/bin/env bash echo "Creating backup with borg..." datetime=$(date +"%Y%m%d%H%M%S") diff --git a/home/bin/executable_linux-monitor b/home/bin/executable_linux-monitor index 1604f8fd..7d0c39b2 100644 --- a/home/bin/executable_linux-monitor +++ b/home/bin/executable_linux-monitor @@ -1,5 +1,5 @@ #!/usr/bin/python -# + import subprocess import json import pathlib diff --git a/home/bin/executable_linux-mount-engi b/home/bin/executable_linux-mount-engi index 241a3e16..e54dc0ed 100644 --- a/home/bin/executable_linux-mount-engi +++ b/home/bin/executable_linux-mount-engi @@ -1,3 +1,3 @@ -#!/bin/bash -# +#!/usr/bin/env bash + sudo mount -t cifs -o uid=tstarr,gid=tstarr,rw,vers=3.0,credentials=/home/tstarr/.smb //192.168.1.135/engi /home/tstarr/mnt/engi diff --git a/home/bin/executable_task-make-grocery b/home/bin/executable_task-make-grocery index 83a7fad9..c7103c27 100644 --- a/home/bin/executable_task-make-grocery +++ b/home/bin/executable_task-make-grocery @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash if [[ $(task "$1" +grocery 2>&1) == "No matches." ]]; then diff --git a/home/bin/executable_task-tag-fleeting b/home/bin/executable_task-tag-fleeting index 3e3030cb..557a7f0d 100644 --- a/home/bin/executable_task-tag-fleeting +++ b/home/bin/executable_task-tag-fleeting @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash if [[ $(task "$1" +fleeting 2>&1) == "No matches." ]]; then diff --git a/home/bin/executable_void-doctor b/home/bin/executable_void-doctor deleted file mode 100644 index 00ec4275..00000000 --- a/home/bin/executable_void-doctor +++ /dev/null @@ -1,39 +0,0 @@ -import yaml -import subprocess - -print("I'm the void doctor!") - -with open('/home/tstarr/.local/share/chezmoi/provision/tasks/desktop/packages.yml', 'r') as f: - in_yaml = yaml.safe_load(f) - -installed = subprocess.getoutput("xbps-query -m | sed 's!-[^-]*$!!'").split("\n") -installed.extend(subprocess.getoutput("flatpak list --columns=application").split("\n")) - -standard_keys = ["xbps", "flatpak"] -custom_keys = { "xbps-src": {"key": "include_tasks", "value": "xbps-src.yml"}} - -def parse_xbps_src(in_dict): - pack_list = [] - for item in in_dict["loop"]: - if "package" in item.keys(): - pack_list.append(item["package"]) - return pack_list - -packages = [] - -for item in in_yaml: - # Check standard for standard keys - for key in standard_keys: - if key in item.keys(): - packages.extend(item[key]["name"]) - - # Check custom if standard doesn't work - for key in custom_keys.keys(): - if custom_keys[key]["key"] in item.keys(): - if custom_keys[key]["value"] in item[custom_keys[key]["key"]]: - if key == "xbps": - packages.extend(parse_xbps_src(item)) - -not_ansible = [i for i in installed if i not in packages] -print("Installed, but not in ansible: ", not_ansible) - diff --git a/home/bin/executable_void-list-packages b/home/bin/executable_void-list-packages deleted file mode 100644 index 709dcdcd..00000000 --- a/home/bin/executable_void-list-packages +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -tmp=$(mktemp); xbps-query -m > ${tmp}; xilog | grep -f ${tmp}; /usr/bin/rm ${tmp} diff --git a/home/bin/executable_wayland-rofi b/home/bin/executable_wayland-rofi deleted file mode 100644 index a523dba8..00000000 --- a/home/bin/executable_wayland-rofi +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -SCREEN_POS=$(swaymsg -t get_outputs \ - | jq -r \ - '.[] | select(.focused).rect | "\(.width)x\(.height)\\+\(.x)\\+\(.y)"') - -# ripgrep -XWAYLAND_OUTPUT=$(xrandr | rg -oP "[A-Z]+[0-9]+(?= [a-z]+ $SCREEN_POS)") - -MONITOR_ID=$(rofi --help | rg $XWAYLAND_OUTPUT -B1 \ - | sed -sr '/ID/!d;s/[^:]*:\s([0-9])/\1/') - -# GNU grep -#XWAYLAND_OUTPUT=$(xrandr | grep -oP "[A-Z]+[0-9]+(?= connected $SCREEN_POS) - -#MONITOR_ID=$(rofi --help | grep $XWAYLAND_OUTPUT -B1 \ - #| sed -sr '/ID/!d;s/[^:]*:\s([0-9])/\1/') - -# stdin for dmenu mode -rofi -m $MONITOR_ID $@ /dev/null >/dev/null -#if [ $? -ge 2 ]; then -# ssh-agent -a "$SSH_AUTH_SOCK" >/dev/null -#fi -# -#if [[ -z $DISPLAY ]] && [[ $(tty) = /dev/tty1 ]]; then -# startx -#fi diff --git a/home/dot_zshrc b/home/dot_zshrc index 5547d272..dfcf36ec 100644 --- a/home/dot_zshrc +++ b/home/dot_zshrc @@ -1,120 +1,41 @@ -# If you come from bash you might have to change your $PATH. -# export PATH=$HOME/bin:/usr/local/bin:$PATH -# -DISABLE_AUTO_UPDATE="true" +##⠀⠀⠀⠀⠀⠀⠀⠀⢠⡆⠀⠀⠀⠀⠀⠀⠀⠀⠀ +#⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿⣿⡀⠀⠀⠀⠀⠀⠀⠀⠀ +#⠀⠀⠀⠀⠀⠀⠀⠀⣼⡏⠸⣧⠀⠀⠀⠀⠀⠀⠀⠀ +#⠠⢤⣤⣤⣤⣤⣤⣴⡿⠀⠀⢻⣦⣤⣤⣤⣤⣤⡤⠄ Tyler Starr (starr-dusT) +#⠀⠀⠙⠻⣦⣄⠀⠀⠀⠀⠀⠀⠀⠀⣠⣴⠟⠋⠀⠀ https://github.com/starr-dusT/dotfiles +#⠀⠀⠀⠀⠀⠙⣿⡆⠀⠀⠀⠀⠰⣿⠋⠀⠀⠀⠀⠀ https://tstarr.us +#⠀⠀⠀⠀⠀⢰⡟⠀⣀⣴⣦⣀⠀⢻⡆⠀⠀⠀⠀⠀ +#⠀⠀⠀⠀⢀⣾⣧⡾⠛⠁⠈⠙⠷⣼⣿⡀⠀⠀⠀⠀ +# ⠀⠀⠀⡸⠟⠁⠀⠀⠀⠀⠀⠀⠈⠛⢧⠀⠀⠀⠀ +# +# Zsh config. -# Path to your oh-my-zsh installation. +# Zsh specific config export ZSH="$HOME/.oh-my-zsh" -# Set name of the theme to load --- if set to "random", it will -# load a random theme each time oh-my-zsh is loaded, in which case, -# to know which specific one was loaded, run: echo $RANDOM_THEME -# See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes -ZSH_THEME="dracula/dracula" - -# Set list of themes to pick from when loading at random -# Setting this variable when ZSH_THEME=random will cause zsh to load -# a theme from this variable instead of looking in $ZSH/themes/ -# If set to an empty array, this variable will have no effect. -# ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" ) - -# Uncomment the following line to use case-sensitive completion. -# CASE_SENSITIVE="true" - -# Uncomment the following line to use hyphen-insensitive completion. -# Case-sensitive completion must be off. _ and - will be interchangeable. -# HYPHEN_INSENSITIVE="true" - -# Uncomment one of the following lines to change the auto-update behavior -# zstyle ':omz:update' mode disabled # disable automatic updates -# zstyle ':omz:update' mode auto # update automatically without asking -# zstyle ':omz:update' mode reminder # just remind me to update when it's time - -# Uncomment the following line to change how often to auto-update (in days). -# zstyle ':omz:update' frequency 13 - -# Uncomment the following line if pasting URLs and other text is messed up. -# DISABLE_MAGIC_FUNCTIONS="true" - -# Uncomment the following line to disable colors in ls. -# DISABLE_LS_COLORS="true" - -# Uncomment the following line to disable auto-setting terminal title. -# DISABLE_AUTO_TITLE="true" - -# Uncomment the following line to enable command auto-correction. -# ENABLE_CORRECTION="true" - -# Uncomment the following line to display red dots whilst waiting for completion. -# You can also set it to another string to have that shown instead of the default red dots. -# e.g. COMPLETION_WAITING_DOTS="%F{yellow}waiting...%f" -# Caution: this setting can cause issues with multiline prompts in zsh < 5.7.1 (see #5765) -# COMPLETION_WAITING_DOTS="true" - -# Uncomment the following line if you want to disable marking untracked files -# under VCS as dirty. This makes repository status check for large repositories -# much, much faster. -# DISABLE_UNTRACKED_FILES_DIRTY="true" - -# Uncomment the following line if you want to change the command execution time -# stamp shown in the history command output. -# You can set one of the optional three formats: -# "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd" -# or set a custom format using the strftime function format specifications, -# see 'man strftime' for details. -# HIST_STAMPS="mm/dd/yyyy" - -# Would you like to use another custom folder than $ZSH/custom? -# ZSH_CUSTOM=/path/to/new-custom-folder - -# Which plugins would you like to load? -# Standard plugins can be found in $ZSH/plugins/ -# Custom plugins may be added to $ZSH_CUSTOM/plugins/ -# Example format: plugins=(rails git textmate ruby lighthouse) -# Add wisely, as too many plugins slow down shell startup. +DISABLE_AUTO_UPDATE="true" plugins=(git zsh-syntax-highlighting) +ZSH_THEME="dracula/dracula" source $ZSH/oh-my-zsh.sh -# User configuration - +# Export PATHs +export EDITOR=nvim if ! [[ "$PATH" =~ "$HOME/.local/bin:$HOME/bin:" ]] then PATH="$HOME/.local/bin:$HOME/bin:$PATH" fi export PATH -export PATH=/home/tstarr/.nimble/bin:$PATH -#export PATH=/home/tstarr/.cargo/bin:$PATH -#export GEM_HOME="$(ruby -e 'puts Gem.user_dir')" -#export PATH="$PATH:$GEM_HOME/bin" - -export NVM_DIR="$HOME/.nvm" -[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm -[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion - -# You may need to manually set your language environment -# export LANG=en_US.UTF-8 - -# Preferred editor for local and remote sessions -export EDITOR=nvim - -# Compilation flags -# export ARCHFLAGS="-arch x86_64" - -# Set personal aliases, overriding those provided by oh-my-zsh libs, -# plugins, and themes. Aliases can be placed here, though oh-my-zsh -# users are encouraged to define aliases within the ZSH_CUSTOM folder. -# For a full list of active aliases, run `alias`. -# -# +# Create Aliases +# Nixos alias nixos-update='cd ~/.local/share/chezmoi/provision/nixos && \ sudo nixos-rebuild switch --flake .#$(hostname) && \ cd -' -alias ssway='export WLR_NO_HARDWARE_CURSORS=1 && sway --unsupported-gpu' -alias s='startx' +# Sway +alias s='sway' # tmuxinator alias tsplat='tmuxinator start splat' @@ -126,11 +47,6 @@ alias cc="cd ~/.local/share/chezmoi" alias cdr="chezmoi apply --verbose --dry-run" alias ca="chezmoi apply" -# xbps -alias xi="sudo xbps-install" -alias xr="sudo xbps-remove" -alias xl="void-list-packages" - # trashcli alias rm='echo "This is not the command you are looking for."; false' alias tp='trash-put' @@ -140,6 +56,10 @@ alias tre='trash-restore' alias trm='trash-rm' alias rofi='wayland-rofi' -# fedora +# Fedora alias update-grub='sudo grub2-mkconfig -o /boot/efi/EFI/fedora/grub.cfg' -export GPG_TTY=$(tty) + +# Void +alias xi="sudo xbps-install" +alias xr="sudo xbps-remove" +alias xl="void-list-packages"