Rearrange again to reduce complexity

Move collections to use default.nix in relevant directories
Combine GUI elements into gui directory

Vanguard.nix

@@ -27,7 +27,6 @@
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGAcvAQ8W71Bn8pdMYst1hoVCmVJ+0h4HBlJzu1C6dwy xenia@Northstar"
   ];
 
-  # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.xenia = {
     isNormalUser = true;
     description = "Evie Litherland-Smith";
@@ -39,10 +38,9 @@
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGAcvAQ8W71Bn8pdMYst1hoVCmVJ+0h4HBlJzu1C6dwy xenia@Northstar"
     ];
   };
+
   home-manager.users.xenia = { ... }: {
-    imports = [ ./home/collections/personal ];
+    imports = [ ./home/personal.nix ];
-    # Home Manager needs a bit of information about you and the
-    # paths it should manage.
     home.username = "xenia";
     home.homeDirectory = "/home/xenia";
     home.stateVersion = "22.11";

common.nix

@@ -8,17 +8,7 @@
   home-manager.useUserPackages = true;
   home-manager.useGlobalPkgs = true;
   home-manager.users.root = { ... }: {
-    imports = [
+    imports = [ ./home/env ./home/tui ./home/git/personal.nix ./home/ssh/personal.nix ];
-      ./home/env/bash.nix
-      ./home/env/fish.nix
-      ./home/env/bat.nix
-      ./home/env/starship.nix
-      ./home/tui/neovim.nix
-      ./home/tui/lazygit.nix
-      ./home/git/personal.nix
-    ];
-    # Home Manager needs a bit of information about you and the
-    # paths it should manage.
     home.username = "root";
     home.homeDirectory = "/root";
     home.stateVersion = "22.11";
@@ -30,11 +20,7 @@
   # Enable power-profiles
   services.power-profiles-daemon.enable = true;
 
-  environment.systemPackages = with pkgs; [
+  environment.systemPackages = with pkgs; [ home-manager ];
-    dig
-    gnumake
-    home-manager
-  ];
 
   programs.nix-ld = {
     enable = true;

home/Legion-xenia.nix

@@ -1,11 +0,0 @@
-{ ... }: {
-  imports = [
-    ./env/xenia.nix
-    ./tui
-  ];
-  # Home Manager needs a bit of information about you and the
-  # paths it should manage.
-  home.username = "xenia";
-  home.homeDirectory = "/home/xenia";
-  home.stateVersion = "22.11";
-}

home/Monarch-tux.nix

@@ -1,25 +1,12 @@
-{ pkgs, ... }:
+{ ... }:
 {
-  imports = [
+  imports = [ ./personal.nix ];
-    ./git/personal.nix
-    ./env/zsh.nix
-    ./env/fish.nix
-    ./env/bat.nix
-    ./env/direnv.nix
-    ./env/keychain.nix
-    ./env/starship.nix
-    ./ssh/personal.nix
-    ./terminal/wezterm.nix
-    ./tui/neovim.nix
-    ./tui/lazygit.nix
-  ];
   # Home Manager needs a bit of information about you and the
   # paths it should manage.
   home.username = "tux";
   home.homeDirectory = "/Users/tux";
   home.stateVersion = "22.11";
 
-  home.packages = with pkgs; [ silver-searcher ];
   services.syncthing.enable = true;
 
   programs.zsh.shellAliases.update = "home-manager switch";

home/Northstar-xenia.nix

@@ -1,12 +0,0 @@
-{ ... }: {
-  imports = [
-    ./env
-    ./env/git/personal.nix
-    ./tui
-  ];
-  # Home Manager needs a bit of information about you and the
-  # paths it should manage.
-  home.username = "xenia";
-  home.homeDirectory = "/home/xenia";
-  home.stateVersion = "22.11";
-}

home/browser/chromium-wayland.nix

@@ -1,4 +0,0 @@
-{ ... }:
-{
-  programs.chromium.enable = true;
-}

home/browser/chromium.nix

@@ -1,8 +0,0 @@
-{ ... }:
-{
-  imports = [ ./chromium.nix ];
-  programs.chromium.commandLineArgs = [
-    "--enable-features=UseOzonePlatform"
-    "--ozone-platform=wayland"
-  ];
-}

home/browser/firefox.nix

@@ -1,4 +0,0 @@
-{ ... }:
-{
-  programs.firefox.enable = true;
-}

home/browser/librewolf.nix

@@ -1,4 +0,0 @@
-{ ... }:
-{
-  programs.librewolf.enable = true;
-}

home/collections/common/desktop.nix

@@ -1,26 +0,0 @@
-{ pkgs, ... }:
-{
-  imports = [
-    ../../browser/librewolf.nix
-    ../../desktop/wayland/hyprland.nix
-    ../../env/bash.nix
-    ../../env/fish.nix
-    ../../env/bat.nix
-    ../../env/direnv.nix
-    ../../env/keychain.nix
-    ../../env/nix-index.nix
-    ../../env/pypoetry.nix
-    ../../env/starship.nix
-    ../../terminal/wezterm.nix
-    ../../tui/neovim.nix
-    ../../tui/lazygit.nix
-  ];
-  home.packages = with pkgs; [
-    bitwarden
-    file
-    marktext
-    silver-searcher
-    signal-desktop
-    zotero
-  ];
-}

home/default.nix

@@ -2,6 +2,4 @@
 let
   home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/master.tar.gz";
 in
-{
+{ imports = [ (import "${home-manager}/nixos") ]; }
-  imports = [ (import "${home-manager}/nixos") ];
-}

home/env/default.nix

@@ -0,0 +1,14 @@
+{ pkgs, ... }:
+{
+  imports = [
+    ./bash.nix
+    ./bat.nix
+    ./direnv.nix
+    ./fish.nix
+    ./keychain.nix
+    ./nix-index.nix
+    ./readline.nix
+    ./starship.nix
+  ];
+  home.packages = with pkgs; [ dig file gnumake silver-searcher ];
+}

home/env/pypoetry.nix

@@ -1,4 +0,0 @@
-{ ... }:
-{
-  xdg.configFile."pypoetry".source = ./config/pypoetry;
-}

home/env/syncthing.nix

@@ -1,8 +0,0 @@
-{ pkgs, ... }:
-{
-  services.syncthing = {
-    enable = true;
-    tray.enable = true;
-  };
-  home.packages = with pkgs; [ syncthing-cli ];
-}

home/gui/default.nix

@@ -0,0 +1,12 @@
+{ pkgs, ... }:
+{
+  imports = [ ./wezterm.nix ];
+  programs.firefox.enable = true;
+  programs.librewolf.enable = true;
+  home.packages = with pkgs; [
+    bitwarden
+    marktext
+    signal-desktop
+    zotero
+  ];
+}

home/gui/wezterm.nix

@@ -0,0 +1,13 @@
+{ ... }:
+{
+  programs.wezterm = {
+    enable = true;
+    extraConfig = builtins.readFile ./config/wezterm/wezterm.lua;
+  };
+  xdg.configFile = {
+    "wezterm/tab_bar_style.lua".source = ./config/wezterm/tab_bar_style.lua;
+    "wezterm/navigator.lua".source = ./config/wezterm/navigator.lua;
+    "wezterm/keys.lua".source = ./config/wezterm/keys.lua;
+    "wezterm/key_tables.lua".source = ./config/wezterm/key_tables.lua;
+  };
+}

home/personal.nix

@@ -1,9 +1,11 @@
 { pkgs, ... }:
 {
   imports = [
-    ../common/desktop.nix
+    ./env
-    ../../git/personal.nix
+    ./gui
-    ../../ssh/personal.nix
+    ./tui
+    ./git/personal.nix
+    ./ssh/personal.nix
   ];
   home.packages = with pkgs; [
     discord

home/ssh/personal.nix

@@ -1,16 +1,11 @@
-{ ... }:
+{ lib, ... }:
 {
   imports = [ ./common.nix ];
   programs.ssh.matchBlocks = {
-    "legion xenia xenia.me.uk" = {
+    "legion" = { port = 30; };
+    "vanguard" = { hostname = "192.168.1.166"; port = 22; };
+    "legion vanguard xenia.me.uk" = lib.hm.dag.entryAfter [ "legion" "vanguard" ] {
       user = "root";
-      hostname = "xenia.me.uk";
-      port = 30;
-      forwardAgent = true;
-    };
-    "vanguard" = {
-      user = "root";
-      hostname = "192.168.1.166";
       forwardAgent = true;
     };
   };

home/terminal/wezterm.nix

@@ -1,5 +0,0 @@
-{ ... }:
-{
-  programs.wezterm.enable = true;
-  xdg.configFile."wezterm".source = ./config/wezterm;
-}

home/tui/default.nix

@@ -0,0 +1,7 @@
+{ ... }:
+{
+  imports = [
+    ./neovim.nix
+    ./lazygit.nix
+  ];
+}

home/tui/neovim.nix

@@ -4,6 +4,7 @@
   programs.neovim = {
     enable = true;
     defaultEditor = true;
+    extraLuaConfig = builtins.readFile ./config/nvim/init.lua;
     viAlias = true;
     vimAlias = true;
     vimdiffAlias = true;
@@ -40,5 +41,5 @@
     ];
   };
   home.packages = with pkgs; [ tree-sitter ];
-  xdg.configFile."nvim".source = ./config/nvim;
+  xdg.configFile."nvim/lua".source = ./config/nvim/lua;
 }

home/work.nix

@@ -1,9 +1,11 @@
 { pkgs, ... }:
 {
   imports = [
-    ../common/desktop.nix
+    ./env
-    ../../git/work.nix
+    ./gui
-    ../../ssh/work.nix
+    ./tui
+    ./git/work.nix
+    ./ssh/work.nix
   ];
   home.packages = with pkgs; [
     libreoffice-fresh