diff --git a/README.md b/README.md index e0344f0..a69ce6e 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,66 @@ -# Dotfiles +# Nix Dotfiles -These are my Dotfiles, a collection of [Neovim](https://neovim.io/), [tmux](https://tmux.github.io/), [zsh](http://zsh.sourceforge.net/), [Hammerspoon](http://www.hammerspoon.org/), and other tools. +This is my dotfile setup, using [Nix](https://nixos.org/), [nix-darwin](https://github.com/LnL7/nix-darwin), and [home-manager](https://github.com/nix-community/home-manager). -## Initial Setup and Installation +> [!WARNING] +> This is a work in progress and I am still learning Nix, so expect things to be broken. + +## Install Dependencies + +First, install the Xcode command-line tools: + +```sh +xcode-select --install +``` + +## Install Nix + +Install Nix using the [Determinate Systems installer](https://github.com/DeterminateSystems/nix-installer): + +```sh +curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/nix | sh -s -- install +``` + +## Install the Nix Flake + +### First-time Installation + +#### Install from GitHub + +To install and use this configuration directly from GitHub without cloning: + +```sh +nix run nix-darwin -- switch --flake github:kogakure/dotfiles +``` + +#### Clone and Install + +Clone the repository: ```sh git clone git@github.com:kogakure/dotfiles.git ~/.dotfiles -cd ~/.dotfiles/ -./install ``` -Dotbot will create symlinks from all necessary files in the folder. +For the initial setup, run: -## Setting Up a New Computer +```sh +nix run nix-darwin -- switch --flake ~/.dotfiles +``` -The project includes a `setup` folder that has install scripts for everything I need on a new computer. You can run the scripts individually or all at once by running `./setup/init.sh`. +This command installs nix-darwin and applies your configuration. + +### Selecting a Specific Configuration + +By default the `$hostname` that matches the current machine is used, but it is possible to manually load one by running: + +```sh +nix run nix-darwin -- switch --flake ~/.dotfiles#mac-mini +``` + +## Updating Configuration + +After making changes to your configuration, apply them with: + +```sh +darwin-rebuild switch --flake ~/.dotfiles +``` diff --git a/nix/darwin/default.nix b/darwin/default.nix similarity index 100% rename from nix/darwin/default.nix rename to darwin/default.nix diff --git a/nix/darwin/homebrew-common.nix b/darwin/homebrew-common.nix similarity index 100% rename from nix/darwin/homebrew-common.nix rename to darwin/homebrew-common.nix diff --git a/nix/flake.lock b/flake.lock similarity index 100% rename from nix/flake.lock rename to flake.lock diff --git a/nix/flake.nix b/flake.nix similarity index 96% rename from nix/flake.nix rename to flake.nix index 04b9e6c..cd3a260 100644 --- a/nix/flake.nix +++ b/flake.nix @@ -47,7 +47,7 @@ in { # Build darwin flake using: - # $ darwin-rebuild switch --flake ~/.dotfiles/nix/.#mac-mini + # $ darwin-rebuild switch --flake ~/.dotfiles/.#mac-mini darwinConfigurations = { "mac-mini" = mkDarwinConfig { system = "aarch64-darwin"; diff --git a/nix/home/ack/ack b/home/ack/ack similarity index 100% rename from nix/home/ack/ack rename to home/ack/ack diff --git a/nix/home/ack/default.nix b/home/ack/default.nix similarity index 100% rename from nix/home/ack/default.nix rename to home/ack/default.nix diff --git a/nix/home/ag/ag b/home/ag/ag similarity index 100% rename from nix/home/ag/ag rename to home/ag/ag diff --git a/nix/home/ag/default.nix b/home/ag/default.nix similarity index 100% rename from nix/home/ag/default.nix rename to home/ag/default.nix diff --git a/nix/home/asdf/asdfrc b/home/asdf/asdfrc similarity index 100% rename from nix/home/asdf/asdfrc rename to home/asdf/asdfrc diff --git a/nix/home/asdf/default-gems b/home/asdf/default-gems similarity index 100% rename from nix/home/asdf/default-gems rename to home/asdf/default-gems diff --git a/nix/home/asdf/default-npm-packages b/home/asdf/default-npm-packages similarity index 100% rename from nix/home/asdf/default-npm-packages rename to home/asdf/default-npm-packages diff --git a/nix/home/asdf/default-python-packages b/home/asdf/default-python-packages similarity index 100% rename from nix/home/asdf/default-python-packages rename to home/asdf/default-python-packages diff --git a/nix/home/asdf/default.nix b/home/asdf/default.nix similarity index 100% rename from nix/home/asdf/default.nix rename to home/asdf/default.nix diff --git a/nix/home/asdf/tool-versions b/home/asdf/tool-versions similarity index 100% rename from nix/home/asdf/tool-versions rename to home/asdf/tool-versions diff --git a/nix/home/bash/default.nix b/home/bash/default.nix similarity index 100% rename from nix/home/bash/default.nix rename to home/bash/default.nix diff --git a/nix/home/bat/default.nix b/home/bat/default.nix similarity index 100% rename from nix/home/bat/default.nix rename to home/bat/default.nix diff --git a/nix/home/ctags/ctags b/home/ctags/ctags similarity index 100% rename from nix/home/ctags/ctags rename to home/ctags/ctags diff --git a/nix/home/ctags/default.nix b/home/ctags/default.nix similarity index 100% rename from nix/home/ctags/default.nix rename to home/ctags/default.nix diff --git a/nix/home/curl/curlrc b/home/curl/curlrc similarity index 100% rename from nix/home/curl/curlrc rename to home/curl/curlrc diff --git a/nix/home/curl/default.nix b/home/curl/default.nix similarity index 100% rename from nix/home/curl/default.nix rename to home/curl/default.nix diff --git a/nix/home/default.nix b/home/default.nix similarity index 99% rename from nix/home/default.nix rename to home/default.nix index 47ec229..9fd3b3b 100644 --- a/nix/home/default.nix +++ b/home/default.nix @@ -151,6 +151,7 @@ in nixpkgs-fmt # Nix code formatter openai-whisper-cpp # Port of OpenAI's Whisper model in C/C++ openssl # A cryptographic library that implements the SSL and TLS protocols + phrase-cli # PhraseApp API v2 Command Line Client pngpaste # Paste image files from clipboard to file on MacOS pnpm # Fast, disk space efficient package manager for JavaScript prettierd # Prettier, as a daemon, for improved formatting speed diff --git a/nix/home/direnv/default.nix b/home/direnv/default.nix similarity index 100% rename from nix/home/direnv/default.nix rename to home/direnv/default.nix diff --git a/nix/home/editorconfig/default.nix b/home/editorconfig/default.nix similarity index 100% rename from nix/home/editorconfig/default.nix rename to home/editorconfig/default.nix diff --git a/nix/home/fish/default.nix b/home/fish/default.nix similarity index 100% rename from nix/home/fish/default.nix rename to home/fish/default.nix diff --git a/nix/home/fish/functions/dataUrl.fish b/home/fish/functions/dataUrl.fish similarity index 100% rename from nix/home/fish/functions/dataUrl.fish rename to home/fish/functions/dataUrl.fish diff --git a/nix/home/fish/functions/deleteNodeModules.fish b/home/fish/functions/deleteNodeModules.fish similarity index 100% rename from nix/home/fish/functions/deleteNodeModules.fish rename to home/fish/functions/deleteNodeModules.fish diff --git a/nix/home/fish/functions/encodeBase64.fish b/home/fish/functions/encodeBase64.fish similarity index 100% rename from nix/home/fish/functions/encodeBase64.fish rename to home/fish/functions/encodeBase64.fish diff --git a/nix/home/fish/functions/fcd.fish b/home/fish/functions/fcd.fish similarity index 100% rename from nix/home/fish/functions/fcd.fish rename to home/fish/functions/fcd.fish diff --git a/nix/home/fish/functions/fe.fish b/home/fish/functions/fe.fish similarity index 100% rename from nix/home/fish/functions/fe.fish rename to home/fish/functions/fe.fish diff --git a/nix/home/fish/functions/fhcd.fish b/home/fish/functions/fhcd.fish similarity index 100% rename from nix/home/fish/functions/fhcd.fish rename to home/fish/functions/fhcd.fish diff --git a/nix/home/fish/functions/fs.fish b/home/fish/functions/fs.fish similarity index 100% rename from nix/home/fish/functions/fs.fish rename to home/fish/functions/fs.fish diff --git a/nix/home/fish/functions/fwt.fish b/home/fish/functions/fwt.fish similarity index 100% rename from nix/home/fish/functions/fwt.fish rename to home/fish/functions/fwt.fish diff --git a/nix/home/fish/functions/ghpr.fish b/home/fish/functions/ghpr.fish similarity index 100% rename from nix/home/fish/functions/ghpr.fish rename to home/fish/functions/ghpr.fish diff --git a/nix/home/fish/functions/server.fish b/home/fish/functions/server.fish similarity index 100% rename from nix/home/fish/functions/server.fish rename to home/fish/functions/server.fish diff --git a/nix/home/fish/functions/unquarantine.fish b/home/fish/functions/unquarantine.fish similarity index 100% rename from nix/home/fish/functions/unquarantine.fish rename to home/fish/functions/unquarantine.fish diff --git a/nix/home/fish/functions/update.fish b/home/fish/functions/update.fish similarity index 100% rename from nix/home/fish/functions/update.fish rename to home/fish/functions/update.fish diff --git a/nix/home/fzf/default.nix b/home/fzf/default.nix similarity index 100% rename from nix/home/fzf/default.nix rename to home/fzf/default.nix diff --git a/nix/home/gh-dash/default.nix b/home/gh-dash/default.nix similarity index 100% rename from nix/home/gh-dash/default.nix rename to home/gh-dash/default.nix diff --git a/nix/home/gh/default.nix b/home/gh/default.nix similarity index 100% rename from nix/home/gh/default.nix rename to home/gh/default.nix diff --git a/nix/home/git/default.nix b/home/git/default.nix similarity index 100% rename from nix/home/git/default.nix rename to home/git/default.nix diff --git a/nix/home/gnupg/default.nix b/home/gnupg/default.nix similarity index 100% rename from nix/home/gnupg/default.nix rename to home/gnupg/default.nix diff --git a/nix/home/hammerspoon/default.nix b/home/hammerspoon/default.nix similarity index 100% rename from nix/home/hammerspoon/default.nix rename to home/hammerspoon/default.nix diff --git a/nix/home/hammerspoon/hammerspoon/caffeine.lua b/home/hammerspoon/hammerspoon/caffeine.lua similarity index 100% rename from nix/home/hammerspoon/hammerspoon/caffeine.lua rename to home/hammerspoon/hammerspoon/caffeine.lua diff --git a/nix/home/hammerspoon/hammerspoon/functions.lua b/home/hammerspoon/hammerspoon/functions.lua similarity index 100% rename from nix/home/hammerspoon/hammerspoon/functions.lua rename to home/hammerspoon/hammerspoon/functions.lua diff --git a/nix/home/hammerspoon/hammerspoon/icons/cup-off.pdf b/home/hammerspoon/hammerspoon/icons/cup-off.pdf similarity index 100% rename from nix/home/hammerspoon/hammerspoon/icons/cup-off.pdf rename to home/hammerspoon/hammerspoon/icons/cup-off.pdf diff --git a/nix/home/hammerspoon/hammerspoon/icons/cup-on.pdf b/home/hammerspoon/hammerspoon/icons/cup-on.pdf similarity index 100% rename from nix/home/hammerspoon/hammerspoon/icons/cup-on.pdf rename to home/hammerspoon/hammerspoon/icons/cup-on.pdf diff --git a/nix/home/hammerspoon/hammerspoon/icons/moon.pdf b/home/hammerspoon/hammerspoon/icons/moon.pdf similarity index 100% rename from nix/home/hammerspoon/hammerspoon/icons/moon.pdf rename to home/hammerspoon/hammerspoon/icons/moon.pdf diff --git a/nix/home/hammerspoon/hammerspoon/icons/sun.pdf b/home/hammerspoon/hammerspoon/icons/sun.pdf similarity index 100% rename from nix/home/hammerspoon/hammerspoon/icons/sun.pdf rename to home/hammerspoon/hammerspoon/icons/sun.pdf diff --git a/nix/home/hammerspoon/hammerspoon/init.lua b/home/hammerspoon/hammerspoon/init.lua similarity index 100% rename from nix/home/hammerspoon/hammerspoon/init.lua rename to home/hammerspoon/hammerspoon/init.lua diff --git a/nix/home/karabiner/default.nix b/home/karabiner/default.nix similarity index 100% rename from nix/home/karabiner/default.nix rename to home/karabiner/default.nix diff --git a/nix/home/karabiner/karabiner/assets/complex_modifications/1668261369.json b/home/karabiner/karabiner/assets/complex_modifications/1668261369.json similarity index 100% rename from nix/home/karabiner/karabiner/assets/complex_modifications/1668261369.json rename to home/karabiner/karabiner/assets/complex_modifications/1668261369.json diff --git a/nix/home/karabiner/karabiner/assets/complex_modifications/1669799628.json b/home/karabiner/karabiner/assets/complex_modifications/1669799628.json similarity index 100% rename from nix/home/karabiner/karabiner/assets/complex_modifications/1669799628.json rename to home/karabiner/karabiner/assets/complex_modifications/1669799628.json diff --git a/nix/home/karabiner/karabiner/assets/complex_modifications/1670850784.json b/home/karabiner/karabiner/assets/complex_modifications/1670850784.json similarity index 100% rename from nix/home/karabiner/karabiner/assets/complex_modifications/1670850784.json rename to home/karabiner/karabiner/assets/complex_modifications/1670850784.json diff --git a/nix/home/karabiner/karabiner/karabiner.json b/home/karabiner/karabiner/karabiner.json similarity index 100% rename from nix/home/karabiner/karabiner/karabiner.json rename to home/karabiner/karabiner/karabiner.json diff --git a/nix/home/lazydocker/default.nix b/home/lazydocker/default.nix similarity index 100% rename from nix/home/lazydocker/default.nix rename to home/lazydocker/default.nix diff --git a/nix/home/lazydocker/lazydocker.yml b/home/lazydocker/lazydocker.yml similarity index 100% rename from nix/home/lazydocker/lazydocker.yml rename to home/lazydocker/lazydocker.yml diff --git a/nix/home/lazygit/default.nix b/home/lazygit/default.nix similarity index 100% rename from nix/home/lazygit/default.nix rename to home/lazygit/default.nix diff --git a/nix/home/lf/default.nix b/home/lf/default.nix similarity index 100% rename from nix/home/lf/default.nix rename to home/lf/default.nix diff --git a/nix/home/lsd/default.nix b/home/lsd/default.nix similarity index 100% rename from nix/home/lsd/default.nix rename to home/lsd/default.nix diff --git a/nix/home/neovim/default.nix b/home/neovim/default.nix similarity index 79% rename from nix/home/neovim/default.nix rename to home/neovim/default.nix index 9c11c90..f32b849 100644 --- a/nix/home/neovim/default.nix +++ b/home/neovim/default.nix @@ -2,7 +2,7 @@ { xdg.configFile.nvim = { - source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/.dotfiles/nix/home/neovim/nvim"; + source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/.dotfiles/home/neovim/nvim"; recursive = true; }; diff --git a/nix/home/neovim/nvim/.gitignore b/home/neovim/nvim/.gitignore similarity index 100% rename from nix/home/neovim/nvim/.gitignore rename to home/neovim/nvim/.gitignore diff --git a/nix/home/neovim/nvim/.neoconf.json b/home/neovim/nvim/.neoconf.json similarity index 100% rename from nix/home/neovim/nvim/.neoconf.json rename to home/neovim/nvim/.neoconf.json diff --git a/nix/home/neovim/nvim/LICENSE b/home/neovim/nvim/LICENSE similarity index 100% rename from nix/home/neovim/nvim/LICENSE rename to home/neovim/nvim/LICENSE diff --git a/nix/home/neovim/nvim/README.md b/home/neovim/nvim/README.md similarity index 100% rename from nix/home/neovim/nvim/README.md rename to home/neovim/nvim/README.md diff --git a/nix/home/neovim/nvim/dictionary/de_neu.txt b/home/neovim/nvim/dictionary/de_neu.txt similarity index 100% rename from nix/home/neovim/nvim/dictionary/de_neu.txt rename to home/neovim/nvim/dictionary/de_neu.txt diff --git a/nix/home/neovim/nvim/dictionary/de_user.txt b/home/neovim/nvim/dictionary/de_user.txt similarity index 100% rename from nix/home/neovim/nvim/dictionary/de_user.txt rename to home/neovim/nvim/dictionary/de_user.txt diff --git a/nix/home/neovim/nvim/dictionary/en_us.txt b/home/neovim/nvim/dictionary/en_us.txt similarity index 100% rename from nix/home/neovim/nvim/dictionary/en_us.txt rename to home/neovim/nvim/dictionary/en_us.txt diff --git a/nix/home/neovim/nvim/init.lua b/home/neovim/nvim/init.lua similarity index 100% rename from nix/home/neovim/nvim/init.lua rename to home/neovim/nvim/init.lua diff --git a/nix/home/neovim/nvim/lazy-lock.json b/home/neovim/nvim/lazy-lock.json similarity index 100% rename from nix/home/neovim/nvim/lazy-lock.json rename to home/neovim/nvim/lazy-lock.json diff --git a/nix/home/neovim/nvim/lazyvim.json b/home/neovim/nvim/lazyvim.json similarity index 100% rename from nix/home/neovim/nvim/lazyvim.json rename to home/neovim/nvim/lazyvim.json diff --git a/nix/home/neovim/nvim/lua/config/autocmds.lua b/home/neovim/nvim/lua/config/autocmds.lua similarity index 100% rename from nix/home/neovim/nvim/lua/config/autocmds.lua rename to home/neovim/nvim/lua/config/autocmds.lua diff --git a/nix/home/neovim/nvim/lua/config/keymaps.lua b/home/neovim/nvim/lua/config/keymaps.lua similarity index 100% rename from nix/home/neovim/nvim/lua/config/keymaps.lua rename to home/neovim/nvim/lua/config/keymaps.lua diff --git a/nix/home/neovim/nvim/lua/config/lazy.lua b/home/neovim/nvim/lua/config/lazy.lua similarity index 100% rename from nix/home/neovim/nvim/lua/config/lazy.lua rename to home/neovim/nvim/lua/config/lazy.lua diff --git a/nix/home/neovim/nvim/lua/config/options.lua b/home/neovim/nvim/lua/config/options.lua similarity index 100% rename from nix/home/neovim/nvim/lua/config/options.lua rename to home/neovim/nvim/lua/config/options.lua diff --git a/nix/home/neovim/nvim/lua/lualine/themes/custom.lua b/home/neovim/nvim/lua/lualine/themes/custom.lua similarity index 100% rename from nix/home/neovim/nvim/lua/lualine/themes/custom.lua rename to home/neovim/nvim/lua/lualine/themes/custom.lua diff --git a/nix/home/neovim/nvim/lua/lualine/themes/transparent.lua b/home/neovim/nvim/lua/lualine/themes/transparent.lua similarity index 100% rename from nix/home/neovim/nvim/lua/lualine/themes/transparent.lua rename to home/neovim/nvim/lua/lualine/themes/transparent.lua diff --git a/nix/home/neovim/nvim/lua/plugins/abolish.lua b/home/neovim/nvim/lua/plugins/abolish.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/abolish.lua rename to home/neovim/nvim/lua/plugins/abolish.lua diff --git a/nix/home/neovim/nvim/lua/plugins/activitywatch.lua b/home/neovim/nvim/lua/plugins/activitywatch.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/activitywatch.lua rename to home/neovim/nvim/lua/plugins/activitywatch.lua diff --git a/nix/home/neovim/nvim/lua/plugins/aerial.lua b/home/neovim/nvim/lua/plugins/aerial.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/aerial.lua rename to home/neovim/nvim/lua/plugins/aerial.lua diff --git a/nix/home/neovim/nvim/lua/plugins/astro.lua b/home/neovim/nvim/lua/plugins/astro.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/astro.lua rename to home/neovim/nvim/lua/plugins/astro.lua diff --git a/nix/home/neovim/nvim/lua/plugins/auto-save.lua b/home/neovim/nvim/lua/plugins/auto-save.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/auto-save.lua rename to home/neovim/nvim/lua/plugins/auto-save.lua diff --git a/nix/home/neovim/nvim/lua/plugins/autotag.lua b/home/neovim/nvim/lua/plugins/autotag.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/autotag.lua rename to home/neovim/nvim/lua/plugins/autotag.lua diff --git a/nix/home/neovim/nvim/lua/plugins/barbecue.lua b/home/neovim/nvim/lua/plugins/barbecue.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/barbecue.lua rename to home/neovim/nvim/lua/plugins/barbecue.lua diff --git a/nix/home/neovim/nvim/lua/plugins/base16.lua b/home/neovim/nvim/lua/plugins/base16.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/base16.lua rename to home/neovim/nvim/lua/plugins/base16.lua diff --git a/nix/home/neovim/nvim/lua/plugins/blamer.lua b/home/neovim/nvim/lua/plugins/blamer.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/blamer.lua rename to home/neovim/nvim/lua/plugins/blamer.lua diff --git a/nix/home/neovim/nvim/lua/plugins/bookmark.lua b/home/neovim/nvim/lua/plugins/bookmark.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/bookmark.lua rename to home/neovim/nvim/lua/plugins/bookmark.lua diff --git a/nix/home/neovim/nvim/lua/plugins/bufferline.lua b/home/neovim/nvim/lua/plugins/bufferline.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/bufferline.lua rename to home/neovim/nvim/lua/plugins/bufferline.lua diff --git a/nix/home/neovim/nvim/lua/plugins/catppuccin.lua b/home/neovim/nvim/lua/plugins/catppuccin.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/catppuccin.lua rename to home/neovim/nvim/lua/plugins/catppuccin.lua diff --git a/nix/home/neovim/nvim/lua/plugins/chafa.lua b/home/neovim/nvim/lua/plugins/chafa.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/chafa.lua rename to home/neovim/nvim/lua/plugins/chafa.lua diff --git a/nix/home/neovim/nvim/lua/plugins/chatgpg.lua b/home/neovim/nvim/lua/plugins/chatgpg.lua similarity index 86% rename from nix/home/neovim/nvim/lua/plugins/chatgpg.lua rename to home/neovim/nvim/lua/plugins/chatgpg.lua index 9e39e7e..9e8564e 100644 --- a/nix/home/neovim/nvim/lua/plugins/chatgpg.lua +++ b/home/neovim/nvim/lua/plugins/chatgpg.lua @@ -15,7 +15,7 @@ return { }, config = function() local home = vim.fn.expand("$HOME") - local file_path = home .. "/.dotfiles/nix/home/neovim/nvim/lua/plugins/chatgpg.txt.gpg" + local file_path = home .. "/.dotfiles/home/neovim/nvim/lua/plugins/chatgpg.txt.gpg" require("chatgpt").setup({ api_key_cmd = "gpg --decrypt --use-agent " .. file_path, }) diff --git a/nix/home/neovim/nvim/lua/plugins/chatgpg.txt.gpg b/home/neovim/nvim/lua/plugins/chatgpg.txt.gpg similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/chatgpg.txt.gpg rename to home/neovim/nvim/lua/plugins/chatgpg.txt.gpg diff --git a/nix/home/neovim/nvim/lua/plugins/cheatsheet.lua b/home/neovim/nvim/lua/plugins/cheatsheet.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/cheatsheet.lua rename to home/neovim/nvim/lua/plugins/cheatsheet.lua diff --git a/nix/home/neovim/nvim/lua/plugins/cmp.lua b/home/neovim/nvim/lua/plugins/cmp.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/cmp.lua rename to home/neovim/nvim/lua/plugins/cmp.lua diff --git a/nix/home/neovim/nvim/lua/plugins/codewindow.lua b/home/neovim/nvim/lua/plugins/codewindow.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/codewindow.lua rename to home/neovim/nvim/lua/plugins/codewindow.lua diff --git a/nix/home/neovim/nvim/lua/plugins/colorizer.lua b/home/neovim/nvim/lua/plugins/colorizer.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/colorizer.lua rename to home/neovim/nvim/lua/plugins/colorizer.lua diff --git a/nix/home/neovim/nvim/lua/plugins/colorscheme-catppuccin.lua b/home/neovim/nvim/lua/plugins/colorscheme-catppuccin.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/colorscheme-catppuccin.lua rename to home/neovim/nvim/lua/plugins/colorscheme-catppuccin.lua diff --git a/nix/home/neovim/nvim/lua/plugins/colorscheme-night-owl.lua b/home/neovim/nvim/lua/plugins/colorscheme-night-owl.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/colorscheme-night-owl.lua rename to home/neovim/nvim/lua/plugins/colorscheme-night-owl.lua diff --git a/nix/home/neovim/nvim/lua/plugins/colorscheme-tokyonight.lua b/home/neovim/nvim/lua/plugins/colorscheme-tokyonight.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/colorscheme-tokyonight.lua rename to home/neovim/nvim/lua/plugins/colorscheme-tokyonight.lua diff --git a/nix/home/neovim/nvim/lua/plugins/colorschemes.lua b/home/neovim/nvim/lua/plugins/colorschemes.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/colorschemes.lua rename to home/neovim/nvim/lua/plugins/colorschemes.lua diff --git a/nix/home/neovim/nvim/lua/plugins/committia.lua b/home/neovim/nvim/lua/plugins/committia.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/committia.lua rename to home/neovim/nvim/lua/plugins/committia.lua diff --git a/nix/home/neovim/nvim/lua/plugins/copilot-chat.lua b/home/neovim/nvim/lua/plugins/copilot-chat.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/copilot-chat.lua rename to home/neovim/nvim/lua/plugins/copilot-chat.lua diff --git a/nix/home/neovim/nvim/lua/plugins/copilot.lua b/home/neovim/nvim/lua/plugins/copilot.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/copilot.lua rename to home/neovim/nvim/lua/plugins/copilot.lua diff --git a/nix/home/neovim/nvim/lua/plugins/cursorline.lua b/home/neovim/nvim/lua/plugins/cursorline.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/cursorline.lua rename to home/neovim/nvim/lua/plugins/cursorline.lua diff --git a/nix/home/neovim/nvim/lua/plugins/dashboard.lua b/home/neovim/nvim/lua/plugins/dashboard.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/dashboard.lua rename to home/neovim/nvim/lua/plugins/dashboard.lua diff --git a/nix/home/neovim/nvim/lua/plugins/dial.lua b/home/neovim/nvim/lua/plugins/dial.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/dial.lua rename to home/neovim/nvim/lua/plugins/dial.lua diff --git a/nix/home/neovim/nvim/lua/plugins/diffview.lua b/home/neovim/nvim/lua/plugins/diffview.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/diffview.lua rename to home/neovim/nvim/lua/plugins/diffview.lua diff --git a/nix/home/neovim/nvim/lua/plugins/editorconfig.lua b/home/neovim/nvim/lua/plugins/editorconfig.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/editorconfig.lua rename to home/neovim/nvim/lua/plugins/editorconfig.lua diff --git a/nix/home/neovim/nvim/lua/plugins/emmet.lua b/home/neovim/nvim/lua/plugins/emmet.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/emmet.lua rename to home/neovim/nvim/lua/plugins/emmet.lua diff --git a/nix/home/neovim/nvim/lua/plugins/example.lua b/home/neovim/nvim/lua/plugins/example.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/example.lua rename to home/neovim/nvim/lua/plugins/example.lua diff --git a/nix/home/neovim/nvim/lua/plugins/export-to-vscode.lua b/home/neovim/nvim/lua/plugins/export-to-vscode.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/export-to-vscode.lua rename to home/neovim/nvim/lua/plugins/export-to-vscode.lua diff --git a/nix/home/neovim/nvim/lua/plugins/flash.lua b/home/neovim/nvim/lua/plugins/flash.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/flash.lua rename to home/neovim/nvim/lua/plugins/flash.lua diff --git a/nix/home/neovim/nvim/lua/plugins/fm.lua b/home/neovim/nvim/lua/plugins/fm.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/fm.lua rename to home/neovim/nvim/lua/plugins/fm.lua diff --git a/nix/home/neovim/nvim/lua/plugins/formatting.lua b/home/neovim/nvim/lua/plugins/formatting.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/formatting.lua rename to home/neovim/nvim/lua/plugins/formatting.lua diff --git a/nix/home/neovim/nvim/lua/plugins/fugitive.lua b/home/neovim/nvim/lua/plugins/fugitive.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/fugitive.lua rename to home/neovim/nvim/lua/plugins/fugitive.lua diff --git a/nix/home/neovim/nvim/lua/plugins/gh-line.lua b/home/neovim/nvim/lua/plugins/gh-line.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/gh-line.lua rename to home/neovim/nvim/lua/plugins/gh-line.lua diff --git a/nix/home/neovim/nvim/lua/plugins/gh.lua b/home/neovim/nvim/lua/plugins/gh.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/gh.lua rename to home/neovim/nvim/lua/plugins/gh.lua diff --git a/nix/home/neovim/nvim/lua/plugins/grammarous.lua b/home/neovim/nvim/lua/plugins/grammarous.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/grammarous.lua rename to home/neovim/nvim/lua/plugins/grammarous.lua diff --git a/nix/home/neovim/nvim/lua/plugins/harpoon-lualine.lua b/home/neovim/nvim/lua/plugins/harpoon-lualine.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/harpoon-lualine.lua rename to home/neovim/nvim/lua/plugins/harpoon-lualine.lua diff --git a/nix/home/neovim/nvim/lua/plugins/harpoon.lua b/home/neovim/nvim/lua/plugins/harpoon.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/harpoon.lua rename to home/neovim/nvim/lua/plugins/harpoon.lua diff --git a/nix/home/neovim/nvim/lua/plugins/highlight-undo.lua b/home/neovim/nvim/lua/plugins/highlight-undo.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/highlight-undo.lua rename to home/neovim/nvim/lua/plugins/highlight-undo.lua diff --git a/nix/home/neovim/nvim/lua/plugins/inc-rename.lua b/home/neovim/nvim/lua/plugins/inc-rename.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/inc-rename.lua rename to home/neovim/nvim/lua/plugins/inc-rename.lua diff --git a/nix/home/neovim/nvim/lua/plugins/lazygit.lua b/home/neovim/nvim/lua/plugins/lazygit.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/lazygit.lua rename to home/neovim/nvim/lua/plugins/lazygit.lua diff --git a/nix/home/neovim/nvim/lua/plugins/legendary.lua b/home/neovim/nvim/lua/plugins/legendary.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/legendary.lua rename to home/neovim/nvim/lua/plugins/legendary.lua diff --git a/nix/home/neovim/nvim/lua/plugins/lf.lua b/home/neovim/nvim/lua/plugins/lf.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/lf.lua rename to home/neovim/nvim/lua/plugins/lf.lua diff --git a/nix/home/neovim/nvim/lua/plugins/linting.lua b/home/neovim/nvim/lua/plugins/linting.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/linting.lua rename to home/neovim/nvim/lua/plugins/linting.lua diff --git a/nix/home/neovim/nvim/lua/plugins/lsp-progress.lua b/home/neovim/nvim/lua/plugins/lsp-progress.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/lsp-progress.lua rename to home/neovim/nvim/lua/plugins/lsp-progress.lua diff --git a/nix/home/neovim/nvim/lua/plugins/lspconfig.lua b/home/neovim/nvim/lua/plugins/lspconfig.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/lspconfig.lua rename to home/neovim/nvim/lua/plugins/lspconfig.lua diff --git a/nix/home/neovim/nvim/lua/plugins/lualine.lua b/home/neovim/nvim/lua/plugins/lualine.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/lualine.lua rename to home/neovim/nvim/lua/plugins/lualine.lua diff --git a/nix/home/neovim/nvim/lua/plugins/markdown-preview.lua b/home/neovim/nvim/lua/plugins/markdown-preview.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/markdown-preview.lua rename to home/neovim/nvim/lua/plugins/markdown-preview.lua diff --git a/nix/home/neovim/nvim/lua/plugins/mason.lua b/home/neovim/nvim/lua/plugins/mason.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/mason.lua rename to home/neovim/nvim/lua/plugins/mason.lua diff --git a/nix/home/neovim/nvim/lua/plugins/mundo.lua b/home/neovim/nvim/lua/plugins/mundo.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/mundo.lua rename to home/neovim/nvim/lua/plugins/mundo.lua diff --git a/nix/home/neovim/nvim/lua/plugins/neogit.lua b/home/neovim/nvim/lua/plugins/neogit.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/neogit.lua rename to home/neovim/nvim/lua/plugins/neogit.lua diff --git a/nix/home/neovim/nvim/lua/plugins/neotest.lua b/home/neovim/nvim/lua/plugins/neotest.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/neotest.lua rename to home/neovim/nvim/lua/plugins/neotest.lua diff --git a/nix/home/neovim/nvim/lua/plugins/noctis.lua b/home/neovim/nvim/lua/plugins/noctis.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/noctis.lua rename to home/neovim/nvim/lua/plugins/noctis.lua diff --git a/nix/home/neovim/nvim/lua/plugins/noice.lua b/home/neovim/nvim/lua/plugins/noice.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/noice.lua rename to home/neovim/nvim/lua/plugins/noice.lua diff --git a/nix/home/neovim/nvim/lua/plugins/notify.lua b/home/neovim/nvim/lua/plugins/notify.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/notify.lua rename to home/neovim/nvim/lua/plugins/notify.lua diff --git a/nix/home/neovim/nvim/lua/plugins/oatmeal.lua b/home/neovim/nvim/lua/plugins/oatmeal.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/oatmeal.lua rename to home/neovim/nvim/lua/plugins/oatmeal.lua diff --git a/nix/home/neovim/nvim/lua/plugins/obsidian.lua b/home/neovim/nvim/lua/plugins/obsidian.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/obsidian.lua rename to home/neovim/nvim/lua/plugins/obsidian.lua diff --git a/nix/home/neovim/nvim/lua/plugins/oil.lua b/home/neovim/nvim/lua/plugins/oil.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/oil.lua rename to home/neovim/nvim/lua/plugins/oil.lua diff --git a/nix/home/neovim/nvim/lua/plugins/ollama.lua b/home/neovim/nvim/lua/plugins/ollama.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/ollama.lua rename to home/neovim/nvim/lua/plugins/ollama.lua diff --git a/nix/home/neovim/nvim/lua/plugins/project.lua b/home/neovim/nvim/lua/plugins/project.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/project.lua rename to home/neovim/nvim/lua/plugins/project.lua diff --git a/nix/home/neovim/nvim/lua/plugins/rainbow-csv.lua b/home/neovim/nvim/lua/plugins/rainbow-csv.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/rainbow-csv.lua rename to home/neovim/nvim/lua/plugins/rainbow-csv.lua diff --git a/nix/home/neovim/nvim/lua/plugins/remote-nvim.lua b/home/neovim/nvim/lua/plugins/remote-nvim.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/remote-nvim.lua rename to home/neovim/nvim/lua/plugins/remote-nvim.lua diff --git a/nix/home/neovim/nvim/lua/plugins/screenshots.lua b/home/neovim/nvim/lua/plugins/screenshots.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/screenshots.lua rename to home/neovim/nvim/lua/plugins/screenshots.lua diff --git a/nix/home/neovim/nvim/lua/plugins/smart-splits.lua b/home/neovim/nvim/lua/plugins/smart-splits.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/smart-splits.lua rename to home/neovim/nvim/lua/plugins/smart-splits.lua diff --git a/nix/home/neovim/nvim/lua/plugins/symbols-outline.lua b/home/neovim/nvim/lua/plugins/symbols-outline.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/symbols-outline.lua rename to home/neovim/nvim/lua/plugins/symbols-outline.lua diff --git a/nix/home/neovim/nvim/lua/plugins/table-mode.lua b/home/neovim/nvim/lua/plugins/table-mode.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/table-mode.lua rename to home/neovim/nvim/lua/plugins/table-mode.lua diff --git a/nix/home/neovim/nvim/lua/plugins/tailwindcss.lua b/home/neovim/nvim/lua/plugins/tailwindcss.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/tailwindcss.lua rename to home/neovim/nvim/lua/plugins/tailwindcss.lua diff --git a/nix/home/neovim/nvim/lua/plugins/telecope-heading.lua b/home/neovim/nvim/lua/plugins/telecope-heading.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/telecope-heading.lua rename to home/neovim/nvim/lua/plugins/telecope-heading.lua diff --git a/nix/home/neovim/nvim/lua/plugins/telescope-file-browser.lua b/home/neovim/nvim/lua/plugins/telescope-file-browser.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/telescope-file-browser.lua rename to home/neovim/nvim/lua/plugins/telescope-file-browser.lua diff --git a/nix/home/neovim/nvim/lua/plugins/telescope-frecency.lua b/home/neovim/nvim/lua/plugins/telescope-frecency.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/telescope-frecency.lua rename to home/neovim/nvim/lua/plugins/telescope-frecency.lua diff --git a/nix/home/neovim/nvim/lua/plugins/telescope-fzy-native.lua b/home/neovim/nvim/lua/plugins/telescope-fzy-native.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/telescope-fzy-native.lua rename to home/neovim/nvim/lua/plugins/telescope-fzy-native.lua diff --git a/nix/home/neovim/nvim/lua/plugins/telescope-github.lua b/home/neovim/nvim/lua/plugins/telescope-github.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/telescope-github.lua rename to home/neovim/nvim/lua/plugins/telescope-github.lua diff --git a/nix/home/neovim/nvim/lua/plugins/telescope-import.lua b/home/neovim/nvim/lua/plugins/telescope-import.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/telescope-import.lua rename to home/neovim/nvim/lua/plugins/telescope-import.lua diff --git a/nix/home/neovim/nvim/lua/plugins/telescope-live-grep-args.lua b/home/neovim/nvim/lua/plugins/telescope-live-grep-args.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/telescope-live-grep-args.lua rename to home/neovim/nvim/lua/plugins/telescope-live-grep-args.lua diff --git a/nix/home/neovim/nvim/lua/plugins/telescope-node-modules.lua b/home/neovim/nvim/lua/plugins/telescope-node-modules.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/telescope-node-modules.lua rename to home/neovim/nvim/lua/plugins/telescope-node-modules.lua diff --git a/nix/home/neovim/nvim/lua/plugins/telescope-smart-open.lua b/home/neovim/nvim/lua/plugins/telescope-smart-open.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/telescope-smart-open.lua rename to home/neovim/nvim/lua/plugins/telescope-smart-open.lua diff --git a/nix/home/neovim/nvim/lua/plugins/telescope-undo.lua b/home/neovim/nvim/lua/plugins/telescope-undo.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/telescope-undo.lua rename to home/neovim/nvim/lua/plugins/telescope-undo.lua diff --git a/nix/home/neovim/nvim/lua/plugins/telescope.lua b/home/neovim/nvim/lua/plugins/telescope.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/telescope.lua rename to home/neovim/nvim/lua/plugins/telescope.lua diff --git a/nix/home/neovim/nvim/lua/plugins/tmux-awesome-plugin-manager.lua b/home/neovim/nvim/lua/plugins/tmux-awesome-plugin-manager.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/tmux-awesome-plugin-manager.lua rename to home/neovim/nvim/lua/plugins/tmux-awesome-plugin-manager.lua diff --git a/nix/home/neovim/nvim/lua/plugins/tmux-navigator.lua b/home/neovim/nvim/lua/plugins/tmux-navigator.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/tmux-navigator.lua rename to home/neovim/nvim/lua/plugins/tmux-navigator.lua diff --git a/nix/home/neovim/nvim/lua/plugins/todo-comments.lua b/home/neovim/nvim/lua/plugins/todo-comments.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/todo-comments.lua rename to home/neovim/nvim/lua/plugins/todo-comments.lua diff --git a/nix/home/neovim/nvim/lua/plugins/transparent.lua b/home/neovim/nvim/lua/plugins/transparent.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/transparent.lua rename to home/neovim/nvim/lua/plugins/transparent.lua diff --git a/nix/home/neovim/nvim/lua/plugins/treesitter.lua b/home/neovim/nvim/lua/plugins/treesitter.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/treesitter.lua rename to home/neovim/nvim/lua/plugins/treesitter.lua diff --git a/nix/home/neovim/nvim/lua/plugins/twilight.lua b/home/neovim/nvim/lua/plugins/twilight.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/twilight.lua rename to home/neovim/nvim/lua/plugins/twilight.lua diff --git a/nix/home/neovim/nvim/lua/plugins/ufo.lua b/home/neovim/nvim/lua/plugins/ufo.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/ufo.lua rename to home/neovim/nvim/lua/plugins/ufo.lua diff --git a/nix/home/neovim/nvim/lua/plugins/various-textobjs.lua b/home/neovim/nvim/lua/plugins/various-textobjs.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/various-textobjs.lua rename to home/neovim/nvim/lua/plugins/various-textobjs.lua diff --git a/nix/home/neovim/nvim/lua/plugins/vim-nix.lua b/home/neovim/nvim/lua/plugins/vim-nix.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/vim-nix.lua rename to home/neovim/nvim/lua/plugins/vim-nix.lua diff --git a/nix/home/neovim/nvim/lua/plugins/vimux.lua b/home/neovim/nvim/lua/plugins/vimux.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/vimux.lua rename to home/neovim/nvim/lua/plugins/vimux.lua diff --git a/nix/home/neovim/nvim/lua/plugins/visincr.lua b/home/neovim/nvim/lua/plugins/visincr.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/visincr.lua rename to home/neovim/nvim/lua/plugins/visincr.lua diff --git a/nix/home/neovim/nvim/lua/plugins/visual-multi.lua b/home/neovim/nvim/lua/plugins/visual-multi.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/visual-multi.lua rename to home/neovim/nvim/lua/plugins/visual-multi.lua diff --git a/nix/home/neovim/nvim/lua/plugins/wakatime.lua b/home/neovim/nvim/lua/plugins/wakatime.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/wakatime.lua rename to home/neovim/nvim/lua/plugins/wakatime.lua diff --git a/nix/home/neovim/nvim/lua/plugins/worktrees.lua b/home/neovim/nvim/lua/plugins/worktrees.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/worktrees.lua rename to home/neovim/nvim/lua/plugins/worktrees.lua diff --git a/nix/home/neovim/nvim/lua/plugins/wrapping.lua b/home/neovim/nvim/lua/plugins/wrapping.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/wrapping.lua rename to home/neovim/nvim/lua/plugins/wrapping.lua diff --git a/nix/home/neovim/nvim/lua/plugins/xtract.lua b/home/neovim/nvim/lua/plugins/xtract.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/xtract.lua rename to home/neovim/nvim/lua/plugins/xtract.lua diff --git a/nix/home/neovim/nvim/lua/plugins/zen-mode.lua b/home/neovim/nvim/lua/plugins/zen-mode.lua similarity index 100% rename from nix/home/neovim/nvim/lua/plugins/zen-mode.lua rename to home/neovim/nvim/lua/plugins/zen-mode.lua diff --git a/nix/home/neovim/nvim/spell/de.utf-8.add b/home/neovim/nvim/spell/de.utf-8.add similarity index 100% rename from nix/home/neovim/nvim/spell/de.utf-8.add rename to home/neovim/nvim/spell/de.utf-8.add diff --git a/nix/home/neovim/nvim/spell/de.utf-8.add.spl b/home/neovim/nvim/spell/de.utf-8.add.spl similarity index 100% rename from nix/home/neovim/nvim/spell/de.utf-8.add.spl rename to home/neovim/nvim/spell/de.utf-8.add.spl diff --git a/nix/home/neovim/nvim/spell/de.utf-8.spl b/home/neovim/nvim/spell/de.utf-8.spl similarity index 100% rename from nix/home/neovim/nvim/spell/de.utf-8.spl rename to home/neovim/nvim/spell/de.utf-8.spl diff --git a/nix/home/neovim/nvim/spell/de.utf-8.sug b/home/neovim/nvim/spell/de.utf-8.sug similarity index 100% rename from nix/home/neovim/nvim/spell/de.utf-8.sug rename to home/neovim/nvim/spell/de.utf-8.sug diff --git a/nix/home/neovim/nvim/spell/en.utf-8.add b/home/neovim/nvim/spell/en.utf-8.add similarity index 100% rename from nix/home/neovim/nvim/spell/en.utf-8.add rename to home/neovim/nvim/spell/en.utf-8.add diff --git a/nix/home/neovim/nvim/spell/en.utf-8.add.spl b/home/neovim/nvim/spell/en.utf-8.add.spl similarity index 100% rename from nix/home/neovim/nvim/spell/en.utf-8.add.spl rename to home/neovim/nvim/spell/en.utf-8.add.spl diff --git a/nix/home/neovim/nvim/spell/en.utf-8.spl b/home/neovim/nvim/spell/en.utf-8.spl similarity index 100% rename from nix/home/neovim/nvim/spell/en.utf-8.spl rename to home/neovim/nvim/spell/en.utf-8.spl diff --git a/nix/home/neovim/nvim/spell/en.utf-8.sug b/home/neovim/nvim/spell/en.utf-8.sug similarity index 100% rename from nix/home/neovim/nvim/spell/en.utf-8.sug rename to home/neovim/nvim/spell/en.utf-8.sug diff --git a/nix/home/neovim/nvim/stylua.toml b/home/neovim/nvim/stylua.toml similarity index 100% rename from nix/home/neovim/nvim/stylua.toml rename to home/neovim/nvim/stylua.toml diff --git a/nix/home/neovim/nvim/thesaurus/de_openthesaurus.txt b/home/neovim/nvim/thesaurus/de_openthesaurus.txt similarity index 100% rename from nix/home/neovim/nvim/thesaurus/de_openthesaurus.txt rename to home/neovim/nvim/thesaurus/de_openthesaurus.txt diff --git a/nix/home/neovim/nvim/thesaurus/de_user.txt b/home/neovim/nvim/thesaurus/de_user.txt similarity index 100% rename from nix/home/neovim/nvim/thesaurus/de_user.txt rename to home/neovim/nvim/thesaurus/de_user.txt diff --git a/nix/home/oatmeal/config.toml b/home/oatmeal/config.toml similarity index 100% rename from nix/home/oatmeal/config.toml rename to home/oatmeal/config.toml diff --git a/nix/home/oatmeal/default.nix b/home/oatmeal/default.nix similarity index 100% rename from nix/home/oatmeal/default.nix rename to home/oatmeal/default.nix diff --git a/nix/home/ripgrep/default.nix b/home/ripgrep/default.nix similarity index 100% rename from nix/home/ripgrep/default.nix rename to home/ripgrep/default.nix diff --git a/nix/home/ripgrep/ripgreprc b/home/ripgrep/ripgreprc similarity index 100% rename from nix/home/ripgrep/ripgreprc rename to home/ripgrep/ripgreprc diff --git a/nix/home/ruby/default.nix b/home/ruby/default.nix similarity index 100% rename from nix/home/ruby/default.nix rename to home/ruby/default.nix diff --git a/nix/home/ruby/gemrc b/home/ruby/gemrc similarity index 100% rename from nix/home/ruby/gemrc rename to home/ruby/gemrc diff --git a/nix/home/sesh/default.nix b/home/sesh/default.nix similarity index 100% rename from nix/home/sesh/default.nix rename to home/sesh/default.nix diff --git a/nix/home/sesh/scripts/node_dev b/home/sesh/scripts/node_dev similarity index 100% rename from nix/home/sesh/scripts/node_dev rename to home/sesh/scripts/node_dev diff --git a/nix/home/sesh/scripts/open_files b/home/sesh/scripts/open_files similarity index 100% rename from nix/home/sesh/scripts/open_files rename to home/sesh/scripts/open_files diff --git a/nix/home/sesh/sesh.toml b/home/sesh/sesh.toml similarity index 100% rename from nix/home/sesh/sesh.toml rename to home/sesh/sesh.toml diff --git a/nix/home/shared/shared-aliases.nix b/home/shared/shared-aliases.nix similarity index 98% rename from nix/home/shared/shared-aliases.nix rename to home/shared/shared-aliases.nix index 59a2b9f..c4371bb 100644 --- a/nix/home/shared/shared-aliases.nix +++ b/home/shared/shared-aliases.nix @@ -68,7 +68,7 @@ in ta = "tmux attach"; # Nix - nxs = "darwin-rebuild switch --flake ~/.dotfiles/nix"; + nxs = "darwin-rebuild switch --flake ~/.dotfiles"; # Bat cat = "bat"; diff --git a/nix/home/skhd/default.nix b/home/skhd/default.nix similarity index 100% rename from nix/home/skhd/default.nix rename to home/skhd/default.nix diff --git a/nix/home/skhd/skhdrc b/home/skhd/skhdrc similarity index 100% rename from nix/home/skhd/skhdrc rename to home/skhd/skhdrc diff --git a/nix/home/starship/default.nix b/home/starship/default.nix similarity index 100% rename from nix/home/starship/default.nix rename to home/starship/default.nix diff --git a/nix/home/tmux/default.nix b/home/tmux/default.nix similarity index 100% rename from nix/home/tmux/default.nix rename to home/tmux/default.nix diff --git a/nix/home/tmux/gitmux.conf b/home/tmux/gitmux.conf similarity index 100% rename from nix/home/tmux/gitmux.conf rename to home/tmux/gitmux.conf diff --git a/nix/home/tmux/tmux-nerd-font-window-name.yml b/home/tmux/tmux-nerd-font-window-name.yml similarity index 100% rename from nix/home/tmux/tmux-nerd-font-window-name.yml rename to home/tmux/tmux-nerd-font-window-name.yml diff --git a/nix/home/tmux/tmux.conf b/home/tmux/tmux.conf similarity index 100% rename from nix/home/tmux/tmux.conf rename to home/tmux/tmux.conf diff --git a/nix/home/wezterm/default.nix b/home/wezterm/default.nix similarity index 100% rename from nix/home/wezterm/default.nix rename to home/wezterm/default.nix diff --git a/nix/home/wezterm/wezterm.icns b/home/wezterm/wezterm.icns similarity index 100% rename from nix/home/wezterm/wezterm.icns rename to home/wezterm/wezterm.icns diff --git a/nix/home/wezterm/wezterm.lua b/home/wezterm/wezterm.lua similarity index 100% rename from nix/home/wezterm/wezterm.lua rename to home/wezterm/wezterm.lua diff --git a/nix/home/wget/default.nix b/home/wget/default.nix similarity index 100% rename from nix/home/wget/default.nix rename to home/wget/default.nix diff --git a/nix/home/wget/wget b/home/wget/wget similarity index 100% rename from nix/home/wget/wget rename to home/wget/wget diff --git a/nix/home/yabai/default.nix b/home/yabai/default.nix similarity index 100% rename from nix/home/yabai/default.nix rename to home/yabai/default.nix diff --git a/nix/home/yabai/yabairc b/home/yabai/yabairc similarity index 100% rename from nix/home/yabai/yabairc rename to home/yabai/yabairc diff --git a/nix/home/yazi/default.nix b/home/yazi/default.nix similarity index 100% rename from nix/home/yazi/default.nix rename to home/yazi/default.nix diff --git a/nix/home/zed/default.nix b/home/zed/default.nix similarity index 100% rename from nix/home/zed/default.nix rename to home/zed/default.nix diff --git a/nix/home/zed/settings.json b/home/zed/settings.json similarity index 100% rename from nix/home/zed/settings.json rename to home/zed/settings.json diff --git a/nix/home/zoxide/default.nix b/home/zoxide/default.nix similarity index 100% rename from nix/home/zoxide/default.nix rename to home/zoxide/default.nix diff --git a/nix/home/zsh/_cht b/home/zsh/_cht similarity index 100% rename from nix/home/zsh/_cht rename to home/zsh/_cht diff --git a/nix/home/zsh/default.nix b/home/zsh/default.nix similarity index 100% rename from nix/home/zsh/default.nix rename to home/zsh/default.nix diff --git a/nix/home/zsh/zshrc.sh b/home/zsh/zshrc.sh similarity index 96% rename from nix/home/zsh/zshrc.sh rename to home/zsh/zshrc.sh index 4034dd8..d083fca 100644 --- a/nix/home/zsh/zshrc.sh +++ b/home/zsh/zshrc.sh @@ -43,15 +43,6 @@ function deleteNodeModules() { find . -name "node_modules" -type d -exec rm -rf '{}' + } -function homebrewBackup() { - cd ~/.dotfiles/ - brew bundle dump --describe -f -} - -function homebrewRestore() { - brew bundle --file ~/.dotfiles/Brewfile -} - # Server server() { browser-sync start --server --files "**" diff --git a/nix/hosts/mac-mini/configuration.nix b/hosts/mac-mini/configuration.nix similarity index 100% rename from nix/hosts/mac-mini/configuration.nix rename to hosts/mac-mini/configuration.nix diff --git a/nix/hosts/mac-mini/home.nix b/hosts/mac-mini/home.nix similarity index 100% rename from nix/hosts/mac-mini/home.nix rename to hosts/mac-mini/home.nix diff --git a/nix/hosts/mac-mini/homebrew.nix b/hosts/mac-mini/homebrew.nix similarity index 100% rename from nix/hosts/mac-mini/homebrew.nix rename to hosts/mac-mini/homebrew.nix diff --git a/nix/README.md b/nix/README.md deleted file mode 100644 index 344de88..0000000 --- a/nix/README.md +++ /dev/null @@ -1,46 +0,0 @@ -# Nix Dotfiles - -This is my folder where I migrate my current dotfile setup to [Nix](https://nixos.org/), [nix-darwin](https://github.com/LnL7/nix-darwin), and [home-manager](https://github.com/nix-community/home-manager). - -> [!WARNING] -> This is a work in progress and I am still learning Nix, so expect things to be broken. - -## Install Dependencies - -```sh -xcode-select --install -``` - -## Install Nix - -```sh -curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/nix | sh -s -- install -``` - -Add this line to your `/etc/nix/nix.conf` file - -```sh -experimental-features = nix-command flakes -``` - -```sh -# First time install -nix run nix-darwin -- switch --flake ~/.dotfiles/nix -``` - -By default the `$hostname` that matches the current machine is used, but it is possible to manually load one by running: - -```sh -nix run nix-darwin -- switch --flake ~/.dotfiles/nix#mac-mini -``` - -Make sure this is added to your path: - -```sh -export PATH="/run/current-system/sw/bin:$PATH" -``` - -```sh -# Switch to new configuration -darwin-rebuild switch --flake ~/.dotfiles/nix -```