diff options
| -rw-r--r-- | home/programs/cli/core.nix | 44 | ||||
| -rw-r--r-- | profiles/darwin.nix | 16 | ||||
| -rw-r--r-- | profiles/defaults.nix | 6 | ||||
| -rw-r--r-- | profiles/home-manager.nix | 9 |
4 files changed, 32 insertions, 43 deletions
diff --git a/home/programs/cli/core.nix b/home/programs/cli/core.nix index cbfd110..7d04684 100644 --- a/home/programs/cli/core.nix +++ b/home/programs/cli/core.nix @@ -1,36 +1,18 @@ { config, pkgs, ... }: { - home.packages = - with pkgs; - [ - bandwhich - bottom - coreutils - delve - dive # explore layers in docker images - docker - docker-credential-helpers - dust - dysk - jless - nil # nix lsp - nix-direnv # integration with direnv - nixfmt-rfc-style # new formatter - procs - shellcheck - tree - wget - wireshark - yq - ] - ++ lib.optionals pkgs.stdenv.isLinux [ - pciutils - powertop - traceroute - ]; - - programs.ripgrep.enable = true; - programs.jq.enable = true; + home.packages = with pkgs; [ + delve + dive # explore layers in docker images + docker + docker-credential-helpers + nil # nix lsp + nix-direnv # integration with direnv + nixfmt-rfc-style # new formatter + shellcheck + tree + wget + wireshark + ]; programs.fish.shellAliases = { grep = "${pkgs.ripgrep}/bin/rg"; diff --git a/profiles/darwin.nix b/profiles/darwin.nix index d1e13a5..f3d0738 100644 --- a/profiles/darwin.nix +++ b/profiles/darwin.nix @@ -59,6 +59,22 @@ # End Nix ''; + home-manager.useGlobalPkgs = true; + + environment.systemPackages = with pkgs; [ + bandwhich + bottom + curl + coreutils + dust + dysk + jless + jq + procs + ripgrep + yq + ]; + nix = { extraOptions = '' tarball-ttl = 900 diff --git a/profiles/defaults.nix b/profiles/defaults.nix index 6ada4c7..1cc92e1 100644 --- a/profiles/defaults.nix +++ b/profiles/defaults.nix @@ -118,13 +118,13 @@ programs.fish.enable = true; environment.systemPackages = with pkgs; [ + bandwhich bottom curl + dust dysk - fd - fish - git htop + jless jq kitty.terminfo mtr diff --git a/profiles/home-manager.nix b/profiles/home-manager.nix index eb7c94d..fa6b60c 100644 --- a/profiles/home-manager.nix +++ b/profiles/home-manager.nix @@ -23,14 +23,5 @@ inputs.agenix.homeManagerModules.default ../home/modules/userinfo.nix ../home/modules/onepassword.nix - { - nixpkgs.overlays = [ - inputs.agenix.overlays.default - inputs.emacs-overlay.overlay - inputs.nur.overlays.default - self.overlays.default - ]; - nixpkgs.config.allowUnfree = true; - } ]; } |