From 90f3daea1c8de48ca1f73d6d3f8080dd3d6a98e1 Mon Sep 17 00:00:00 2001 From: Brian Zalewski Date: Mon, 21 Nov 2022 12:01:34 +0000 Subject: [PATCH] Update dotfiles/.config/software/terminal/Scoopfile, dotfiles/.config/software/development/Scoopfile, TODO, dotfiles/.config/software/terminal/Packages.config, dotfiles/.config/software/desktop/Packages.config, dotfiles/.config/software/development/Packages.config, dotfiles/.config/software/desktop/Wingetfile, dotfiles/.config/software/development/Brewfile, dotfiles/.config/software/terminal/Brewfile, dotfiles/.config/software/desktop/Brewfile, dotfiles/.config/software/Brewfile-alternatives.yml Deleted dotfiles/.local/Scoop.full --- TODO | 7 +-- .../software/Brewfile-alternatives.yml | 59 +++++++++++++++++++ .../software/desktop/Brewfile} | 0 .../software/desktop/Packages.config} | 0 .../software/desktop/Wingetfile} | 0 .../software/development/Brewfile} | 4 -- .../software/development/Packages.config} | 0 .../software/development/Scoopfile} | 0 .../software/terminal/Brewfile} | 0 .../software/terminal/Packages.config} | 0 .../software/terminal/Scoopfile} | 2 - dotfiles/.local/Scoop.full | 0 12 files changed, 61 insertions(+), 11 deletions(-) create mode 100644 dotfiles/.config/software/Brewfile-alternatives.yml rename dotfiles/{.local/Brewfile.full => .config/software/desktop/Brewfile} (100%) rename dotfiles/{.local/Packages.config.full => .config/software/desktop/Packages.config} (100%) rename dotfiles/{.local/Winget.full => .config/software/desktop/Wingetfile} (100%) rename dotfiles/{.local/Brewfile.dev => .config/software/development/Brewfile} (99%) rename dotfiles/{.local/Packages.config.dev => .config/software/development/Packages.config} (100%) rename dotfiles/{.local/Scoop.dev => .config/software/development/Scoopfile} (100%) rename dotfiles/{.local/Brewfile.terminal => .config/software/terminal/Brewfile} (100%) rename dotfiles/{.local/Packages.config.terminal => .config/software/terminal/Packages.config} (100%) rename dotfiles/{.local/Scoop.terminal => .config/software/terminal/Scoopfile} (90%) delete mode 100644 dotfiles/.local/Scoop.full diff --git a/TODO b/TODO index 30f97c51..df1884fd 100644 --- a/TODO +++ b/TODO @@ -1,14 +1,10 @@ -### RUN AFTER NB INSTALL ON BREWFILE -nb completions install + ### Ensure these PATHs are added on Windows add to PATH: '%ProgramFiles(x86)%\mitmproxy\bin' '%ProgramFiles(x86)%\juju' -### Run after git lfs install -git lfs install - ### POSSIBLY USEFUL SOFTWARE https://hackjutsu.com/Lepton/ @@ -19,6 +15,7 @@ https://hackjutsu.com/Lepton/ # we can install via NPM, Go etc. # LSD used instead of exa for Windows # Glances not on Windows +# ASDF not on Windows # autorestic not on windows # gist not on Windows # git-secret not on Windows diff --git a/dotfiles/.config/software/Brewfile-alternatives.yml b/dotfiles/.config/software/Brewfile-alternatives.yml new file mode 100644 index 00000000..57b5b6a1 --- /dev/null +++ b/dotfiles/.config/software/Brewfile-alternatives.yml @@ -0,0 +1,59 @@ +--- +version: '3' + +preference: + - flatpak + - snap + - apt + - dnf + - pacman + - apk + - brew + - yay + - choco + - scoop + - winget + - go + - cargo + +alternatives: + delta: + brew: + - git-delta + - example-package + scoop: delta + git-lfs: + brew: git-lfs + scoop: git-lfs + nb: + brew: nb + rsync: + apt: rsync + brew: rsync + choco: rsync + dnf: rsync + shotcut: + choco: shotcut + flatpak: org.shotcut.Shotcut + snap: shotcut + volta: + brew: volta + scoop: volta + wget: + apk: wget + apt: wget + brew: rsync + dnf: wget + +preinstall: + example-package: | + echo "preinstall routine" + +postinstall: + git-lfs: | + git lfs install + nb: | + nb completions install + volta: | + volta setup + volta install node@latest diff --git a/dotfiles/.local/Brewfile.full b/dotfiles/.config/software/desktop/Brewfile similarity index 100% rename from dotfiles/.local/Brewfile.full rename to dotfiles/.config/software/desktop/Brewfile diff --git a/dotfiles/.local/Packages.config.full b/dotfiles/.config/software/desktop/Packages.config similarity index 100% rename from dotfiles/.local/Packages.config.full rename to dotfiles/.config/software/desktop/Packages.config diff --git a/dotfiles/.local/Winget.full b/dotfiles/.config/software/desktop/Wingetfile similarity index 100% rename from dotfiles/.local/Winget.full rename to dotfiles/.config/software/desktop/Wingetfile diff --git a/dotfiles/.local/Brewfile.dev b/dotfiles/.config/software/development/Brewfile similarity index 99% rename from dotfiles/.local/Brewfile.dev rename to dotfiles/.config/software/development/Brewfile index 9127b5a3..8037dbd1 100644 --- a/dotfiles/.local/Brewfile.dev +++ b/dotfiles/.config/software/development/Brewfile @@ -97,7 +97,6 @@ brew "yarn" brew "yank" brew "goofys" brew "awscli" -brew "azure-cli" brew "consul-template" brew "wkhtmltopdf" brew "watchman" @@ -114,11 +113,8 @@ brew "nomad" brew "mitmproxy" brew "juju" brew "gradle" -brew "google-cloud-sdk" brew "git-filter-repo" -brew "gh" brew "ffmpeg" -brew "exiftool" # Homebrew Casks (only available on macOS) # e.g. `brew install --cask ` diff --git a/dotfiles/.local/Packages.config.dev b/dotfiles/.config/software/development/Packages.config similarity index 100% rename from dotfiles/.local/Packages.config.dev rename to dotfiles/.config/software/development/Packages.config diff --git a/dotfiles/.local/Scoop.dev b/dotfiles/.config/software/development/Scoopfile similarity index 100% rename from dotfiles/.local/Scoop.dev rename to dotfiles/.config/software/development/Scoopfile diff --git a/dotfiles/.local/Brewfile.terminal b/dotfiles/.config/software/terminal/Brewfile similarity index 100% rename from dotfiles/.local/Brewfile.terminal rename to dotfiles/.config/software/terminal/Brewfile diff --git a/dotfiles/.local/Packages.config.terminal b/dotfiles/.config/software/terminal/Packages.config similarity index 100% rename from dotfiles/.local/Packages.config.terminal rename to dotfiles/.config/software/terminal/Packages.config diff --git a/dotfiles/.local/Scoop.terminal b/dotfiles/.config/software/terminal/Scoopfile similarity index 90% rename from dotfiles/.local/Scoop.terminal rename to dotfiles/.config/software/terminal/Scoopfile index 5d9741b3..46527ae4 100644 --- a/dotfiles/.local/Scoop.terminal +++ b/dotfiles/.config/software/terminal/Scoopfile @@ -1,5 +1,3 @@ -scoop bucket add main -# Missing ASDF bat bitwarden-cli direnv diff --git a/dotfiles/.local/Scoop.full b/dotfiles/.local/Scoop.full deleted file mode 100644 index e69de29b..00000000