Merge branch 'master' of https://github.com/Guanran928/flake
This commit is contained in:
commit
2ef4f15dbd
4 changed files with 11 additions and 6 deletions
|
@ -43,6 +43,7 @@
|
||||||
darwinConfigurations = {
|
darwinConfigurations = {
|
||||||
"iMac-macOS" = nix-darwin.lib.darwinSystem {
|
"iMac-macOS" = nix-darwin.lib.darwinSystem {
|
||||||
system = "x86_64-darwin";
|
system = "x86_64-darwin";
|
||||||
|
specialArgs = { inherit inputs; };
|
||||||
modules = [
|
modules = [
|
||||||
./darwin
|
./darwin
|
||||||
./machines/darwin/imac-2017.nix
|
./machines/darwin/imac-2017.nix
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{ inputs, ... }:
|
{ inputs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = [ inputs.home-manager.nixosModules.home-manager ];
|
imports = [ inputs.home-manager.darwinModules.home-manager ];
|
||||||
|
|
||||||
home-manager = {
|
home-manager = {
|
||||||
useGlobalPkgs = true;
|
useGlobalPkgs = true;
|
||||||
|
|
9
users/guanranwang/home-manager/darwin/default.nix
Normal file
9
users/guanranwang/home-manager/darwin/default.nix
Normal file
|
@ -0,0 +1,9 @@
|
||||||
|
{ ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
imports = [
|
||||||
|
../common/home.nix
|
||||||
|
./home.nix
|
||||||
|
./dotfiles.nix
|
||||||
|
];
|
||||||
|
}
|
|
@ -1,11 +1,6 @@
|
||||||
{ config, pkgs, lib, ... }:
|
{ config, pkgs, lib, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = [
|
|
||||||
./dotfiles.nix
|
|
||||||
../common/home.nix
|
|
||||||
];
|
|
||||||
|
|
||||||
home = {
|
home = {
|
||||||
username = "guanranwang";
|
username = "guanranwang";
|
||||||
homeDirectory = "/Users/guanranwang";
|
homeDirectory = "/Users/guanranwang";
|
||||||
|
|
Loading…
Reference in a new issue