Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revamp #1

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions .alacritty.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
shell:
program: /Users/daniel/.nix-profile/bin/fish
program: /opt/homebrew/bin/fish
args:
- --login
- -C
- "tmux-attach-to-first-unattached-session-or-create"

alt_send_esc: false
- "tmux new-session -A -s main"

window:
decorations: "none"
Expand Down
8 changes: 0 additions & 8 deletions .bin/tmux-attach-to-first-unattached-session-or-create

This file was deleted.

6 changes: 0 additions & 6 deletions .bin/tmux-name-of-first-unattached-session

This file was deleted.

39 changes: 28 additions & 11 deletions .brew/Brewfile
Original file line number Diff line number Diff line change
@@ -1,23 +1,40 @@
# This should only be used for applications with graphical user interfaces until
# https://github.com/nix-community/home-manager/issues/1341 is resolved.

# Install: brew bundle install
# Remove surplus packages: brew bundle cleanup -f
# Overwrite: brew bundle dump

tap "dnjstrom/git-select-branch"
tap "homebrew/bundle"
tap "homebrew/cask"
tap "homebrew/cask-fonts"
tap "homebrew/core"

brew "ctop"
brew "fish"
brew "fisher"
brew "gh"
brew "grc"
brew "htop"
brew "jq"
brew "n"
brew "neovim"
brew "reattach-to-user-namespace"
brew "rust"
brew "starship"
brew "tmux"
brew "tpm"
brew "tree"
brew "dnjstrom/git-select-branch/git-select-branch"

cask "1password"
cask "alacritty"
cask "docker"
cask "figma"
cask "font-fira-code"
cask "google-chrome"
cask "messenger"
cask "phoenix"
cask "slack"
cask "spotify"
cask "visual-studio-code"
vscode "christian-kohler.npm-intellisense"
vscode "christian-kohler.path-intellisense"
vscode "dbaeumer.vscode-eslint"
vscode "EditorConfig.EditorConfig"
vscode "esbenp.prettier-vscode"
vscode "formulahendry.auto-close-tag"
vscode "formulahendry.auto-rename-tag"
vscode "mikestead.dotenv"
vscode "ms-azuretools.vscode-docker"
vscode "vscodevim.vim"
8 changes: 8 additions & 0 deletions .brew/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Install
brew bundle install

# Remove surplus packages
brew bundle cleanup -f

# Overwrite
brew bundle dump
3 changes: 3 additions & 0 deletions .config/fish/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Install fish plugins

fisher update
20 changes: 6 additions & 14 deletions .fishrc.fish → .config/fish/config.fish
Original file line number Diff line number Diff line change
@@ -1,26 +1,19 @@
# Clear greeting message on startup
set fish_greeting
set -g fish_greeting

# Environment variables
# Set english locale
set -x LC_ALL en_US.UTF-8
set -x LANG en_US.UTF-8
set -x EDITOR nvim
set -x PATH $PATH ~/.bin
set -x PATH $PATH ~/.nix-profile/bin
set -x PATH $PATH ~/Code/dotfiles/bin
set -x N_PREFIX $HOME/.local
set -x PATH $PATH /opt/homebrew/bin
set -x PATH $PATH $HOME/.local/bin

# Set up secret environment variables
# source ~/.dotfiles/fish/config.secret.fish

# Load nix environment
if test -e /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
fenv source /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
end

if test -e /nix/var/nix/profiles/default/etc/profile.d/nix.sh
fenv source /nix/var/nix/profiles/default/etc/profile.d/nix.sh
end
# Set up secret environment variables
# source ~/.dotfiles/fish/config.secret.fish

# Alias for managing config files
alias cfg='git --git-dir=$HOME/Code/dotfiles/ --work-tree=$HOME'
Expand Down Expand Up @@ -94,5 +87,4 @@ set -u fish_color_quote green


starship init fish | source
direnv hook fish | source
brew shellenv | source
4 changes: 4 additions & 0 deletions .config/fish/fish_plugins
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
oh-my-fish/plugin-foreign-env
jorgebucaran/autopair.fish
oh-my-fish/plugin-grc
jethrokuan/z
59 changes: 0 additions & 59 deletions .config/home-manager/home.nix

This file was deleted.

3 changes: 0 additions & 3 deletions .config/nixpkgs/config.nix

This file was deleted.

21 changes: 8 additions & 13 deletions .github/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,21 +36,16 @@ cd ~/.brew
brew bundle install
```

#### Install Nix
##### Install tmux plugins

https://nixos.org/download.html#nix-install-macos
tmux
# Type <Ctrl-a I>

```
sh <(curl -L https://nixos.org/nix/install)
```
##### Install fish plugins

#### Install Home manager
fisher update

https://rycee.gitlab.io/home-manager/index.html#sec-install-standalone
##### Install vim plugins

```
nix-channel --add https://github.com/nix-community/home-manager/archive/master.tar.gz home-manager
nix-channel --update
nix-shell '<home-manager>' -A install
home-manager switch
```
vim
:PlugInstall
6 changes: 3 additions & 3 deletions .tmux.conf
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ set -g @plugin 'tmux-plugins/tmux-open'


# Use fish shell
set -g default-command /Users/daniel/.nix-profile/bin/fish
set -g default-shell /Users/daniel/.nix-profile/bin/fish
set -g default-command /opt/homebrew/bin/fish
set -g default-shell /opt/homebrew/bin/fish

# Add truecolor support
set-option -ga terminal-overrides ",xterm-256color:Tc"
Expand Down Expand Up @@ -83,7 +83,7 @@ set -ga status-right '#{?client_prefix,#[fg=yellow],#[fg=blue]}#{?client_pref

# Install tmux plugin manager and plugins, if not already available
if "test ! -d ~/.tmux/plugins/tpm" \
"run 'git clone https://github.com/tmux-plugins/tpm; ~/.tmux/plugins/tpm; ~/.tmux/plugins/tpm/bin/install_plugins'"
"run 'git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm; ~/.tmux/plugins/tpm/bin/install_plugins'"

# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
# Press prefix + I (capital I, as in Install) to fetch the plugin.
Expand Down