use zsh on work mac
Some checks failed
use nix / build (push) Failing after 4m4s

This commit is contained in:
Cyryl Płotnicki 2024-10-02 14:38:34 +01:00
parent 530f4023fc
commit aa507c0814
4 changed files with 32 additions and 15 deletions

View file

@ -179,7 +179,7 @@
useGlobalPkgs = true;
useUserPackages = true;
users."Cyryl.Plotnicki" = {
home.username = "Cyryl.Plotnicki";
home.username = "Cyryl.Plotnicki";
home.homeDirectory = "/Users/Cyryl.Plotnicki";
programs.zsh.loginExtra = ''
eval "$(/opt/homebrew/bin/brew shellenv)"

View file

@ -5,9 +5,22 @@
lib,
nixpkgs-nixos-unstable-and-unfree,
...
}: {
}: let
username = "Cyryl.Plotnicki";
in {
imports = [
(import ../../git { inherit pkgs; inherit lib; inherit config; cyplo.username = "Cyryl.Plotnicki"; })
(import ../../zsh {
inherit pkgs;
inherit lib;
inherit config;
cyplo.username = username;
})
(import ../../git {
inherit pkgs;
inherit lib;
inherit config;
cyplo.username = username;
})
];
services.nix-daemon.enable = true;
@ -33,8 +46,6 @@
})
];
homebrew.enable = true;
homebrew.casks = [
"caffeine"
@ -61,10 +72,10 @@
];
programs.kitty.settings.hide_window_decorations = lib.mkForce false;
home.sessionPath = ["$HOME/bin"];
home.sessionPath = ["$HOME/bin" "/Users/Cyryl.Plotnicki/Library/Application Support/JetBrains/Toolbox/scripts"];
home.packages = with pkgs; [];
programs = {
git.userEmail = "cyryl.plotnicki@cushon.co.uk";
git.userEmail = "cyryl.plotnicki@cushon.co.uk";
};
};
}

View file

@ -4,11 +4,11 @@
lib,
cyplo,
...
}:
let
username = if cyplo ? username then "${cyplo.username}" else "cyryl";
in
{
}: let
username =
if cyplo ? username
then "${cyplo.username}"
else "cyryl";
in {
home-manager.users."${username}" = {...}: {imports = [./home.nix];};
}

View file

@ -2,8 +2,14 @@
config,
pkgs,
lib,
cyplo,
...
}: {
}: let
username =
if cyplo ? username
then "${cyplo.username}"
else "cyryl";
in {
programs.zsh.enable = true;
home-manager.users.cyryl = {...}: {imports = [./home.nix];};
home-manager.users."${username}" = {...}: {imports = [./home.nix];};
}