all: add a few fixes for running on arm64
This commit is contained in:
parent
131e7d37c2
commit
f5a047afcf
@ -1,5 +1,4 @@
|
||||
{ config
|
||||
, pkgs
|
||||
{ pkgs
|
||||
, isUnstable
|
||||
, lib
|
||||
, ...
|
||||
@ -21,12 +20,13 @@ in
|
||||
systemPackages = with pkgs; [
|
||||
(aspellWithDicts (dicts: with dicts; [ en en-computers es de ]))
|
||||
go-font
|
||||
texlive.combined.scheme-full
|
||||
|
||||
graphviz
|
||||
|
||||
myEmacs
|
||||
editorScript
|
||||
];
|
||||
]
|
||||
++ lib.optionals (pkgs.system == "x86_64-linux") [ texlive.combined.scheme-full ];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
@ -258,7 +258,7 @@
|
||||
nixos-hardware.nixosModules.framework-11th-gen-intel
|
||||
] "stan";
|
||||
weather = buildSys "aarch64-linux" stable [ ] "weather";
|
||||
retic = buildSys "aarch64-linux" unstable [ ] "retic";
|
||||
retic = buildSys "aarch64-linux" stable [ ] "retic";
|
||||
|
||||
faf = buildSys "x86_64-linux" stable [ ./configs/hardened.nix ] "faf";
|
||||
box = buildSys "x86_64-linux" unstable [ ./configs/hardened.nix ] "box";
|
||||
|
@ -1,9 +1,8 @@
|
||||
{ pkgs
|
||||
, lib
|
||||
, ...
|
||||
}:
|
||||
{
|
||||
_module.args.isUnstable = true;
|
||||
_module.args.isUnstable = false;
|
||||
imports = [
|
||||
./hardware-configuration.nix
|
||||
];
|
||||
@ -23,11 +22,7 @@
|
||||
};
|
||||
|
||||
preDNS.enable = false;
|
||||
systemd.services.NetworkManager-wait-online.serviceConfig.ExecStart =
|
||||
lib.mkForce [ "" "${pkgs.networkmanager}/bin/nm-online -q" ];
|
||||
services = {
|
||||
libinput.enable = true;
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
python3Packages.rns
|
||||
python3Packages.nomadnet
|
||||
|
@ -141,9 +141,14 @@ in
|
||||
openssh.authorizedKeys.keys = config.myconf.hwPubKeys;
|
||||
};
|
||||
|
||||
environment.etc."configuration-template.nix" = {
|
||||
source = ./install_template.nix;
|
||||
mode = "0644";
|
||||
environment = {
|
||||
etc."configuration-template.nix" = {
|
||||
source = ./install_template.nix;
|
||||
mode = "0644";
|
||||
};
|
||||
systemPackages = [
|
||||
jq
|
||||
];
|
||||
};
|
||||
|
||||
services = {
|
||||
|
@ -1,8 +1,13 @@
|
||||
{ emacsWithPackagesFromUsePackage
|
||||
, pkgs
|
||||
, emacsPkg ? pkgs.emacs-pgtk
|
||||
, ...
|
||||
}:
|
||||
let
|
||||
emacsPkg = (if (pkgs.system == "x86_64-linux") then
|
||||
pkgs.emacs-pgtk
|
||||
else
|
||||
pkgs.emacs);
|
||||
in
|
||||
emacsWithPackagesFromUsePackage {
|
||||
config = ../configs/emacs.org;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user