diff --git a/config/darwin.nix b/config/darwin.nix index 2db1f37..42eee5c 100644 --- a/config/darwin.nix +++ b/config/darwin.nix @@ -21,10 +21,10 @@ "scroll-reverser" "google-chrome" "instantview" - "nextcloud" "tailscale" "discord" "iterm2" + "zoom" "vlc" ]; }; @@ -33,6 +33,9 @@ services.nix-daemon.enable = true; nix.package = pkgs.nix; + # Enable rosetta + virtualisation.rosetta.enable = true; + # Keyboard and Mouse system.keyboard = { enableKeyMapping = true; diff --git a/home/darwin.nix b/home/darwin.nix index f2c783b..276f26a 100644 --- a/home/darwin.nix +++ b/home/darwin.nix @@ -1,10 +1,18 @@ -{ ... }: -{ +{ pkgs, lib, config, ... }: +let + mypkgs = import ../packages/all-packages.nix { + inherit pkgs lib config; + }; +in { home = { username = "jadenmaxwell"; homeDirectory = "/Users/jadenmaxwell"; }; + home.packages = with mypkgs; [ + bitwarden-cli-bin + ]; + imports = [ ./shared.nix ./neovim.nix diff --git a/packages/all-packages.nix b/packages/all-packages.nix index 7c11d72..cbe0104 100644 --- a/packages/all-packages.nix +++ b/packages/all-packages.nix @@ -1,4 +1,5 @@ { pkgs, lib, config, ... }: rec { tpm = pkgs.callPackage ./tpm {}; evil-winrm = pkgs.callPackage ./evil-winrm {}; + bitwarden-cli-bin = pkgs.callPackage ./bitwarden-cli-bin {}; } diff --git a/packages/bitwarden-cli-bin/default.nix b/packages/bitwarden-cli-bin/default.nix new file mode 100644 index 0000000..5a23616 --- /dev/null +++ b/packages/bitwarden-cli-bin/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchzip }: stdenv.mkDerivation rec { + + pname = "bitwarden-cli-bin"; + version = "2024.8.2"; + + src = fetchzip { + url = "https://github.com/bitwarden/clients/releases/download/cli-v${version}/bw-macos-${version}.zip"; + hash = "sha256-obJVIJ2n5lEXsjn7RQ+lIraHnBcn4vsU6LaAV4NPBSU="; + }; + + doCheck = true; + dontStrip = true; + + installPhase = '' + mkdir -p $out/bin + cp -rv $src/bw $out/bin/bw + ''; + + meta = with lib; { + description = "Secure and free password manager for all of your devices"; + homepage = "https://bitwarden.com"; + license = lib.licenses.gpl3Only; + mainProgram = "bw"; + platforms = platforms.darwin; + }; +}