nix

commit 5c98246679170310bb2e4c2d278d691fc3ab2630
parent 8a8e0cca4c4eb24ca91d11a7b573c2e2d0a561c6
Author: mtmn <miro@haravara.org>
Date:   Sun, 19 Apr 2026 18:33:52 +0200

chore: core mixin

Diffstat:
M
hosts/void/default.nix
 | 
22
++--------------------
M
modules/mixins/core/default.nix
 | 
97
+++++++++++++++++++++++++++++--------------------------------------------------

2 files changed, 38 insertions(+), 81 deletions(-)
diff --git a/hosts/void/default.nix b/hosts/void/default.nix
@@ -3,17 +3,8 @@
   lib,
   ...
 }: {
+  imports = [../../modules/mixins/core];
   home.packages = lib.concatLists (lib.attrValues (with pkgs; {
-    core = [
-      neovim
-      eza
-      bat
-      fzf
-      just
-      zoxide
-      tmux
-    ];
-
     web = [
       aerc
       offpunk
@@ -43,7 +34,6 @@
       git-absorb
       git-annex
       lazygit
-      jujutsu
       jjui
       prek
       gh
@@ -64,7 +54,6 @@
 
     net = [
       dnscontrol
-      rsync
       sshfs
       rclone
       xh
@@ -90,9 +79,6 @@
       tree-sitter
       bear
       entr
-      meson
-      ninja
-      cmake
     ];
 
     utils = [
@@ -122,16 +108,12 @@
     ];
 
     nix = [
-      deadnix
-      statix
       cachix
       comma
       nh
-      nvd
-      ragenix
       nix-diff
-      alejandra
       nixd
+      nvd
       lorri
     ];
 
diff --git a/modules/mixins/core/default.nix b/modules/mixins/core/default.nix
@@ -1,66 +1,41 @@
-{pkgs, ...}: {
-  home.packages = with pkgs; [
-    # nix
-    alejandra
-    comma
-    deadnix
-    deploy-rs
-    nh
-    nil
-    nix-du
-    nixd
-    nixfmt
-    nixos-anywhere
-    nvd
-    ragenix
-    statix
+{
+  pkgs,
+  lib,
+  ...
+}: {
+  home.packages = lib.concatLists (lib.attrValues (with pkgs; {
+    utils = [
+      neovim
+      eza
+      bat
+      fzf
+      just
+      zoxide
+      tmux
+    ];
 
-    # vcs
-    difftastic
-    git-bug
-    git-crypt
-    git-absorb
-    git-filter-repo
-    gitleaks
-    jujutsu
-    jjui
-    prek
+    vcs = [
+      git
+      jujutsu
+    ];
 
-    # data
-    duckdb
-    gron
-    jaq
-    jless
-    jq
-    pandoc
-    taplo
+    net = [
+      rsync
+      wget
+      curl
+    ];
 
-    # ops
-    ansible
-    ansible-lint
-    awscli2
-    hadolint
-    woodpecker-cli
+    build = [
+      meson
+      ninja
+      cmake
+    ];
 
-    # net
-    bore-cli
-    curl
-    hurl
-    inetutils
-    lftp
-    mosh
-    mosquitto
-    net-tools
-    newsraft
-    nmap
-    offpunk
-    rclone
-    rsync
-    sshfs
-    thrift
-    websocat
-    wget
-    whois
-    xh
-  ];
+    nix = [
+      deadnix
+      statix
+      ragenix
+      alejandra
+    ];
+  }));
 }