taotien/NOflake
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix some compat for rpi4

Browse source
This commit is contained in:
Tao Tien 2023-10-01 01:00:49 +00:00
parent 470464dc47
commit ed53e0aaf6
5 changed files with 24 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

18
flake.lock generated
View file

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1695541019, "lastModified": 1695887975,
"narHash": "sha256-rs++zfk41K9ArWkDAlmBDlGlKO8qeRIRzdjo+9SmNFI=", "narHash": "sha256-u3+5FR12dI305jCMb0fJNQx2qwoQ54lv1tPoEWp0hmg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "61283b30d11f27d5b76439d43f20d0c0c8ff5296", "rev": "adcfd6aa860d1d129055039696bc457af7d50d0e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -16,11 +16,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1695559356, "lastModified": 1695825837,
"narHash": "sha256-kXZ1pUoImD9OEbPCwpTz4tHsNTr4CIyIfXb3ocuR8sI=", "narHash": "sha256-4Ne11kNRnQsmSJCRSSNkFRSnHC4Y5gPDBIQGjjPfJiU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "261abe8a44a7e8392598d038d2e01f7b33cf26d0", "rev": "5cfafa12d57374f48bcc36fda3274ada276cf69e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -31,11 +31,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1695644571, "lastModified": 1695830400,
"narHash": "sha256-asS9dCCdlt1lPq0DLwkVBbVoEKuEuz+Zi3DG7pR/RxA=", "narHash": "sha256-gToZXQVr0G/1WriO83olnqrLSHF2Jb8BPcmCt497ro0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6500b4580c2a1f3d0f980d32d285739d8e156d92", "rev": "8a86b98f0ba1c405358f1b71ff8b5e1d317f5db2",
"type": "github" "type": "github"
}, },
"original": { "original": {

13
flake.nix
View file

@ -9,10 +9,17 @@
outputs = { nixpkgs, nixos-hardware, nixpkgs-unstable, ... }: outputs = { nixpkgs, nixos-hardware, nixpkgs-unstable, ... }:
let let
system = "x86_64-linux"; system-x86 = "x86_64-linux";
overlay-unstable = final: prev: { overlay-unstable = final: prev: {
unstable = import nixpkgs-unstable { unstable = import nixpkgs-unstable {
inherit system; inherit system-x86;
config.allowUnfree = true;
};
};
system-arm64 = "aarch64-linux";
overlay-unstable-arm = final: prev: {
unstable = import nixpkgs-unstable {
inherit system-arm64;
config.allowUnfree = true; config.allowUnfree = true;
}; };
}; };
@ -44,7 +51,7 @@
./extras/gaming.nix ./extras/gaming.nix
]; ];
NObangers = nixosSystem [ NObangers = nixosSystem [
({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; }) ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable-arm ]; })
nixos-hw.raspberry-pi-4 nixos-hw.raspberry-pi-4
./systems/BASED.nix ./systems/BASED.nix
./systems/NObangers.nix ./systems/NObangers.nix

2
systems/BASED.nix
View file

@ -16,7 +16,7 @@
nfs-utils nfs-utils
nil nil
nixpkgs-fmt nixpkgs-fmt
onlyoffice-bin # onlyoffice-bin
ouch ouch
ripgrep-all ripgrep-all
skim skim

6
systems/NObangers.nix
View file

@ -11,7 +11,7 @@
services.btrfs.autoScrub.enable = false; services.btrfs.autoScrub.enable = false;
boot.initrd.availableKernelModules = [ "xhci_pci" "usbhid" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "usbhid" ];
boot.loader.grub.enable = true; boot.loader.grub.enable = false;
boot.loader.generic-extlinux-compatible.enable = true; boot.loader.generic-extlinux-compatible.enable = true;
console.enable = false; console.enable = false;
powerManagement.cpuFreqGovernor = "ondemand"; powerManagement.cpuFreqGovernor = "ondemand";
@ -19,8 +19,8 @@
hardware = { hardware = {
raspberry-pi."4" = { raspberry-pi."4" = {
apply-overlays-dtmerge.enable = true; apply-overlays-dtmerge.enable = true;
# audio.enable = true; audio.enable = true;
# fkms-3d.enable = true; fkms-3d.enable = true;
}; };
deviceTree = { deviceTree = {
enable = true; enable = true;

2
users/tao.nix
View file

@ -13,7 +13,7 @@
# enchant # enchant
# nuspell # nuspell
# hunspellDicts.en-us-large # hunspellDicts.en-us-large
rustdesk # rustdesk
bottles bottles
cider cider
darktable darktable