refactor: standardize config file structure

WilliamHsieh · Jan 8, 2024 · 75ce000 · 75ce000
1 parent 560ddea
commit 75ce000
Show file tree

Hide file tree

Showing 52 changed files with 6 additions and 7 deletions.
diff --git a/config/.config/alacritty/alacritty.yml → config/alacritty/alacritty.yml b/config/.config/alacritty/alacritty.yml → config/alacritty/alacritty.yml
diff --git a/config/.config/clangd/config.yaml → config/clangd/config.yaml b/config/.config/clangd/config.yaml → config/clangd/config.yaml
diff --git a/config/.config/nvim/.gitignore → config/nvim/.gitignore b/config/.config/nvim/.gitignore → config/nvim/.gitignore
diff --git a/.../.config/nvim/after/ftplugin/markdown.lua → config/nvim/after/ftplugin/markdown.lua b/.../.config/nvim/after/ftplugin/markdown.lua → config/nvim/after/ftplugin/markdown.lua
diff --git a/config/.config/nvim/after/ftplugin/qf.lua → config/nvim/after/ftplugin/qf.lua b/config/.config/nvim/after/ftplugin/qf.lua → config/nvim/after/ftplugin/qf.lua
diff --git a/config/.config/nvim/after/ftplugin/tex.lua → config/nvim/after/ftplugin/tex.lua b/config/.config/nvim/after/ftplugin/tex.lua → config/nvim/after/ftplugin/tex.lua
diff --git a/config/.config/nvim/init.lua → config/nvim/init.lua b/config/.config/nvim/init.lua → config/nvim/init.lua
diff --git a/config/.config/nvim/lazy-lock.json → config/nvim/lazy-lock.json b/config/.config/nvim/lazy-lock.json → config/nvim/lazy-lock.json
diff --git a/config/.config/nvim/lua/core/autocmd.lua → config/nvim/lua/core/autocmd.lua b/config/.config/nvim/lua/core/autocmd.lua → config/nvim/lua/core/autocmd.lua
diff --git a/config/.config/nvim/lua/core/icons.lua → config/nvim/lua/core/icons.lua b/config/.config/nvim/lua/core/icons.lua → config/nvim/lua/core/icons.lua
diff --git a/config/.config/nvim/lua/core/mapping.lua → config/nvim/lua/core/mapping.lua b/config/.config/nvim/lua/core/mapping.lua → config/nvim/lua/core/mapping.lua
diff --git a/config/.config/nvim/lua/core/plugins.lua → config/nvim/lua/core/plugins.lua b/config/.config/nvim/lua/core/plugins.lua → config/nvim/lua/core/plugins.lua
diff --git a/config/.config/nvim/lua/core/setting.lua → config/nvim/lua/core/setting.lua b/config/.config/nvim/lua/core/setting.lua → config/nvim/lua/core/setting.lua
diff --git a/config/.config/nvim/lua/core/utils.lua → config/nvim/lua/core/utils.lua b/config/.config/nvim/lua/core/utils.lua → config/nvim/lua/core/utils.lua
diff --git a/config/.config/nvim/lua/plugins/alpha.lua → config/nvim/lua/plugins/alpha.lua b/config/.config/nvim/lua/plugins/alpha.lua → config/nvim/lua/plugins/alpha.lua
diff --git a/...ig/.config/nvim/lua/plugins/autopairs.lua → config/nvim/lua/plugins/autopairs.lua b/...ig/.config/nvim/lua/plugins/autopairs.lua → config/nvim/lua/plugins/autopairs.lua
diff --git a/...g/.config/nvim/lua/plugins/bufferline.lua → config/nvim/lua/plugins/bufferline.lua b/...g/.config/nvim/lua/plugins/bufferline.lua → config/nvim/lua/plugins/bufferline.lua
diff --git a/...g/.config/nvim/lua/plugins/catppuccin.lua → config/nvim/lua/plugins/catppuccin.lua b/...g/.config/nvim/lua/plugins/catppuccin.lua → config/nvim/lua/plugins/catppuccin.lua
diff --git a/config/.config/nvim/lua/plugins/cmp.lua → config/nvim/lua/plugins/cmp.lua b/config/.config/nvim/lua/plugins/cmp.lua → config/nvim/lua/plugins/cmp.lua
diff --git a/...ig/.config/nvim/lua/plugins/colorizer.lua → config/nvim/lua/plugins/colorizer.lua b/...ig/.config/nvim/lua/plugins/colorizer.lua → config/nvim/lua/plugins/colorizer.lua
diff --git a/config/.config/nvim/lua/plugins/comment.lua → config/nvim/lua/plugins/comment.lua b/config/.config/nvim/lua/plugins/comment.lua → config/nvim/lua/plugins/comment.lua
diff --git a/....config/nvim/lua/plugins/git_worktree.lua → config/nvim/lua/plugins/git_worktree.lua b/....config/nvim/lua/plugins/git_worktree.lua → config/nvim/lua/plugins/git_worktree.lua
diff --git a/config/.config/nvim/lua/plugins/gitsigns.lua → config/nvim/lua/plugins/gitsigns.lua b/config/.config/nvim/lua/plugins/gitsigns.lua → config/nvim/lua/plugins/gitsigns.lua
diff --git a/config/.config/nvim/lua/plugins/heirline.lua → config/nvim/lua/plugins/heirline.lua b/config/.config/nvim/lua/plugins/heirline.lua → config/nvim/lua/plugins/heirline.lua
diff --git a/config/.config/nvim/lua/plugins/hop.lua → config/nvim/lua/plugins/hop.lua b/config/.config/nvim/lua/plugins/hop.lua → config/nvim/lua/plugins/hop.lua
diff --git a/...g/.config/nvim/lua/plugins/illuminate.lua → config/nvim/lua/plugins/illuminate.lua b/...g/.config/nvim/lua/plugins/illuminate.lua → config/nvim/lua/plugins/illuminate.lua
diff --git a/...g/.config/nvim/lua/plugins/indentline.lua → config/nvim/lua/plugins/indentline.lua b/...g/.config/nvim/lua/plugins/indentline.lua → config/nvim/lua/plugins/indentline.lua
diff --git a/config/.config/nvim/lua/plugins/init.lua → config/nvim/lua/plugins/init.lua b/config/.config/nvim/lua/plugins/init.lua → config/nvim/lua/plugins/init.lua
diff --git a/config/.config/nvim/lua/plugins/lsp/init.lua → config/nvim/lua/plugins/lsp/init.lua b/config/.config/nvim/lua/plugins/lsp/init.lua → config/nvim/lua/plugins/lsp/init.lua
diff --git a/...ig/nvim/lua/plugins/lsp/server/clangd.lua → ...ig/nvim/lua/plugins/lsp/server/clangd.lua b/...ig/nvim/lua/plugins/lsp/server/clangd.lua → ...ig/nvim/lua/plugins/lsp/server/clangd.lua
diff --git a/.../nvim/lua/plugins/lsp/server/emmet_ls.lua → .../nvim/lua/plugins/lsp/server/emmet_ls.lua b/.../nvim/lua/plugins/lsp/server/emmet_ls.lua → .../nvim/lua/plugins/lsp/server/emmet_ls.lua
diff --git a/...ig/nvim/lua/plugins/lsp/server/jsonls.lua → ...ig/nvim/lua/plugins/lsp/server/jsonls.lua b/...ig/nvim/lua/plugins/lsp/server/jsonls.lua → ...ig/nvim/lua/plugins/lsp/server/jsonls.lua
diff --git a/...ig/nvim/lua/plugins/lsp/server/lua_ls.lua → ...ig/nvim/lua/plugins/lsp/server/lua_ls.lua b/...ig/nvim/lua/plugins/lsp/server/lua_ls.lua → ...ig/nvim/lua/plugins/lsp/server/lua_ls.lua
diff --git a/...g/nvim/lua/plugins/lsp/server/pyright.lua → ...g/nvim/lua/plugins/lsp/server/pyright.lua b/...g/nvim/lua/plugins/lsp/server/pyright.lua → ...g/nvim/lua/plugins/lsp/server/pyright.lua
diff --git a/config/.config/nvim/lua/plugins/lspsaga.lua → config/nvim/lua/plugins/lspsaga.lua b/config/.config/nvim/lua/plugins/lspsaga.lua → config/nvim/lua/plugins/lspsaga.lua
diff --git a/config/.config/nvim/lua/plugins/neogit.lua → config/nvim/lua/plugins/neogit.lua b/config/.config/nvim/lua/plugins/neogit.lua → config/nvim/lua/plugins/neogit.lua
diff --git a/config/.config/nvim/lua/plugins/noice.lua → config/nvim/lua/plugins/noice.lua b/config/.config/nvim/lua/plugins/noice.lua → config/nvim/lua/plugins/noice.lua
diff --git a/config/.config/nvim/lua/plugins/notify.lua → config/nvim/lua/plugins/notify.lua b/config/.config/nvim/lua/plugins/notify.lua → config/nvim/lua/plugins/notify.lua
diff --git a/config/.config/nvim/lua/plugins/nvimtree.lua → config/nvim/lua/plugins/nvimtree.lua b/config/.config/nvim/lua/plugins/nvimtree.lua → config/nvim/lua/plugins/nvimtree.lua
diff --git a/config/.config/nvim/lua/plugins/splits.lua → config/nvim/lua/plugins/splits.lua b/config/.config/nvim/lua/plugins/splits.lua → config/nvim/lua/plugins/splits.lua
diff --git a/...ig/.config/nvim/lua/plugins/statuscol.lua → config/nvim/lua/plugins/statuscol.lua b/...ig/.config/nvim/lua/plugins/statuscol.lua → config/nvim/lua/plugins/statuscol.lua
diff --git a/...ig/.config/nvim/lua/plugins/telescope.lua → config/nvim/lua/plugins/telescope.lua b/...ig/.config/nvim/lua/plugins/telescope.lua → config/nvim/lua/plugins/telescope.lua
diff --git a/...g/.config/nvim/lua/plugins/toggleterm.lua → config/nvim/lua/plugins/toggleterm.lua b/...g/.config/nvim/lua/plugins/toggleterm.lua → config/nvim/lua/plugins/toggleterm.lua
diff --git a/...ig/.config/nvim/lua/plugins/tpipeline.lua → config/nvim/lua/plugins/tpipeline.lua b/...ig/.config/nvim/lua/plugins/tpipeline.lua → config/nvim/lua/plugins/tpipeline.lua
diff --git a/...g/.config/nvim/lua/plugins/treesitter.lua → config/nvim/lua/plugins/treesitter.lua b/...g/.config/nvim/lua/plugins/treesitter.lua → config/nvim/lua/plugins/treesitter.lua
diff --git a/config/.config/nvim/lua/plugins/undotree.lua → config/nvim/lua/plugins/undotree.lua b/config/.config/nvim/lua/plugins/undotree.lua → config/nvim/lua/plugins/undotree.lua
diff --git a/config/.config/nvim/lua/plugins/vimtex.lua → config/nvim/lua/plugins/vimtex.lua b/config/.config/nvim/lua/plugins/vimtex.lua → config/nvim/lua/plugins/vimtex.lua
diff --git a/config/.config/nvim/lua/plugins/whichkey.lua → config/nvim/lua/plugins/whichkey.lua b/config/.config/nvim/lua/plugins/whichkey.lua → config/nvim/lua/plugins/whichkey.lua
diff --git a/config/.config/starship.toml → config/starship/starship.toml b/config/.config/starship.toml → config/starship/starship.toml
diff --git a/config/.tmux.conf → config/tmux/tmux.conf b/config/.tmux.conf → config/tmux/tmux.conf
diff --git a/config/.vimrc → config/vim/.vimrc b/config/.vimrc → config/vim/.vimrc
diff --git a/home/default.nix b/home/default.nix
@@ -66,20 +66,19 @@ in
   xdg.enable = true;
 
   xdg.configFile = {
-    "nvim".source = link ".config/nvim";
-    "alacritty".source = link ".config/alacritty";
-    "starship.toml".source = link ".config/starship.toml";
+    "nvim".source = link "nvim";
+    "alacritty".source = link "alacritty";
+    "starship".source = link "starship";
     "home-manager".source = link "..";
     "zsh/.p10k.zsh".source = link "zsh/.p10k.zsh";
     "clangd/config.yaml".text = ''
-      ${lib.removeSuffix "\n" (builtins.readFile ../config/.config/clangd/config.yaml)}
+      ${lib.removeSuffix "\n" (builtins.readFile ../config/clangd/config.yaml)}
         Compiler: ${pkgs.gcc}/bin/g++
     '';
   };
 
   home.file = {
-    ".vimrc".source = link ".vimrc";
-    ".tmux.conf".source = link ".tmux.conf";
+    ".vimrc".source = link "vim/.vimrc";
   };
 
   nix = {
@@ -146,7 +145,7 @@ in
     plugins = with pkgs.tmuxPlugins; [
       {
         plugin = prefix-highlight;
-        extraConfig = "source-file ~/.tmux.conf";
+        extraConfig = "source-file ${dotfilesDir}/config/tmux/tmux.conf";
       }
       extrakto
       tmux-fzf