pinned python 3.12

ad-nix.code-workspace

@@ -27,7 +27,11 @@
 		},
 		"python.defaultInterpreterPath": "${workspaceFolder}/.devenv/state/venv/bin/python3",
 		"python.autoComplete.extraPaths": ["~/ad-lola", "${fileWorkspaceFolder}/apps/room_control/src"],
-		"python.analysis.extraPaths": ["~/ad-lola", "${fileWorkspaceFolder}/apps/room_control/src"],
+		"python.analysis.extraPaths": [
+			"~/ad-lola",
+			"${workspaceFolder:conf}/lola/apps/room_control/src",
+			"${workspaceFolder:conf}/lola/apps/lola-parking/src"
+		],
 		"python.analysis.autoFormatStrings": true,
 		"python.analysis.completeFunctionParens": true,
 		"python.analysis.autoImportCompletions": true,

configuration.nix

@@ -1,7 +1,7 @@
 { pkgs, lib, userSettings, systemSettings, ... }:
 {
   imports = [
-    (import ./home-manager {inherit systemSettings userSettings lib pkgs;})
+    # (import ./home-manager {inherit systemSettings userSettings lib pkgs;})
      ./nixos
      ./scripts
   ];
@@ -23,12 +23,8 @@
   # sops.age.keyFile = "${userSettings.adHome}/.config/sops/age/keys.txt";
 
   environment.systemPackages = with pkgs; [
-    bash
-    git
-    eza
     sops
     gdbm
-    btop
   ];
 
   virtualisation.docker.enable = true;

flake.lock

@@ -9,16 +9,20 @@
           "devenv"
         ],
         "git-hooks": [
-          "devenv"
+          "devenv",
+          "git-hooks"
         ],
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": [
+          "devenv",
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1744206633,
+        "lastModified": 1748883665,
-        "narHash": "sha256-pb5aYkE8FOoa4n123slgHiOf1UbNSnKe5pEZC+xXD5g=",
+        "narHash": "sha256-R0W7uAg+BLoHjMRMQ8+oiSbTq8nkGz5RDpQ+ZfxxP3A=",
         "owner": "cachix",
         "repo": "cachix",
