Restructure Darwin configuration

So far, this is just based on mightymac. The other devices will be updated soon.
2026-03-27 01:17:42 -04:00 · 2024-12-07 23:12:52 -05:00 · 2024-12-07 23:12:52 -05:00 · f95cc09e13
commit f95cc09e13
parent ce3a1b5e20
45 changed files with 14 additions and 18 deletions
--- a/modules/home-manager/common/all-gui.nix
+++ b/modules/home-manager/common/all-gui.nix
--- a/modules/home-manager/common/all-cli.nix
+++ b/modules/home-manager/common/all-cli.nix
@ -335,14 +335,14 @@ in {

  home.file = {
    ".config/nvim/lua/config" = {
-      source = ../files/nvim/lua/config;
+      source = ./files/nvim/lua/config;
      recursive = true;
    };
    ".config/nvim/lua/plugins" = {
-      source = ../files/nvim/lua/plugins;
+      source = ./files/nvim/lua/plugins;
      recursive = true;
    };
-    ".config/powershell/Microsoft.PowerShell_profile.ps1".source = ../files/Microsoft.PowerShell_profile.ps1;
-    ".config/powershell/Microsoft.VSCode_profile.ps1".source = ../files/Microsoft.PowerShell_profile.ps1;
+    ".config/powershell/Microsoft.PowerShell_profile.ps1".source = ./files/Microsoft.PowerShell_profile.ps1;
+    ".config/powershell/Microsoft.VSCode_profile.ps1".source = ./files/Microsoft.PowerShell_profile.ps1;
  };
 }
