summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Vink <ivi@vinkies.net>2024-06-26 21:38:33 +0200
committerMike Vink <ivi@vinkies.net>2024-06-26 21:38:33 +0200
commitfc4e077021b6acca038743c763376cef24911e6a (patch)
tree410d9f716cc43fa942c86faa77df35d8d2bd9b34
parent5f19ec51f8e0305ce08ff7a1c55c75e84979a3d2 (diff)
update vm
-rw-r--r--ivi/ivi.nix3
-rw-r--r--machines/vm-aarch64.nix9
-rw-r--r--profiles/core/configuration.nix2
-rw-r--r--profiles/core/home.nix11
-rw-r--r--profiles/graphical/suckless.nix1
-rw-r--r--secrets/syncthing.yaml6
6 files changed, 24 insertions, 8 deletions
diff --git a/ivi/ivi.nix b/ivi/ivi.nix
index 5fbd6d6..76af405 100644
--- a/ivi/ivi.nix
+++ b/ivi/ivi.nix
@@ -126,7 +126,8 @@ self: lib: with lib; let
"graphical"
];
syncthing = {
- enable = false;
+ enable = true;
+ id = "LDZVZ6H-KO3BKC6-FMLZOND-MKXI4DF-SNT27OT-Q5KMN2M-A2DYFNQ-3BWUYA6";
};
};
persephone = {
diff --git a/machines/vm-aarch64.nix b/machines/vm-aarch64.nix
index cc63194..b40f811 100644
--- a/machines/vm-aarch64.nix
+++ b/machines/vm-aarch64.nix
@@ -5,6 +5,7 @@
];
system.stateVersion = "24.05";
virtualisation.vmware.guest.enable = true;
+ virtualisation.docker.enable = true;
networking.hostName = "vm-aarch64";
hm.xsession.initExtra = ''
@@ -14,6 +15,14 @@
wal -R
dwm
'';
+ environment.systemPackages = with pkgs; [
+ kubernetes-helm
+ azure-cli
+ awscli2
+ (google-cloud-sdk.withExtraComponents (with google-cloud-sdk.components; [
+ gke-gcloud-auth-plugin
+ ]))
+ ];
services.pcscd.enable = true;
sops.age.keyFile = "${config.hm.xdg.configHome}/sops/age/keys.txt";
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
];
};
}
diff --git a/secrets/syncthing.yaml b/secrets/syncthing.yaml
index 7eedf46..d19240c 100644
--- a/secrets/syncthing.yaml
+++ b/secrets/syncthing.yaml
@@ -1,8 +1,8 @@
lemptop: ENC[AES256_GCM,data:3dmcPh8EtBYe2KQQ1HMddLey5Qdhtz7kGvMFZaqidMZ099ycd+EnXrHsJIRHoWFrGsRbBs6vgWytKX49JBcrl5im8u7Jw6AbFtCh81XOau8+EaKD+Z+uynRhbJ31y+AH5MTGIniM+7RviGUDeBM8oZAvtazbaiswckFkR8HrJ8WcGOi2xkq+HY/OIqTnBpy83Q7A0oD6YPfNjvFJUB0LJFU/mYfrbmADEkobeKQz57sHc22scjrfszWmxcgcjrriuqRReucClU9uQ3GO8bEMvWFT7epjZAkwht7Oq1K2U17kt6xsrqTWRPNwQsB3P2w7i5YQMBnGAtz0b9VC5hH8GyZJGBFLRkk0fzxhUL9SXRid2wvTKrCAoMnjWTCw8K2D,iv:ojRT/RzCcxQlGh2FFz5tdUYOq4bekGcmE8Hm9tUSrDg=,tag:jd/g0vpTCOmf2EdQCcpcZQ==,type:str]
pump: ENC[AES256_GCM,data:2Vu1idorw/kMsDThT2ywGmdPMgQdDHQItpZRukpdiapcKxMa65U/AQzshkbuQVTN5AaDkMNnLQrrLt8qQY0QxhTpddc4+y1kLaVAE5G+8di/2GJiGKUAjHOwyX72BXqjkAYOZ6u96PThOs3PmyhHhiH5ge9ZpOh1zOG2CD4dzoMLHHPHgSv8NLuhZ3kuc3yE3a/YgMgs9NjCvL44Pks8ktVq9DZAJfJB+eRGJPA9k6sN1NP1vMW9RKnk6dI+ZwOz1OHnQvfyVqe/vJxG96m4ALq4oeqn003+me72GB4DO9GLx2IkAsK0Jw9ZoiiJDSfEMVGzhH348mZXfAsTTb2coN9+834V5tBIT9OVDx+cJfHF7+7sm1FHH+fkzbteSH4q,iv:2IY08X5IYjGPEEZYqB/Sa8B1GOkURQg8nqgRwgTJs5c=,tag:ey3TMSDpt5xuEB9eH1ylOw==,type:str]
work: ENC[AES256_GCM,data:Kfw00ljs0JUEMET3Ii+pQwdNAe7A49oZUB+f5+rKU/doKqW5KC5T4vRV+AY2xIle6Gz2qQI4tN9ffdFZnKS6HvS/aoSnPwSrZo9VYyyBFlhcEwqfdhtzspu+oDkz6EQtqOxZAqzKP5mEPN5YRT0FWTWT99oYtXEHtuG7h80ivZbnY2gjQgkGGieq/c2TDVotS6Av/ycUd5ZQrd9iNXgeuHuQbfLF7/xhOZweYgcDuTqcGNaPdz4y/TRWQa05VkhkcByvHZ+6fG8SkZ7RjUuRsAC5D6ErJqqQmRznOZ6E6RElLWZdkIr2ahXtdU8t7VCDsInA8ua15V2vTEcVNoNYRFjDCAx3lbgO0pelHUno1bwXah6YFEPCMqlieSOMtT3p,iv:jsPrGHem6Qq87/ePRjGLcPWfAqWcy13yNCuZjN2I8pw=,tag:ED7trfDcmuIB/ljyqPMB8Q==,type:str]
+vm-aarch64: ENC[AES256_GCM,data:ft+KvxDX3N2E4mj6kyOtEjXNnYaG+jm2dVJ8wx0QO8vX8wgdvWTvA4477LlXbE20jFIqrVsEggQQliJl5i1i8CxHrS+Io3k0HS1ECSRMlB/BTk04ZeCH4GNohJD42oD85xhEkAj7IJV+LhadetQoFKWVTKzAblKfitvKX26mxHrGtzimvrk6Mx65VGFNaBomVmlVn0l4fUpbmCJQKkqsQklN3axsHzsUsx2S8hc+x1QeFm3m3lxU/hlJlDZMf2scEXHRI7Bs/HUrbXc/xlbJ1a/JNv+ym9QGzpZ2MeTrBnfTP7rM2h111YNhPz/ZQlfb1EFUIr2EeaTaPXCl7wZI/oEQpv4L00k4jTDSFxrKevzL7Kgjm3eMdRXwXAPUJlco,iv:mkpZyeqAmZZsH5M+MN1IGDt6zXG9F2++G7a4a1JdJ/Q=,tag:fZYauE9H/QlZz62Lnupisw==,type:str]
serber: ENC[AES256_GCM,data:iQTU+w==,iv:FbnGkujV72nsFIk74CerwT7dxmHPQNuSMFx4vesR5gQ=,tag:xCsJYRRYwhD5r5kf2buOTw==,type:str]
-vm-aarch64: ENC[AES256_GCM,data:PSQQ/g==,iv:H8GBjrRuz4zCHQLZFCInTtFhPZQSBdiXCoAJ1JFySYA=,tag:xDuJ1xwBQb9ialpkDnIIWA==,type:str]
sops:
kms: []
gcp_kms: []
@@ -36,8 +36,8 @@ sops:
WUUxdCtNbHhtbWo0NGloY1NSMHFEYzAKZG5k7qu7N4SyUogiO+qDQIoEXcT2B4zQ
L7bA4NDUJBFNfekX6R/VWTuOdPHHIZkcbjEj79iEbFSo4DBeSOatRw==
-----END AGE ENCRYPTED FILE-----
- lastmodified: "2024-06-20T07:40:21Z"
- mac: ENC[AES256_GCM,data:QR8h58ORw9jApjIX//K/4GsIzVPjWRL5uH6I5UL1RCdJs06dmeotmSyNmi/BIX7BzkObS5YP8ysq3tITDiMfNwyT14S+Ju/aVUlTvxAopmIkF/jYo8DtbfIlxfV0IeXOjsOkmPSzanDQK7T8gf1NrNpKLbjWEofSPEOsInMd2MQ=,iv:iBJGMUPJVp8c2JYZjWx3ZeSbCECfbBaZhz9RyWnX4xI=,tag:Pd/AzzWcaxNvmBuSFwsweA==,type:str]
+ lastmodified: "2024-06-26T08:21:16Z"
+ mac: ENC[AES256_GCM,data:ihtuC/CsMopUj4TbWNO3jIEgWY2Dfm0X0nLdwf2OOIOC9HCFvLZEVd0SxnIq1tSsmzUjvKZIVPFpFgN6nQjM7bO9VBwC4dCSlZogp3HxLl9iMjcGcwVO0xmz4NN7qYZyz2QXaTIMl4/0/cgv/gLcm7CL8eg/EaKIzwtp89AlksQ=,iv:z1vV0xwU+2ecz3pv4KBULSjWuX+eIFmypGXdbjzFM5s=,tag:sIzRpLx+sIKgIItc/tUa+w==,type:str]
pgp: []
unencrypted_suffix: _unencrypted
version: 3.8.1