Squashed commit of the following:
commit baadd91ee2a879dee1f25380102b3a2771d001f3 Author: TrudeEH <ehtrude@gmail.com> Date: Mon Mar 25 13:18:48 2024 +0000 Finished preparations to merge commit 4789d301aef540216b900141372bf6b925e7931e Author: TrudeEH <ehtrude@gmail.com> Date: Mon Mar 25 13:03:14 2024 +0000 Update bashrc commit 465d5c43ea87928dcf1cb77efb2131cb7ddb4133 Author: TrudeEH <ehtrude@gmail.com> Date: Mon Mar 25 12:56:15 2024 +0000 Fix bashrc on debian commit 193cd30089c2102909d3b8d22e335845455d9934 Author: TrudeEH <ehtrude@gmail.com> Date: Mon Mar 25 12:52:25 2024 +0000 Attempt to reduce linking steps commit 39589aaeb92c6bdb87fc38fc5a6c9adf320630a4 Author: TrudeEH <ehtrude@gmail.com> Date: Mon Mar 25 12:51:28 2024 +0000 Added --adopt flag to stow commit 6d575fb675408eecd721e82433ffd0f3391629b8 Author: TrudeEH <ehtrude@gmail.com> Date: Mon Mar 25 12:49:28 2024 +0000 Try to force stow to override existing symlinks commit b646179a0e50f71057ad4c2f87b6cadd35be1eb1 Author: TrudeEH <ehtrude@gmail.com> Date: Mon Mar 25 12:45:26 2024 +0000 Fix grep commit 614167978708a24e9e738fe2bdb3b9c5aff35c67 Author: TrudeEH <ehtrude@gmail.com> Date: Mon Mar 25 12:42:44 2024 +0000 Fix last commit commit e460693bf708e9a3ad882da143daf7f621ae7b96 Author: TrudeEH <ehtrude@gmail.com> Date: Mon Mar 25 12:41:33 2024 +0000 Test label fix commit a93ecf4bc09c3f6f6e2a0381eb83528c84e991b5 Author: TrudeEH <ehtrude@gmail.com> Date: Mon Mar 25 12:40:09 2024 +0000 Update grep to separate "-" from normal package names commit e556aaf8d9acb54f05866da33223eb7bc03c8248 Author: TrudeEH <ehtrude@gmail.com> Date: Mon Mar 25 12:36:46 2024 +0000 revert to last commit commit f2658d974dc0c738e4e2b62df900b0dcc286dda7 Author: TrudeEH <ehtrude@gmail.com> Date: Mon Mar 25 12:34:01 2024 +0000 Try to fix incorrect search command commit 8f099335f510e31ae44a1d720c68f12b4c68aab6 Author: TrudeEH <ehtrude@gmail.com> Date: Mon Mar 25 12:32:24 2024 +0000 Fix APT search output commit 0f0acbf13e4e82b59f5e4975a99c83b0636d7c7a Author: TrudeEH <ehtrude@gmail.com> Date: Mon Mar 25 12:28:57 2024 +0000 fix apt search package command commit ef66be61203321c22d4968c0f0002559db1a72a4 Author: TrudeEH <ehtrude@gmail.com> Date: Mon Mar 25 12:25:31 2024 +0000 Fix remove bug commit 627fdc72887d521b7a7f0b24ceb84a23bf787f5e Author: TrudeEH <ehtrude@gmail.com> Date: Mon Mar 25 12:21:36 2024 +0000 Add warning if app isn't installed. commit b341caa088cce0134360757014cc8e06df206868 Author: TrudeEH <ehtrude@gmail.com> Date: Mon Mar 25 12:20:05 2024 +0000 fix check input commit 399163f9b8cf62fe6c211e98733524fcb041bb29 Author: TrudeEH <ehtrude@gmail.com> Date: Mon Mar 25 12:19:36 2024 +0000 debug print commit 2cb7904fe3a2ae5350a60b2f0f16975e397ed497 Author: TrudeEH <ehtrude@gmail.com> Date: Mon Mar 25 12:14:09 2024 +0000 Fix string commit d83e4f95595683cdc8166162af14d160b30fd79d Author: TrudeEH <ehtrude@gmail.com> Date: Mon Mar 25 12:13:11 2024 +0000 Fix check input commit 992343066539ab2b5780c5fa6e73ba3a68f0e8f2 Author: TrudeEH <ehtrude@gmail.com> Date: Mon Mar 25 12:11:38 2024 +0000 debug print 2 commit bc0cf43a28c5a701bd90158eb10efcc1b1cae611 Author: TrudeEH <ehtrude@gmail.com> Date: Mon Mar 25 12:10:28 2024 +0000 debug print commit 8fa90f9b602d5e18a4632022b6a2a131f2131150 Author: TrudeEH <ehtrude@gmail.com> Date: Mon Mar 25 12:09:27 2024 +0000 style fix commit 3358c726a93d808f5ec53f321302ce6525a2111f Author: TrudeEH <ehtrude@gmail.com> Date: Mon Mar 25 12:07:09 2024 +0000 fix nix return again commit e3db3959aff42722bc0e3076b92e5a83d40a52ce Author: TrudeEH <ehtrude@gmail.com> Date: Mon Mar 25 12:05:06 2024 +0000 tr with nix for newline commit 165c3e8c86581b3ecc5c4b7f801d4a3570c394a1 Author: TrudeEH <ehtrude@gmail.com> Date: Mon Mar 25 12:03:12 2024 +0000 test nix return fix commit 16b6825362a2e456ea8758fbe0a20e4763a58562 Author: TrudeEH <ehtrude@gmail.com> Date: Mon Mar 25 12:02:25 2024 +0000 test nix return commit a108b47ac189bb4ddd4891c80bbb5044da4501de Author: TrudeEH <ehtrude@gmail.com> Date: Mon Mar 25 12:01:35 2024 +0000 Fix wrong apt-get usage commit bcc3b9f32cead6fa439a057a995086943dfe9e36 Author: TrudeEH <ehtrude@gmail.com> Date: Mon Mar 25 11:55:41 2024 +0000 Switch apt to apt-get commit eb5b272055e000a60e91042529e7c976c84be274 Author: TrudeEH <ehtrude@gmail.com> Date: Mon Mar 25 11:53:24 2024 +0000 Fix return codes commit 07e424e3de6f115aefa50778d0ffdf89e13c2fe8 Author: TrudeEH <ehtrude@gmail.com> Date: Mon Mar 25 11:47:14 2024 +0000 Removed unnecessary checks commit b6e08e978a6ce420e8f7bb85087aef30a151aede Author: TrudeEH <ehtrude@gmail.com> Date: Mon Mar 25 11:41:47 2024 +0000 Attempt fix, again commit 5e95a13f75fa234da0a330f0a878fb2f4eec8b39 Author: TrudeEH <ehtrude@gmail.com> Date: Mon Mar 25 11:37:11 2024 +0000 Fix last commit commit 2babffa9e124928e9e46395d9199138e1800c265 Author: TrudeEH <ehtrude@gmail.com> Date: Mon Mar 25 11:35:32 2024 +0000 Check if program is installed before installing it. commit 938fd9fe5ea39c4e55944c0488f33437de06e7b7 Author: TrudeEH <ehtrude@gmail.com> Date: Mon Mar 25 11:26:04 2024 +0000 Dotfiles rewrite (using stew) Full rewrite; Still in testing
This commit is contained in:
45
home/.bashrc
Normal file
45
home/.bashrc
Normal file
@@ -0,0 +1,45 @@
|
||||
#
|
||||
# ~/.bashrc
|
||||
#
|
||||
|
||||
source ~/dotfiles/scripts/p.sh
|
||||
|
||||
alias ls='ls --color=auto'
|
||||
alias grep='grep --color=auto'
|
||||
PS1='\n[\[\e[37m\]\u\[\e[0m\]@\[\e[37;2m\]\h\[\e[0m\]] \[\e[1m\]\w \[\e[0;2m\]J:\[\e[0m\]\j\n\$ '
|
||||
|
||||
bind -s 'set completion-ignore-case on'
|
||||
|
||||
compress() {
|
||||
FILE=$1
|
||||
shift
|
||||
case $FILE in
|
||||
*.tar.bz2) tar cjf $FILE $* ;;
|
||||
*.tar.gz) tar czf $FILE $* ;;
|
||||
*.tgz) tar czf $FILE $* ;;
|
||||
*.zip) zip $FILE $* ;;
|
||||
*.rar) rar $FILE $* ;;
|
||||
*) echo "Filetype not recognized" ;;
|
||||
esac
|
||||
}
|
||||
|
||||
extract() {
|
||||
if [ -f $1 ]; then
|
||||
case $1 in
|
||||
*.tar.bz2) tar xjf $1 ;;
|
||||
*.tar.gz) tar xzf $1 ;;
|
||||
*.bz2) bunzip2 $1 ;;
|
||||
*.rar) unrar e $1 ;;
|
||||
*.gz) gunzip $1 ;;
|
||||
*.tar) tar xf $1 ;;
|
||||
*.tbz2) tar xjf $1 ;;
|
||||
*.tgz) tar xzf $1 ;;
|
||||
*.zip) unzip $1 ;;
|
||||
*.Z) uncompress $1 ;;
|
||||
*.7z) 7z x $1 ;;
|
||||
*) echo "'$1' cannot be extracted via extract()" ;;
|
||||
esac
|
||||
else
|
||||
echo "'$1' is not a valid file"
|
||||
fi
|
||||
}
|
||||
3
home/.config/nixpkgs/config.nix
Normal file
3
home/.config/nixpkgs/config.nix
Normal file
@@ -0,0 +1,3 @@
|
||||
{
|
||||
allowUnfree = true;
|
||||
}
|
||||
46
home/.zshrc
46
home/.zshrc
@@ -8,51 +8,7 @@ fi
|
||||
# Open VSCode from the terminal
|
||||
code () { VSCODE_CWD="$PWD" open -n -b "com.microsoft.VSCode" --args $* ;}
|
||||
|
||||
# Shortcuts for brew and macOS update
|
||||
p () {
|
||||
if ! command -v brew &> /dev/null; then
|
||||
echo "Brew not found. Installing..."
|
||||
/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
|
||||
(echo; echo 'eval "$(/opt/homebrew/bin/brew shellenv)"') > ~/.zprofile
|
||||
eval "$(/opt/homebrew/bin/brew shellenv)"
|
||||
fi
|
||||
|
||||
case $1 in
|
||||
install|i)
|
||||
shift
|
||||
brew install $*
|
||||
;;
|
||||
remove|r|)
|
||||
shift
|
||||
brew uninstall $*
|
||||
;;
|
||||
update|u)
|
||||
brew update
|
||||
brew upgrade
|
||||
brew autoremove
|
||||
brew cleanup
|
||||
;;
|
||||
list|l)
|
||||
brew list
|
||||
;;
|
||||
bundle|b)
|
||||
brew bundle --file $2
|
||||
;;
|
||||
macOSupdate|m)
|
||||
echo "Updating MacOS..."
|
||||
echo "THE DEVICE WILL RESTART IF NECESSARY."
|
||||
sudo softwareupdate -iaR
|
||||
;;
|
||||
*)
|
||||
echo "Usage: p {(i)nstall|(r)emove|(u)pdate|(l)ist|(b)undle|(m)acOSupdate} <package>"
|
||||
;;
|
||||
esac
|
||||
|
||||
# Generate a new bundle in the dotfiles.
|
||||
echo "Updating bundle in $HOME/dotfiles..."
|
||||
rm -f $HOME/dotfiles/BrewFile
|
||||
brew bundle dump --describe --file=$HOME/dotfiles/BrewFile
|
||||
}
|
||||
source $HOME/dotfiles/scripts/p.sh
|
||||
|
||||
# Shortcuts to extract files
|
||||
extract () {
|
||||
|
||||
Reference in New Issue
Block a user