From 064948a8ba11786227413a87defa1b02f8dd3c35 Mon Sep 17 00:00:00 2001 From: "Geir O. Jerstad" Date: Fri, 4 Jul 2025 19:47:54 +0200 Subject: [PATCH] regressed lab-tool to 0.1.0-dev not pretty but it works --- machines/little-rascal/configuration.nix | 5 + .../little-rascal/minimal-configuration.nix | 107 ------------------ packages/default.nix | 6 - 3 files changed, 5 insertions(+), 113 deletions(-) delete mode 100644 machines/little-rascal/minimal-configuration.nix diff --git a/machines/little-rascal/configuration.nix b/machines/little-rascal/configuration.nix index 063ea54..4fe64e0 100644 --- a/machines/little-rascal/configuration.nix +++ b/machines/little-rascal/configuration.nix @@ -126,6 +126,11 @@ keyMap = "no"; }; + # System packages - testing lab tool installation + environment.systemPackages = with pkgs; [ + inputs.self.packages.${pkgs.system}.lab + ]; + # System version system.stateVersion = "25.05"; } diff --git a/machines/little-rascal/minimal-configuration.nix b/machines/little-rascal/minimal-configuration.nix deleted file mode 100644 index eb62bb0..0000000 --- a/machines/little-rascal/minimal-configuration.nix +++ /dev/null @@ -1,107 +0,0 @@ -# Minimal NixOS Configuration for little-rascal -# This is for initial installation - use deploy-rs to apply full config afterwards -{ - config, - pkgs, - lib, - ... -}: { - # Enable flakes for configuration deployment - nix.settings.experimental-features = ["nix-command" "flakes"]; - - # Boot configuration - boot = { - loader = { - systemd-boot.enable = true; - efi.canTouchEfiVariables = true; - timeout = 3; - }; - - # Import hardware scan results - initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod"]; - kernelModules = ["kvm-amd"]; - - # Clean tmp on boot - tmp.cleanOnBoot = true; - }; - - # Minimal file systems - you'll need to adjust this based on your disk setup - fileSystems."/" = { - device = "/dev/disk/by-label/nixos"; - fsType = "ext4"; - }; - - fileSystems."/boot" = { - device = "/dev/disk/by-label/BOOT"; - fsType = "vfat"; - }; - - # Basic networking - networking = { - hostName = "little-rascal"; - networkmanager.enable = true; - - # Open SSH port - firewall = { - enable = true; - allowedTCPPorts = [22]; - allowedUDPPorts = [41641]; # Tailscale - }; - }; - - # Essential services - services = { - # SSH for remote deployment - openssh = { - enable = true; - settings = { - PasswordAuthentication = false; - KbdInteractiveAuthentication = false; - PermitRootLogin = "prohibit-password"; - PubkeyAuthentication = true; - }; - }; - - # Tailscale for secure home lab access - tailscale.enable = true; - }; - - # Create admin user for deployment - users = { - mutableUsers = false; - users = { - root = { - # Add your SSH public key here for initial access - openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPgzKS1N7+7+N1/8U8++1pl4hapDm6TOy0QhrfrYA8mz geir@geokkjer.eu-admin" # Admin key - ]; - }; - - geir = { - isNormalUser = true; - extraGroups = ["wheel" "networkmanager" "sudo"]; - openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHukJK0Kc1YexvzF8PdqaqWNZdVffGoM6ePPMecrU6dM geir@geokkjer.eu-dev" # Dev key - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPgzKS1N7+7+N1/8U8++1pl4hapDm6TOy0QhrfrYA8mz geir@geokkjer.eu-admin" # Admin key for backup access - ]; - }; - }; - }; - - # Sudo configuration - security.sudo = { - enable = true; - wheelNeedsPassword = false; - }; - - # Basic packages for system management - environment.systemPackages = with pkgs; [ - git - vim - htop - curl - wget - ]; - # System version - system.stateVersion = "25.05"; -} diff --git a/packages/default.nix b/packages/default.nix index 8fda920..dabdab7 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -3,10 +3,4 @@ # Home-lab administration command-line tool lab = (pkgs.callPackage ./lab-tools.nix {}).lab; - - # Claude Task Master AI package - claude-task-master-ai = pkgs.callPackage ./claude-task-master-ai.nix {}; - - # Re-export commonly used packages with custom configurations - # (Basic CLI tools moved to base.nix) }