From 8e3fe8b8db3761c8dbd7076f16b91572249ed385 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Tue, 17 Dec 2024 02:40:50 -0600 Subject: [PATCH] update gpdpocke3 --- flake.lock | 30 ++++++++++++------------- hosts/configuration.nix | 29 ++++++++++++++++++++++++ hosts/gpdPocket3/configuration.nix | 36 +++--------------------------- 3 files changed, 47 insertions(+), 48 deletions(-) diff --git a/flake.lock b/flake.lock index 3e8a773..10e2985 100644 --- a/flake.lock +++ b/flake.lock @@ -140,11 +140,11 @@ }, "gpdPocket3_nixpkgs": { "locked": { - "lastModified": 1734083684, - "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=", + "lastModified": 1734323986, + "narHash": "sha256-m/lh6hYMIWDYHCAsn81CDAiXoT3gmxXI9J987W5tZrE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84", + "rev": "394571358ce82dff7411395829aa6a3aad45b907", "type": "github" }, "original": { @@ -177,11 +177,11 @@ }, "h002_nixpkgs": { "locked": { - "lastModified": 1734083684, - "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=", + "lastModified": 1734323986, + "narHash": "sha256-m/lh6hYMIWDYHCAsn81CDAiXoT3gmxXI9J987W5tZrE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84", + "rev": "394571358ce82dff7411395829aa6a3aad45b907", "type": "github" }, "original": { @@ -236,11 +236,11 @@ }, "joe_nixpkgs": { "locked": { - "lastModified": 1734083684, - "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=", + "lastModified": 1734323986, + "narHash": "sha256-m/lh6hYMIWDYHCAsn81CDAiXoT3gmxXI9J987W5tZrE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84", + "rev": "394571358ce82dff7411395829aa6a3aad45b907", "type": "github" }, "original": { @@ -273,11 +273,11 @@ }, "lio_nixpkgs": { "locked": { - "lastModified": 1734083684, - "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=", + "lastModified": 1734323986, + "narHash": "sha256-m/lh6hYMIWDYHCAsn81CDAiXoT3gmxXI9J987W5tZrE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84", + "rev": "394571358ce82dff7411395829aa6a3aad45b907", "type": "github" }, "original": { @@ -384,11 +384,11 @@ }, "nixpkgs_stable": { "locked": { - "lastModified": 1734083684, - "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=", + "lastModified": 1734323986, + "narHash": "sha256-m/lh6hYMIWDYHCAsn81CDAiXoT3gmxXI9J987W5tZrE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84", + "rev": "394571358ce82dff7411395829aa6a3aad45b907", "type": "github" }, "original": { diff --git a/hosts/configuration.nix b/hosts/configuration.nix index 0172261..bb1ace6 100644 --- a/hosts/configuration.nix +++ b/hosts/configuration.nix @@ -48,6 +48,7 @@ in ]; }; + # rate limiting for github nix.extraOptions = '' keep-outputs = true @@ -64,6 +65,34 @@ in flake = "/home/${settings.user.username}/.config/nixos-config"; }; + # Remote build off home lio computer + programs.ssh.extraConfig = '' + Host lio_ + PubkeyAcceptedKeyTypes ssh-ed25519 + ServerAliveInterval 60 + IPQoS throughput + IdentityFile ${config.age.secrets.nix2lio.path} + ''; + nix = { + distributedBuilds = true; + buildMachines = [ + { + hostName = "lio_"; + system = "x86_64-linux"; + protocol = "ssh-ng"; + maxJobs = 32; + supportedFeatures = [ + "nixos-test" + "benchmark" + "big-parallel" + "kvm" + "uid-range" # Often helpful + ]; + mandatoryFeatures = [ ]; + } + ]; + }; + # TODO do I want this dynamic at all? Roaming? time.timeZone = "America/Chicago"; # Select internationalization properties. diff --git a/hosts/gpdPocket3/configuration.nix b/hosts/gpdPocket3/configuration.nix index 9015ed4..5294446 100644 --- a/hosts/gpdPocket3/configuration.nix +++ b/hosts/gpdPocket3/configuration.nix @@ -27,28 +27,6 @@ rustdesk.enable = true; }; - nix = { - distributedBuilds = true; - extraOptions = '' - builders-use-substitutes = true - ''; - buildMachines = [ - { - hostName = "lio_"; - system = "x86_64-linux"; - protocol = "ssh"; - maxJobs = 32; - supportedFeatures = [ - "nixos-test" - "benchmark" - "big-parallel" - "kvm" - "uid-range" # Often helpful - ]; - mandatoryFeatures = [ ]; - } - ]; - }; # machine specific configuration # ============================== @@ -100,30 +78,22 @@ "nvme" "xhci_pci" "usbhid" - # "thuFryuni/PolyMC/developnderbolt" ]; services.xserver.videoDrivers = [ "intel" ]; - hardware.opengl = { - enable = true; - # driSupport = true; - }; - # hardware.opengl.driSupport32Bit = true; - # hardware.graphics.enable = true; - - hardware.opengl.extraPackages = with pkgs; [ + hardware.graphics.enable = true; + hardware.graphics.extraPackages = with pkgs; [ intel-media-driver intel-vaapi-driver ]; # Stuff from https://github.com/NixOS/nixos-hardware/blob/9a763a7acc4cfbb8603bb0231fec3eda864f81c0/gpd/pocket-3/default.nix services.fstrim.enable = true; - services.xserver.libinput.enable = true; + services.libinput.enable = true; services.tlp.enable = lib.mkDefault ( (lib.versionOlder (lib.versions.majorMinor lib.version) "21.05") || !config.services.power-profiles-daemon.enable ); # KVM module video - environment.shellAliases = { kvm = "ffplay -i /dev/video2"; };