Update configuration for the Darwin host
chromium package is not available on Darwin platforms, so use HomeBrew there instead. Also tweak puppeteer's configuration variables.
This commit is contained in:
parent
3b65e08934
commit
8716fa17d3
GPG Key ID:
B0567C20730E9B11
66
flake.lock
66
flake.lock
|
|
@ -48,11 +48,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1711588700,
|
||||
"narHash": "sha256-vBB5HoQVnA6c/UrDOhLXKAahEwSRccw2YXYHxD7qoi4=",
|
||||
"lastModified": 1712325259,
|
||||
"narHash": "sha256-9PipXYv1Ek1oi0WrGZYtlvnjoYS20QdSLLpJ+nHEbjE=",
|
||||
"owner": "nix-community",
|
||||
"repo": "disko",
|
||||
"rev": "502241afa3de2a24865ddcbe4c122f4546e32092",
|
||||
"rev": "fbbac1aee6eae60c32b47e95447c4a3ec59d9773",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -84,11 +84,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1709336216,
|
||||
"narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=",
|
||||
"lastModified": 1712014858,
|
||||
"narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2",
|
||||
"rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -144,11 +144,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1711625603,
|
||||
"narHash": "sha256-W+9dfqA9bqUIBV5u7jaIARAzMe3kTq/Hp2SpSVXKRQw=",
|
||||
"lastModified": 1712317700,
|
||||
"narHash": "sha256-rnkQ6qMhlxfjpCECkTMlFXHU/88QvC5KpdJWq5H6F1E=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "c0ef0dab55611c676ad7539bf4e41b3ec6fa87d2",
|
||||
"rev": "782eed8bb64b27acaeb7c17be4a095c85e65717f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -191,11 +191,11 @@
|
|||
"rust-overlay": "rust-overlay"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1711442573,
|
||||
"narHash": "sha256-/A3YzcY5erYOPojp5Ffwgxv4X5MTnRiWwuaXfgXbK2g=",
|
||||
"lastModified": 1712261512,
|
||||
"narHash": "sha256-qsBZ3tJj/3LR8jNYyCKjyCe0ePj4cMynSWBMC1OEDtc=",
|
||||
"owner": "nix-community",
|
||||
"repo": "lanzaboote",
|
||||
"rev": "df7ac26bd24fac8baa94d60a02c3e0f0d4d16368",
|
||||
"rev": "999c0cb03f748fe311bca78961dbf0562dc91659",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -211,11 +211,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1711249705,
|
||||
"narHash": "sha256-h/NQECj6mIzF4XR6AQoSpkCnwqAM+ol4+qOdYi2ykmQ=",
|
||||
"lastModified": 1711854532,
|
||||
"narHash": "sha256-JPStavwlT7TfxxiXHk6Q7sbNxtnXAIjXQJMLO0KB6M0=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-index-database",
|
||||
"rev": "34519f3bb678a5abbddf7b200ac5347263ee781b",
|
||||
"rev": "2844b5f3ad3b478468151bd101370b9d8ef8a3a7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -226,11 +226,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1711703276,
|
||||
"narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=",
|
||||
"lastModified": 1712163089,
|
||||
"narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "d8fe5e6c92d0d190646fb9f1056741a229980089",
|
||||
"rev": "fd281bd6b7d3e32ddfa399853946f782553163b5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -258,11 +258,11 @@
|
|||
},
|
||||
"nixpkgs-stable_2": {
|
||||
"locked": {
|
||||
"lastModified": 1711233294,
|
||||
"narHash": "sha256-eEu5y4J145BYDw9o/YEmeJyqh8blgnZwuz9k234zuWc=",
|
||||
"lastModified": 1711819797,
|
||||
"narHash": "sha256-tNeB6emxj74Y6ctwmsjtMlzUMn458sBmwnD35U5KIM4=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "ac6bdf6181666ebb4f90dd20f31e2fa66ede6b68",
|
||||
"rev": "2b4e3ca0091049c6fbb4908c66b05b77eaef9f0c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -282,11 +282,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1711799416,
|
||||
"narHash": "sha256-BM3aduxJjvSL0jTYG1ixWDhBvIWuouycvprKQYP0FnM=",
|
||||
"lastModified": 1712081763,
|
||||
"narHash": "sha256-+xImkX19gde0Qac6kbJtJAXKXTOgcUE5z3RsBxVtseo=",
|
||||
"owner": "pjones",
|
||||
"repo": "plasma-manager",
|
||||
"rev": "25b222a95a764bb76b7082746e8a1115c46ae2d8",
|
||||
"rev": "96a90a7f5ce6b29e01d7da83d082e870e4462174",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -377,11 +377,11 @@
|
|||
"nixpkgs-stable": "nixpkgs-stable_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1711249319,
|
||||
"narHash": "sha256-N+Pp3/8H+rd7cO71VNV/ovV/Kwt+XNeUHNhsmyTabdM=",
|
||||
"lastModified": 1711855048,
|
||||
"narHash": "sha256-HxegAPnQJSC4cbEbF4Iq3YTlFHZKLiNTk8147EbLdGg=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "405987a66cce9a4a82f321f11b205982a7127c88",
|
||||
"rev": "99b1e37f9fc0960d064a7862eb7adfb92e64fa10",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -412,11 +412,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1711803027,
|
||||
"narHash": "sha256-Qic3OvsVLpetchzaIe2hJqgliWXACq2Oee6mBXa/IZQ=",
|
||||
"lastModified": 1711963903,
|
||||
"narHash": "sha256-N3QDhoaX+paWXHbEXZapqd1r95mdshxToGowtjtYkGI=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "1810d51a015c1730f2fe05a255258649799df416",
|
||||
"rev": "49dc4a92b02b8e68798abd99184f228243b6e3ac",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -438,11 +438,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1711761168,
|
||||
"narHash": "sha256-w7GgKhBcrg1B72Ymb24rDeAoHsNwZdF8OghR4VxGYHk=",
|
||||
"lastModified": 1712193503,
|
||||
"narHash": "sha256-fFaZQKHzro+BJQpVJAVLDCYjdC7jRMWcAAAbvzSLy9s=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-vscode-extensions",
|
||||
"rev": "5fae7231f16bd5467660c50e7d6a3732559443a0",
|
||||
"rev": "5c608e844bd36dcf16d3ec3f31ef136d745890a7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@ in
|
|||
APPTAINER_CACHEDIR = "${xdg.cacheHome}/apptainer";
|
||||
LINUXKIT_CACHE = "${xdg.cacheHome}/linuxkit";
|
||||
MAGEFILE_CACHE = "${xdg.cacheHome}/magefile";
|
||||
PUPPETEER_CACHE_DIR = "${xdg.cacheHome}/puppeteer";
|
||||
TF_PLUGIN_CACHE_DIR = "${xdg.cacheHome}/terraform/plugin-cache";
|
||||
|
||||
DOCKER_CONFIG = "${xdg.configHome}/docker";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# TODO: set commandLineArgs (for Wayland and MacOS separately)
|
||||
{ pkgs, ... }: {
|
||||
{ lib, pkgs, ... }: lib.mkIf pkgs.stdenv.isLinux {
|
||||
programs.chromium = {
|
||||
package = pkgs.ungoogled-chromium;
|
||||
dictionaries = [ pkgs.hunspellDictsChromium.en_US ];
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# NOTE: fish, zsh and bash inherit home.{shellAliases,sessionVariables} options properly.
|
||||
# nushell and ion don't.
|
||||
{ config, pkgs, ... }:
|
||||
{ osConfig, config, pkgs, ... }:
|
||||
let
|
||||
inherit (config) home xdg;
|
||||
in
|
||||
|
|
@ -62,8 +62,11 @@ in
|
|||
# mage
|
||||
MAGEFILE_ENABLE_COLOR = "true";
|
||||
# skip chromium/electron download
|
||||
PUPPETEER_EXECUTABLE_PATH = "${config.programs.chromium.package}/bin/chromium-browser";
|
||||
PUPPETEER_SKIP_CHROMIUM_DOWNLOAD = "true";
|
||||
PUPPETEER_EXECUTABLE_PATH =
|
||||
if pkgs.stdenv.isDarwin
|
||||
then "${osConfig.homebrew.brewPrefix}/chromium"
|
||||
else "${config.programs.chromium.package}/bin/chromium-browser";
|
||||
PUPPETEER_SKIP_DOWNLOAD = "true";
|
||||
ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -24,19 +24,11 @@ in
|
|||
(nerdfonts.override { fonts = [ "IosevkaTerm" ]; })
|
||||
];
|
||||
|
||||
homebrew = {
|
||||
casks = [
|
||||
"aws-vpn-client"
|
||||
"displaylink"
|
||||
"keepassxc" # the brew formulae comes with keepassxc-cli, while the package from nixpkgs only has .app file
|
||||
"maccy"
|
||||
"openlens"
|
||||
];
|
||||
|
||||
brews = [
|
||||
"pulumi" # pulumi packages in NixOS repository are pretty outdated (and no pulumi-language-yaml)
|
||||
];
|
||||
};
|
||||
homebrew.casks = [
|
||||
"aws-vpn-client"
|
||||
"displaylink"
|
||||
"openlens"
|
||||
];
|
||||
|
||||
# NOTE: re-apply this configuration whenever MacOS does a system upgrade
|
||||
security.pam.enableSudoTouchIdAuth = true;
|
||||
|
|
@ -77,17 +69,22 @@ in
|
|||
hoppscotch
|
||||
(hunspellWithDicts (with hunspellDicts; [ en_US-large ]))
|
||||
iterm2
|
||||
keepassxc
|
||||
kubectl
|
||||
kubectx
|
||||
kubernetes-helm
|
||||
lima
|
||||
luajit_openresty
|
||||
maccy
|
||||
minikube
|
||||
packer
|
||||
nodejs-slim
|
||||
(packer.overrideAttrs { doCheck = false; })
|
||||
pulumi-bin
|
||||
qemu_kvm
|
||||
s5cmd
|
||||
shellcheck
|
||||
sops
|
||||
(ssm-session-manager-plugin.overrideAttrs { doCheck = false; })
|
||||
ssm-session-manager-plugin
|
||||
stern
|
||||
(terraform.overrideAttrs { doCheck = false; })
|
||||
(vault.overrideAttrs { doCheck = false; })
|
||||
|
|
|
|||
|
|
@ -22,8 +22,10 @@
|
|||
enable = true;
|
||||
defaultEditor = true;
|
||||
};
|
||||
opam.enable = true;
|
||||
pnpm.enable = true;
|
||||
ripgrep.enable = true;
|
||||
translate-shell.enable = true;
|
||||
starship.enable = true;
|
||||
vivid.enable = true;
|
||||
vscode = {
|
||||
|
|
@ -36,6 +38,8 @@
|
|||
open-vsx.brody715.vscode-cuelang
|
||||
open-vsx.coenraads.bracket-pair-colorizer-2
|
||||
open-vsx.editorconfig.editorconfig
|
||||
open-vsx.mhutchie.git-graph
|
||||
open-vsx.vscode-org-mode.org-mode
|
||||
open-vsx.golang.go
|
||||
open-vsx.grafana.vscode-jsonnet
|
||||
open-vsx.hashicorp.terraform
|
||||
|
|
@ -43,6 +47,8 @@
|
|||
open-vsx.mads-hartmann.bash-ide-vscode
|
||||
open-vsx.ms-kubernetes-tools.vscode-kubernetes-tools
|
||||
open-vsx.pkief.material-icon-theme
|
||||
open-vsx.eamodio.gitlens
|
||||
open-vsx.redhat.vscode-yaml # Kubernetes extension depends on this
|
||||
# open-vsx.tabbyml.vscode-tabby
|
||||
vscode-marketplace.tsandall.opa
|
||||
open-vsx.vscodevim.vim
|
||||
|
|
|
|||
Loading…
Reference in New Issue