rhelmot
/
nixos-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add logic for native-cross

This commit is contained in:
Audrey 2025-03-28 00:55:54 -07:00
parent 87185f1f1f
commit b0ed46319c
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
configuration-native.nix Normal file
View File

@ -0,0 +1,11 @@
{ config, pkgs, lib, ... }:
{
config = lib.mkIf (pkgs.stdenv.buildPlatform == pkgs.stdenv.hostPlatform) {
environment.systemPackages = with pkgs; [
meld
];
programs.git.config.merge.tool = "meld";
};
}

4
configuration.nix
View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
{ {
imports = [ ./overlays/packages.nix ]; imports = [ ./overlays/packages.nix ./configuration-native.nix ];
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
nix.settings.extra-experimental-features = "nix-command flakes"; nix.settings.extra-experimental-features = "nix-command flakes";
@ -37,7 +37,6 @@
stdenv.cc stdenv.cc
stdenv.cc.bintools # bins but not manpages included in stdenv.cc stdenv.cc.bintools # bins but not manpages included in stdenv.cc
patchelf patchelf
meld
(python3.withPackages (p: with p; [ (python3.withPackages (p: with p; [
virtualenvwrapper virtualenvwrapper
@ -94,7 +93,6 @@
core.editor = "nvim"; core.editor = "nvim";
init.defaultBranch = "main"; init.defaultBranch = "main";
blame.markUnblamableLines = true; blame.markUnblamableLines = true;
merge.tool = "meld";
credential.helper = "store"; credential.helper = "store";
url."ssh://git@".insteadOf = "git://"; url."ssh://git@".insteadOf = "git://";
}; };