-        "rev": "8a60090640b96f9df95d1ab99e5763a586be1404",
+        "rev": "f707778d902af4d62d8dd92c269f8e70de09acbe",
         "type": "github"
       },
       "original": {
@@ -39,11 +43,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1750097069,
+        "lastModified": 1756048064,
-        "narHash": "sha256-MePLDJw4megMq47O3WXgmpnDOIaQrHYrgA3xS7Ps+c8=",
+        "narHash": "sha256-mVgB6qWhLrCW6AciLyFXosDKKZFtBgqvixcA8a07s+g=",
         "owner": "cachix",
         "repo": "devenv",
-        "rev": "ab8a1563714393d366b2db7d93f021afb45e7a6f",
+        "rev": "3fb20c149d329b01a2b519fbb2a9ca3e6e6e1b05",
         "type": "github"
       },
       "original": {
@@ -55,11 +59,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1733328505,
+        "lastModified": 1747046372,
-        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
+        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
+        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
         "type": "github"
       },
       "original": {
@@ -71,11 +75,11 @@
     "flake-compat_2": {
       "flake": false,
       "locked": {
-        "lastModified": 1733328505,
+        "lastModified": 1747046372,
-        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
+        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
+        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
         "type": "github"
       },
       "original": {
@@ -93,11 +97,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1712014858,
+        "lastModified": 1733312601,
-        "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
+        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
+        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
         "type": "github"
       },
       "original": {
@@ -127,7 +131,8 @@
     "git-hooks": {
       "inputs": {
         "flake-compat": [
-          "devenv"
+          "devenv",
+          "flake-compat"
         ],
         "gitignore": "gitignore",
         "nixpkgs": [
@@ -136,11 +141,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1746537231,
+        "lastModified": 1750779888,
-        "narHash": "sha256-Wb2xeSyOsCoTCTj7LOoD6cdKLEROyFAArnYoS+noCWo=",
+        "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "fa466640195d38ec97cf0493d6d6882bc4d14969",
+        "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d",
         "type": "github"
       },
       "original": {
@@ -178,11 +183,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1750099781,
+        "lastModified": 1756022458,
-        "narHash": "sha256-6EVPi3XzioPzwxLZ/2nD6jbKCLA2ZXRdOWFgHg2ozrA=",
+        "narHash": "sha256-J1i35r4HfNDdPpwL0vOBaZopQudAUVtartEerc1Jryc=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "1db3cb415da14c81d8e0fdd3a5edeba82ad13a1f",
+        "rev": "9e3a33c0bcbc25619e540b9dfea372282f8a9740",
         "type": "github"
       },
       "original": {
@@ -212,51 +217,39 @@
         "type": "github"
       }
     },
-    "libgit2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1697646580,
-        "narHash": "sha256-oX4Z3S9WtJlwvj0uH9HlYcWv+x1hqp8mhXl7HsLu2f0=",
-        "owner": "libgit2",
-        "repo": "libgit2",
-        "rev": "45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "libgit2",
-        "repo": "libgit2",
-        "type": "github"
-      }
-    },
     "nix": {
       "inputs": {
         "flake-compat": [
-          "devenv"
+          "devenv",
+          "flake-compat"
         ],
         "flake-parts": "flake-parts",
-        "libgit2": "libgit2",
+        "git-hooks-nix": [
-        "nixpkgs": "nixpkgs_2",
+          "devenv",
+          "git-hooks"
+        ],
+        "nixpkgs": [
+          "devenv",
+          "nixpkgs"
+        ],
         "nixpkgs-23-11": [
           "devenv"
         ],
         "nixpkgs-regression": [
           "devenv"
-        ],
-        "pre-commit-hooks": [
-          "devenv"
         ]
       },
       "locked": {
-        "lastModified": 1745930071,
+        "lastModified": 1755029779,
-        "narHash": "sha256-bYyjarS3qSNqxfgc89IoVz8cAFDkF9yPE63EJr+h50s=",
+        "narHash": "sha256-3+GHIYGg4U9XKUN4rg473frIVNn8YD06bjwxKS1IPrU=",
-        "owner": "domenkozar",
+        "owner": "cachix",
         "repo": "nix",
-        "rev": "b455edf3505f1bf0172b39a735caef94687d0d9c",
+        "rev": "b0972b0eee6726081d10b1199f54de6d2917f861",
         "type": "github"
       },
       "original": {
-        "owner": "domenkozar",
+        "owner": "cachix",
-        "ref": "devenv-2.24",
+        "ref": "devenv-2.30",
         "repo": "nix",
         "type": "github"
       }
@@ -269,11 +262,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1750100488,
+        "lastModified": 1750825763,
-        "narHash": "sha256-WFY6/1AtATVloT/takLMt6/0RNx2ivU1ZXG4Pn64/eA=",
+        "narHash": "sha256-gUtcO/8Bcw4YerJpSIRu+Q2MYKxWrtT+8Bp3Mh1Qfmw=",
         "ref": "refs/heads/main",
-        "rev": "696f5a00078b39c9ca81802170924c4647ffd5a1",
+        "rev": "1ab1e4b9e610dcd40a3d728f377b6ac8a302d977",
-        "revCount": 16,
+        "revCount": 26,
         "type": "git",
         "url": "https://gitea.john-stream.com/john/nix-home"
       },
@@ -284,11 +277,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1733212471,
+        "lastModified": 1755615617,
-        "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=",
+        "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776",
+        "rev": "20075955deac2583bb12f07151c2df830ef346b4",
         "type": "github"
       },
       "original": {
@@ -306,11 +299,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1749760516,
+        "lastModified": 1755249745,
-        "narHash": "sha256-koLwnVjVrR4yS2ea1owMj6ps2sOhH67ObTIld9H27Yo=",
+        "narHash": "sha256-lDIbUfJ8xK62ekG+qojTlA1raHpKdScBTx8IFlQYx9U=",
         "owner": "cachix",
         "repo": "nixpkgs-python",
-        "rev": "908dbb466af5955ea479ac95953333fd64387216",
+        "rev": "b6632af2db9f47c79dac8f4466388c7b1b6c3071",
         "type": "github"
       },
       "original": {
@@ -320,38 +313,6 @@
       }
     },
     "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1717432640,
