commit fbf95a7c12c744d73c8502eac75759be2576484c
parent 1c58f928eb056c638336751f4ad43de2cb4476b3
Author: mtmn <miro@haravara.org>
Date: Sat, 23 May 2026 20:19:17 +0200
devshell: only use for `deploy-rs` and linux
Diffstat:
6 files changed, 19 insertions(+), 93 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -147,25 +147,6 @@
"type": "github"
}
},
- "elixir-overlay": {
- "inputs": {
- "flake-utils": "flake-utils_3",
- "nixpkgs": "nixpkgs_3"
- },
- "locked": {
- "lastModified": 1777038236,
- "narHash": "sha256-zjstrj6cEO9jATzTWfgiClrW4yiC9rImsiwQnfCEuKA=",
- "owner": "zoedsoupe",
- "repo": "elixir-overlay",
- "rev": "aa12c745a8b19467fb691609b4c1d56b949472e6",
- "type": "github"
- },
- "original": {
- "owner": "zoedsoupe",
- "repo": "elixir-overlay",
- "type": "github"
- }
- },
"elm2nix": {
"inputs": {
"flake-utils": "flake-utils",
@@ -236,24 +217,6 @@
"type": "github"
}
},
- "flake-utils_3": {
- "inputs": {
- "systems": "systems_5"
- },
- "locked": {
- "lastModified": 1731533236,
- "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
- "owner": "numtide",
- "repo": "flake-utils",
- "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "flake-utils",
- "type": "github"
- }
- },
"home-manager": {
"inputs": {
"nixpkgs": [
@@ -332,11 +295,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1779475168,
- "narHash": "sha256-gm3D4FF9EcZlXK/ZnsC6IYzpEQplOoT+LPTurzOPyrk=",
+ "lastModified": 1779536132,
+ "narHash": "sha256-q+fF42iv/geEbHfgSzy3tS0FF/EyD6XTZ98E6yxiBO8=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "a0991c886dc83e6e9de01d5266e4842985b1850e",
+ "rev": "3d8f0f3f72a6cd4d93d0ad13203f2ea1cb7e1456",
"type": "github"
},
"original": {
@@ -346,22 +309,6 @@
"type": "github"
}
},
- "nixpkgs_3": {
- "locked": {
- "lastModified": 1761516808,
- "narHash": "sha256-4ZdXt+vhA+qyE/TNCp16v2sBJyr0pteKqgiLTXxM4eU=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "2ab7841f414ccdefea889707b2d5e4b32cda9729",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixos-25.05-small",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
"ragenix": {
"inputs": {
"agenix": "agenix",
@@ -422,17 +369,16 @@
},
"shirts": {
"inputs": {
- "elixir-overlay": "elixir-overlay",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
- "lastModified": 1778236854,
- "narHash": "sha256-rC7idsQjSRjpMpHikwoZHzHRqQ/oF8ic6m/dMnLr/v8=",
+ "lastModified": 1779561041,
+ "narHash": "sha256-wOdVXTBlMEME1Aehev79JJMHSL5O2fNeaBk7ntqTBv4=",
"owner": "~mtmn",
"repo": "shirts",
- "rev": "b03b838ac619850f8d80aff675f095a9731617f1",
+ "rev": "24fb714964f45bd854c74de53f600b2b7bb2a079",
"type": "sourcehut"
},
"original": {
@@ -501,21 +447,6 @@
"type": "github"
}
},
- "systems_5": {
- "locked": {
- "lastModified": 1681028828,
- "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
- "owner": "nix-systems",
- "repo": "default",
- "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
- "type": "github"
- },
- "original": {
- "owner": "nix-systems",
- "repo": "default",
- "type": "github"
- }
- },
"utils": {
"inputs": {
"systems": "systems_2"
diff --git a/flake.nix b/flake.nix
@@ -155,20 +155,15 @@
nodes = deployNodes;
};
- devShells = lib.genAttrs ["x86_64-linux" "aarch64-darwin"] (system: let
- pkgs = nixpkgs.legacyPackages.${system};
- in {
- default = pkgs.mkShell {
- packages =
- [
- home-manager.packages.${system}.home-manager
- pkgs.nh
- pkgs.nvd
- ]
- ++ lib.optionals (system == "x86_64-linux") [
- deploy-rs.packages.${system}.deploy-rs
- ];
+ devShells.x86_64-linux.default = let
+ pkgs = nixpkgs.legacyPackages.x86_64-linux;
+ in
+ pkgs.mkShell {
+ packages = [
+ pkgs.nh
+ pkgs.nvd
+ deploy-rs.packages.x86_64-linux.deploy-rs
+ ];
};
- });
};
}
diff --git a/hosts/nixaran/flake.nix b/hosts/nixaran/flake.nix
Binary files differ.
diff --git a/justfile b/justfile
@@ -13,7 +13,7 @@ deploy host="nixaran":
local:
-@backup -t git:nix
- nix develop -c nh home switch .
+ nh home switch .
diff:
nix develop -c home-manager build --flake ".#$(whoami)@$(hostname)" --no-update-lock-file
diff --git a/modules/services/bandeno.nix b/modules/services/bandeno.nix
@@ -8,10 +8,10 @@
}: let
cfg = config.services.haravara.bandeno;
- bandeno-src = inputs.bandeno.packages.${pkgs.system}.default;
+ bandeno-src = inputs.bandeno.packages.${pkgs.stdenv.hostPlatform.system}.default;
in {
options.services.haravara.bandeno = {
- enable = lib.mkEnableOption "Bandeno - Deno application";
+ enable = lib.mkEnableOption "Bandeno - Bandcamp RSS feed proxy";
port = lib.mkOption {
type = lib.types.port;
diff --git a/modules/services/shirts.nix b/modules/services/shirts.nix
@@ -8,7 +8,7 @@
}: let
cfg = config.services.haravara.shirts;
- shirts = inputs.shirts.packages.${pkgs.system}.default;
+ shirts = inputs.shirts.packages.${pkgs.stdenv.hostPlatform.system}.default;
in {
options.services.haravara.shirts = {
enable = lib.mkEnableOption "link shortener that beams up";
