From 25735890a439d813f3714907952ad7c3a1cbd060 Mon Sep 17 00:00:00 2001 From: Franck Cuny Date: Wed, 31 Dec 2025 08:57:48 -0800 Subject: there's no need to have this in a separate file --- home/profiles/darwin.nix | 27 ++++++++++++++++++++++++--- home/programs/cli/core.nix | 25 ------------------------- 2 files changed, 24 insertions(+), 28 deletions(-) delete mode 100644 home/programs/cli/core.nix diff --git a/home/profiles/darwin.nix b/home/profiles/darwin.nix index 4347384..5cbb1d7 100644 --- a/home/profiles/darwin.nix +++ b/home/profiles/darwin.nix @@ -1,4 +1,4 @@ -{ config, ... }: +{ pkgs, config, ... }: { age = { identityPaths = [ "${config.home.homeDirectory}/.ssh/agenix" ]; @@ -6,9 +6,7 @@ }; imports = [ - ../programs/dev/direnv.nix ../programs/cli/bat.nix - ../programs/cli/core.nix ../programs/cli/eza.nix ../programs/cli/fd.nix ../programs/dev/delta.nix @@ -23,5 +21,28 @@ ../programs/term/kitty.nix ]; + 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"; + ps = "${pkgs.procs}/bin/procs"; + }; + + home.sessionPath = [ + "${config.home.homeDirectory}/.local/bin" + ]; + xdg.enable = true; } diff --git a/home/programs/cli/core.nix b/home/programs/cli/core.nix deleted file mode 100644 index 7d04684..0000000 --- a/home/programs/cli/core.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ config, pkgs, ... }: -{ - 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"; - ps = "${pkgs.procs}/bin/procs"; - }; - - home.sessionPath = [ - "${config.home.homeDirectory}/.local/bin" - ]; -} -- cgit v1.2.3