diff --git a/flake.lock b/flake.lock index 20a470c..dbf2fd5 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1769170682, - "narHash": "sha256-oMmN1lVQU0F0W2k6OI3bgdzp2YOHWYUAw79qzDSjenU=", + "lastModified": 1770197578, + "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c5296fdd05cfa2c187990dd909864da9658df755", + "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", "type": "github" }, "original": { diff --git a/hosts/puter/default.nix b/hosts/puter/default.nix index 5c0ed2e..237a2a6 100644 --- a/hosts/puter/default.nix +++ b/hosts/puter/default.nix @@ -2,8 +2,7 @@ config, pkgs, ... -}: -{ +}: { imports = [ ./hardware-configuration.nix ./syncthing.nix diff --git a/hosts/puter/hardware-configuration.nix b/hosts/puter/hardware-configuration.nix index 87a7950..de56486 100644 --- a/hosts/puter/hardware-configuration.nix +++ b/hosts/puter/hardware-configuration.nix @@ -42,6 +42,13 @@ lib.mkDefault config.hardware.enableRedistributableFirmware; boot.loader.systemd-boot.enable = true; + boot.loader.systemd-boot.extraEntries = { + "usb-live.conf" = " + title USB Live Boot + efi /EFI/boot/bootx64.efi + options root=/dev/sdb2 + "; + }; boot.loader.efi.canTouchEfiVariables = true; boot.initrd.luks.devices."luks-d27fc6c5-7edd-4c18-ab70-3ca02a28abcc".device = "/dev/disk/by-uuid/d27fc6c5-7edd-4c18-ab70-3ca02a28abcc"; diff --git a/hosts/puter/packages.nix b/hosts/puter/packages.nix index 0351bcb..6e05256 100644 --- a/hosts/puter/packages.nix +++ b/hosts/puter/packages.nix @@ -2,8 +2,7 @@ config, pkgs, ... -}: -{ +}: { nixpkgs.config.permittedInsecurePackages = [ "qtwebengine-5.15.19" "electron-36.9.5" diff --git a/modules/common/rustnet.nix b/modules/common/rustnet.nix index f48eb1f..10371d6 100644 --- a/modules/common/rustnet.nix +++ b/modules/common/rustnet.nix @@ -1,5 +1,4 @@ -{ pkgs ? import {} }: - +{pkgs ? import {}}: pkgs.stdenv.mkDerivation rec { pname = "rustnet"; version = "0.18.0"; @@ -23,6 +22,6 @@ pkgs.stdenv.mkDerivation rec { #maintainers = lib.maintainers.0x545a; #license = lib.licenses.asl20; homepage = "https://github.com/domcyrus/rustnet"; - platforms = [ "x86_64-linux" ]; + platforms = ["x86_64-linux"]; }; } diff --git a/modules/common/yggdrasil.nix b/modules/common/yggdrasil.nix index e61a1fc..bf5dfe5 100644 --- a/modules/common/yggdrasil.nix +++ b/modules/common/yggdrasil.nix @@ -1,5 +1,4 @@ -{ pkgs, ... }: -{ +{pkgs, ...}: { services.yggdrasil = { enable = true; persistentKeys = false; diff --git a/modules/userapps/utils.nix b/modules/userapps/utils.nix index f99bcdf..428b749 100644 --- a/modules/userapps/utils.nix +++ b/modules/userapps/utils.nix @@ -2,11 +2,9 @@ config, pkgs, ... -}: -let +}: let rustnet = pkgs.callPackage ../../modules/common/rustnet.nix {}; -in -{ +in { programs.neovim = {defaultEditor = true;}; environment.systemPackages = with pkgs; [ parallel-disk-usage