qbit/xin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

all: add a few fixes for running on arm64

Browse Source
This commit is contained in:
Aaron Bieber 2024-09-30 05:50:35 -06:00
parent 131e7d37c2
commit f5a047afcf
No known key found for this signature in database
5 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configs/emacs.nix
View File

@ -1,5 +1,4 @@
{ config { pkgs
, pkgs
, isUnstable , isUnstable
, lib , lib
, ... , ...
@ -21,12 +20,13 @@ in
systemPackages = with pkgs; [ systemPackages = with pkgs; [
(aspellWithDicts (dicts: with dicts; [ en en-computers es de ])) (aspellWithDicts (dicts: with dicts; [ en en-computers es de ]))
go-font go-font
texlive.combined.scheme-full
graphviz graphviz
myEmacs myEmacs
editorScript editorScript
]; ]
++ lib.optionals (pkgs.system == "x86_64-linux") [ texlive.combined.scheme-full ];
}; };
}; };
} }

2
flake.nix
View File

@ -258,7 +258,7 @@
nixos-hardware.nixosModules.framework-11th-gen-intel nixos-hardware.nixosModules.framework-11th-gen-intel
] "stan"; ] "stan";
weather = buildSys "aarch64-linux" stable [ ] "weather"; 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"; faf = buildSys "x86_64-linux" stable [ ./configs/hardened.nix ] "faf";
box = buildSys "x86_64-linux" unstable [ ./configs/hardened.nix ] "box"; box = buildSys "x86_64-linux" unstable [ ./configs/hardened.nix ] "box";

9
hosts/retic/default.nix
View File

@ -1,9 +1,8 @@
{ pkgs { pkgs
, lib
, ... , ...
}: }:
{ {
_module.args.isUnstable = true; _module.args.isUnstable = false;
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
]; ];
@ -23,11 +22,7 @@
}; };
preDNS.enable = false; 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; [ environment.systemPackages = with pkgs; [
python3Packages.rns python3Packages.rns
python3Packages.nomadnet python3Packages.nomadnet

11
installer.nix
View File

@ -141,9 +141,14 @@ in
openssh.authorizedKeys.keys = config.myconf.hwPubKeys; openssh.authorizedKeys.keys = config.myconf.hwPubKeys;
}; };
environment.etc."configuration-template.nix" = { environment = {
source = ./install_template.nix; etc."configuration-template.nix" = {
mode = "0644"; source = ./install_template.nix;
mode = "0644";
};
systemPackages = [
jq
];
}; };
services = { services = {

7
pkgs/emacs.nix
View File

@ -1,8 +1,13 @@
{ emacsWithPackagesFromUsePackage { emacsWithPackagesFromUsePackage
, pkgs , pkgs
, emacsPkg ? pkgs.emacs-pgtk
, ... , ...
}: }:
let
emacsPkg = (if (pkgs.system == "x86_64-linux") then
pkgs.emacs-pgtk
else
pkgs.emacs);
in
emacsWithPackagesFromUsePackage { emacsWithPackagesFromUsePackage {
config = ../configs/emacs.org; config = ../configs/emacs.org;