added some more stuff
This commit is contained in:
parent
27bc6d99e0
commit
36a21d1257
8 changed files with 60 additions and 14 deletions
|
|
@ -54,6 +54,7 @@ in
|
||||||
sops.defaultSopsFile = ../../secrets/sops.yaml;
|
sops.defaultSopsFile = ../../secrets/sops.yaml;
|
||||||
sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
|
sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
|
||||||
sops.secrets.build-service = { };
|
sops.secrets.build-service = { };
|
||||||
|
sops.secrets.fw-qemu = { };
|
||||||
|
|
||||||
environment.systemPackages = [ pkgs.cifs-utils ];
|
environment.systemPackages = [ pkgs.cifs-utils ];
|
||||||
|
|
||||||
|
|
@ -99,6 +100,20 @@ in
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
fileSystems."/mnt/fw-qemu/C" = {
|
||||||
|
device = "//10.0.2.4/qemu/C$";
|
||||||
|
fsType = "cifs";
|
||||||
|
options =
|
||||||
|
let
|
||||||
|
automount_opts =
|
||||||
|
"x-systemd.automount,noauto,x-systemd.idle-timeout=60,"
|
||||||
|
+ "x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s";
|
||||||
|
in
|
||||||
|
[
|
||||||
|
"${automount_opts},credentials=${toString config.sops.secrets.fw-qemu.path},vers=3.0"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
home-manager.extraSpecialArgs = { inherit inputs pkgs; };
|
home-manager.extraSpecialArgs = { inherit inputs pkgs; };
|
||||||
home-manager.users.fw = {
|
home-manager.users.fw = {
|
||||||
imports = [
|
imports = [
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,9 @@
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
|
let
|
||||||
|
azPkgs = inputs.nixpkgs-azure-cli.legacyPackages.${pkgs.stdenv.hostPlatform.system};
|
||||||
|
in
|
||||||
{
|
{
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
|
|
@ -12,7 +15,14 @@
|
||||||
awscli
|
awscli
|
||||||
minio-client
|
minio-client
|
||||||
opentofu
|
opentofu
|
||||||
azure-cli
|
(azPkgs.azure-cli.withExtensions (
|
||||||
|
with azPkgs.azure-cli.extensions;
|
||||||
|
[
|
||||||
|
# aks-preview
|
||||||
|
# ssh
|
||||||
|
fzf
|
||||||
|
]
|
||||||
|
))
|
||||||
yq
|
yq
|
||||||
jq
|
jq
|
||||||
git
|
git
|
||||||
|
|
|
||||||
|
|
@ -106,6 +106,7 @@ in
|
||||||
set -x -U GOPATH $HOME/.go
|
set -x -U GOPATH $HOME/.go
|
||||||
gh completion -s fish > ~/.config/fish/completions/gh.fish
|
gh completion -s fish > ~/.config/fish/completions/gh.fish
|
||||||
set -gx PATH $PATH $HOME/scripts
|
set -gx PATH $PATH $HOME/scripts
|
||||||
|
set -gx PATH $PATH $HOME/.krew/bin
|
||||||
|
|
||||||
set -Ux FZF_DEFAULT_OPTS "${fzfOpts}"
|
set -Ux FZF_DEFAULT_OPTS "${fzfOpts}"
|
||||||
'';
|
'';
|
||||||
|
|
|
||||||
|
|
@ -73,6 +73,9 @@
|
||||||
speedcrunch
|
speedcrunch
|
||||||
wayland-bongocat
|
wayland-bongocat
|
||||||
opencode
|
opencode
|
||||||
|
quickemu
|
||||||
|
virt-viewer
|
||||||
|
go-passbolt-cli
|
||||||
|
|
||||||
dbeaver-bin
|
dbeaver-bin
|
||||||
(
|
(
|
||||||
|
|
|
||||||
|
|
@ -26,8 +26,10 @@
|
||||||
helm-git
|
helm-git
|
||||||
];
|
];
|
||||||
})
|
})
|
||||||
# k3sup
|
|
||||||
];
|
];
|
||||||
|
|
||||||
|
environment.variables = {
|
||||||
|
KREW_ROOT = "$HOME/.krew";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
{ pkgs, inputs, ... }:
|
{ pkgs, inputs, ... }:
|
||||||
{
|
{
|
||||||
|
home.packages = [ pkgs.copyq ];
|
||||||
programs.tmux = {
|
programs.tmux = {
|
||||||
enable = true;
|
enable = true;
|
||||||
mouse = true;
|
mouse = true;
|
||||||
|
|
@ -11,11 +12,11 @@
|
||||||
plugins = with pkgs; [
|
plugins = with pkgs; [
|
||||||
tmuxPlugins.sensible
|
tmuxPlugins.sensible
|
||||||
tmuxPlugins.pain-control
|
tmuxPlugins.pain-control
|
||||||
tmuxPlugins.session-wizard
|
|
||||||
tmuxPlugins.logging
|
tmuxPlugins.logging
|
||||||
tmuxPlugins.resurrect
|
tmuxPlugins.resurrect
|
||||||
tmuxPlugins.continuum
|
tmuxPlugins.continuum
|
||||||
tmuxPlugins.open
|
tmuxPlugins.open
|
||||||
|
tmuxPlugins.tmux-fzf
|
||||||
{ plugin = inputs.minimal-tmux.packages.${pkgs.stdenv.hostPlatform.system}.default; }
|
{ plugin = inputs.minimal-tmux.packages.${pkgs.stdenv.hostPlatform.system}.default; }
|
||||||
];
|
];
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
|
|
@ -30,6 +31,8 @@
|
||||||
bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel 'xclip -in -selection clipboard'
|
bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel 'xclip -in -selection clipboard'
|
||||||
bind -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-and-cancel "xclip -i -f -selection primary | xclip -i -selection clipboard"
|
bind -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-and-cancel "xclip -i -f -selection primary | xclip -i -selection clipboard"
|
||||||
|
|
||||||
|
bind-key -T prefix T display-popup -E -h "40%" -w "80%" ~/.nix-profile/share/tmux-plugins/session-wizard/bin/t
|
||||||
|
|
||||||
set -g @continuum-restore 'on'
|
set -g @continuum-restore 'on'
|
||||||
|
|
||||||
set -g default-terminal "tmux-256color"
|
set -g default-terminal "tmux-256color"
|
||||||
|
|
|
||||||
11
root_ca.crt
Normal file
11
root_ca.crt
Normal file
|
|
@ -0,0 +1,11 @@
|
||||||
|
-----BEGIN CERTIFICATE-----
|
||||||
|
MIIBozCCAUmgAwIBAgIQQ2MDZa+mQZSTrbCWcL7n9TAKBggqhkjOPQQDAjAwMRIw
|
||||||
|
EAYDVQQKEwlpZmFjdHMtY2ExGjAYBgNVBAMTEWlmYWN0cy1jYSBSb290IENBMB4X
|
||||||
|
DTI2MDEyODEwMjgxMVoXDTM2MDEyNjEwMjgxMVowMDESMBAGA1UEChMJaWZhY3Rz
|
||||||
|
LWNhMRowGAYDVQQDExFpZmFjdHMtY2EgUm9vdCBDQTBZMBMGByqGSM49AgEGCCqG
|
||||||
|
SM49AwEHA0IABExdoMXQswrSmwJOMhtZ1S9eKszlcBMLitUKIdbtWkW+lTOuiuWr
|
||||||
|
dYY3evg0cMCkujkxgax5GyXtjhhESkYA/gijRTBDMA4GA1UdDwEB/wQEAwIBBjAS
|
||||||
|
BgNVHRMBAf8ECDAGAQH/AgEBMB0GA1UdDgQWBBRVgDkzcoTuUUNhVHJ35XNKw80W
|
||||||
|
ZDAKBggqhkjOPQQDAgNIADBFAiAaUVBcKf/bFdvqs4Q1YWDVrIz6+B71NcUz/iQd
|
||||||
|
owJe5QIhANY9JCU3BR3M/Ca+BNmDyQpqXCs7yz36N8hoqlmKtC/3
|
||||||
|
-----END CERTIFICATE-----
|
||||||
|
|
@ -10,6 +10,7 @@ user-password: ENC[AES256_GCM,data:cngHqB2IQXVvSMwm5KJeq6wOQMQ4z/DWap3YMyahq2fz8
|
||||||
immich-secrets-file: ENC[AES256_GCM,data:aUSQr5k7uqZzBvpSAFgpfStcuEPbf3U2GED+biU56UBi02MgQzckmK4kKJ7XIF6UyBvxLw==,iv:mep3JNp86YjsIJSONYNLeEYsSN/ERao7hs7O5cnHF9s=,tag:m6sulZTYMnTpxgPGFXITTg==,type:str]
|
immich-secrets-file: ENC[AES256_GCM,data:aUSQr5k7uqZzBvpSAFgpfStcuEPbf3U2GED+biU56UBi02MgQzckmK4kKJ7XIF6UyBvxLw==,iv:mep3JNp86YjsIJSONYNLeEYsSN/ERao7hs7O5cnHF9s=,tag:m6sulZTYMnTpxgPGFXITTg==,type:str]
|
||||||
paperless-admin-password: ENC[AES256_GCM,data:Aup5T7pMptHT6z7Uqzd9I4EMaG4sbPNC9bVj+muTowkNKAr3nMOOXaAL4wgy00UI9u4KdZzQ/hyrYMMT,iv:VaR7OK8CEC3VlSbGvLIihX15fQQ7H/PyWZcp7nifOAg=,tag:G4DNgqjbZYaeSmj8vmT5IA==,type:str]
|
paperless-admin-password: ENC[AES256_GCM,data:Aup5T7pMptHT6z7Uqzd9I4EMaG4sbPNC9bVj+muTowkNKAr3nMOOXaAL4wgy00UI9u4KdZzQ/hyrYMMT,iv:VaR7OK8CEC3VlSbGvLIihX15fQQ7H/PyWZcp7nifOAg=,tag:G4DNgqjbZYaeSmj8vmT5IA==,type:str]
|
||||||
build-service: ENC[AES256_GCM,data:4I1iPfdc5mbzGIYCVEtTZW0/MvLwUyEb2uaDERaApYMOVB3iSVNx+fyhxRokaQ==,iv:zAfFGFJdj6TvkS4D9qtRhYtPcvhNqv98Dmzp0TKVp+4=,tag:bWrUbEleOVq01eeKYvq7rw==,type:str]
|
build-service: ENC[AES256_GCM,data:4I1iPfdc5mbzGIYCVEtTZW0/MvLwUyEb2uaDERaApYMOVB3iSVNx+fyhxRokaQ==,iv:zAfFGFJdj6TvkS4D9qtRhYtPcvhNqv98Dmzp0TKVp+4=,tag:bWrUbEleOVq01eeKYvq7rw==,type:str]
|
||||||
|
fw-qemu: ENC[AES256_GCM,data:TxbilLf79+gieY3WbAGl175aTUVjIc6rlKfYTy8Usmw=,iv:WCvfZctBVCSPwoCXMDoSroNt+kakGke5r0pFOSAMPgo=,tag:qY0HxicfypO15CozZ2fcoQ==,type:str]
|
||||||
sops:
|
sops:
|
||||||
age:
|
age:
|
||||||
- recipient: age1jeyw96795qu52swmtkjqgr2w3g4vxc43ckc5r4hlwpje23ptnfwsheah0s
|
- recipient: age1jeyw96795qu52swmtkjqgr2w3g4vxc43ckc5r4hlwpje23ptnfwsheah0s
|
||||||
|
|
@ -57,7 +58,7 @@ sops:
|
||||||
dFZ3T3VUeHVnVThadHVQaVJCNkdZeDQK99L7CbBbklUUtanyFIOiCzO3hZP1mh3z
|
dFZ3T3VUeHVnVThadHVQaVJCNkdZeDQK99L7CbBbklUUtanyFIOiCzO3hZP1mh3z
|
||||||
ZZhhr6BCcHBbqzLaRLbT27BTCoNuGsXxyzW6tpXYacYuITkcFq9bOQ==
|
ZZhhr6BCcHBbqzLaRLbT27BTCoNuGsXxyzW6tpXYacYuITkcFq9bOQ==
|
||||||
-----END AGE ENCRYPTED FILE-----
|
-----END AGE ENCRYPTED FILE-----
|
||||||
lastmodified: "2025-12-30T12:32:36Z"
|
lastmodified: "2026-02-19T10:11:05Z"
|
||||||
mac: ENC[AES256_GCM,data:4uQBw966lOw1/NBi5LCuKEs5chGQvRtbVjJijF/504go5GsGVcrCOvoedwZzM2ui5GYecrmIKWThjRxT9DLYkzb+8BOF7sWKRwjQq2g/3Ew1UnqDJC+uiTvHSq2QzB/B5tD3astQyo8Y7JryHDZDVIvYano+gijIzQgFNeAVgQU=,iv:xucBautLNDbMD/KXryRdcW1I8Ui30ANloShQ3OjKFLI=,tag:estaWlGhl9R+vlSWxa79jA==,type:str]
|
mac: ENC[AES256_GCM,data:I6wKjKoYp1MxO/5kLBiiETJWlDHcuqtLFU4ZlzPHqS3MuOCh0958Zlzv0R6vz5piREqEoiFFPb2O4VROMMXK+xKXTzO5us0j9OYfPi5J/8J0g085QCKqO4nnpyb/CxSMoHJ2+BTfmyhbAwqmXe7jo0ylOU/gFfx9fIt6ewD0LjI=,iv:+My8r7y4FhFQnOx7wNQGJ9Cd4vk7CzxUJv7xnJoPyXE=,tag:eywhbOfjOp940jem30YMVQ==,type:str]
|
||||||
unencrypted_suffix: _unencrypted
|
unencrypted_suffix: _unencrypted
|
||||||
version: 3.11.0
|
version: 3.11.0
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue