.vscode/settings.json

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

nixos/home/jahanson/workstation.nix

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