mirror of
https://github.com/willemml/dotfiles.nix.git
synced 2025-04-13 19:57:19 +00:00
install nix darwin
This commit is contained in:
parent
658a9412af
commit
7c43c1c753
4 changed files with 32 additions and 35 deletions
50
flake.nix
50
flake.nix
|
@ -10,7 +10,7 @@
|
||||||
nur.url = "github:nix-community/NUR";
|
nur.url = "github:nix-community/NUR";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = inputs@{ nixpkgs, home-manager, darwin, nur, ... }:
|
outputs = inputs@{ self, nixpkgs, home-manager, darwin, nur, ... }:
|
||||||
let
|
let
|
||||||
system = "aarch64-darwin";
|
system = "aarch64-darwin";
|
||||||
|
|
||||||
|
@ -31,32 +31,30 @@
|
||||||
nurpkgs = pkgs;
|
nurpkgs = pkgs;
|
||||||
pkgs = throw "nixpkgs eval";
|
pkgs = throw "nixpkgs eval";
|
||||||
};
|
};
|
||||||
in {
|
|
||||||
homeConfigurations.willem = home-manager.lib.homeManagerConfiguration {
|
|
||||||
inherit pkgs;
|
|
||||||
|
|
||||||
# Specify your home configuration modules here, for example,
|
home-manager-config = {
|
||||||
# the path to your home.nix.
|
home-manager.useGlobalPkgs = true;
|
||||||
modules = [ nur.hmModules.nur ./home ];
|
home-manager.useUserPackages = true;
|
||||||
|
home-manager.extraSpecialArgs = { inherit nurNoPkgs pkgs; inputs = { inherit (inputs); }; };
|
||||||
# Optionally use extraSpecialArgs
|
home-manager.sharedModules = [ nur.hmModules.nur ];
|
||||||
# to pass through arguments to home.nix
|
home-manager.users.willem = ./home;
|
||||||
extraSpecialArgs = { inherit nurNoPkgs; inputs = { inherit (inputs); }; };
|
users.users.willem = {
|
||||||
|
home = "/Users/willem";
|
||||||
|
isHidden = false;
|
||||||
|
name = "willem";
|
||||||
|
shell = pkgs.zshInteractive;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
in {
|
||||||
|
darwinConfigurations = {
|
||||||
|
zeus = darwin.lib.darwinSystem {
|
||||||
|
inherit system;
|
||||||
|
modules = [
|
||||||
|
./system/darwin.nix
|
||||||
|
home-manager.darwinModules.home-manager
|
||||||
|
home-manager-config
|
||||||
|
];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
# darwinConfigurations = {
|
|
||||||
# hostname = darwin.lib.darwinSystem {
|
|
||||||
# inherit system (inputs);
|
|
||||||
# modules = [
|
|
||||||
# ./system
|
|
||||||
# home-manager.darwinModules.home-manager {
|
|
||||||
# home-manager.useGlobalPkgs = true;
|
|
||||||
# home-manager.useUserPackages = true;
|
|
||||||
# home-manager.users.willem = import ./home;
|
|
||||||
|
|
||||||
# extraSpecialArgs = { inherit (inputs) nurNoPkgs; };
|
|
||||||
# }
|
|
||||||
# ];
|
|
||||||
# };
|
|
||||||
# };
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,8 +1,6 @@
|
||||||
{ config, pkgs, lib, inputs, ... }:
|
{ config, pkgs, lib, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
inherit (pkgs) stdenv;
|
|
||||||
inherit (lib) mkIf;
|
|
||||||
emacsCommand = "emacsclient -c -nw";
|
emacsCommand = "emacsclient -c -nw";
|
||||||
in rec {
|
in rec {
|
||||||
home = {
|
home = {
|
||||||
|
@ -24,7 +22,6 @@ in rec {
|
||||||
}
|
}
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
homeDirectory = "/Users/willem";
|
|
||||||
keyboard = {
|
keyboard = {
|
||||||
layout = "us";
|
layout = "us";
|
||||||
variant = "colemak";
|
variant = "colemak";
|
||||||
|
@ -37,7 +34,7 @@ in rec {
|
||||||
sessionVariables = rec {
|
sessionVariables = rec {
|
||||||
EDITOR = emacsCommand;
|
EDITOR = emacsCommand;
|
||||||
VISUAL = emacsCommand;
|
VISUAL = emacsCommand;
|
||||||
ORGDIR = "${home.homeDirectory}/Documents/org";
|
ORGDIR = "~/Documents/org";
|
||||||
UBCDIR = "${ORGDIR}/ubc";
|
UBCDIR = "${ORGDIR}/ubc";
|
||||||
};
|
};
|
||||||
stateVersion = "22.11";
|
stateVersion = "22.11";
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ lib, config, pkgs, ... }:
|
{ lib, config, inputs, pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
programs = {
|
programs = {
|
||||||
|
@ -183,7 +183,7 @@
|
||||||
e = "emacsclient -c -nw";
|
e = "emacsclient -c -nw";
|
||||||
em = "emacs -nw";
|
em = "emacs -nw";
|
||||||
ew = "emacsclient -c";
|
ew = "emacsclient -c";
|
||||||
hms = "home-manager switch --flake ${config.home.homeDirectory}/.config/dotfiles.nix#willem";
|
drs = "darwin-rebuild switch --flake ${config.home.homeDirectory}/.config/dotfiles.nix#";
|
||||||
l = "ls -1";
|
l = "ls -1";
|
||||||
np = "nix-shell -p";
|
np = "nix-shell -p";
|
||||||
org = "z ${config.home.sessionVariables.ORGDIR}";
|
org = "z ${config.home.sessionVariables.ORGDIR}";
|
||||||
|
|
|
@ -1,7 +1,9 @@
|
||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
{
|
|
||||||
environment.systemPackages = [ ];
|
|
||||||
|
|
||||||
|
{
|
||||||
services.nix-daemon.enable = true;
|
services.nix-daemon.enable = true;
|
||||||
|
|
||||||
nix.package = pkgs.nix;
|
nix.package = pkgs.nix;
|
||||||
|
|
||||||
|
programs.zsh.enable = true;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue