death916/nixconfig
1
0
Fork 0
mirror of https://github.com/Death916/nixconfig.git synced 2026-04-11 04:48:25 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

hash

Browse source
This commit is contained in:
death916 2025-05-14 07:58:06 -07:00
parent a1602af795
commit af81a55447
2 changed files with 28 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

20
flake.nix
View file

@ -17,9 +17,15 @@
url = "github:nix-community/home-manager/release-24.11"; # Or your preferred branch
inputs.nixpkgs.follows = "nixpkgs";
};
# Add rust-overlay for nightly Rust toolchain
rust-overlay = {
url = "github:oxalica/rust-overlay";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs = inputs@{ nixpkgs, home-manager, nixos-cosmic, ... }:
outputs = inputs@{ nixpkgs, home-manager, nixos-cosmic, rust-overlay, ... }:
let
# Common arguments to pass to all system configurations
commonSpecialArgs = {
@ -38,6 +44,12 @@
substituters = [ "https://cosmic.cachix.org/" ];
trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ];
};
# Add rust-overlay to nixpkgs overlays
nixpkgs.overlays = [
rust-overlay.overlays.default
(import ./overlays/halloy-overlay.nix)
];
}
nixos-cosmic.nixosModules.default # COSMIC Desktop Environment for laptop
./nixos/configuration.nix # Your existing laptop NixOS configuration
@ -76,10 +88,6 @@
];
};
};
# If you have global overlays from ./overlays:
# nixpkgs.overlays = [
# (import ./overlays/my-global-overlay.nix)
# ];
};
}

17
overlays/halloy-overlay.nix
View file

@ -10,9 +10,22 @@ self: super: {
sha256 = "sha256-cG/B6oiRkyoC5fK7bLdCDQYZymfMZspWXvOkqpwHRPk=";
};
# Skip the edition2024 check
# Use nightly Rust from rust-overlay
RUSTC_BOOTSTRAP = 1;
# Use the nightly Rust toolchain
nativeBuildInputs = with super; [
pkg-config
(rust-bin.nightly.latest.default.override {
extensions = [ "rust-src" ];
})
];
# Add patch to enable edition2024
postPatch = ''
sed -i '1i cargo-features = ["edition2024"]' Cargo.toml
'';
cargoLock = {
lockFile = super.fetchurl {
url = "https://raw.githubusercontent.com/squidowl/halloy/${version}/Cargo.lock";
@ -26,8 +39,6 @@ self: super: {
"dpi-0.1.1" = "";
};
};
nativeBuildInputs = with super; [ pkg-config ];
buildInputs = with super; [
libxkbcommon