m/graphical: more rust things

This commit is contained in:
Ari Gato 2024-12-04 13:37:17 +01:00
parent d3e074b163
commit 36ad214cfe
3 changed files with 29 additions and 18 deletions

37
flake.lock generated
View file

@ -255,21 +255,6 @@
"type": "github"
}
},
"impermanence": {
"locked": {
"lastModified": 1731242966,
"narHash": "sha256-B3C3JLbGw0FtLSWCjBxU961gLNv+BOOBC6WvstKLYMw=",
"owner": "nix-community",
"repo": "impermanence",
"rev": "3ed3f0eaae9fcc0a8331e77e9319c8a4abd8a71a",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "impermanence",
"type": "github"
}
},
"jovian-nixos": {
"inputs": {
"nix-github-actions": "nix-github-actions_2",
@ -641,12 +626,12 @@
"agenix": "agenix",
"colmena": "colmena",
"deploy-rs": "deploy-rs",
"impermanence": "impermanence",
"jovian-nixos": "jovian-nixos",
"lanzaboote": "lanzaboote",
"nix-comfyui": "nix-comfyui",
"nix-formatter-pack": "nix-formatter-pack",
"nixpkgs": "nixpkgs_6",
"rust-overlay": "rust-overlay_2",
"simple-nixos-mailserver": "simple-nixos-mailserver"
}
},
@ -671,6 +656,26 @@
"type": "github"
}
},
"rust-overlay_2": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1733279627,
"narHash": "sha256-NCNDAGPkdFdu+DLErbmNbavmVW9AwkgP7azROFFSB0U=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "4da5a80ef76039e80468c902f1e9f5c0eab87d96",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"simple-nixos-mailserver": {
"inputs": {
"blobs": "blobs",

View file

@ -5,7 +5,6 @@
nixpkgs.url = "github:arachnist/nixpkgs/ar-patchset-unstable";
nix-formatter-pack.url = "github:Gerschtli/nix-formatter-pack";
deploy-rs.url = "github:serokell/deploy-rs";
impermanence.url = "github:nix-community/impermanence";
colmena.url = "github:zhaofengli/colmena/main";
agenix = {
url = "github:ryantm/agenix";
@ -24,9 +23,13 @@
inputs.nixpkgs.follows = "nixpkgs";
};
nix-comfyui.url = "github:dyscorv/nix-comfyui";
rust-overlay = {
url = "github:oxalica/rust-overlay";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs = { self, nixpkgs, deploy-rs, nix-comfyui, ... }@inputs:
outputs = { self, nixpkgs, deploy-rs, ... }@inputs:
let
systems = [ "x86_64-linux" "aarch64-linux" ];
forAllSystems = nixpkgs.lib.genAttrs systems;

View file

@ -162,6 +162,8 @@ in {
environment.sessionVariables = { MOZ_ENABLE_WAYLAND = "1"; };
nixpkgs.overlays = [ inputs.rust-overlay.overlays.default ];
environment.systemPackages = [
inputs.agenix.packages.${pkgs.system}.default
inputs.colmena.packages.${pkgs.system}.colmena
@ -216,6 +218,7 @@ in {
bash-language-server
clippy
rust-analyzer
rust-bin.stable.latest.default
(signal-desktop.overrideAttrs (old: {
preFixup = ''