diff --git a/.Brewfile b/.Brewfile deleted file mode 100644 index 0d080f0..0000000 --- a/.Brewfile +++ /dev/null @@ -1,16 +0,0 @@ -tap "homebrew/bundle" -brew "gh" -brew "go" -brew "hadolint" -brew "rclone" -brew "shellcheck" -brew "tea" - -if OS.mac? - brew "corepack" - brew "node" - cask "docker" - cask "logseq" - cask "slack" - cask "visual-studio-code" -end diff --git a/.profile b/.profile index 3cbcf01..f9e89c4 100644 --- a/.profile +++ b/.profile @@ -1,19 +1,5 @@ -if [ -d /usr/local/Homebrew ]; then - export HOMEBREW_PREFIX="/usr/local" - export HOMEBREW_CELLAR="/usr/local/Cellar" - export HOMEBREW_REPOSITORY="/usr/local/Homebrew" - export PATH="/usr/local/bin:/usr/local/sbin${PATH+:$PATH}" - export MANPATH="/usr/local/share/man${MANPATH+:$MANPATH}:" - export INFOPATH="/usr/local/share/info:${INFOPATH:-}" -else - export HOMEBREW_PREFIX="/home/linuxbrew/.linuxbrew" - export HOMEBREW_CELLAR="/home/linuxbrew/.linuxbrew/Cellar" - export HOMEBREW_REPOSITORY="/home/linuxbrew/.linuxbrew/Homebrew" - export PATH="/home/linuxbrew/.linuxbrew/bin:/home/linuxbrew/.linuxbrew/sbin${PATH+:$PATH}" - export MANPATH="/home/linuxbrew/.linuxbrew/share/man${MANPATH+:$MANPATH}:" - export INFOPATH="/home/linuxbrew/.linuxbrew/share/info:${INFOPATH:-}" -fi [ -n "$BASH_VERSION" ] && . "$HOME/.bashrc" [ -f "$HOME/.cargo/env" ] && . "$HOME/.cargo/env" +[ -e "$HOME/.nix-profile/etc/profile.d/nix.sh" ] && . "$HOME"/.nix-profile/etc/profile.d/nix.sh export DENO_INSTALL_ROOT="${HOME}/.local" export PATH="$HOME/.local/bin:$PATH" diff --git a/README.md b/README.md index 76b0ef4..3fa0481 100644 --- a/README.md +++ b/README.md @@ -13,5 +13,5 @@ sudo ./install or ```sh -sudo ./install homebrew desktop +sudo ./install desktop ``` diff --git a/homebrew/install b/homebrew/install deleted file mode 100755 index 8895b3c..0000000 --- a/homebrew/install +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -set -euo pipefail -cd -- "$(dirname -- "$0")" - -function install_homebrew_packages() { - local uid - uid=${SUDO_UID:-$(id -u)} - sudo --user="#$uid" \ - NONINTERACTIVE=1 \ - bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)" - if [[ -x /usr/local/bin/brew ]]; then - sudo --user="#$uid" \ - /usr/local/bin/brew bundle --global - else - sudo --user="#$uid" \ - /home/linuxbrew/.linuxbrew/bin/brew bundle --global - fi -} - -[[ $(uname -sm) =~ ^(Linux x86_64|Darwin x86_64)$ ]] && - install_homebrew_packages diff --git a/packages.bash b/packages.bash index 4940627..64a77c0 100644 --- a/packages.bash +++ b/packages.bash @@ -8,19 +8,20 @@ docker-compose-plugin fdupes ffmpeg fzf +gh git-crypt -imagemagick +golang jq knot-dnsutils nano +nix-setup-systemd nodejs qemu-user-static +rclone screen +shellcheck smartmontools sqlite3 tailscale +tea-cli ) - -if [[ "$(df --output=fstype . | sed 1d)" == "btrfs" ]]; then - packages+=(snapper) -fi