-        "narHash": "sha256-+f9c4/ZX5MWDOuB1rKoWj+lBNm0z0rs4CK47HBLxy1o=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "88269ab3044128b7c2f4c7d68448b2fb50456870",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "release-24.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1749794982,
-        "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_4": {
       "locked": {
         "lastModified": 1682134069,
         "narHash": "sha256-TnI/ZXSmRxQDt2sjRYK/8j8iha4B4zP2cnQCZZ3vp7k=",
@@ -370,7 +331,7 @@
         "devenv": "devenv",
         "home-manager": "home-manager",
         "nix-home": "nix-home",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs",
         "nixpkgs-python": "nixpkgs-python",
         "sops-nix": "sops-nix",
         "vscode-server": "vscode-server"
@@ -383,11 +344,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1749592509,
+        "lastModified": 1754988908,
-        "narHash": "sha256-VunQzfZFA+Y6x3wYi2UE4DEQ8qKoAZZCnZPUlSoqC+A=",
+        "narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "50754dfaa0e24e313c626900d44ef431f3210138",
+        "rev": "3223c7a92724b5d804e9988c6b447a0d09017d48",
         "type": "github"
       },
       "original": {
@@ -414,14 +375,14 @@
     "vscode-server": {
       "inputs": {
         "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1729422940,
+        "lastModified": 1753541826,
-        "narHash": "sha256-DlvJv33ml5UTKgu4b0HauOfFIoDx6QXtbqUF3vWeRCY=",
+        "narHash": "sha256-foGgZu8+bCNIGeuDqQ84jNbmKZpd+JvnrL2WlyU4tuU=",
         "owner": "nix-community",
         "repo": "nixos-vscode-server",
-        "rev": "8b6db451de46ecf9b4ab3d01ef76e59957ff549f",
+        "rev": "6d5f074e4811d143d44169ba4af09b20ddb6937d",
         "type": "github"
       },
       "original": {

flake.nix

@@ -35,8 +35,6 @@
     nixosSystem = inputs.nixpkgs.lib.nixosSystem;
 
     userSettings = {
-      gitUserName = "John Lancaster";
-      gitUserEmail = "32917998+jsl12@users.noreply.github.com";
       userName = "appdaemon";
       adHome = "/home/appdaemon";
     };
@@ -47,7 +45,7 @@
       system = "x86_64-linux";
       timeZone = "America/Chicago";
       locale = "en_US.UTF-8";
-      # pythonVersion = "3.11.10"; # This is largely irrelevant because uv will handle it
+      pythonVersion = "3.12"; # This is largely irrelevant because uv will handle it
     };
 
     pkgs = inputs.nixpkgs.legacyPackages.${systemSettings.system};
@@ -64,7 +62,7 @@
       modules = [
         (inputs.nixpkgs + "/nixos/modules/virtualisation/proxmox-lxc.nix")
         inputs.home-manager.nixosModules.default
-        inputs.nix-home.nixosModules.default { user = "appdaemon"; }
+        inputs.nix-home.nixosModules.default { user = "${userSettings.userName}"; }
         inputs.vscode-server.nixosModules.default
         inputs.sops-nix.nixosModules.sops
         ./configuration.nix
@@ -92,7 +90,7 @@
           # https://devenv.sh/supported-languages/python/
           languages.python = {
             enable = true;
-            # version = systemSettings.pythonVersion;
+            version = systemSettings.pythonVersion;
             uv = {
               enable = true;
               package = pkgs.uv;

home-manager/git.nix

@@ -1,12 +0,0 @@
-{ userSettings, ... }:
-{
-  programs.git = {
-    enable = true;
-    extraConfig.credential.helper = "store --file ~/.git-credentials";
-    userName = "${userSettings.gitUserName}";
-    userEmail = "${userSettings.gitUserEmail}";
-    extraConfig = {
-      safe.directory = "/home/appdaemon/ad-nix";
-    };
-  };
-}

home-manager/zsh.nix

@@ -1,23 +0,0 @@
-{ ... }:
-{
-  programs.zsh = {
-    enable = true;
-    oh-my-zsh = {
-      enable = true;
-      # https://github.com/ohmyzsh/ohmyzsh/wiki/themes
-      # theme = "robbyrussell";
-      # theme = "simple";
-      theme = "risto";
-      plugins = [
-        "sudo"
-        "dotenv"
-        "git"
-        "ssh"
-        "ssh-agent"
-      ];
-    };
-    shellAliases = {
-      ls = "eza -lgs type -o --no-time";
-    };
-  };
-}

nixos/default.nix

@@ -1,6 +1,7 @@
 { ... }:
 {
   imports = [
+    ./home-manager.nix
     ./docker
     ./services
   ];

nixos/home-manager.nix

@@ -17,8 +17,11 @@
       home.stateVersion = systemSettings.stateVersion;
       home.homeDirectory = lib.mkForce "${userSettings.adHome}";
       systemd.user.startServices = "sd-switch"; # helps with handling systemd services when switching
-      programs.ssh.enable = true;
       programs.gh.enable = true;
+      programs.git.extraConfig.safe.directory = "/home/appdaemon/ad-nix";
+      home.packages = with pkgs; [
+        lazydocker
+      ];
     };
   };
 }

nixos/services/telegraf.nix

@@ -1,6 +1,6 @@
 { config, pkgs, ... }:
 let
-  influxURL = "http://panoptes.john-stream.com:8086";
+  influxURL = "https://influxdb.john-stream.com";
   organization = "homelab";
   bucket = "docker";
   token = "${builtins.readFile config.sops.secrets."telegraf_influx_token".path}";
@@ -41,7 +41,6 @@ in
           container_name_include = [];
           timeout = "5s";
           perdevice_include = ["cpu" "blkio" "network"];
-          total = false;
           docker_label_include = [];
         };
       };