From a35753cfd94290e1f158d691208c61e6045c5763 Mon Sep 17 00:00:00 2001 From: Noah Masur <7386960+nmasur@users.noreply.github.com> Date: Sat, 30 Apr 2022 19:28:19 -0400 Subject: [PATCH] remove some old unnecessary configs --- bin/bookmark | 15 ----- bin/calc | 13 ---- bin/nixos-fix-timezones | 3 - bin/nixos-rebuild | 3 - bin/nixos-rebuild-home | 3 - bin/nuke | 13 ---- bin/reset_1p | 4 -- bin/vimv | 44 ------------ cargo/Cargofile | 6 -- digrc.symlink | 1 - direnvrc.symlink | 13 ---- fd/fdignore.symlink | 8 --- git/gitconfig.symlink | 18 ----- modules/shell/git.nix | 1 + modules/shell/utilities.nix | 29 ++++---- python/boto/poetry.lock | 120 --------------------------------- python/boto/pyproject.toml | 15 ----- python/requests/poetry.lock | 96 -------------------------- python/requests/pyproject.toml | 16 ----- rg/rgignore.symlink | 8 --- 20 files changed, 17 insertions(+), 412 deletions(-) delete mode 100755 bin/bookmark delete mode 100755 bin/calc delete mode 100755 bin/nixos-fix-timezones delete mode 100755 bin/nixos-rebuild delete mode 100755 bin/nixos-rebuild-home delete mode 100755 bin/nuke delete mode 100755 bin/reset_1p delete mode 100755 bin/vimv delete mode 100644 cargo/Cargofile delete mode 100644 digrc.symlink delete mode 100644 direnvrc.symlink delete mode 100644 fd/fdignore.symlink delete mode 100644 git/gitconfig.symlink delete mode 100644 python/boto/poetry.lock delete mode 100644 python/boto/pyproject.toml delete mode 100644 python/requests/poetry.lock delete mode 100644 python/requests/pyproject.toml delete mode 100644 rg/rgignore.symlink diff --git a/bin/bookmark b/bin/bookmark deleted file mode 100755 index 9fb38bf..0000000 --- a/bin/bookmark +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -URL=$1 -TITLE=$2 -DESCRIPTION=$3 -FEED=$4 - -printf "\n\n## [%s](%s)\n%s\nFrom %s: added on [%s](%s.md).\n\n---\n" \ - "$TITLE" \ - "$URL" \ - "$DESCRIPTION" \ - "$FEED" \ - "$TODAY_NOTE" \ - "$TODAY_NOTE" \ - >>"$NOTES_PATH/bookmarks.md" diff --git a/bin/calc b/bin/calc deleted file mode 100755 index 57b551c..0000000 --- a/bin/calc +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env ruby -# -# Run a quick calculation with Ruby -# -# Usage: calc "1/2" - -class Integer - def /(other) - fdiv(other) - end -end - -puts eval(ARGV.join("")) diff --git a/bin/nixos-fix-timezones b/bin/nixos-fix-timezones deleted file mode 100755 index aa330ec..0000000 --- a/bin/nixos-fix-timezones +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env sh - -doas -u localtimed localtimed diff --git a/bin/nixos-rebuild b/bin/nixos-rebuild deleted file mode 100755 index d979b88..0000000 --- a/bin/nixos-rebuild +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env sh - -nixos-rebuild switch -I nixos-config="/home/noah/dev/personal/dotfiles/nixos/configuration.nix" diff --git a/bin/nixos-rebuild-home b/bin/nixos-rebuild-home deleted file mode 100755 index 702ae0d..0000000 --- a/bin/nixos-rebuild-home +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env sh - -home-manager switch -f "/home/noah/dev/personal/dotfiles/nixos/home.nix" diff --git a/bin/nuke b/bin/nuke deleted file mode 100755 index 51d438d..0000000 --- a/bin/nuke +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -nuke() { - local pid - pid=$(ps -ef | grep -v ^root | sed 1d | fzf -m | awk '{print $2}') - - if [ "x$pid" != "x" ] - then - echo $pid | xargs kill -${1:-9} - fi -} - -nuke diff --git a/bin/reset_1p b/bin/reset_1p deleted file mode 100755 index 84c976c..0000000 --- a/bin/reset_1p +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -security find-generic-password -s 1Password -w | op signin enterprise_console --output=raw > $HOME/.op_tmux_token_tmp - diff --git a/bin/vimv b/bin/vimv deleted file mode 100755 index 74844fc..0000000 --- a/bin/vimv +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env bash -set -eu - -# Lists the current directory's files in Vim, so you can edit it and save to rename them -# USAGE: vimv [file1 file2] -# https://github.com/thameera/vimv - -declare -r FILENAMES_FILE=$(mktemp "${TMPDIR:-/tmp}/vimv.XXX") - -trap '{ rm -f "${FILENAMES_FILE}" ; }' EXIT - -if [ $# -ne 0 ]; then - src=( "$@" ) -else - IFS=$'\r\n' GLOBIGNORE='*' command eval 'src=($(ls))' -fi - -for ((i=0;i<${#src[@]};++i)); do - echo "${src[i]}" >> "${FILENAMES_FILE}" -done - -${EDITOR:-vi} "${FILENAMES_FILE}" - -IFS=$'\r\n' GLOBIGNORE='*' command eval 'dest=($(cat "${FILENAMES_FILE}"))' - -if (( ${#src[@]} != ${#dest[@]} )); then - echo "WARN: Number of files changed. Did you delete a line by accident? Aborting.." >&2 - exit 1 -fi - -declare -i count=0 -for ((i=0;i<${#src[@]};++i)); do - if [ "${src[i]}" != "${dest[i]}" ]; then - mkdir -p "$(dirname "${dest[i]}")" - if git ls-files --error-unmatch "${src[i]}" > /dev/null 2>&1; then - git mv "${src[i]}" "${dest[i]}" - else - mv "${src[i]}" "${dest[i]}" - fi - ((++count)) - fi -done - -echo "$count" files renamed. diff --git a/cargo/Cargofile b/cargo/Cargofile deleted file mode 100644 index be20472..0000000 --- a/cargo/Cargofile +++ /dev/null @@ -1,6 +0,0 @@ -# Packages to install with Cargo - -toml-cli # Parse TOML from the command line -rates # See exchange rates -wrangler # Cloudflare Workers CLI -csview # Quick display CSV as tables diff --git a/digrc.symlink b/digrc.symlink deleted file mode 100644 index 0eac377..0000000 --- a/digrc.symlink +++ /dev/null @@ -1 +0,0 @@ -+noall +answer diff --git a/direnvrc.symlink b/direnvrc.symlink deleted file mode 100644 index 878c1ca..0000000 --- a/direnvrc.symlink +++ /dev/null @@ -1,13 +0,0 @@ -layout_poetry() { - if [[ ! -f pyproject.toml ]]; then - log_error 'No pyproject.toml found. Use `poetry new` or `poetry init` to create one first.' - exit 2 - fi - - # create venv if it doesn't exist - poetry run true - - export VIRTUAL_ENV=$(poetry env info --path) - export POETRY_ACTIVE=1 - PATH_add "$VIRTUAL_ENV/bin" -} diff --git a/fd/fdignore.symlink b/fd/fdignore.symlink deleted file mode 100644 index f385e61..0000000 --- a/fd/fdignore.symlink +++ /dev/null @@ -1,8 +0,0 @@ -!.env* -!.github/ -!.gitignore -!*.tfvars -.terraform/ -.target/ -/Library/ -target diff --git a/git/gitconfig.symlink b/git/gitconfig.symlink deleted file mode 100644 index de9f053..0000000 --- a/git/gitconfig.symlink +++ /dev/null @@ -1,18 +0,0 @@ -[filter "lfs"] - clean = git-lfs clean -- %f - smudge = git-lfs smudge -- %f - process = git-lfs filter-process - required = true -[user] - name = Noah Masur - email = 7386960+nmasur@users.noreply.github.com -[hub] - host = github.take2games.com -[pager] - branch = false -[core] - editor = nvim -[pull] - ff = only -[credential] - helper = osxkeychain diff --git a/modules/shell/git.nix b/modules/shell/git.nix index d1b5cba..9412cdd 100644 --- a/modules/shell/git.nix +++ b/modules/shell/git.nix @@ -12,6 +12,7 @@ in { extraConfig = { pager = { branch = "false"; }; safe = { directory = builtins.toString ../../.; }; + pull = { ff = "only"; }; }; }; diff --git a/modules/shell/utilities.nix b/modules/shell/utilities.nix index 741c0e2..4f10b99 100644 --- a/modules/shell/utilities.nix +++ b/modules/shell/utilities.nix @@ -16,24 +16,27 @@ in { home-manager.users.${identity.user} = { home.packages = with pkgs; [ - unzip - rsync - ripgrep - bat - fd - sd - jq - tealdeer - tree - htop - glow - prettyping - qrencode + unzip # Extract zips + rsync # Copy folders + ripgrep # grep + bat # cat + fd # find + sd # sed + jq # JSON manipulation + tealdeer # Cheatsheets + tree # View directory hierarchy + htop # Show system processes + glow # Pretty markdown previews + prettyping # ping + qrencode # Generate qr codes + vimv # Batch rename files + dig # DNS lookup ]; home.file = { ".rgignore".text = ignorePatterns; ".fdignore".text = ignorePatterns; + ".digrc".text = "+noall +answer"; # Cleaner dig commands }; programs.fish.shellAbbrs = { diff --git a/python/boto/poetry.lock b/python/boto/poetry.lock deleted file mode 100644 index e871a32..0000000 --- a/python/boto/poetry.lock +++ /dev/null @@ -1,120 +0,0 @@ -[[package]] -name = "boto3" -version = "1.20.5" -description = "The AWS SDK for Python" -category = "main" -optional = false -python-versions = ">= 3.6" - -[package.dependencies] -botocore = ">=1.23.5,<1.24.0" -jmespath = ">=0.7.1,<1.0.0" -s3transfer = ">=0.5.0,<0.6.0" - -[package.extras] -crt = ["botocore[crt] (>=1.21.0,<2.0a0)"] - -[[package]] -name = "botocore" -version = "1.23.5" -description = "Low-level, data-driven core of boto 3." -category = "main" -optional = false -python-versions = ">= 3.6" - -[package.dependencies] -jmespath = ">=0.7.1,<1.0.0" -python-dateutil = ">=2.1,<3.0.0" -urllib3 = ">=1.25.4,<1.27" - -[package.extras] -crt = ["awscrt (==0.12.5)"] - -[[package]] -name = "jmespath" -version = "0.10.0" -description = "JSON Matching Expressions" -category = "main" -optional = false -python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" - -[[package]] -name = "python-dateutil" -version = "2.8.2" -description = "Extensions to the standard Python datetime module" -category = "main" -optional = false -python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7" - -[package.dependencies] -six = ">=1.5" - -[[package]] -name = "s3transfer" -version = "0.5.0" -description = "An Amazon S3 Transfer Manager" -category = "main" -optional = false -python-versions = ">= 3.6" - -[package.dependencies] -botocore = ">=1.12.36,<2.0a.0" - -[package.extras] -crt = ["botocore[crt] (>=1.20.29,<2.0a.0)"] - -[[package]] -name = "six" -version = "1.16.0" -description = "Python 2 and 3 compatibility utilities" -category = "main" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*" - -[[package]] -name = "urllib3" -version = "1.26.7" -description = "HTTP library with thread-safe connection pooling, file post, and more." -category = "main" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4" - -[package.extras] -brotli = ["brotlipy (>=0.6.0)"] -secure = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "certifi", "ipaddress"] -socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] - -[metadata] -lock-version = "1.1" -python-versions = "^3.8" -content-hash = "fc1d3a2527ef475cf30a75a0bccfbe2fc3ca0ed539edb55268147bce9b170ff5" - -[metadata.files] -boto3 = [ - {file = "boto3-1.20.5-py3-none-any.whl", hash = "sha256:81ca80fbb3d551819c35c809cb159fd0bec6701d3d8f0e5906a22da7558d098e"}, - {file = "boto3-1.20.5.tar.gz", hash = "sha256:cc620c289b12d7bf7c2706b517c9f8950f9be4622aacc9e7580b8b4ee0d3bc73"}, -] -botocore = [ - {file = "botocore-1.23.5-py3-none-any.whl", hash = "sha256:c8eaeee0bac356396386aa9165043808fe736fb9e03ac0dedb1dfd82f41ad1a3"}, - {file = "botocore-1.23.5.tar.gz", hash = "sha256:49d1f012dc8467577a5fe603fc87cc13af816dd926b2bc2e28a3b2999ab14d36"}, -] -jmespath = [ - {file = "jmespath-0.10.0-py2.py3-none-any.whl", hash = "sha256:cdf6525904cc597730141d61b36f2e4b8ecc257c420fa2f4549bac2c2d0cb72f"}, - {file = "jmespath-0.10.0.tar.gz", hash = "sha256:b85d0567b8666149a93172712e68920734333c0ce7e89b78b3e987f71e5ed4f9"}, -] -python-dateutil = [ - {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"}, - {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"}, -] -s3transfer = [ - {file = "s3transfer-0.5.0-py3-none-any.whl", hash = "sha256:9c1dc369814391a6bda20ebbf4b70a0f34630592c9aa520856bf384916af2803"}, - {file = "s3transfer-0.5.0.tar.gz", hash = "sha256:50ed823e1dc5868ad40c8dc92072f757aa0e653a192845c94a3b676f4a62da4c"}, -] -six = [ - {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"}, - {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"}, -] -urllib3 = [ - {file = "urllib3-1.26.7-py2.py3-none-any.whl", hash = "sha256:c4fdf4019605b6e5423637e01bc9fe4daef873709a7973e195ceba0a62bbc844"}, - {file = "urllib3-1.26.7.tar.gz", hash = "sha256:4987c65554f7a2dbf30c18fd48778ef124af6fab771a377103da0585e2336ece"}, -] diff --git a/python/boto/pyproject.toml b/python/boto/pyproject.toml deleted file mode 100644 index 29b0d53..0000000 --- a/python/boto/pyproject.toml +++ /dev/null @@ -1,15 +0,0 @@ -[tool.poetry] -name = "boto" -version = "0.1.0" -description = "Amazon Web Services API" -authors = ["Noah Masur "] - -[tool.poetry.dependencies] -python = "^3.8" -boto3 = "^1.14.46" - -[tool.poetry.dev-dependencies] - -[build-system] -requires = ["poetry>=0.12"] -build-backend = "poetry.masonry.api" diff --git a/python/requests/poetry.lock b/python/requests/poetry.lock deleted file mode 100644 index 9f47717..0000000 --- a/python/requests/poetry.lock +++ /dev/null @@ -1,96 +0,0 @@ -[[package]] -name = "certifi" -version = "2020.12.5" -description = "Python package for providing Mozilla's CA Bundle." -category = "main" -optional = false -python-versions = "*" - -[[package]] -name = "chardet" -version = "3.0.4" -description = "Universal encoding detector for Python 2 and 3" -category = "main" -optional = false -python-versions = "*" - -[[package]] -name = "idna" -version = "2.10" -description = "Internationalized Domain Names in Applications (IDNA)" -category = "main" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" - -[[package]] -name = "python-dotenv" -version = "0.15.0" -description = "Add .env support to your django/flask apps in development and deployments" -category = "main" -optional = false -python-versions = "*" - -[package.extras] -cli = ["click (>=5.0)"] - -[[package]] -name = "requests" -version = "2.25.0" -description = "Python HTTP for Humans." -category = "main" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" - -[package.dependencies] -certifi = ">=2017.4.17" -chardet = ">=3.0.2,<4" -idna = ">=2.5,<3" -urllib3 = ">=1.21.1,<1.27" - -[package.extras] -security = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)"] -socks = ["PySocks (>=1.5.6,!=1.5.7)", "win-inet-pton"] - -[[package]] -name = "urllib3" -version = "1.26.5" -description = "HTTP library with thread-safe connection pooling, file post, and more." -category = "main" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4" - -[package.extras] -brotli = ["brotlipy (>=0.6.0)"] -secure = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "certifi", "ipaddress"] -socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] - -[metadata] -lock-version = "1.1" -python-versions = "^3.9" -content-hash = "0e7791a51dfaac094d66da11fbe4465030798924ede1baef134e9a184d6eaa8b" - -[metadata.files] -certifi = [ - {file = "certifi-2020.12.5-py2.py3-none-any.whl", hash = "sha256:719a74fb9e33b9bd44cc7f3a8d94bc35e4049deebe19ba7d8e108280cfd59830"}, - {file = "certifi-2020.12.5.tar.gz", hash = "sha256:1a4995114262bffbc2413b159f2a1a480c969de6e6eb13ee966d470af86af59c"}, -] -chardet = [ - {file = "chardet-3.0.4-py2.py3-none-any.whl", hash = "sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691"}, - {file = "chardet-3.0.4.tar.gz", hash = "sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae"}, -] -idna = [ - {file = "idna-2.10-py2.py3-none-any.whl", hash = "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0"}, - {file = "idna-2.10.tar.gz", hash = "sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6"}, -] -python-dotenv = [ - {file = "python-dotenv-0.15.0.tar.gz", hash = "sha256:587825ed60b1711daea4832cf37524dfd404325b7db5e25ebe88c495c9f807a0"}, - {file = "python_dotenv-0.15.0-py2.py3-none-any.whl", hash = "sha256:0c8d1b80d1a1e91717ea7d526178e3882732420b03f08afea0406db6402e220e"}, -] -requests = [ - {file = "requests-2.25.0-py2.py3-none-any.whl", hash = "sha256:e786fa28d8c9154e6a4de5d46a1d921b8749f8b74e28bde23768e5e16eece998"}, - {file = "requests-2.25.0.tar.gz", hash = "sha256:7f1a0b932f4a60a1a65caa4263921bb7d9ee911957e0ae4a23a6dd08185ad5f8"}, -] -urllib3 = [ - {file = "urllib3-1.26.5-py2.py3-none-any.whl", hash = "sha256:753a0374df26658f99d826cfe40394a686d05985786d946fbe4165b5148f5a7c"}, - {file = "urllib3-1.26.5.tar.gz", hash = "sha256:a7acd0977125325f516bda9735fa7142b909a8d01e8b2e4c8108d0984e6e0098"}, -] diff --git a/python/requests/pyproject.toml b/python/requests/pyproject.toml deleted file mode 100644 index fb4576a..0000000 --- a/python/requests/pyproject.toml +++ /dev/null @@ -1,16 +0,0 @@ -[tool.poetry] -name = "ipython" -version = "0.1.0" -description = "" -authors = ["Your Name "] - -[tool.poetry.dependencies] -python = "^3.9" -requests = "^2.25.0" -python-dotenv = "^0.15.0" - -[tool.poetry.dev-dependencies] - -[build-system] -requires = ["poetry-core>=1.0.0"] -build-backend = "poetry.core.masonry.api" diff --git a/rg/rgignore.symlink b/rg/rgignore.symlink deleted file mode 100644 index ae09259..0000000 --- a/rg/rgignore.symlink +++ /dev/null @@ -1,8 +0,0 @@ -!.env* -!.github/ -!.gitignore -!*.tfvars -!.ssh/ -.terraform/ -.target/ -/Library/