remove with and explicitly set what needs to be set in config.
This commit is contained in:
parent
a27cac9e4b
commit
0607896460
2 changed files with 79 additions and 66 deletions
|
@ -1,14 +1,17 @@
|
|||
{ 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
|
||||
programs.krewfile = {
|
||||
enable = true;
|
||||
|
@ -40,8 +43,7 @@ with config;
|
|||
|
||||
home = {
|
||||
# Install these packages for my user
|
||||
packages = with pkgs;
|
||||
[
|
||||
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
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,9 +1,13 @@
|
|||
{ 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
|
||||
environment.systemPackages = with pkgs; [
|
||||
btop
|
||||
|
@ -15,12 +19,16 @@ with config;
|
|||
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
|
||||
|
@ -43,4 +51,5 @@ with config;
|
|||
enable = true;
|
||||
nix-direnv.enable = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue