diff options
| author | Mike Vink <mike@pionative.com> | 2024-04-05 12:01:07 +0200 |
|---|---|---|
| committer | Mike Vink <mike@pionative.com> | 2024-04-05 12:01:07 +0200 |
| commit | d05d3476c1dbda8103b323b590252a974a714c9d (patch) | |
| tree | 37c65c38e349a6538af4a379c64911e9e6a62757 /profiles | |
| parent | 1655468b949829a7bf6fe1a79a60a636e407c5ca (diff) | |
update macos env
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/core/configuration.nix | 2 | ||||
| -rw-r--r-- | profiles/core/home.nix | 11 | ||||
| -rw-r--r-- | profiles/core/neovim.nix | 3 | ||||
| -rw-r--r-- | profiles/station/packages.nix | 1 |
4 files changed, 9 insertions, 8 deletions
diff --git a/profiles/core/configuration.nix b/profiles/core/configuration.nix index 3a605b1..51e2f91 100644 --- a/profiles/core/configuration.nix +++ b/profiles/core/configuration.nix @@ -81,6 +81,6 @@ nix.package = pkgs.nixUnstable; nix.extraOptions = '' - experimental-features = nix-command flakes + experimental-features = nix-command flakes configurable-impure-env ''; } diff --git a/profiles/core/home.nix b/profiles/core/home.nix index eb0bcac..c003fc0 100644 --- a/profiles/core/home.nix +++ b/profiles/core/home.nix @@ -40,11 +40,8 @@ ''; in { enable = true; - } // (if machine.isDarwin then { - tmuxConfig = cfg; - } else { extraConfig = cfg; - }); + }; hm = { fonts.fontconfig.enable = true; @@ -123,6 +120,9 @@ zsh = { enable = true; completionInit = '' + if type brew &>/dev/null; then + FPATH="$(brew --prefix)/share/zsh/site-functions:''${FPATH}" + fi autoload -U compinit select-word-style select-word-style select-word-style bash zstyle ':completion:*' menu select @@ -274,7 +274,8 @@ enableSshSupport = false; defaultCacheTtl = 34550000; maxCacheTtl = 34550000; - pinentryFlavor = "gtk2"; + # pinentryFlavor = "gtk2"; + pinentryPackage = pkgs.pinentry-gtk2; }; }; } diff --git a/profiles/core/neovim.nix b/profiles/core/neovim.nix index e1da7cc..86d4a78 100644 --- a/profiles/core/neovim.nix +++ b/profiles/core/neovim.nix @@ -42,7 +42,6 @@ alejandra statix fzf - bat nil shellcheck vale @@ -56,6 +55,7 @@ lsp_lines-nvim gitsigns-nvim vim-helm + lualine-nvim # external oil-nvim @@ -73,6 +73,7 @@ lsp_signature-nvim nvim-dap nvim-dap-ui + nvim-nio nvim-dap-python luasnip vim-test diff --git a/profiles/station/packages.nix b/profiles/station/packages.nix index 587d25e..4d16657 100644 --- a/profiles/station/packages.nix +++ b/profiles/station/packages.nix @@ -15,7 +15,6 @@ k9s krew azure-cli - github-cli argocd (google-cloud-sdk.withExtraComponents (with google-cloud-sdk.components; [ gke-gcloud-auth-plugin |