remove with and explicitly set what needs to be set in config.

This commit is contained in:
Joseph Hanson 2024-10-23 21:06:20 -05:00
parent a27cac9e4b
commit 0607896460
Signed by: jahanson
SSH key fingerprint: SHA256:vy6dKBECV522aPAwklFM3ReKAVB086rT3oWwiuiFG7o
2 changed files with 79 additions and 66 deletions

View file

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

View file

@ -1,9 +1,13 @@
{ config, pkgs, inputs, ... }: {
pkgs,
inputs,
...
}:
# Role for dev stations # Role for dev stations
# Could be a workstatio or a headless server. # 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
@ -15,12 +19,16 @@ with config;
unstable.ncdu unstable.ncdu
yq yq
# nix lsp/formatters
nil
nixd
nixpkgs-fmt
unstable.nixfmt-rfc-style # nixfmt RFC 166-style compatible with nixpkgs soon
# dev # dev
gh gh
go go
hadolint hadolint
nil
nixpkgs-fmt
shfmt shfmt
statix statix
tmux tmux
@ -43,4 +51,5 @@ with config;
enable = true; enable = true;
nix-direnv.enable = true; nix-direnv.enable = true;
}; };
};
} }