yanlin/nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rearrange file structure

Browse source
This commit is contained in:
Yan Lin 2025-09-02 23:26:46 +02:00
parent de1bfdcbe6
commit 530274e081
8 changed files with 20 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

4
flake.nix
View file

@ -21,14 +21,14 @@
{ {
darwinConfigurations."iMac" = nix-darwin.lib.darwinSystem { darwinConfigurations."iMac" = nix-darwin.lib.darwinSystem {
modules = [ modules = [
./hosts/darwin/iMac ./hosts/darwin/iMac/system.nix
]; ];
specialArgs = { inherit nix-homebrew; }; specialArgs = { inherit nix-homebrew; };
}; };
darwinConfigurations."MacBook-Air" = nix-darwin.lib.darwinSystem { darwinConfigurations."MacBook-Air" = nix-darwin.lib.darwinSystem {
modules = [ modules = [
./hosts/darwin/MacBook-Air ./hosts/darwin/MacBook-Air/system.nix
]; ];
specialArgs = { inherit nix-homebrew; }; specialArgs = { inherit nix-homebrew; };
}; };

2
hosts/darwin/MacBook-Air/home.nix
View file

@ -2,7 +2,7 @@
{ {
imports = [ imports = [
../../../home/common.nix ../home-default.nix
]; ];
# MacBook Air-specific home configuration # MacBook Air-specific home configuration

3
hosts/darwin/MacBook-Air/default.nix → hosts/darwin/MacBook-Air/system.nix
View file

@ -7,7 +7,6 @@
# Import common Darwin configuration # Import common Darwin configuration
imports = [ imports = [
../../../system ../system-default.nix
../../../system/darwin
]; ];
} }

28
home/common.nix → hosts/darwin/home-default.nix
View file

@ -3,20 +3,20 @@
{ {
imports = [ imports = [
nixvim.homeModules.nixvim nixvim.homeModules.nixvim
../modules/nvim.nix ../../modules/nvim.nix
../modules/tmux.nix ../../modules/tmux.nix
../modules/zsh.nix ../../modules/zsh.nix
../modules/ssh.nix ../../modules/ssh.nix
../modules/git.nix ../../modules/git.nix
../modules/lazygit.nix ../../modules/lazygit.nix
../modules/papis.nix ../../modules/papis.nix
../modules/termscp.nix ../../modules/termscp.nix
../modules/rsync.nix ../../modules/rsync.nix
../modules/btop.nix ../../modules/btop.nix
../modules/firefox.nix ../../modules/firefox.nix
../modules/ghostty.nix ../../modules/ghostty.nix
../modules/syncthing.nix ../../modules/syncthing.nix
../config/fonts.nix ../../config/fonts.nix
]; ];
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;

2
hosts/darwin/iMac/home.nix
View file

@ -2,7 +2,7 @@
{ {
imports = [ imports = [
../../../home/common.nix ../home-default.nix
]; ];
# iMac-specific home configuration # iMac-specific home configuration

3
hosts/darwin/iMac/default.nix → hosts/darwin/iMac/system.nix
View file

@ -7,7 +7,6 @@
# Import common Darwin configuration # Import common Darwin configuration
imports = [ imports = [
../../../system ../system-default.nix
../../../system/darwin
]; ];
} }

0
system/darwin/default.nix → hosts/darwin/system-default.nix
View file

7
system/default.nix
View file

@ -1,7 +0,0 @@
{ config, pkgs, ... }:
{
imports = [
];
}