diff --git a/flake.lock b/flake.lock index 192da82..774bc8d 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixos-hardware": { "locked": { - "lastModified": 1695541019, - "narHash": "sha256-rs++zfk41K9ArWkDAlmBDlGlKO8qeRIRzdjo+9SmNFI=", + "lastModified": 1695887975, + "narHash": "sha256-u3+5FR12dI305jCMb0fJNQx2qwoQ54lv1tPoEWp0hmg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "61283b30d11f27d5b76439d43f20d0c0c8ff5296", + "rev": "adcfd6aa860d1d129055039696bc457af7d50d0e", "type": "github" }, "original": { @@ -16,11 +16,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1695559356, - "narHash": "sha256-kXZ1pUoImD9OEbPCwpTz4tHsNTr4CIyIfXb3ocuR8sI=", + "lastModified": 1695825837, + "narHash": "sha256-4Ne11kNRnQsmSJCRSSNkFRSnHC4Y5gPDBIQGjjPfJiU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "261abe8a44a7e8392598d038d2e01f7b33cf26d0", + "rev": "5cfafa12d57374f48bcc36fda3274ada276cf69e", "type": "github" }, "original": { @@ -31,11 +31,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1695644571, - "narHash": "sha256-asS9dCCdlt1lPq0DLwkVBbVoEKuEuz+Zi3DG7pR/RxA=", + "lastModified": 1695830400, + "narHash": "sha256-gToZXQVr0G/1WriO83olnqrLSHF2Jb8BPcmCt497ro0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6500b4580c2a1f3d0f980d32d285739d8e156d92", + "rev": "8a86b98f0ba1c405358f1b71ff8b5e1d317f5db2", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 61a2c2d..aa36d24 100644 --- a/flake.nix +++ b/flake.nix @@ -9,10 +9,17 @@ outputs = { nixpkgs, nixos-hardware, nixpkgs-unstable, ... }: let - system = "x86_64-linux"; + system-x86 = "x86_64-linux"; overlay-unstable = final: prev: { 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; }; }; @@ -44,7 +51,7 @@ ./extras/gaming.nix ]; NObangers = nixosSystem [ - ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; }) + ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable-arm ]; }) nixos-hw.raspberry-pi-4 ./systems/BASED.nix ./systems/NObangers.nix diff --git a/systems/BASED.nix b/systems/BASED.nix index 6ee71f4..bb4b2c0 100644 --- a/systems/BASED.nix +++ b/systems/BASED.nix @@ -16,7 +16,7 @@ nfs-utils nil nixpkgs-fmt - onlyoffice-bin + # onlyoffice-bin ouch ripgrep-all skim diff --git a/systems/NObangers.nix b/systems/NObangers.nix index e69fd7a..2659629 100644 --- a/systems/NObangers.nix +++ b/systems/NObangers.nix @@ -11,7 +11,7 @@ services.btrfs.autoScrub.enable = false; boot.initrd.availableKernelModules = [ "xhci_pci" "usbhid" ]; - boot.loader.grub.enable = true; + boot.loader.grub.enable = false; boot.loader.generic-extlinux-compatible.enable = true; console.enable = false; powerManagement.cpuFreqGovernor = "ondemand"; @@ -19,8 +19,8 @@ hardware = { raspberry-pi."4" = { apply-overlays-dtmerge.enable = true; - # audio.enable = true; - # fkms-3d.enable = true; + audio.enable = true; + fkms-3d.enable = true; }; deviceTree = { enable = true; diff --git a/users/tao.nix b/users/tao.nix index 7564a74..13cfe49 100644 --- a/users/tao.nix +++ b/users/tao.nix @@ -13,7 +13,7 @@ # enchant # nuspell # hunspellDicts.en-us-large - rustdesk + # rustdesk bottles cider darktable