.vscode/settings.json

@@ -8,13 +8,13 @@
     "files.trimTrailingWhitespace": true,
     "sops.defaults.ageKeyFile": "age.key",
     "nix.enableLanguageServer": true,
-  "nix.serverPath": "/run/current-system/sw/bin/nixd",
-  "nix.formatterPath": "/run/current-system/sw/bin/nixfmt",
+    "nix.serverPath": "/run/current-system/sw/bin/nil",
+    "nix.formatterPath": "/run/current-system/sw/bin/nixpkgs-fmt",
     "nix.serverSettings": {
-    "nixd": {
+        "nil": {
             "formatting": {
-        "command": ["nixfmt"]
-      }
+              "command": ["nixpkgs-fmt"]
             }
           }
+    },
 }

nixos/home/jahanson/workstation.nix

@@ -1,17 +1,14 @@
-{
-  pkgs,
-  inputs,
-  ...
-}:
+{ pkgs, config, inputs, ... }:
 let
   coderMainline = pkgs.coder.override { channel = "mainline"; };
 in
+with config;
 {
   imports = [
     ./global.nix
     inputs.krewfile.homeManagerModules.krewfile
   ];
-  config = {
+
   # Krewfile management
   programs.krewfile = {
     enable = true;
@@ -43,7 +40,8 @@ in
 
   home = {
     # Install these packages for my user
-      packages = with pkgs; [
+    packages = with pkgs;
+      [
         # apps
         obsidian
         parsec-bin
@@ -71,11 +69,9 @@ in
         pre-commit # Pre-commit tasks for git
         shellcheck # shell script linting
         unstable.act # run GitHub actions locally
-        unstable.kubebuilder # k8s controller development
         unstable.nodePackages_latest.prettier # code formatter
         unstable.tailspin # logfile highlighter
         coderMainline # VSCode in the browser -- has overlay
       ];
   };
-  };
 }

nixos/profiles/role-dev.nix

@@ -1,13 +1,9 @@
-{
-  pkgs,
-  inputs,
-  ...
-}:
+{ config, pkgs, inputs, ... }:
 # Role for dev stations
 # Could be a workstatio or a headless server.
 
+with config;
 {
-  config = {
   # git & vim are in global
   environment.systemPackages = with pkgs; [
     btop
@@ -19,16 +15,12 @@
     unstable.ncdu
     yq
 
-      # nix lsp/formatters
-      nil
-      nixd
-      nixpkgs-fmt
-      unstable.nixfmt-rfc-style # nixfmt RFC 166-style compatible with nixpkgs soon
-
     # dev
     gh
     go
     hadolint
+    nil
+    nixpkgs-fmt
     shfmt
     statix
     tmux
@@ -51,5 +43,4 @@
     enable = true;
     nix-direnv.enable = true;
   };
-  };
 }