change to nixfmt-rfcstyle and nixd

.vscode/settings.json

@@ -1,20 +1,20 @@
 {
-    "editor.fontFamily": "FiraCode Nerd Font",
-    "editor.hover.delay": 1500,
-    "editor.bracketPairColorization.enabled": true,
-    "editor.guides.bracketPairs": true,
-    "editor.guides.bracketPairsHorizontal": true,
-    "editor.guides.highlightActiveBracketPair": true,
-    "files.trimTrailingWhitespace": true,
-    "sops.defaults.ageKeyFile": "age.key",
-    "nix.enableLanguageServer": true,
-    "nix.serverPath": "/run/current-system/sw/bin/nil",
-    "nix.formatterPath": "/run/current-system/sw/bin/nixpkgs-fmt",
-    "nix.serverSettings": {
-        "nil": {
-            "formatting": {
-              "command": ["nixpkgs-fmt"]
-            }
-          }
-    },
+  "editor.fontFamily": "FiraCode Nerd Font",
+  "editor.hover.delay": 1500,
+  "editor.bracketPairColorization.enabled": true,
+  "editor.guides.bracketPairs": true,
+  "editor.guides.bracketPairsHorizontal": true,
+  "editor.guides.highlightActiveBracketPair": true,
+  "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.serverSettings": {
+    "nixd": {
+      "formatting": {
+        "command": ["nixfmt"]
+      }
+    }
+  }
 }

nixos/home/jahanson/workstation.nix

@@ -1,47 +1,49 @@
-{ pkgs, config, inputs, ... }:
+{
+  pkgs,
+  inputs,
+  ...
+}:
 let
   coderMainline = pkgs.coder.override { channel = "mainline"; };
 in
-with config;
 {
   imports = [
     ./global.nix
     inputs.krewfile.homeManagerModules.krewfile
   ];
-
-  # Krewfile management
-  programs.krewfile = {
-    enable = true;
-    krewPackage = pkgs.krew;
-    indexes = {
-      "netshoot" = "https://github.com/nilic/kubectl-netshoot.git";
+  config = {
+    # Krewfile management
+    programs.krewfile = {
+      enable = true;
+      krewPackage = pkgs.krew;
+      indexes = {
+        "netshoot" = "https://github.com/nilic/kubectl-netshoot.git";
+      };
+      plugins = [
+        "netshoot/netshoot"
+        "resource-capacity"
+        "rook-ceph"
+      ];
     };
-    plugins = [
-      "netshoot/netshoot"
-      "resource-capacity"
-      "rook-ceph"
-    ];
-  };
 
-  myHome = {
-    programs.firefox.enable = true;
-    programs.thunderbird.enable = true;
-    shell = {
-      wezterm.enable = true;
+    myHome = {
+      programs.firefox.enable = true;
+      programs.thunderbird.enable = true;
+      shell = {
+        wezterm.enable = true;
 
-      git = {
-        enable = true;
-        username = "Joseph Hanson";
-        email = "joe@veri.dev";
-        signingKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIDSAmssproxG+KsVn2DfuteBAemHrmmAFzCtldpKl4J";
+        git = {
+          enable = true;
+          username = "Joseph Hanson";
+          email = "joe@veri.dev";
+          signingKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIDSAmssproxG+KsVn2DfuteBAemHrmmAFzCtldpKl4J";
+        };
       };
     };
-  };
 
-  home = {
-    # Install these packages for my user
-    packages = with pkgs;
-      [
+    home = {
+      # Install these packages for my user
+      packages = with pkgs; [
         # apps
         obsidian
         parsec-bin
@@ -69,9 +71,11 @@ with config;
         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,46 +1,55 @@
-{ config, pkgs, inputs, ... }:
+{
+  pkgs,
+  inputs,
+  ...
+}:
 # Role for dev stations
 # Could be a workstatio or a headless server.
 
-with config;
 {
-  # git & vim are in global
-  environment.systemPackages = with pkgs; [
-    btop
-    dnsutils
-    fira-code-nerdfont
-    jo
-    jq
-    nix
-    unstable.ncdu
-    yq
+  config = {
+    # git & vim are in global
+    environment.systemPackages = with pkgs; [
+      btop
+      dnsutils
+      fira-code-nerdfont
+      jo
+      jq
+      nix
+      unstable.ncdu
+      yq
 
-    # dev
-    gh
-    go
-    hadolint
-    nil
-    nixpkgs-fmt
-    shfmt
-    statix
-    tmux
-    unstable.cyme
-    unstable.helix
+      # nix lsp/formatters
+      nil
+      nixd
+      nixpkgs-fmt
+      unstable.nixfmt-rfc-style # nixfmt RFC 166-style compatible with nixpkgs soon
 
-    # flake imports
-    inputs.nix-inspect.packages.${pkgs.system}.default
-    inputs.talhelper.packages.${pkgs.system}.default
+      # dev
+      gh
+      go
+      hadolint
+      shfmt
+      statix
+      tmux
+      unstable.cyme
+      unstable.helix
 
-    # charmbracelet tools
-    gum
-    vhs
-    mods
-    soft-serve
-  ];
+      # flake imports
+      inputs.nix-inspect.packages.${pkgs.system}.default
+      inputs.talhelper.packages.${pkgs.system}.default
 
-  programs.direnv = {
-    # TODO move to home-manager
-    enable = true;
-    nix-direnv.enable = true;
+      # charmbracelet tools
+      gum
+      vhs
+      mods
+      soft-serve
+    ];
+
+    programs.direnv = {
+      # TODO move to home-manager
+      enable = true;
+      nix-direnv.enable = true;
+    };
   };
 }