cupcakearmy/nix-macos
1
0
Fork 0
mirror of https://github.com/cupcakearmy/nix-macos.git synced 2025-04-09 23:52:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

move pkgs to host config

Browse Source
This commit is contained in:
Niccolo Borgioli 2025-02-04 15:08:43 +01:00
parent 1e7e973472
commit c7aeaaef8d
6 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
darwin.nix
View File

@ -62,8 +62,7 @@
homebrew = { homebrew = {
enable = true; enable = true;
# casks = (if builtins.hasAttr "casks" host then host.casks else [ ]) ++ (import ./cask.nix); casks = (import ./cask.nix) ++ (lib.attrByPath [ "extras" "casks" ] [ ] host);
casks = (lib.attrByPath [ "extras" "casks" ] [ ] host) ++ (import ./cask.nix);
taps = [ "lihaoyun6/tap" ]; taps = [ "lihaoyun6/tap" ];
onActivation = { onActivation = {
autoUpdate = true; autoUpdate = true;

2
flake.nix
View File

@ -45,7 +45,7 @@
home-manager.backupFileExtension = "backup"; home-manager.backupFileExtension = "backup";
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.users.${host.username} = import ./home.nix { inherit host; }; home-manager.users.${host.username} = import ./home/home.nix { inherit host; };
} }
]; ];
}; };

20
home.nix → home/home.nix
View File

@ -15,10 +15,8 @@
home.homeDirectory = "/Users/${host.username}"; home.homeDirectory = "/Users/${host.username}";
home.packages = home.packages =
[ ] (import ./pkgs.nix { inherit pkgs; })
++ (import ./home/shared.nix { inherit pkgs; }) ++ ((lib.attrByPath [ "extras" "pkgs" ] (pkgs: [ ]) host) pkgs);
# TODO: Move to host config
++ lib.optionals (host.hostName == "sflx") (import ./home/sflx.nix { inherit pkgs; });
fonts.fontconfig.enable = true; fonts.fontconfig.enable = true;
@ -28,12 +26,12 @@
}; };
file = { file = {
".config/omp/config.yaml".source = ./files/omp/config.yaml; ".config/omp/config.yaml".source = ../files/omp/config.yaml;
".config/ghostty/config".source = ./files/ghostty/config; ".config/ghostty/config".source = ../files/ghostty/config;
".gitconfig".source = ./files/git/gitconfig; ".gitconfig".source = ../files/git/gitconfig;
".gitignore_global".source = ./files/git/gitignore_global; ".gitignore_global".source = ../files/git/gitignore_global;
".gitconfig.local".source = ./files/git/config.work; ".gitconfig.local".source = ../files/git/config.work;
".config/nvim".source = ./files/nvim; ".config/nvim".source = ../files/nvim;
}; };
shellAliases = { shellAliases = {
@ -89,7 +87,7 @@
# Secrets # Secrets
sops = { sops = {
age.keyFile = "${config.home.homeDirectory}/.config/sops/age/keys.txt"; age.keyFile = "${config.home.homeDirectory}/.config/sops/age/keys.txt";
defaultSopsFile = ./secrets/ssh.yaml; defaultSopsFile = ../secrets/ssh.yaml;
secrets.config = { secrets.config = {
mode = "0600"; mode = "0600";
path = "${config.home.homeDirectory}/.ssh/config"; path = "${config.home.homeDirectory}/.ssh/config";

1
home/shared.nix → home/pkgs.nix
View File

@ -11,6 +11,7 @@ with pkgs;
gnutar gnutar
gnupg gnupg
htop htop
btop
rclone rclone
rename rename
tmux tmux

9
home/sflx.nix
View File

@ -1,9 +0,0 @@
{ pkgs }:
with pkgs;
[
vault
cocoapods
phrase-cli
boundary
awscli2
]

8
hosts/mac16.nix
View File

@ -9,5 +9,13 @@
"datagrip" "datagrip"
"tailscale" "tailscale"
]; ];
pkgs =
pkgs: with pkgs; [
vault
cocoapods
phrase-cli
boundary
awscli2
];
}; };
} }