From 16b8bd53b144cd34b80031c4fb0ea686f9a0c279 Mon Sep 17 00:00:00 2001 From: James Walker Date: Mon, 22 Mar 2021 22:59:58 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=B9=20cleaning=20up=20some=20old=20doc?= =?UTF-8?q?s,=20etc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .homesick_subdir | 2 -- README.md | 22 ++++++++-------- install.sh | 67 ------------------------------------------------ 3 files changed, 10 insertions(+), 81 deletions(-) delete mode 100644 .homesick_subdir delete mode 100755 install.sh diff --git a/.homesick_subdir b/.homesick_subdir deleted file mode 100644 index ac89784..0000000 --- a/.homesick_subdir +++ /dev/null @@ -1,2 +0,0 @@ -.ssh -.config diff --git a/README.md b/README.md index 73c47ff..2414d0b 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,13 @@ # dotfiles -My config files and things. May contain cruft. +This is how I manage my workstations. Currently using [nix](https://nixos.org) (and nix-darwin). -## Installation - -Using [homesick](https://rubygems.org/gems/homesick): - - gem install homesick - homesick clone git@github.com:walkah/dotfiles.git - homesick symlink dotfiles - -## Updates - - homesick pull dotfiles && homesick symlink dotfiles +## Install + +1. Install nix (daemon mode): `sh <(curl -L https://nixos.org/nix/install) --darwin-use-unencrypted-nix-store-volume --daemon` +1. Install nix-darwin: + * `nix-build https://github.com/LnL7/nix-darwin/archive/master.tar.gz -A installer` + * `./result/bin/darwin-installer` +1. Add home-manager channel: `nix-channel --add https://github.com/nix-community/home-manager/archive/master.tar.gz home-manager` +1. Link `./darwin/configuration.nix` to `~/.nixpkgs/darwin-configuration.nix` +1. Run `darwin-rebuild switch` diff --git a/install.sh b/install.sh deleted file mode 100755 index 6695cbe..0000000 --- a/install.sh +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/bash - -add_omz() { - if [ ! -d ~/.oh-my-zsh ]; then - echo "Installing oh-my-zsh..." - git clone https://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh - chsh -s /bin/zsh - else - echo "Oh-My-Zsh already installed." - fi -} - -add_homesick() { - if [ ! -d ~/.homesick ]; then - echo "Installing homesick..." - homesick clone https://github.com/walkah/dotfiles.git - homesick symlink - else - echo "Homesick already installed." - fi - -} - -install_macos() { - if [ ! -x "$(command -v git)" ]; then - echo "Installing xcode commandline tools..." - sudo xcode-select --install - fi - - if [ ! -x "$(command -v brew)" ]; then - echo "Installing homebrew..." - /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" - else - echo "Homebrew already installed." - fi - - add_omz - - sudo gem install homesick - add_homesick - - echo "Initial brew bundle..." - brew bundle --global -} - -install_linux() { - sudo apt install zsh curl git homesick - sudo snap install starship - - add_omz - - add_homesick - - if [ ! -d ~/.asdf ]; then - git clone https://github.com/asdf-vm/asdf.git ~/.asdf --branch v0.8.0 - fi -} - -# Actual installer -case "$OSTYPE" in - darwin*) - install_macos - ;; - linux*) - install_linux - ;; -esac