From fc4e077021b6acca038743c763376cef24911e6a Mon Sep 17 00:00:00 2001
From: Mike Vink <ivi@vinkies.net>
Date: Wed, 26 Jun 2024 21:38:33 +0200
Subject: update vm

---
 profiles/core/configuration.nix |  2 +-
 profiles/core/home.nix          | 11 ++++++++---
 profiles/graphical/suckless.nix |  1 +
 3 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'profiles')

diff --git a/profiles/core/configuration.nix b/profiles/core/configuration.nix
index 671b18d..87b3d97 100644
--- a/profiles/core/configuration.nix
+++ b/profiles/core/configuration.nix
@@ -32,7 +32,7 @@
         uid = mkIf (!machine.isDarwin) 1000;
         description = ivi.realName;
         openssh.authorizedKeys.keys = ivi.sshKeys;
-        extraGroups = ["wheel" "networkmanager" "docker" "transmission" "dialout"];
+        extraGroups = ["wheel" "networkmanager" "docker" "transmission" "dialout" "test"];
         isNormalUser = true;
       };
       root = {
diff --git a/profiles/core/home.nix b/profiles/core/home.nix
index 33e9061..ed86a55 100644
--- a/profiles/core/home.nix
+++ b/profiles/core/home.nix
@@ -120,12 +120,13 @@
       zsh = {
         enable = true;
         completionInit = ''
-          autoload -U compinit select-word-style select-word-style
+          autoload -Uz +X compinit bashcompinit select-word-style select-word-style
           select-word-style bash
           zstyle ':completion:*' menu select
           zmodload zsh/complist
-          compinit
           _comp_options+=(globdots) # Include hidden files.
+          compinit
+          bashcompinit
         '';
         initExtra = ''
           # Use vim keys in tab complete menu:
@@ -200,7 +201,11 @@
           ( command -v kubectl ) &>/dev/null && eval "$(kubectl completion zsh)"
           ( command -v zoxide ) &>/dev/null && eval "$(zoxide init zsh)"
           ( command -v pioctl ) &>/dev/null && eval "$(_PIOCTL_COMPLETE=zsh_source pioctl)"
-          export PATH="$PATH:$HOME/.local/bin:/opt/homebrew/bin:${config.ivi.home}/.krew/bin:${config.ivi.home}/.cargo/bin:${pkgs.ncurses}/bin"
+
+          # Workaround for completion here...
+          ( command -v aws ) &>/dev/null && source /run/current-system/sw/share/zsh/site-functions/_aws
+          ( command -v az ) &>/dev/null && source /run/current-system/sw/share/zsh/site-functions/_az
+
           [[ -f ~/.cache/wal/sequences ]] && (cat ~/.cache/wal/sequences &)
           unset LD_PRELOAD
 
diff --git a/profiles/graphical/suckless.nix b/profiles/graphical/suckless.nix
index 27b302e..b6bb011 100644
--- a/profiles/graphical/suckless.nix
+++ b/profiles/graphical/suckless.nix
@@ -81,6 +81,7 @@
       librewolf
       xclip
       mpv
+      maim
     ];
   };
 }
-- 
cgit v1.2.3