Commit 1d2cafd
committed
refactor(nix): extract settings.nix to root nix/ directory
Extract settings.nix from nix/modules/shared/ to nix/ for better
consistency with the modular flake-parts architecture.
## Changes
- Moved `nix/modules/shared/settings.nix` β `nix/settings.nix`
- Updated `nix/modules/shared/default.nix` to remove settings.nix import
- Updated `flake-modules/hosts.nix` to import settings.nix in both:
- darwinConfigurations
- nixosConfigurations
- Updated FLAKE-PARTS-MIGRATION.md documentation
## Rationale
This creates a consistent structure where all core system modules are
at the same level:
```
nix/
βββ settings.nix # Custom options & config
βββ shared-configuration.nix # Core system configuration
βββ overlays.nix # Package overlays
```
All three modules are platform-aware (handling both Darwin and Linux)
and are imported by all system configurations, maintaining a single
unified configuration across all managed systems.
## Content
The settings.nix module remains functionally unchanged:
- Defines custom `config.my.*` options
- Sets up home-manager aliases
- Configures XDG directories
- Manages environment variables
- Platform-specific home directory logic (Darwin vs Linux)
Only the file location has changed for better organization.1 parent 14f2cd0 commit 1d2cafd
File tree
4 files changed
+40
-17
lines changed- flake-modules
- nix
4 files changed
+40
-17
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
45 | 45 | | |
46 | 46 | | |
47 | 47 | | |
48 | | - | |
49 | | - | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
50 | 51 | | |
51 | | - | |
52 | | - | |
| 52 | + | |
53 | 53 | | |
54 | 54 | | |
55 | 55 | | |
56 | 56 | | |
57 | 57 | | |
58 | 58 | | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
59 | 68 | | |
60 | 69 | | |
61 | 70 | | |
| |||
87 | 96 | | |
88 | 97 | | |
89 | 98 | | |
90 | | - | |
91 | | - | |
92 | | - | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
93 | 102 | | |
94 | 103 | | |
95 | 104 | | |
96 | | - | |
| 105 | + | |
| 106 | + | |
97 | 107 | | |
98 | 108 | | |
99 | | - | |
| 109 | + | |
100 | 110 | | |
101 | 111 | | |
102 | 112 | | |
| |||
107 | 117 | | |
108 | 118 | | |
109 | 119 | | |
110 | | - | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
111 | 136 | | |
112 | | - | |
113 | | - | |
114 | | - | |
115 | | - | |
116 | | - | |
| 137 | + | |
| 138 | + | |
117 | 139 | | |
118 | | - | |
| 140 | + | |
119 | 141 | | |
120 | 142 | | |
121 | 143 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
31 | 31 | | |
32 | 32 | | |
33 | 33 | | |
| 34 | + | |
34 | 35 | | |
35 | 36 | | |
36 | 37 | | |
| |||
52 | 53 | | |
53 | 54 | | |
54 | 55 | | |
| 56 | + | |
55 | 57 | | |
56 | 58 | | |
57 | 59 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
4 | 3 | | |
5 | 4 | | |
6 | 5 | | |
| |||
File renamed without changes.
0 commit comments