Fix up for hermes
This commit is contained in:
parent
abd055702b
commit
4a2dfb8e6e
5 changed files with 58 additions and 14 deletions
|
|
@ -1,5 +1,23 @@
|
|||
{ ... }:
|
||||
|
||||
{
|
||||
|
||||
}
|
||||
homebrew = {
|
||||
enable = true;
|
||||
|
||||
casks = [
|
||||
"1password"
|
||||
"1password-cli"
|
||||
"adguard"
|
||||
];
|
||||
};
|
||||
|
||||
programs.zsh = {
|
||||
enable = true;
|
||||
enableGlobalCompInit = false;
|
||||
shellInit = ''
|
||||
if [ -e "/opt/homebrew/bin/brew" ]; then
|
||||
eval "$(/opt/homebrew/bin/brew shellenv)"
|
||||
fi
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,6 +6,8 @@
|
|||
...
|
||||
}:
|
||||
let
|
||||
inherit (lib) mkDefault;
|
||||
|
||||
bootUUID = config.machine.fs.bootUUID;
|
||||
efiUUID = config.machine.fs.efiUUID;
|
||||
luuksUUID = config.machine.fs.luuksUUID;
|
||||
|
|
@ -39,6 +41,11 @@ in
|
|||
xbootldrMountPoint = "/boot";
|
||||
};
|
||||
|
||||
environment.sessionVariables = {
|
||||
EDITOR = "${pkgs.vim}/bin/vim";
|
||||
PAGER = "${pkgs.less}/bin/less";
|
||||
};
|
||||
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/${bootUUID}";
|
||||
fsType = "ext4";
|
||||
|
|
@ -53,11 +60,6 @@ in
|
|||
];
|
||||
};
|
||||
|
||||
environment.sessionVariables = {
|
||||
EDITOR = "${pkgs.vim}/bin/vim";
|
||||
PAGER = "${pkgs.less}/bin/less";
|
||||
};
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/${cryptrootUUID}";
|
||||
fsType = "btrfs";
|
||||
|
|
@ -112,6 +114,8 @@ in
|
|||
options = [ "subvol=@var_lib_portables" ];
|
||||
};
|
||||
|
||||
networking.useDHCP = mkDefault true;
|
||||
|
||||
services.avahi.enable = true;
|
||||
services.openssh.enable = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -8,6 +8,8 @@ let
|
|||
inherit (lib) mkDefault;
|
||||
in
|
||||
{
|
||||
environment.pathsToLink = [ "/share/zsh" ];
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
curl
|
||||
git
|
||||
|
|
@ -15,10 +17,7 @@ in
|
|||
wget
|
||||
];
|
||||
|
||||
networking = {
|
||||
hostName = "${config.machine.hostName}";
|
||||
useDHCP = mkDefault true;
|
||||
};
|
||||
networking.hostName = "${config.machine.hostName}";
|
||||
|
||||
nix.package = pkgs.lixPackageSets.stable.lix;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue