From 3613e0a9d7aea2f5451b5c2c1e5a8545a1f1f926 Mon Sep 17 00:00:00 2001 From: sloane Date: Mon, 4 Nov 2024 11:05:48 -0500 Subject: [PATCH] chore: use stow --- README.md | 54 ------------------- .../fish/completions/jj.fish | 0 {.config => dot-config}/fish/config.fish | 0 .../fish/functions/fish_jj_prompt.fish | 0 .../fish/functions/fish_prompt.fish | 0 .../fish/functions/fish_vcs_prompt.fish | 0 .../fish/functions/prefixed-function.fish | 0 .../fish/functions/supportconsole.fish | 0 .../fish/functions/vitally-init.fish | 0 .../functions/vitally-reset-database.fish | 0 .../fish/functions/vitally-session-name.fish | 0 .../fish/functions/vitally-start.fish | 0 .../fish/functions/vitally-stop.fish | 0 .../fish/functions/vitally.fish | 0 .../fish/functions/worktree.fish | 0 {.config => dot-config}/git/config | 0 {.config => dot-config}/git/ignore | 0 .../complex_modifications/1706650930.json | 0 .../karabiner/karabiner.json | 0 .../kitty/current-theme.conf | 0 {.config => dot-config}/kitty/kitty.conf | 0 {.config => dot-config}/mise/config.toml | 0 {.config => dot-config}/nix-darwin/.gitignore | 0 {.config => dot-config}/nix-darwin/README.md | 0 {.config => dot-config}/nix-darwin/flake.lock | 0 {.config => dot-config}/nix-darwin/flake.nix | 0 .../hosts/Sloanes-MacBook-Air/default.nix | 0 .../hosts/Sloanes-MacBook-Pro/default.nix | 0 .../hosts/tid27880sperrau/default.nix | 0 .../nix-darwin/modules/darwin/global.nix | 0 .../nix-darwin/modules/darwin/nixvim.nix | 0 .../nix-darwin/modules/global/global.nix | 0 .../nix-darwin/users/sloane/default.nix | 0 .../nix-darwin/users/sperrault/default.nix | 0 .../nixvim/config/colorscheme.nix | 0 .../nixvim/config/default.nix | 0 .../nixvim/config/keys.nix | 0 .../nixvim/config/plugins.nix | 0 .../nixvim/config/settings.nix | 0 {.config => dot-config}/nixvim/flake.lock | 0 {.config => dot-config}/nixvim/flake.nix | 0 {.config => dot-config}/nvim/init.lua | 0 {.config => dot-config}/nvim/lazy-lock.json | 0 .../nvim/lua/config/base.lua | 0 .../nvim/lua/config/lazy.lua | 0 .../nvim/lua/config/mappings.lua | 0 .../nvim/lua/plugins/colorscheme.lua | 0 .../nvim/lua/plugins/core.lua | 0 .../nvim/lua/plugins/lsp.lua | 0 .../nvim/lua/plugins/treesitter.lua | 0 .../nvim/lua/plugins/ui.lua | 0 .../nvim/lua/plugins/vcs.lua | 0 {.config => dot-config}/tmux/tmux.conf | 0 {.config => dot-config}/zellij/config.kdl | 0 .gitignore => dot-gitignore | 0 .jjconfig.toml => dot-jjconfig.toml | 0 56 files changed, 54 deletions(-) rename {.config => dot-config}/fish/completions/jj.fish (100%) rename {.config => dot-config}/fish/config.fish (100%) rename {.config => dot-config}/fish/functions/fish_jj_prompt.fish (100%) rename {.config => dot-config}/fish/functions/fish_prompt.fish (100%) rename {.config => dot-config}/fish/functions/fish_vcs_prompt.fish (100%) rename {.config => dot-config}/fish/functions/prefixed-function.fish (100%) rename {.config => dot-config}/fish/functions/supportconsole.fish (100%) rename {.config => dot-config}/fish/functions/vitally-init.fish (100%) rename {.config => dot-config}/fish/functions/vitally-reset-database.fish (100%) rename {.config => dot-config}/fish/functions/vitally-session-name.fish (100%) rename {.config => dot-config}/fish/functions/vitally-start.fish (100%) rename {.config => dot-config}/fish/functions/vitally-stop.fish (100%) rename {.config => dot-config}/fish/functions/vitally.fish (100%) rename {.config => dot-config}/fish/functions/worktree.fish (100%) rename {.config => dot-config}/git/config (100%) rename {.config => dot-config}/git/ignore (100%) rename {.config => dot-config}/karabiner/assets/complex_modifications/1706650930.json (100%) rename {.config => dot-config}/karabiner/karabiner.json (100%) rename {.config => dot-config}/kitty/current-theme.conf (100%) rename {.config => dot-config}/kitty/kitty.conf (100%) rename {.config => dot-config}/mise/config.toml (100%) rename {.config => dot-config}/nix-darwin/.gitignore (100%) rename {.config => dot-config}/nix-darwin/README.md (100%) rename {.config => dot-config}/nix-darwin/flake.lock (100%) rename {.config => dot-config}/nix-darwin/flake.nix (100%) rename {.config => dot-config}/nix-darwin/hosts/Sloanes-MacBook-Air/default.nix (100%) rename {.config => dot-config}/nix-darwin/hosts/Sloanes-MacBook-Pro/default.nix (100%) rename {.config => dot-config}/nix-darwin/hosts/tid27880sperrau/default.nix (100%) rename {.config => dot-config}/nix-darwin/modules/darwin/global.nix (100%) rename {.config => dot-config}/nix-darwin/modules/darwin/nixvim.nix (100%) rename {.config => dot-config}/nix-darwin/modules/global/global.nix (100%) rename {.config => dot-config}/nix-darwin/users/sloane/default.nix (100%) rename {.config => dot-config}/nix-darwin/users/sperrault/default.nix (100%) rename {.config => dot-config}/nixvim/config/colorscheme.nix (100%) rename {.config => dot-config}/nixvim/config/default.nix (100%) rename {.config => dot-config}/nixvim/config/keys.nix (100%) rename {.config => dot-config}/nixvim/config/plugins.nix (100%) rename {.config => dot-config}/nixvim/config/settings.nix (100%) rename {.config => dot-config}/nixvim/flake.lock (100%) rename {.config => dot-config}/nixvim/flake.nix (100%) rename {.config => dot-config}/nvim/init.lua (100%) rename {.config => dot-config}/nvim/lazy-lock.json (100%) rename {.config => dot-config}/nvim/lua/config/base.lua (100%) rename {.config => dot-config}/nvim/lua/config/lazy.lua (100%) rename {.config => dot-config}/nvim/lua/config/mappings.lua (100%) rename {.config => dot-config}/nvim/lua/plugins/colorscheme.lua (100%) rename {.config => dot-config}/nvim/lua/plugins/core.lua (100%) rename {.config => dot-config}/nvim/lua/plugins/lsp.lua (100%) rename {.config => dot-config}/nvim/lua/plugins/treesitter.lua (100%) rename {.config => dot-config}/nvim/lua/plugins/ui.lua (100%) rename {.config => dot-config}/nvim/lua/plugins/vcs.lua (100%) rename {.config => dot-config}/tmux/tmux.conf (100%) rename {.config => dot-config}/zellij/config.kdl (100%) rename .gitignore => dot-gitignore (100%) rename .jjconfig.toml => dot-jjconfig.toml (100%) diff --git a/README.md b/README.md index 48afb1f..96a4feb 100644 --- a/README.md +++ b/README.md @@ -1,57 +1,3 @@ # dotfiles ⚙️ My personal and professional development environment setup and configuration -## Usage - -### Install nix - -I've used the [DeterminateSystems installer](https://github.com/DeterminateSystems/nix-installer?tab=readme-ov-file#the-determinate-nix-installer). - -### Install Homebrew - -_(This is mostly to use casks to install GUI applications.)_ - -Use the instructions on [brew.sh](https://brew.sh/). - -### Run first time setup - -If the current hostname and username of are already defined in the [nix-darwin config](./.config/nix-darwin) you can run `nix-darwin` to bootstrap the machine. - -```sh -nix run nix-darwin -- switch --flake 'github:sloanelybutsurely/dotfiles?dir=.config/nix-darwin' -``` - -
-New hostname or username - -If you're setting up a brand new machine or using a new username you'll have to clone this repo and update the `nix-darwin` config to include the new hostname and/or username. - -If you commit and push these changes you can continue these instructions from the above. - -If you want to bootstrap from a local copy of this repo you can run `nix-darwin`: - -```sh -nix run nix-darwin -- switch --flake /path/to/.config/nix-darwin -``` - -
- - -### Set shell - -```sh -chsh -s /run/current-system/sw/bin/fish -``` - -### Reboot the machine - -This will let the new shell take hold. - -### Clone remaining dotfiles and nix-darwin - -Once setup you can fetch a local copy of the nix-darwin config and some remaining dotfiles. - -```sh -# yadm should have been installed by -yadm clone git@github.com:sloanelybutsurely/dotfiles.git -``` diff --git a/.config/fish/completions/jj.fish b/dot-config/fish/completions/jj.fish similarity index 100% rename from .config/fish/completions/jj.fish rename to dot-config/fish/completions/jj.fish diff --git a/.config/fish/config.fish b/dot-config/fish/config.fish similarity index 100% rename from .config/fish/config.fish rename to dot-config/fish/config.fish diff --git a/.config/fish/functions/fish_jj_prompt.fish b/dot-config/fish/functions/fish_jj_prompt.fish similarity index 100% rename from .config/fish/functions/fish_jj_prompt.fish rename to dot-config/fish/functions/fish_jj_prompt.fish diff --git a/.config/fish/functions/fish_prompt.fish b/dot-config/fish/functions/fish_prompt.fish similarity index 100% rename from .config/fish/functions/fish_prompt.fish rename to dot-config/fish/functions/fish_prompt.fish diff --git a/.config/fish/functions/fish_vcs_prompt.fish b/dot-config/fish/functions/fish_vcs_prompt.fish similarity index 100% rename from .config/fish/functions/fish_vcs_prompt.fish rename to dot-config/fish/functions/fish_vcs_prompt.fish diff --git a/.config/fish/functions/prefixed-function.fish b/dot-config/fish/functions/prefixed-function.fish similarity index 100% rename from .config/fish/functions/prefixed-function.fish rename to dot-config/fish/functions/prefixed-function.fish diff --git a/.config/fish/functions/supportconsole.fish b/dot-config/fish/functions/supportconsole.fish similarity index 100% rename from .config/fish/functions/supportconsole.fish rename to dot-config/fish/functions/supportconsole.fish diff --git a/.config/fish/functions/vitally-init.fish b/dot-config/fish/functions/vitally-init.fish similarity index 100% rename from .config/fish/functions/vitally-init.fish rename to dot-config/fish/functions/vitally-init.fish diff --git a/.config/fish/functions/vitally-reset-database.fish b/dot-config/fish/functions/vitally-reset-database.fish similarity index 100% rename from .config/fish/functions/vitally-reset-database.fish rename to dot-config/fish/functions/vitally-reset-database.fish diff --git a/.config/fish/functions/vitally-session-name.fish b/dot-config/fish/functions/vitally-session-name.fish similarity index 100% rename from .config/fish/functions/vitally-session-name.fish rename to dot-config/fish/functions/vitally-session-name.fish diff --git a/.config/fish/functions/vitally-start.fish b/dot-config/fish/functions/vitally-start.fish similarity index 100% rename from .config/fish/functions/vitally-start.fish rename to dot-config/fish/functions/vitally-start.fish diff --git a/.config/fish/functions/vitally-stop.fish b/dot-config/fish/functions/vitally-stop.fish similarity index 100% rename from .config/fish/functions/vitally-stop.fish rename to dot-config/fish/functions/vitally-stop.fish diff --git a/.config/fish/functions/vitally.fish b/dot-config/fish/functions/vitally.fish similarity index 100% rename from .config/fish/functions/vitally.fish rename to dot-config/fish/functions/vitally.fish diff --git a/.config/fish/functions/worktree.fish b/dot-config/fish/functions/worktree.fish similarity index 100% rename from .config/fish/functions/worktree.fish rename to dot-config/fish/functions/worktree.fish diff --git a/.config/git/config b/dot-config/git/config similarity index 100% rename from .config/git/config rename to dot-config/git/config diff --git a/.config/git/ignore b/dot-config/git/ignore similarity index 100% rename from .config/git/ignore rename to dot-config/git/ignore diff --git a/.config/karabiner/assets/complex_modifications/1706650930.json b/dot-config/karabiner/assets/complex_modifications/1706650930.json similarity index 100% rename from .config/karabiner/assets/complex_modifications/1706650930.json rename to dot-config/karabiner/assets/complex_modifications/1706650930.json diff --git a/.config/karabiner/karabiner.json b/dot-config/karabiner/karabiner.json similarity index 100% rename from .config/karabiner/karabiner.json rename to dot-config/karabiner/karabiner.json diff --git a/.config/kitty/current-theme.conf b/dot-config/kitty/current-theme.conf similarity index 100% rename from .config/kitty/current-theme.conf rename to dot-config/kitty/current-theme.conf diff --git a/.config/kitty/kitty.conf b/dot-config/kitty/kitty.conf similarity index 100% rename from .config/kitty/kitty.conf rename to dot-config/kitty/kitty.conf diff --git a/.config/mise/config.toml b/dot-config/mise/config.toml similarity index 100% rename from .config/mise/config.toml rename to dot-config/mise/config.toml diff --git a/.config/nix-darwin/.gitignore b/dot-config/nix-darwin/.gitignore similarity index 100% rename from .config/nix-darwin/.gitignore rename to dot-config/nix-darwin/.gitignore diff --git a/.config/nix-darwin/README.md b/dot-config/nix-darwin/README.md similarity index 100% rename from .config/nix-darwin/README.md rename to dot-config/nix-darwin/README.md diff --git a/.config/nix-darwin/flake.lock b/dot-config/nix-darwin/flake.lock similarity index 100% rename from .config/nix-darwin/flake.lock rename to dot-config/nix-darwin/flake.lock diff --git a/.config/nix-darwin/flake.nix b/dot-config/nix-darwin/flake.nix similarity index 100% rename from .config/nix-darwin/flake.nix rename to dot-config/nix-darwin/flake.nix diff --git a/.config/nix-darwin/hosts/Sloanes-MacBook-Air/default.nix b/dot-config/nix-darwin/hosts/Sloanes-MacBook-Air/default.nix similarity index 100% rename from .config/nix-darwin/hosts/Sloanes-MacBook-Air/default.nix rename to dot-config/nix-darwin/hosts/Sloanes-MacBook-Air/default.nix diff --git a/.config/nix-darwin/hosts/Sloanes-MacBook-Pro/default.nix b/dot-config/nix-darwin/hosts/Sloanes-MacBook-Pro/default.nix similarity index 100% rename from .config/nix-darwin/hosts/Sloanes-MacBook-Pro/default.nix rename to dot-config/nix-darwin/hosts/Sloanes-MacBook-Pro/default.nix diff --git a/.config/nix-darwin/hosts/tid27880sperrau/default.nix b/dot-config/nix-darwin/hosts/tid27880sperrau/default.nix similarity index 100% rename from .config/nix-darwin/hosts/tid27880sperrau/default.nix rename to dot-config/nix-darwin/hosts/tid27880sperrau/default.nix diff --git a/.config/nix-darwin/modules/darwin/global.nix b/dot-config/nix-darwin/modules/darwin/global.nix similarity index 100% rename from .config/nix-darwin/modules/darwin/global.nix rename to dot-config/nix-darwin/modules/darwin/global.nix diff --git a/.config/nix-darwin/modules/darwin/nixvim.nix b/dot-config/nix-darwin/modules/darwin/nixvim.nix similarity index 100% rename from .config/nix-darwin/modules/darwin/nixvim.nix rename to dot-config/nix-darwin/modules/darwin/nixvim.nix diff --git a/.config/nix-darwin/modules/global/global.nix b/dot-config/nix-darwin/modules/global/global.nix similarity index 100% rename from .config/nix-darwin/modules/global/global.nix rename to dot-config/nix-darwin/modules/global/global.nix diff --git a/.config/nix-darwin/users/sloane/default.nix b/dot-config/nix-darwin/users/sloane/default.nix similarity index 100% rename from .config/nix-darwin/users/sloane/default.nix rename to dot-config/nix-darwin/users/sloane/default.nix diff --git a/.config/nix-darwin/users/sperrault/default.nix b/dot-config/nix-darwin/users/sperrault/default.nix similarity index 100% rename from .config/nix-darwin/users/sperrault/default.nix rename to dot-config/nix-darwin/users/sperrault/default.nix diff --git a/.config/nixvim/config/colorscheme.nix b/dot-config/nixvim/config/colorscheme.nix similarity index 100% rename from .config/nixvim/config/colorscheme.nix rename to dot-config/nixvim/config/colorscheme.nix diff --git a/.config/nixvim/config/default.nix b/dot-config/nixvim/config/default.nix similarity index 100% rename from .config/nixvim/config/default.nix rename to dot-config/nixvim/config/default.nix diff --git a/.config/nixvim/config/keys.nix b/dot-config/nixvim/config/keys.nix similarity index 100% rename from .config/nixvim/config/keys.nix rename to dot-config/nixvim/config/keys.nix diff --git a/.config/nixvim/config/plugins.nix b/dot-config/nixvim/config/plugins.nix similarity index 100% rename from .config/nixvim/config/plugins.nix rename to dot-config/nixvim/config/plugins.nix diff --git a/.config/nixvim/config/settings.nix b/dot-config/nixvim/config/settings.nix similarity index 100% rename from .config/nixvim/config/settings.nix rename to dot-config/nixvim/config/settings.nix diff --git a/.config/nixvim/flake.lock b/dot-config/nixvim/flake.lock similarity index 100% rename from .config/nixvim/flake.lock rename to dot-config/nixvim/flake.lock diff --git a/.config/nixvim/flake.nix b/dot-config/nixvim/flake.nix similarity index 100% rename from .config/nixvim/flake.nix rename to dot-config/nixvim/flake.nix diff --git a/.config/nvim/init.lua b/dot-config/nvim/init.lua similarity index 100% rename from .config/nvim/init.lua rename to dot-config/nvim/init.lua diff --git a/.config/nvim/lazy-lock.json b/dot-config/nvim/lazy-lock.json similarity index 100% rename from .config/nvim/lazy-lock.json rename to dot-config/nvim/lazy-lock.json diff --git a/.config/nvim/lua/config/base.lua b/dot-config/nvim/lua/config/base.lua similarity index 100% rename from .config/nvim/lua/config/base.lua rename to dot-config/nvim/lua/config/base.lua diff --git a/.config/nvim/lua/config/lazy.lua b/dot-config/nvim/lua/config/lazy.lua similarity index 100% rename from .config/nvim/lua/config/lazy.lua rename to dot-config/nvim/lua/config/lazy.lua diff --git a/.config/nvim/lua/config/mappings.lua b/dot-config/nvim/lua/config/mappings.lua similarity index 100% rename from .config/nvim/lua/config/mappings.lua rename to dot-config/nvim/lua/config/mappings.lua diff --git a/.config/nvim/lua/plugins/colorscheme.lua b/dot-config/nvim/lua/plugins/colorscheme.lua similarity index 100% rename from .config/nvim/lua/plugins/colorscheme.lua rename to dot-config/nvim/lua/plugins/colorscheme.lua diff --git a/.config/nvim/lua/plugins/core.lua b/dot-config/nvim/lua/plugins/core.lua similarity index 100% rename from .config/nvim/lua/plugins/core.lua rename to dot-config/nvim/lua/plugins/core.lua diff --git a/.config/nvim/lua/plugins/lsp.lua b/dot-config/nvim/lua/plugins/lsp.lua similarity index 100% rename from .config/nvim/lua/plugins/lsp.lua rename to dot-config/nvim/lua/plugins/lsp.lua diff --git a/.config/nvim/lua/plugins/treesitter.lua b/dot-config/nvim/lua/plugins/treesitter.lua similarity index 100% rename from .config/nvim/lua/plugins/treesitter.lua rename to dot-config/nvim/lua/plugins/treesitter.lua diff --git a/.config/nvim/lua/plugins/ui.lua b/dot-config/nvim/lua/plugins/ui.lua similarity index 100% rename from .config/nvim/lua/plugins/ui.lua rename to dot-config/nvim/lua/plugins/ui.lua diff --git a/.config/nvim/lua/plugins/vcs.lua b/dot-config/nvim/lua/plugins/vcs.lua similarity index 100% rename from .config/nvim/lua/plugins/vcs.lua rename to dot-config/nvim/lua/plugins/vcs.lua diff --git a/.config/tmux/tmux.conf b/dot-config/tmux/tmux.conf similarity index 100% rename from .config/tmux/tmux.conf rename to dot-config/tmux/tmux.conf diff --git a/.config/zellij/config.kdl b/dot-config/zellij/config.kdl similarity index 100% rename from .config/zellij/config.kdl rename to dot-config/zellij/config.kdl diff --git a/.gitignore b/dot-gitignore similarity index 100% rename from .gitignore rename to dot-gitignore diff --git a/.jjconfig.toml b/dot-jjconfig.toml similarity index 100% rename from .jjconfig.toml rename to dot-jjconfig.toml