From fb469d54d685728ad8deaf94e5ad6cb9bf4d0971 Mon Sep 17 00:00:00 2001 From: Naman Sood Date: Fri, 28 Jul 2023 02:43:56 -0400 Subject: [PATCH 01/10] use newest version of zsh theme Signed-off-by: Naman Sood --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index ab4b552..372ce28 100755 --- a/install.sh +++ b/install.sh @@ -15,7 +15,7 @@ git clone https://github.com/ohmyzsh/ohmyzsh.git ~/.oh-my-zsh echo "Downloading zsh theme" mkdir -p ~/.oh-my-zsh/custom/themes/ -wget -xqO ~/.oh-my-zsh/custom/themes/aphrodite.zsh-theme https://github.com/win0err/aphrodite-terminal-theme/raw/6f8733782e7e31676897dd9fb036fa7e057553c6/aphrodite.zsh-theme +wget -xqO ~/.oh-my-zsh/custom/themes/aphrodite.zsh-theme https://github.com/win0err/aphrodite-terminal-theme/raw/master/aphrodite.zsh-theme for f in ${DOTFILES} do From 5ead386c4a733f711ab5d92eb6bd45f2e88710ef Mon Sep 17 00:00:00 2001 From: Naman Sood Date: Sat, 23 Dec 2023 21:11:00 -0500 Subject: [PATCH 02/10] use curl instead of wget Signed-off-by: Naman Sood --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index 372ce28..bd61b74 100755 --- a/install.sh +++ b/install.sh @@ -15,7 +15,7 @@ git clone https://github.com/ohmyzsh/ohmyzsh.git ~/.oh-my-zsh echo "Downloading zsh theme" mkdir -p ~/.oh-my-zsh/custom/themes/ -wget -xqO ~/.oh-my-zsh/custom/themes/aphrodite.zsh-theme https://github.com/win0err/aphrodite-terminal-theme/raw/master/aphrodite.zsh-theme +curl --create-dirs -Lo ~/.oh-my-zsh/custom/themes/aphrodite.zsh-theme https://github.com/win0err/aphrodite-terminal-theme/raw/master/aphrodite.zsh-theme for f in ${DOTFILES} do From 055aeba82bc1b9cd7d76d4635ea96cb5fd37d4c9 Mon Sep 17 00:00:00 2001 From: Naman Sood Date: Sat, 23 Dec 2023 21:11:27 -0500 Subject: [PATCH 03/10] fix vim backspacing in freebsd Signed-off-by: Naman Sood --- vimrc | 1 + 1 file changed, 1 insertion(+) diff --git a/vimrc b/vimrc index 3ea9764..f29f619 100644 --- a/vimrc +++ b/vimrc @@ -3,3 +3,4 @@ set autoindent set tabstop=4 " makes it so that yanks/deletes go into middle click keyboard set clipboard=unnamed +set backspace=indent,eol,start From 82c8a6aaa19a5d86987cb6ba4e1b3beaa675e25e Mon Sep 17 00:00:00 2001 From: Naman Sood Date: Thu, 11 Jan 2024 12:48:25 -0500 Subject: [PATCH 04/10] plead harder with firefox to use wayland Signed-off-by: Naman Sood --- zprofile | 1 + 1 file changed, 1 insertion(+) diff --git a/zprofile b/zprofile index fc043a8..d39b62a 100644 --- a/zprofile +++ b/zprofile @@ -7,6 +7,7 @@ fi # fix for firefox using xwayland instead of wayland native if [ "$XDG_SESSION_TYPE" = "wayland" ]; then export MOZ_ENABLE_WAYLAND=1 + export GDK_BACKEND=wayland fi export TENDS_TO=42 From 1c6cc5bb5e2abc376efc82ea2275a5f6c460fdcc Mon Sep 17 00:00:00 2001 From: Naman Sood Date: Tue, 16 Jan 2024 12:36:13 -0500 Subject: [PATCH 05/10] add filteruntil Signed-off-by: Naman Sood --- install.sh | 12 ++++++++++++ src/filteruntil.cpp | 21 +++++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 src/filteruntil.cpp diff --git a/install.sh b/install.sh index bd61b74..3d102f3 100755 --- a/install.sh +++ b/install.sh @@ -9,6 +9,12 @@ DOTFILES=( plan ) +CPP_PROGS=( + filteruntil +) + +CXX="${CXX:-g++}" + echo "Setting up oh-my-zsh" rm -rf ~/.oh-my-zsh git clone https://github.com/ohmyzsh/ohmyzsh.git ~/.oh-my-zsh @@ -25,6 +31,12 @@ do ln -sf $TARGET $LINK done +for f in ${CPP_PROGS} +do + echo "Installing $f" + $CXX -std=c++23 -O3 "$(pwd)/src/$f.cpp" -o "$HOME/bin/$f" +done + mkdir -p ~/bin for f in bin/* do diff --git a/src/filteruntil.cpp b/src/filteruntil.cpp new file mode 100644 index 0000000..3473061 --- /dev/null +++ b/src/filteruntil.cpp @@ -0,0 +1,21 @@ +#include + +int main(int argc, char **argv) { + if(argc != 2) { + std::cerr << "usage: " << argv[0] << " " << std::endl; + return 1; + } + + std::string pattern(argv[1]); + std::string line; + + while(std::getline(std::cin, line)) { + if(line.find(pattern) != std::string::npos) { + break; + } + } + + while(std::getline(std::cin, line)) { + std::cout << line << std::endl; + } +} From 3fadb8a2ce0ad69868c91a14587f576ec6dfd7bf Mon Sep 17 00:00:00 2001 From: Naman Sood Date: Tue, 16 Jan 2024 14:09:17 -0500 Subject: [PATCH 06/10] make ~/bin before putting files in it Signed-off-by: Naman Sood --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index 3d102f3..eb509ae 100755 --- a/install.sh +++ b/install.sh @@ -31,13 +31,13 @@ do ln -sf $TARGET $LINK done +mkdir -p ~/bin for f in ${CPP_PROGS} do echo "Installing $f" $CXX -std=c++23 -O3 "$(pwd)/src/$f.cpp" -o "$HOME/bin/$f" done -mkdir -p ~/bin for f in bin/* do FILENAME=$(echo $f | awk -F'/' '{print $2}') From e7f2b0fdc9c4a00af22e95bb639aba59f54d1bdc Mon Sep 17 00:00:00 2001 From: Naman Sood Date: Tue, 16 Apr 2024 02:32:29 -0400 Subject: [PATCH 07/10] remove one terrible hack, add another Signed-off-by: Naman Sood --- zprofile | 4 ++++ zshrc | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/zprofile b/zprofile index d39b62a..1d92b29 100644 --- a/zprofile +++ b/zprofile @@ -10,4 +10,8 @@ if [ "$XDG_SESSION_TYPE" = "wayland" ]; then export GDK_BACKEND=wayland fi +# make AUR packages not compress, since they immediately get +# decompressed anyway +export PKGEXT=pkg.tar + export TENDS_TO=42 diff --git a/zshrc b/zshrc index 8dac141..74be33d 100644 --- a/zshrc +++ b/zshrc @@ -1,5 +1,4 @@ # PATH changes are in .zshenv -alias sudo='sudo --preserve-env=PATH env ' alias lntexheader='ln -s ~/coursenotes/nsdheader.sty $(pwd)' # Path to your oh-my-zsh installation. From a67e10d21ba2580d50be164a0d4d666de8865878 Mon Sep 17 00:00:00 2001 From: Naman Sood Date: Wed, 8 May 2024 13:54:05 -0400 Subject: [PATCH 08/10] reorganize zshrc, add bat support Signed-off-by: Naman Sood --- oh-my-zsh | 1 - zshrc | 108 ++++++++---------------------------------------------- 2 files changed, 16 insertions(+), 93 deletions(-) delete mode 160000 oh-my-zsh diff --git a/oh-my-zsh b/oh-my-zsh deleted file mode 160000 index 67cc59b..0000000 --- a/oh-my-zsh +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 67cc59b4258a13232cddfddd75f44d8ca2b80172 diff --git a/zshrc b/zshrc index 74be33d..016161d 100644 --- a/zshrc +++ b/zshrc @@ -1,108 +1,19 @@ # PATH changes are in .zshenv -alias lntexheader='ln -s ~/coursenotes/nsdheader.sty $(pwd)' # Path to your oh-my-zsh installation. 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 # Aphrodite theme: https://github.com/win0err/aphrodite-terminal-theme ZSH_THEME="aphrodite" -# 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" +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 the following line to disable bi-weekly auto-update checks. -# DISABLE_AUTO_UPDATE="true" - -# Uncomment the following line to automatically update without prompting. -# DISABLE_UPDATE_PROMPT="true" - -# Uncomment the following line to change how often to auto-update (in days). -# export UPDATE_ZSH_DAYS=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. -# Caution: this setting can cause issues with multiline prompts (zsh 5.7.1 and newer seem to work) -# See https://github.com/ohmyzsh/ohmyzsh/issues/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. +# oh-my-zsh plugins plugins=() source $ZSH/oh-my-zsh.sh -# User configuration - -# export MANPATH="/usr/local/man:$MANPATH" - -# You may need to manually set your language environment -# export LANG=en_US.UTF-8 - -# Preferred editor for local and remote sessions -# if [[ -n $SSH_CONNECTION ]]; then -# export EDITOR='vim' -# else -# export EDITOR='mvim' -# fi - -# 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`. -# -# Example aliases -# alias zshconfig="mate ~/.zshrc" -# alias ohmyzsh="mate ~/.oh-my-zsh" - -[[ ! -r /home/nsood/.opam/opam-init/init.zsh ]] || source /home/nsood/.opam/opam-init/init.zsh > /dev/null 2> /dev/null - exp() { cd "$@" && ls } @@ -111,6 +22,9 @@ cdmk() { mkdir -p "$@" && cd "$@" } +# use gvim -v as vim if vim does not exist +# on Fedora, vim is compiled without copy-paste support, +# but gvim is compiled with if which gvim &>/dev/null && ! which vim &>/dev/null; then alias vim='gvim -v' export EDITOR='gvim -v' @@ -118,6 +32,16 @@ else export EDITOR=vim fi +# bat config +if which bat &> /dev/null; then + # tell it to use 8-bit terminal colors + export BAT_THEME="ansi" + + # tell man to use it as the pager + export MANPAGER="sh -c 'col -bx | bat -l man -p'" + export MANROFFOPT="-c" +fi + alias ':q'=exit alias open=xdg-open -alias neofetch=hyfetch +alias lntexheader='ln -s ~/coursenotes/nsdheader.sty $(pwd)' From 5805bfc81a8845135cfa657e19d97f5f5bba7333 Mon Sep 17 00:00:00 2001 From: Naman Sood Date: Tue, 18 Jun 2024 21:36:26 -0400 Subject: [PATCH 09/10] makepkg requires leading . in PKGEXT now Signed-off-by: Naman Sood --- zprofile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zprofile b/zprofile index 1d92b29..e01fdf6 100644 --- a/zprofile +++ b/zprofile @@ -12,6 +12,6 @@ fi # make AUR packages not compress, since they immediately get # decompressed anyway -export PKGEXT=pkg.tar +export PKGEXT=".pkg.tar" export TENDS_TO=42 From a742bebe3d30604d62bdeb80402405152fbe0b87 Mon Sep 17 00:00:00 2001 From: Naman Sood Date: Thu, 14 Nov 2024 22:02:32 -0500 Subject: [PATCH 10/10] add ssh config Signed-off-by: Naman Sood --- install.sh | 1 + ssh/config | 9 +++++++++ 2 files changed, 10 insertions(+) create mode 100644 ssh/config diff --git a/install.sh b/install.sh index eb509ae..35552f2 100755 --- a/install.sh +++ b/install.sh @@ -7,6 +7,7 @@ DOTFILES=( zprofile zshrc plan + ssh/config ) CPP_PROGS=( diff --git a/ssh/config b/ssh/config new file mode 100644 index 0000000..9861ded --- /dev/null +++ b/ssh/config @@ -0,0 +1,9 @@ +Host git.tends.to + User git + Port 7920 + +Host silicon helium deuterium + User nsood + +Host argon + User tends