From 4d872cd6323b5579e3b7bb50185c082d8c7f5632 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?m=C3=BCde?= Date: Wed, 29 Apr 2026 23:58:15 +0200 Subject: [PATCH] damocles-lab misc --- flake.nix | 4 ++-- nixosConfigurations/aur0ra-installer/default.nix | 4 ++-- nixosConfigurations/damocles-lab/default.nix | 2 +- nixosConfigurations/damocles/claude-container.nix | 11 +++++++---- nixosConfigurations/damocles/default.nix | 13 ++++++++++++- 5 files changed, 24 insertions(+), 10 deletions(-) diff --git a/flake.nix b/flake.nix index ea6d9fe..dce3929 100644 --- a/flake.nix +++ b/flake.nix @@ -235,7 +235,7 @@ device, system, home-manager-users ? { }, - nixosSystem ? nixpkgs.lib.nixosSystem + nixosSystem ? nixpkgs.lib.nixosSystem, }: let specialArgs = inputs // { @@ -247,7 +247,7 @@ modules = [ { imports = [ - ./nixosConfigurations/${device} + ./nixosConfigurations/${device} self.nixosModules.global-settings ] ++ (lib.optionals (home-manager-users != { }) [ diff --git a/nixosConfigurations/aur0ra-installer/default.nix b/nixosConfigurations/aur0ra-installer/default.nix index 5557fae..b6c1e1a 100644 --- a/nixosConfigurations/aur0ra-installer/default.nix +++ b/nixosConfigurations/aur0ra-installer/default.nix @@ -8,10 +8,10 @@ { imports = [ ../aur0ra - # nixos-images.nixosModules.sdimage-installer + # nixos-images.nixosModules.sdimage-installer ]; disabledModules = [ # disable the sd-image module that nixos-images uses - # (modulesPath + "/installer/sd-card/sd-image-aarch64-installer.nix") + # (modulesPath + "/installer/sd-card/sd-image-aarch64-installer.nix") ]; } diff --git a/nixosConfigurations/damocles-lab/default.nix b/nixosConfigurations/damocles-lab/default.nix index 752065d..705e31a 100644 --- a/nixosConfigurations/damocles-lab/default.nix +++ b/nixosConfigurations/damocles-lab/default.nix @@ -1,6 +1,6 @@ { pkgs, ... }: { - imports = [../damocles/claude-container.nix]; + imports = [ ../damocles/claude-container.nix ]; services.openssh = { enable = true; diff --git a/nixosConfigurations/damocles/claude-container.nix b/nixosConfigurations/damocles/claude-container.nix index c754f47..17d599f 100644 --- a/nixosConfigurations/damocles/claude-container.nix +++ b/nixosConfigurations/damocles/claude-container.nix @@ -1,4 +1,10 @@ -{ pkgs,self,lib, ... }: { +{ + pkgs, + self, + lib, + ... +}: +{ nixpkgs.overlays = [ self.overlays.unstable-packages ]; allowedUnfreePackages = [ "claude-code" ]; @@ -11,9 +17,6 @@ gawk gnugrep curl - cargo - rustc - clippy ]; boot.isContainer = true; diff --git a/nixosConfigurations/damocles/default.nix b/nixosConfigurations/damocles/default.nix index e0c276b..c5eff0a 100644 --- a/nixosConfigurations/damocles/default.nix +++ b/nixosConfigurations/damocles/default.nix @@ -1,3 +1,14 @@ +{ pkgs, ... }: { - imports = [ ./android-dev.nix ./claude-container.nix ]; + imports = [ + ./android-dev.nix + ./claude-container.nix + ]; + + environment.systemPackages = with pkgs; [ + cargo + rustc + clippy + gh + ]; }