nix

commit c4ee1e7d2896496a8ac1ac2569d013a0d37cf9cc
parent d03e27c3164da6776bf8b62b396b5e52897e91f5
Author: mtmn <miro@haravara.org>
Date:   Sat,  2 May 2026 18:22:14 +0200

chore: run `deploy-rs` from devshell; misc

Diffstat:
M
flake.lock
 | 
18
+++++++++---------
M
flake.nix
 | 
6
++++++
M
hosts/void/default.nix
 | 
37
+++++--------------------------------
M
justfile
 | 
10
+++++-----
M
modules/mixins/core/default.nix
 | 
1
+

5 files changed, 26 insertions(+), 46 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -110,11 +110,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1776613567,
-        "narHash": "sha256-gC9Cp5ibBmGD5awCA9z7xy6MW6iJufhazTYJOiGlCUI=",
+        "lastModified": 1777713215,
+        "narHash": "sha256-8GzXDOXckDWwST8TY5DbwYFjdvQLlP7K9CLSVx6iTTo=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "32f4236bfc141ae930b5ba2fb604f561fed5219d",
+        "rev": "63b4e7e6cf75307c1d26ac3762b886b5b0247267",
         "type": "github"
       },
       "original": {
@@ -200,11 +200,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1777679572,
-        "narHash": "sha256-egYNbRrkn+6SwTHinhdb6WUfzzdC3nXfCRqS321VylY=",
+        "lastModified": 1777733408,
+        "narHash": "sha256-lyKV2GtkMPS1Mp8bKJ8sBr7LPCzL4GnVnQQYa4e7UsQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "9cb587ade2aa1b4a7257f0238d41072690b0ca4f",
+        "rev": "9ce9f7f128c5834bb71a4f5c62232187371379b6",
         "type": "github"
       },
       "original": {
@@ -287,11 +287,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1777548390,
-        "narHash": "sha256-WacE23EbHTsBKvr8cu+1DFNbP6Rh1brHUH5SDUI0NQI=",
+        "lastModified": 1777641297,
+        "narHash": "sha256-WNGcmeOZ8Tr9dq6ztCspYbzWFswr2mPebM9LpsfGxPk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "7aaa00e7cc9be6c316cb5f6617bd740dd435c59d",
+        "rev": "c6d65881c5624c9cae5ea6cedef24699b0c0a4c0",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
@@ -141,5 +141,11 @@
     deploy = {
       nodes = deployNodes;
     };
+
+    devShells = lib.genAttrs ["x86_64-linux"] (system: {
+      default = nixpkgs.legacyPackages.${system}.mkShell {
+        packages = [deploy-rs.packages.${system}.deploy-rs];
+      };
+    });
   };
 }
diff --git a/hosts/void/default.nix b/hosts/void/default.nix
@@ -28,7 +28,6 @@
       datasette
       tokyocabinet
       dhall
-      dhall-json
       pandoc
       codespelunker
       opensearch-cli
@@ -38,33 +37,14 @@
       git-bug
       git-crypt
       git-absorb
-      git-annex
-      git-filter-repo
       lazygit
       jujutsu
       jjui
       prek
-      gh
-      prr
-      difftastic
       hut
       got
     ];
 
-    ci = [
-      ansible-language-server
-      ansible-lint
-      ansible
-      awscli2
-      podman
-      skopeo
-      tenv
-      act
-      woodpecker-cli
-      gh-enhance
-      pinact
-    ];
-
     net = lib.concatLists [
       [
         dnscontrol
@@ -77,6 +57,7 @@
         knot-dns
         aria2
         yt-dlp
+        awscli2
       ]
       (with python314Packages; [yt-dlp-ejs])
     ];
@@ -86,8 +67,6 @@
       sacad
       ffmpeg
       soundtouch
-      ghostscript
-      oxipng
       imagemagick
     ];
 
@@ -100,10 +79,8 @@
 
     utils = [
       shellcheck
-      ouch
       shfmt
       ncdu
-      hyperfine
       gdb
       strace
       perf
@@ -111,22 +88,17 @@
       buf
       duc
       clang-tools
-      harper
-      topiary
       parallel
       pbpctrl
+      jotdown
+      podman
+      tenv
     ];
 
     lsp = [
       zls_0_15
       just-lsp
-    ];
-
-    go = [
-      go
       gopls
-      go-audit
-      golangci-lint
     ];
 
     nix = [
@@ -191,6 +163,7 @@
     other = [
       babashka
       gleam
+      go
     ];
   }));
 }
diff --git a/justfile b/justfile
@@ -1,15 +1,15 @@
 default:
     @just --list
 
+update:
+    nix flake update
+
 check:
     nix flake check --no-update-lock-file 2>&1 | grep -vE "unknown flake output '(deploy|configData)'"
 
 diff host="nixaran":
-    nix run --inputs-from . github:serokell/deploy-rs -- --dry-activate .#{{ host }} 2>&1 | grep -vE "unknown flake output '(deploy|configData)'"
-
-update:
-    nix flake update
+    nix develop -c deploy -- --dry-activate .#{{ host }} 2>&1 | grep -vE "unknown flake output '(deploy|configData)'"
 
 deploy host="nixaran":
     @backup nix
-    nix run --inputs-from . github:serokell/deploy-rs .#{{ host }} 2>&1 | grep -vE "unknown flake output '(deploy|configData)'"
+    nix develop -c deploy .#{{ host }} 2>&1 | grep -vE "unknown flake output '(deploy|configData)'"
diff --git a/modules/mixins/core/default.nix b/modules/mixins/core/default.nix
@@ -13,6 +13,7 @@
       just
       zoxide
       tmux
+      difftastic
     ];
 
     net = [