Compare commits

..

2 commits

Author SHA1 Message Date
d0ee7b139c make sure zsh editor config can be materialised on mac
Some checks failed
use nix / build (push) Has been cancelled
2024-10-02 15:42:46 +01:00
6c9a7b9a0a add helix on work mac 2024-10-02 15:32:22 +01:00
4 changed files with 19 additions and 4 deletions

View file

@ -1,2 +1,3 @@
https://discourse.nixos.org/t/ssl-ca-cert-error-on-macos/31171/6 https://discourse.nixos.org/t/ssl-ca-cert-error-on-macos/31171/6
`nix run nix-darwin -- switch --flake '.#cushy'`

View file

@ -21,6 +21,12 @@ in {
inherit config; inherit config;
cyplo.username = username; cyplo.username = username;
}) })
(import ../../helix {
inherit pkgs;
inherit lib;
inherit config;
cyplo.username = username;
})
]; ];
services.nix-daemon.enable = true; services.nix-daemon.enable = true;

View file

@ -2,8 +2,16 @@
config, config,
pkgs, pkgs,
lib, lib,
cyplo,
... ...
}: { }:
let
username =
if cyplo ? username
then "${cyplo.username}"
else "cyryl";
in
{
nix.settings = { nix.settings = {
trusted-substituters = [ trusted-substituters = [
"https://helix.cachix.org" "https://helix.cachix.org"
@ -12,5 +20,5 @@
"helix.cachix.org-1:ejp9KQpR1FBI2onstMQ34yogDm4OgU2ru6lIwPvuCVs=" "helix.cachix.org-1:ejp9KQpR1FBI2onstMQ34yogDm4OgU2ru6lIwPvuCVs="
]; ];
}; };
home-manager.users.cyryl = {...}: {imports = [./home.nix];}; home-manager.users."${username}" = {...}: {imports = [./home.nix];};
} }

View file

@ -14,8 +14,8 @@ in {
VISUAL = lib.mkForce helix; VISUAL = lib.mkForce helix;
}; };
programs.zsh.sessionVariables = { programs.zsh.sessionVariables = {
EDITOR = lib.mkForce helix; EDITOR = helix;
VISUAL = lib.mkForce helix; VISUAL = helix;
}; };
systemd.user.sessionVariables = { systemd.user.sessionVariables = {
EDITOR = lib.mkForce helix; EDITOR = lib.mkForce helix;