From 31ad3df72d2a8446cefac27dd2541d2b65c28733 Mon Sep 17 00:00:00 2001 From: death916 Date: Thu, 2 Apr 2026 01:31:35 -0700 Subject: [PATCH] piefed and flake --- flake.lock | 36 ++++++++++++++++++------------------ flake.nix | 19 +++++++++++-------- home-manager/orac-home.nix | 3 ++- nixos/orac.nix | 1 + 4 files changed, 32 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index e6ba992..b62574a 100644 --- a/flake.lock +++ b/flake.lock @@ -215,11 +215,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1774944478, - "narHash": "sha256-+t9t5+DlvbUXDlD4oNE110OR51B7TYBtA0IFihZwt7M=", + "lastModified": 1775081186, + "narHash": "sha256-5gHN23GD3QZKIrFqsa2mnvGALIZf100EolW3d6AYKUc=", "owner": "flox", "repo": "flox", - "rev": "e35db4f751aaf94558328a9eddd817bc606be35a", + "rev": "20817fdfd21d2a090edd97c223830c7c094e5ca5", "type": "github" }, "original": { @@ -314,11 +314,11 @@ ] }, "locked": { - "lastModified": 1774875830, - "narHash": "sha256-WPYlTmZvVa9dWlAziFkVjBdv1Z6giNIq40O1DxsBmiI=", + "lastModified": 1775077333, + "narHash": "sha256-OXcxobt7lBkh1B8AjwreU+24myhtKpqeLfAeIyNLFY8=", "owner": "nix-community", "repo": "home-manager", - "rev": "7afd8cebb99e25a64a745765920e663478eb8830", + "rev": "49ca96b2714c5931e17401eff87f3edd42d2b0f2", "type": "github" }, "original": { @@ -403,11 +403,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1774915174, - "narHash": "sha256-T4vmNkkd1JmyNSKFb1TMtNmKDFImRmgD563RwaGv1xc=", + "lastModified": 1775082056, + "narHash": "sha256-rC0fWLlXNnZe+SjrCUqnX9QSrGiwLhTjR+y14onv+J4=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "91916a2d94eee0b72eb8e7e033511bbf173879eb", + "rev": "529f72249c2cf4cefc824a612aeddf2d5f858f54", "type": "github" }, "original": { @@ -665,11 +665,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1774709303, - "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=", + "lastModified": 1775036866, + "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8110df5ad7abf5d4c0f6fb0f8f978390e77f9685", + "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e", "type": "github" }, "original": { @@ -697,11 +697,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1774799055, - "narHash": "sha256-Tsq9BCz0q47ej1uFF39m4tuhcwru/ls6vCCJzutEpaw=", + "lastModified": 1775002709, + "narHash": "sha256-d3Yx83vSrN+2z/loBh4mJpyRqr9aAJqlke4TkpFmRJA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "107cba9eb4a8d8c9f8e9e61266d78d340867913a", + "rev": "bcd464ccd2a1a7cd09aa2f8d4ffba83b761b1d0e", "type": "github" }, "original": { @@ -817,11 +817,11 @@ ] }, "locked": { - "lastModified": 1774926780, - "narHash": "sha256-JMdDYn0F+swYBILlpCeHDbCSyzqkeSGNxZ/Q5J584jM=", + "lastModified": 1775099554, + "narHash": "sha256-3xBsGnGDLOFtnPZ1D3j2LU19wpAlYefRKTlkv648rU0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "962a0934d0e32f42d1b5e49186f9595f9b178d2d", + "rev": "8d6387ed6d8e6e6672fd3ed4b61b59d44b124d99", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 9efac08..9bf9562 100644 --- a/flake.nix +++ b/flake.nix @@ -261,14 +261,17 @@ ./nixos/orac.nix # Your main homelab config ./nixos/orac-hardware.nix home-manager.nixosModules.home-manager - { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.extraSpecialArgs = { inherit hmLib; }; - home-manager.users.death916 = { - imports = [ ./home-manager/orac-home.nix ]; - }; - } + ( + { unstablePkgs, ... }: + { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.extraSpecialArgs = { inherit hmLib unstablePkgs inputs; }; + home-manager.users.death916 = { + imports = [ ./home-manager/orac-home.nix ]; + }; + } + ) ]; }; }; diff --git a/home-manager/orac-home.nix b/home-manager/orac-home.nix index fe72bf9..cc1354f 100644 --- a/home-manager/orac-home.nix +++ b/home-manager/orac-home.nix @@ -3,6 +3,7 @@ pkgs, lib, inputs, + unstablePkgs, ... }: @@ -19,7 +20,7 @@ wget zellij systemctl-tui - gemini-cli + unstablePkgs.gemini-cli eza duf ]; diff --git a/nixos/orac.nix b/nixos/orac.nix index 2e9aef8..f1a04a0 100644 --- a/nixos/orac.nix +++ b/nixos/orac.nix @@ -11,6 +11,7 @@ ../modules/containers/docker/karakeep/docker-compose.nix ../modules/nixos/orac/monitoring.nix ../modules/containers/docker/crowdsec/crowdsec.nix + ../modules/containers/piefed/piefed-containers.nix ]; networking.firewall = {