--- a/modules/hosts/common/files/Microsoft.PowerShell_profile.ps1
+++ b/modules/hosts/common/files/Microsoft.PowerShell_profile.ps1
--- a/modules/hosts/common/files/nvim/lua/config/vim-options.lua
+++ b/modules/hosts/common/files/nvim/lua/config/vim-options.lua
--- a/modules/hosts/common/files/nvim/lua/disabled/barbar.lua
+++ b/modules/hosts/common/files/nvim/lua/disabled/barbar.lua
--- a/modules/hosts/common/files/nvim/lua/disabled/cheatsheet.lua
+++ b/modules/hosts/common/files/nvim/lua/disabled/cheatsheet.lua
--- a/modules/hosts/common/files/nvim/lua/disabled/nvim-tree.lua
+++ b/modules/hosts/common/files/nvim/lua/disabled/nvim-tree.lua
--- a/modules/hosts/common/files/nvim/lua/disabled/themes/dracula.lua
+++ b/modules/hosts/common/files/nvim/lua/disabled/themes/dracula.lua
--- a/modules/hosts/common/files/nvim/lua/disabled/themes/gruvbox.lua
+++ b/modules/hosts/common/files/nvim/lua/disabled/themes/gruvbox.lua
--- a/modules/hosts/common/files/nvim/lua/disabled/themes/kanagawa.lua
+++ b/modules/hosts/common/files/nvim/lua/disabled/themes/kanagawa.lua
--- a/modules/hosts/common/files/nvim/lua/disabled/themes/oxocarbon.lua
+++ b/modules/hosts/common/files/nvim/lua/disabled/themes/oxocarbon.lua
--- a/modules/hosts/common/files/nvim/lua/disabled/themes/tokyonight.lua
+++ b/modules/hosts/common/files/nvim/lua/disabled/themes/tokyonight.lua
--- a/modules/hosts/common/files/nvim/lua/plugins/alpha.lua
+++ b/modules/hosts/common/files/nvim/lua/plugins/alpha.lua
--- a/modules/hosts/common/files/nvim/lua/plugins/bufferline.lua
+++ b/modules/hosts/common/files/nvim/lua/plugins/bufferline.lua
--- a/modules/hosts/common/files/nvim/lua/plugins/catppuccin.lua
+++ b/modules/hosts/common/files/nvim/lua/plugins/catppuccin.lua
--- a/modules/hosts/common/files/nvim/lua/plugins/completions.lua
+++ b/modules/hosts/common/files/nvim/lua/plugins/completions.lua
--- a/modules/hosts/common/files/nvim/lua/plugins/edgy.lua
+++ b/modules/hosts/common/files/nvim/lua/plugins/edgy.lua
--- a/modules/hosts/common/files/nvim/lua/plugins/git-stuff.lua
+++ b/modules/hosts/common/files/nvim/lua/plugins/git-stuff.lua
--- a/modules/hosts/common/files/nvim/lua/plugins/lsp-config.lua
+++ b/modules/hosts/common/files/nvim/lua/plugins/lsp-config.lua
--- a/modules/hosts/common/files/nvim/lua/plugins/lualine.lua
+++ b/modules/hosts/common/files/nvim/lua/plugins/lualine.lua
--- a/modules/hosts/common/files/nvim/lua/plugins/neo-tree.lua
+++ b/modules/hosts/common/files/nvim/lua/plugins/neo-tree.lua
--- a/modules/hosts/common/files/nvim/lua/plugins/noice.lua
+++ b/modules/hosts/common/files/nvim/lua/plugins/noice.lua
--- a/modules/hosts/common/files/nvim/lua/plugins/none-ls.lua
+++ b/modules/hosts/common/files/nvim/lua/plugins/none-ls.lua
--- a/modules/hosts/common/files/nvim/lua/plugins/nvim-web-devicons.lua
+++ b/modules/hosts/common/files/nvim/lua/plugins/nvim-web-devicons.lua
--- a/modules/hosts/common/files/nvim/lua/plugins/telescope.lua
+++ b/modules/hosts/common/files/nvim/lua/plugins/telescope.lua
--- a/modules/hosts/common/files/nvim/lua/plugins/todo-comments.lua
+++ b/modules/hosts/common/files/nvim/lua/plugins/todo-comments.lua
--- a/modules/hosts/common/files/nvim/lua/plugins/toggleterm.lua
+++ b/modules/hosts/common/files/nvim/lua/plugins/toggleterm.lua
--- a/modules/hosts/common/files/nvim/lua/plugins/treesitter.lua
+++ b/modules/hosts/common/files/nvim/lua/plugins/treesitter.lua
--- a/modules/hosts/common/files/nvim/lua/plugins/trouble.lua
+++ b/modules/hosts/common/files/nvim/lua/plugins/trouble.lua
--- a/modules/hosts/common/files/nvim/lua/plugins/vim-tmux-navigator.lua
+++ b/modules/hosts/common/files/nvim/lua/plugins/vim-tmux-navigator.lua
--- a/modules/hosts/common/files/nvim/lua/plugins/which-key.lua
+++ b/modules/hosts/common/files/nvim/lua/plugins/which-key.lua
--- a/modules/hosts/common/files/tilix/Beanbag-Mathias.json
+++ b/modules/hosts/common/files/tilix/Beanbag-Mathias.json
--- a/modules/hosts/common/files/waybar/config
+++ b/modules/hosts/common/files/waybar/config
--- a/modules/hosts/common/files/waybar/style.css
+++ b/modules/hosts/common/files/waybar/style.css
--- a/modules/hosts/common/files/xfce4/terminal/accels.scm
+++ b/modules/hosts/common/files/xfce4/terminal/accels.scm
--- a/modules/hosts/common/files/xfce4/terminal/terminalrc
+++ b/modules/hosts/common/files/xfce4/terminal/terminalrc
--- a/modules/system/common/secrets.yaml
+++ b/modules/system/common/secrets.yaml
--- a/modules/system/common/all-darwin.nix
+++ b/modules/system/common/all-darwin.nix
--- a/modules/home-manager/common/all-darwin.nix
+++ b/modules/home-manager/common/all-darwin.nix
--- a/modules/home-manager/hosts/mightymac/gene.liverman.nix
+++ b/modules/home-manager/hosts/mightymac/gene.liverman.nix
@ -1,9 +1,9 @@
 { username, ... }: {
  home.stateVersion = "23.11";
  imports = [
-    ../../common/all-cli.nix
+    ../home.nix
+    ../../common
    ../../common/all-gui.nix
-    ../../common/all-darwin.nix
  ];

  programs = {
--- a/modules/home-manager/hosts/mightymac/secrets.yaml
+++ b/modules/home-manager/hosts/mightymac/secrets.yaml