From 0e0a18c0784abf8a7736aaae3a81e2e3b6c60ab4 Mon Sep 17 00:00:00 2001
From: Brian Lee <blee@satstack.cloud>
Date: Thu, 5 Dec 2024 09:15:42 -0800
Subject: [PATCH] litten: Add jmespath to ansible build inputs, and minor
 syntax changes for NixOS 24.11

---
 litten.brenise.dev/configuration.nix | 42 +++++++++++++++++-----------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/litten.brenise.dev/configuration.nix b/litten.brenise.dev/configuration.nix
index 537cc46..16c649a 100644
--- a/litten.brenise.dev/configuration.nix
+++ b/litten.brenise.dev/configuration.nix
@@ -22,6 +22,13 @@ in
         "zoom"
       ];
   };
+  nixpkgs.overlays = [
+    (self: super: {
+      ansible = super.ansible.overrideAttrs (oldAttrs: {
+        propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [ super.python312Packages.jmespath ];
+      }); # Add jmespath to ansible build inputs
+    })
+  ];
 
   boot = {
     loader = {
@@ -34,7 +41,7 @@ in
     bluetooth.enable = true;
     keyboard.qmk.enable = true;
 
-    opengl = { # https://wiki.nixos.org/wiki/Accelerated_Video_Playback
+    graphics = { # https://wiki.nixos.org/wiki/Accelerated_Video_Playback
       enable = true;
       extraPackages = with pkgs; [
         intel-media-driver
@@ -89,7 +96,7 @@ in
         isNormalUser = true;
         extraGroups = [
           "wheel"
-        # "docker"
+          "docker"
           "glance"
           ];
         packages = with pkgs; [
@@ -132,10 +139,10 @@ in
           packer
           terraform
           ansible
-          python311 # Not working in 3.12 yet: openwebui
+          python311
           python311Packages.pip
           python311Packages.ipython
-          python311Packages.jmespath # for Ansible playbooks with json_query (grafana, caddy)
+        # python311Packages.jmespath # for Ansible playbooks with json_query (grafana, caddy)
           libreoffice-qt
           hunspell
           hunspellDicts.uk_UA
@@ -245,7 +252,10 @@ in
   # };
 
     fish.enable = true;
-    vim.defaultEditor = true;
+    vim = {
+      enable = true;
+      defaultEditor = true;
+    };
     bash = {
       shellAliases = {
         ll = "ls -lAF --classify --group-directories-first";
@@ -461,17 +471,17 @@ in
 
   };
 
-# virtualisation.docker = {
-#   enable = true;
-#   rootless = {
-#     enable = true;
-#     setSocketVariable = true;
-#   };
-#   autoPrune = {
-#     enable = true;
-#     dates = "monthly";
-#   };
-# };
+  virtualisation.docker = {
+    enable = true;
+    rootless = {
+      enable = true;
+      setSocketVariable = true;
+    };
+    autoPrune = {
+      enable = true;
+      dates = "monthly";
+    };
+  };
 
   system.stateVersion = "23.05";
 }