diff --git a/flake.nix b/flake.nix index 7553e3b..6db88cc 100644 --- a/flake.nix +++ b/flake.nix @@ -38,7 +38,7 @@ home-manager.url = "github:nix-community/home-manager/release-24.05"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; - neovim-flake.url = "github:notashelf/neovim-flake/v0.5"; + neovim-flake.url = "github:NotAShelf/nvf/v0.6"; neovim-flake.inputs.nixpkgs.follows = "nixpkgs"; disko.url = "github:nix-community/disko"; diff --git a/homes/aarch64-darwin/harald@m4/default.nix b/homes/aarch64-darwin/harald@m4/default.nix index 467fabd..c6a3652 100644 --- a/homes/aarch64-darwin/harald@m4/default.nix +++ b/homes/aarch64-darwin/harald@m4/default.nix @@ -11,6 +11,13 @@ stateVersion = "23.11"; # Please read the comment before changing. }; + + programs.ssh.extraConfig = '' + UseKeychain yes + AddKeysToAgent yes + IdentityFile ~/.ssh/id_ed25519 + ''; + metacfg = { cli-apps = { bash.enable = true; diff --git a/modules/darwin/system/interface/default.nix b/modules/darwin/system/interface/default.nix index 717f37b..ae0c5a4 100644 --- a/modules/darwin/system/interface/default.nix +++ b/modules/darwin/system/interface/default.nix @@ -47,7 +47,7 @@ in }; NSGlobalDomain = { - _HIHideMenuBar = true; + _HIHideMenuBar = false; AppleShowScrollBars = "Always"; }; }; diff --git a/modules/darwin/user/default.nix b/modules/darwin/user/default.nix index 8de684c..2dcf664 100644 --- a/modules/darwin/user/default.nix +++ b/modules/darwin/user/default.nix @@ -21,6 +21,12 @@ in email = mkOpt types.str "harald@hoyer.xyz" "The email of the user."; uid = mkOpt (types.nullOr types.int) 501 "The uid for the user account."; + sshKeys = mkOpt (types.listOf types.str) [ + "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIDsb/Tr69YN5MQLweWPuJaRGm+h2kOyxfD6sqKEDTIwoAAAABHNzaDo= harald@fedora.fritz.box" + "sk-ecdsa-sha2-nistp256@openssh.com AAAAInNrLWVjZHNhLXNoYTItbmlzdHAyNTZAb3BlbnNzaC5jb20AAAAIbmlzdHAyNTYAAABBBACLgT81iB1iWWVuXq6PdQ5GAAGhaZhSKnveQCvcNnAOZ5WKH80bZShKHyAYzrzbp8IGwLWJcZQ7TqRK+qZdfagAAAAEc3NoOg== harald@hoyer.xyz" + "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBAYbUTKpy4QR3s944/hjJ1UK05asFEs/SmWeUbtS0cdA660sT4xHnRfals73FicOoz+uIucJCwn/SCM804j+wtM=" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMNsmP15vH8BVKo7bdvIiiEjiQboPGcRPqJK0+bH4jKD harald@lenovo.fritz.box" + ] "ssh keys"; }; config = { @@ -29,6 +35,7 @@ in # module to evaluate successfully since it reads # `users.users.${metacfg.user.name}.uid`. uid = mkIf (cfg.uid != null) cfg.uid; + openssh.authorizedKeys.keys = cfg.sshKeys; }; snowfallorg.users.${config.metacfg.user.name}.home.config = {