make sure zsh is the default shell

This commit is contained in:
Cyryl Płotnicki 2025-01-04 16:28:12 +00:00
parent 43966336a5
commit 0e16b9d224
4 changed files with 60 additions and 5 deletions

44
flake.lock generated
View file

@ -59,6 +59,27 @@
"type": "github"
}
},
"darwin-master": {
"inputs": {
"nixpkgs": [
"nixpkgs-master"
]
},
"locked": {
"lastModified": 1736002328,
"narHash": "sha256-anoVvML2D+nLfHlBfhEcCMjTou/9SRrrlqQN+Ug39ws=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "a464e5ba8cfb10a81599dbd422f30f5d37997916",
"type": "github"
},
"original": {
"owner": "lnl7",
"ref": "master",
"repo": "nix-darwin",
"type": "github"
}
},
"disko": {
"inputs": {
"nixpkgs": [
@ -251,6 +272,27 @@
"type": "github"
}
},
"home-manager-master": {
"inputs": {
"nixpkgs": [
"nixpkgs-master"
]
},
"locked": {
"lastModified": 1735979091,
"narHash": "sha256-WpFjt6+8UD81EP386c269ZTqpEmlGJgcPw+OB4b7EBs=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "11ab08541e61ac3bbf2ab27229f68622629401df",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "master",
"repo": "home-manager",
"type": "github"
}
},
"lix": {
"flake": false,
"locked": {
@ -471,12 +513,14 @@
"inputs": {
"alejandra": "alejandra",
"darwin": "darwin",
"darwin-master": "darwin-master",
"disko": "disko",
"endless-sky": "endless-sky",
"flake-compat": "flake-compat",
"flake-utils": "flake-utils",
"helix": "helix",
"home-manager": "home-manager",
"home-manager-master": "home-manager-master",
"lix-module": "lix-module",
"nil": "nil",
"nix-ld": "nix-ld",

View file

@ -3,12 +3,14 @@
outputs = {
alejandra,
darwin,
darwin-master,
disko,
endless-sky,
flake-compat,
flake-utils,
helix,
home-manager,
home-manager-master,
lix-module,
nil,
nix-ld,
@ -196,13 +198,13 @@
}
];
};
"airy" = darwin.lib.darwinSystem rec {
"airy" = darwin-master.lib.darwinSystem rec {
system = "aarch64-darwin";
modules = [
(import ./nixos/options.nix)
(./. + "/nixos/boxes/airy")
{users.users.cyryl.home = "/Users/cyryl";}
home-manager.darwinModules.home-manager
home-manager-master.darwinModules.home-manager
{
home-manager = {
useGlobalPkgs = true;
@ -377,6 +379,10 @@
url = "github:lnl7/nix-darwin/master";
inputs.nixpkgs.follows = "nixpkgs-stable";
};
darwin-master = {
url = "github:lnl7/nix-darwin/master";
inputs.nixpkgs.follows = "nixpkgs-master";
};
home-manager = {
type = "github";
owner = "nix-community";
@ -384,6 +390,13 @@
ref = "release-24.11";
inputs.nixpkgs.follows = "nixpkgs-stable";
};
home-manager-master = {
type = "github";
owner = "nix-community";
repo = "home-manager";
ref = "master";
inputs.nixpkgs.follows = "nixpkgs-master";
};
flake-utils = {
type = "github";
owner = "numtide";

View file

@ -17,11 +17,8 @@
nix.settings.experimental-features = "nix-command flakes";
programs.zsh.enable = true; # default shell on catalina
system.stateVersion = 4;
# The platform the configuration will be used on.
nixpkgs.hostPlatform = "aarch64-darwin";
fonts.packages = with pkgs; [

View file

@ -5,5 +5,6 @@
...
}: {
programs.zsh.enable = true;
users.users."${config.local.username}".shell = pkgs.zsh;
home-manager.users."${config.local.username}" = {...}: {imports = [./home.nix];};
}