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,47 +1,49 @@
{ 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;
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 # 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,46 +1,55 @@
{ 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;
{ {
# git & vim are in global config = {
environment.systemPackages = with pkgs; [ # git & vim are in global
btop environment.systemPackages = with pkgs; [
dnsutils btop
fira-code-nerdfont dnsutils
jo fira-code-nerdfont
jq jo
nix jq
unstable.ncdu nix
yq unstable.ncdu
yq
# dev # nix lsp/formatters
gh nil
go nixd
hadolint nixpkgs-fmt
nil unstable.nixfmt-rfc-style # nixfmt RFC 166-style compatible with nixpkgs soon
nixpkgs-fmt
shfmt
statix
tmux
unstable.cyme
unstable.helix
# flake imports # dev
inputs.nix-inspect.packages.${pkgs.system}.default gh
inputs.talhelper.packages.${pkgs.system}.default go
hadolint
shfmt
statix
tmux
unstable.cyme
unstable.helix
# charmbracelet tools # flake imports
gum inputs.nix-inspect.packages.${pkgs.system}.default
vhs inputs.talhelper.packages.${pkgs.system}.default
mods
soft-serve
];
programs.direnv = { # charmbracelet tools
# TODO move to home-manager gum
enable = true; vhs
nix-direnv.enable = true; mods
soft-serve
];
programs.direnv = {
# TODO move to home-manager
enable = true;
nix-direnv.enable = true;
};
}; };
} }