From 36a21d12577c4df22b9bab413938b7d861f2e163 Mon Sep 17 00:00:00 2001 From: fwastring Date: Fri, 6 Mar 2026 11:16:39 +0100 Subject: [PATCH 1/2] added some more stuff --- maskiner/core/configuration.nix | 15 +++++++++++++++ moduler/dev.nix | 14 ++++++++++++-- moduler/fish.nix | 1 + moduler/programs.nix | 3 +++ moduler/programs/kubernetes-tools.nix | 6 ++++-- moduler/tmux.nix | 19 +++++++++++-------- root_ca.crt | 11 +++++++++++ secrets/sops.yaml | 5 +++-- 8 files changed, 60 insertions(+), 14 deletions(-) create mode 100644 root_ca.crt diff --git a/maskiner/core/configuration.nix b/maskiner/core/configuration.nix index b76e029..6b35beb 100644 --- a/maskiner/core/configuration.nix +++ b/maskiner/core/configuration.nix @@ -54,6 +54,7 @@ in sops.defaultSopsFile = ../../secrets/sops.yaml; sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; sops.secrets.build-service = { }; + sops.secrets.fw-qemu = { }; 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.users.fw = { imports = [ diff --git a/moduler/dev.nix b/moduler/dev.nix index a3a5f3b..f79534b 100644 --- a/moduler/dev.nix +++ b/moduler/dev.nix @@ -3,6 +3,9 @@ pkgs, ... }: +let + azPkgs = inputs.nixpkgs-azure-cli.legacyPackages.${pkgs.stdenv.hostPlatform.system}; +in { environment.systemPackages = with pkgs; [ @@ -11,8 +14,15 @@ gh awscli minio-client - opentofu - azure-cli + opentofu + (azPkgs.azure-cli.withExtensions ( + with azPkgs.azure-cli.extensions; + [ + # aks-preview + # ssh + fzf + ] + )) yq jq git diff --git a/moduler/fish.nix b/moduler/fish.nix index e93c6d0..e898153 100644 --- a/moduler/fish.nix +++ b/moduler/fish.nix @@ -106,6 +106,7 @@ in set -x -U GOPATH $HOME/.go gh completion -s fish > ~/.config/fish/completions/gh.fish set -gx PATH $PATH $HOME/scripts + set -gx PATH $PATH $HOME/.krew/bin set -Ux FZF_DEFAULT_OPTS "${fzfOpts}" ''; diff --git a/moduler/programs.nix b/moduler/programs.nix index 0524d24..eaebc67 100644 --- a/moduler/programs.nix +++ b/moduler/programs.nix @@ -73,6 +73,9 @@ speedcrunch wayland-bongocat opencode + quickemu + virt-viewer + go-passbolt-cli dbeaver-bin ( diff --git a/moduler/programs/kubernetes-tools.nix b/moduler/programs/kubernetes-tools.nix index bc5444d..010e769 100644 --- a/moduler/programs/kubernetes-tools.nix +++ b/moduler/programs/kubernetes-tools.nix @@ -12,7 +12,7 @@ config = lib.mkIf config.kubernetes-tools.enable { environment.systemPackages = with pkgs; [ kubectl - krew + krew # buildkit argocd # containerd @@ -26,8 +26,10 @@ helm-git ]; }) - # k3sup ]; + environment.variables = { + KREW_ROOT = "$HOME/.krew"; + }; }; } diff --git a/moduler/tmux.nix b/moduler/tmux.nix index 9212fcb..02506a3 100644 --- a/moduler/tmux.nix +++ b/moduler/tmux.nix @@ -1,5 +1,6 @@ { pkgs, inputs, ... }: { +home.packages = [ pkgs.copyq ]; programs.tmux = { enable = true; mouse = true; @@ -11,24 +12,26 @@ plugins = with pkgs; [ tmuxPlugins.sensible tmuxPlugins.pain-control - tmuxPlugins.session-wizard tmuxPlugins.logging tmuxPlugins.resurrect tmuxPlugins.continuum tmuxPlugins.open + tmuxPlugins.tmux-fzf { plugin = inputs.minimal-tmux.packages.${pkgs.stdenv.hostPlatform.system}.default; } ]; extraConfig = '' - set -g set-clipboard on + set -g set-clipboard on - set -g base-index 1 - set-window-option -g pane-base-index 1 + set -g base-index 1 + set-window-option -g pane-base-index 1 - set-window-option -g mode-keys vi + set-window-option -g mode-keys vi - bind-key -T copy-mode-vi v send-keys -X begin-selection - 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-key -T copy-mode-vi v send-keys -X begin-selection + 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-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' diff --git a/root_ca.crt b/root_ca.crt new file mode 100644 index 0000000..c663d5d --- /dev/null +++ b/root_ca.crt @@ -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----- diff --git a/secrets/sops.yaml b/secrets/sops.yaml index 6ba2171..4477c44 100644 --- a/secrets/sops.yaml +++ b/secrets/sops.yaml @@ -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] 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] +fw-qemu: ENC[AES256_GCM,data:TxbilLf79+gieY3WbAGl175aTUVjIc6rlKfYTy8Usmw=,iv:WCvfZctBVCSPwoCXMDoSroNt+kakGke5r0pFOSAMPgo=,tag:qY0HxicfypO15CozZ2fcoQ==,type:str] sops: age: - recipient: age1jeyw96795qu52swmtkjqgr2w3g4vxc43ckc5r4hlwpje23ptnfwsheah0s @@ -57,7 +58,7 @@ sops: dFZ3T3VUeHVnVThadHVQaVJCNkdZeDQK99L7CbBbklUUtanyFIOiCzO3hZP1mh3z ZZhhr6BCcHBbqzLaRLbT27BTCoNuGsXxyzW6tpXYacYuITkcFq9bOQ== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-12-30T12:32:36Z" - mac: ENC[AES256_GCM,data:4uQBw966lOw1/NBi5LCuKEs5chGQvRtbVjJijF/504go5GsGVcrCOvoedwZzM2ui5GYecrmIKWThjRxT9DLYkzb+8BOF7sWKRwjQq2g/3Ew1UnqDJC+uiTvHSq2QzB/B5tD3astQyo8Y7JryHDZDVIvYano+gijIzQgFNeAVgQU=,iv:xucBautLNDbMD/KXryRdcW1I8Ui30ANloShQ3OjKFLI=,tag:estaWlGhl9R+vlSWxa79jA==,type:str] + lastmodified: "2026-02-19T10:11:05Z" + mac: ENC[AES256_GCM,data:I6wKjKoYp1MxO/5kLBiiETJWlDHcuqtLFU4ZlzPHqS3MuOCh0958Zlzv0R6vz5piREqEoiFFPb2O4VROMMXK+xKXTzO5us0j9OYfPi5J/8J0g085QCKqO4nnpyb/CxSMoHJ2+BTfmyhbAwqmXe7jo0ylOU/gFfx9fIt6ewD0LjI=,iv:+My8r7y4FhFQnOx7wNQGJ9Cd4vk7CzxUJv7xnJoPyXE=,tag:eywhbOfjOp940jem30YMVQ==,type:str] unencrypted_suffix: _unencrypted version: 3.11.0 From 37656d65407830a4362e5f64aa218a0f44dbb74e Mon Sep 17 00:00:00 2001 From: fwastring Date: Fri, 6 Mar 2026 11:16:47 +0100 Subject: [PATCH 2/2] pinned az --- flake.lock | 163 +++++++++++++++++++++++++++++------------------------ flake.nix | 3 +- 2 files changed, 92 insertions(+), 74 deletions(-) diff --git a/flake.lock b/flake.lock index d6d45de..30927ca 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1767024902, - "narHash": "sha256-sMdk6QkMDhIOnvULXKUM8WW8iyi551SWw2i6KQHbrrU=", + "lastModified": 1771610171, + "narHash": "sha256-+DeInuhbm6a6PpHDNUS7pozDouq2+8xSDefoNaZLW0E=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "b8a0c5ba5a9fbd2c660be7dd98bdde0ff3798556", + "rev": "7f9eb087703ec4acc6b288d02fa9ea3db803cd3d", "type": "github" }, "original": { @@ -126,11 +126,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1768575137, - "narHash": "sha256-e0SsKnkSnq+UwZNS9ZyPJjTjabzq9TRc1hqeDnvOF1Q=", + "lastModified": 1771587924, + "narHash": "sha256-eVYOGmF8nQBhudJyU6lHdgJI87kvGz8JyCq5/Vi9Mjk=", "owner": "catppuccin", "repo": "nix", - "rev": "48e67b4ad22072f1ae30b0ed8e1cb020cf06c611", + "rev": "b0c65edbf31c2ad3d84438d82c2310f2c28373f3", "type": "github" }, "original": { @@ -165,11 +165,11 @@ ] }, "locked": { - "lastModified": 1768727946, - "narHash": "sha256-le2GY+ZR6uRHMuOAc60sBR3gBD2BEk1qOZ3S5C/XFpU=", + "lastModified": 1771881364, + "narHash": "sha256-A5uE/hMium5of/QGC6JwF5TGoDAfpNtW00T0s9u/PN8=", "owner": "nix-community", "repo": "disko", - "rev": "558e84658d0eafc812497542ad6ca0d9654b3b0f", + "rev": "a4cb7bf73f264d40560ba527f9280469f1f081c6", "type": "github" }, "original": { @@ -218,11 +218,11 @@ ] }, "locked": { - "lastModified": 1768135262, - "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", + "lastModified": 1769996383, + "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", + "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", "type": "github" }, "original": { @@ -239,11 +239,11 @@ ] }, "locked": { - "lastModified": 1765835352, - "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", + "lastModified": 1769996383, + "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "a34fae9c08a15ad73f295041fec82323541400a9", + "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", "type": "github" }, "original": { @@ -373,11 +373,11 @@ ] }, "locked": { - "lastModified": 1768798936, - "narHash": "sha256-eHld4id3TeD9Sxx5vgv58BnTl1fz+ewIKspz/kEoAE8=", + "lastModified": 1772060133, + "narHash": "sha256-VuyRptb8v1lVGMlLp4/1vRX3Efwec0CN0S6mKmDPzLg=", "owner": "nix-community", "repo": "home-manager", - "rev": "2954aa29441a1a98901362e4d35515875761ad65", + "rev": "ce9b6e52500a0ea0ec48f0bbf6d7a3e431d9dfa4", "type": "github" }, "original": { @@ -431,11 +431,11 @@ ] }, "locked": { - "lastModified": 1766946335, - "narHash": "sha256-MRD+Jr2bY11MzNDfenENhiK6pvN+nHygxdHoHbZ1HtE=", + "lastModified": 1770511807, + "narHash": "sha256-suKmSbSk34uPOJDTg/GbPrKEJutzK08vj0VoTvAFBCA=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "4af02a3925b454deb1c36603843da528b67ded6c", + "rev": "7c75487edd43a71b61adb01cae8326d277aab683", "type": "github" }, "original": { @@ -461,11 +461,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1768746153, - "narHash": "sha256-H3BxpO76d/SX/qiCzl3bUi352xIkgdqqSb0sJfuv25w=", + "lastModified": 1772107319, + "narHash": "sha256-qdeeNrWmUe1P2FsnNU1ngoZl8UxczEMJBziwm78V42I=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "eb0480ba0d0870ab5d8a876f01c6ab033a4b35f4", + "rev": "c71fbd854dfdedaae011f4b8b1fdb81f8054b309", "type": "github" }, "original": { @@ -561,11 +561,11 @@ ] }, "locked": { - "lastModified": 1764612430, - "narHash": "sha256-54ltTSbI6W+qYGMchAgCR6QnC1kOdKXN6X6pJhOWxFg=", + "lastModified": 1771866172, + "narHash": "sha256-fYFoXhQLrm1rD8vSFKQBOEX4OGCuJdLt1amKfHd5GAw=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "0d00dc118981531aa731150b6ea551ef037acddd", + "rev": "0b219224910e7642eb0ed49f0db5ec3d008e3e41", "type": "github" }, "original": { @@ -638,11 +638,11 @@ ] }, "locked": { - "lastModified": 1766253372, - "narHash": "sha256-1+p4Kw8HdtMoFSmJtfdwjxM4bPxDK9yg27SlvUMpzWA=", + "lastModified": 1771271487, + "narHash": "sha256-41gEiUS0Pyw3L/ge1l8MXn61cK14VAhgWB/JV8s/oNI=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "51a4f93ce8572e7b12b7284eb9e6e8ebf16b4be9", + "rev": "340a792e3b3d482c4ae5f66d27a9096bdee6d76d", "type": "github" }, "original": { @@ -663,11 +663,11 @@ ] }, "locked": { - "lastModified": 1763640274, - "narHash": "sha256-Uan1Nl9i4TF/kyFoHnTq1bd/rsWh4GAK/9/jDqLbY5A=", + "lastModified": 1770501770, + "narHash": "sha256-NWRM6+YxTRv+bT9yvlhhJ2iLae1B1pNH3mAL5wi2rlQ=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "f6cf414ca0e16a4d30198fd670ec86df3c89f671", + "rev": "0bd8b6cde9ec27d48aad9e5b4deefb3746909d40", "type": "github" }, "original": { @@ -692,11 +692,11 @@ ] }, "locked": { - "lastModified": 1767473322, - "narHash": "sha256-RGOeG+wQHeJ6BKcsSB8r0ZU77g9mDvoQzoTKj2dFHwA=", + "lastModified": 1771606233, + "narHash": "sha256-F3PLUqQ/TwgR70U+UeOqJnihJZ2EuunzojYC4g5xHr0=", "owner": "hyprwm", "repo": "hyprwire", - "rev": "d5e7d6b49fe780353c1cf9a1cf39fa8970bd9d11", + "rev": "06c7f1f8c4194786c8400653c4efc49dc14c0f3a", "type": "github" }, "original": { @@ -732,11 +732,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1768781101, - "narHash": "sha256-p3guh/Vx4Pf+Ggk3X69SPTJot6emv6rgKpoBLNO61Ag=", + "lastModified": 1771977871, + "narHash": "sha256-lhmPJpB4V67O7rpTxb637yYX4C4PyhlnCGk+hrpjiyA=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "e90cb6d441572fc05ffb8769051d59f1d2d3269e", + "rev": "76b7e0e4f7ed155a090a551cd2ab3e7cd81eb6c3", "type": "github" }, "original": { @@ -748,11 +748,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1768778690, - "narHash": "sha256-XrWZBeH0GnvnQzE9Xmm69sesSGB2h5uVLuTmLA7k1p0=", + "lastModified": 1771977223, + "narHash": "sha256-RAPxiR+GFi+eH8Hd8zP9Pg4ZRwAwGiCN+HOt9K5LMb4=", "owner": "neovim", "repo": "neovim", - "rev": "30259d6af79e731491e6b12d815893b1b130b52b", + "rev": "327dcb897024159bdb201caf23d8d5673d7a0567", "type": "github" }, "original": { @@ -763,11 +763,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1768564909, - "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", + "lastModified": 1771848320, + "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f", + "rev": "2fc6539b481e1d2569f25f8799236694180c0993", "type": "github" }, "original": { @@ -777,13 +777,29 @@ "type": "github" } }, - "nixpkgs_2": { + "nixpkgs-azure-cli": { "locked": { - "lastModified": 1768305791, - "narHash": "sha256-AIdl6WAn9aymeaH/NvBj0H9qM+XuAuYbGMZaP0zcXAQ=", + "lastModified": 1751274312, + "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1412caf7bf9e660f2f962917c14b1ea1c3bc695e", + "rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1771369470, + "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0182a361324364ae3f436a63005877674cf45efb", "type": "github" }, "original": { @@ -811,11 +827,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1767379071, - "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=", + "lastModified": 1771848320, + "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fb7944c166a3b630f177938e478f0378e64ce108", + "rev": "2fc6539b481e1d2569f25f8799236694180c0993", "type": "github" }, "original": { @@ -827,11 +843,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1768661221, - "narHash": "sha256-MJwOjrIISfOpdI9x4C+5WFQXvHtOuj5mqLZ4TMEtk1M=", + "lastModified": 1771923393, + "narHash": "sha256-Fy0+UXELv9hOE8WjYhJt8fMDLYTU2Dqn3cX4BwoGBos=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3327b113f2ef698d380df83fbccefad7e83d7769", + "rev": "ea7f1f06811ce7fcc81d6c6fd4213150c23edcf2", "type": "github" }, "original": { @@ -843,11 +859,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1768564909, - "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", + "lastModified": 1771848320, + "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f", + "rev": "2fc6539b481e1d2569f25f8799236694180c0993", "type": "github" }, "original": { @@ -859,11 +875,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1771008912, - "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", + "lastModified": 1771848320, + "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a82ccc39b39b621151d6732718e3e250109076fa", + "rev": "2fc6539b481e1d2569f25f8799236694180c0993", "type": "github" }, "original": { @@ -898,11 +914,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1768795384, - "narHash": "sha256-gZIXLzhupxAwRMMRTFgrl669ciYiiPmnA3PwocJ+6jQ=", + "lastModified": 1771135771, + "narHash": "sha256-wyvBIhDuyCRyjB3yPg77qoyxrlgQtBR1rVW3c9knV3E=", "owner": "nix-community", "repo": "nixvim", - "rev": "57d393deb53af1b28b14973d3e3885c3d17e7bbe", + "rev": "ed0424f0b08d303a7348f52f7850ad1b2704f9ba", "type": "github" }, "original": { @@ -965,11 +981,11 @@ ] }, "locked": { - "lastModified": 1767281941, - "narHash": "sha256-6MkqajPICgugsuZ92OMoQcgSHnD6sJHwk8AxvMcIgTE=", + "lastModified": 1771858127, + "narHash": "sha256-Gtre9YoYl3n25tJH2AoSdjuwcqij5CPxL3U3xysYD08=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "f0927703b7b1c8d97511c4116eb9b4ec6645a0fa", + "rev": "49bbbfc218bf3856dfa631cead3b052d78248b83", "type": "github" }, "original": { @@ -989,6 +1005,7 @@ "minimal-tmux": "minimal-tmux", "neovim-nightly-overlay": "neovim-nightly-overlay", "nixpkgs": "nixpkgs_6", + "nixpkgs-azure-cli": "nixpkgs-azure-cli", "nixvim": "nixvim", "powershell-es": "powershell-es", "sops-nix": "sops-nix", @@ -1021,11 +1038,11 @@ ] }, "locked": { - "lastModified": 1768709255, - "narHash": "sha256-aigyBfxI20FRtqajVMYXHtj5gHXENY2gLAXEhfJ8/WM=", + "lastModified": 1772048434, + "narHash": "sha256-/wA0OaH6kZ/pFA+nXR/tvg5oupOmEDmMS5us79JT60o=", "owner": "Mic92", "repo": "sops-nix", - "rev": "5e8fae80726b66e9fec023d21cd3b3e638597aa9", + "rev": "334daa7c273dd8bf7a0cd370e4e16022b64e55e9", "type": "github" }, "original": { @@ -1055,11 +1072,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1768744881, - "narHash": "sha256-3+h7OxqfrPIB/tRsiZXWE9sCbTm7NQN5Ie428p+S6BA=", + "lastModified": 1771787992, + "narHash": "sha256-Vg4bGwwenNYI8p3nJTl9FRyeIyrjATeZrZr+GyUSDrw=", "owner": "nix-community", "repo": "stylix", - "rev": "06684f00cfbee14da96fd4307b966884de272d3a", + "rev": "30054cca073b49b42a71289edec858f535b27fe9", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2796068..2bfb434 100644 --- a/flake.nix +++ b/flake.nix @@ -4,6 +4,7 @@ inputs = { # Nixpkgs nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs-azure-cli.url = "github:NixOS/nixpkgs/nixos-24.11"; stylix = { url = "github:nix-community/stylix"; inputs.nixpkgs.follows = "nixpkgs"; @@ -71,7 +72,7 @@ confetti.nixosModules.default bbk.nixosModules.default nixvim.nixosModules.default - disko.nixosModules.disko + disko.nixosModules.disko ]; }; laptop = nixpkgs.lib.nixosSystem {