From 45010d5f0a689fe4c70e603e9f15a266ae67f982 Mon Sep 17 00:00:00 2001 From: kenji Date: Sun, 17 Aug 2025 09:46:09 -0500 Subject: [PATCH] minor changes --- config.nix | 2 +- flake.lock | 6 +++--- hosts/hakase/configuration.nix | 17 ++++++++--------- modules/default/apps.nix | 4 ++++ modules/default/boot.nix | 6 ++++++ modules/default/security.nix | 3 +++ modules/home/apps.nix | 2 ++ packages/virtualbox/default.nix | 4 ++-- 8 files changed, 29 insertions(+), 15 deletions(-) diff --git a/config.nix b/config.nix index a782d0a..6fb88a2 100644 --- a/config.nix +++ b/config.nix @@ -20,7 +20,7 @@ nixos = { Hostname = "hakase"; Timezone = "America/Chicago"; - enableSteamOS = true; + enableSteamOS = false; Boot = { mode = "systemd"; # systemd or grub diff --git a/flake.lock b/flake.lock index 0688e4f..2f1b60b 100644 --- a/flake.lock +++ b/flake.lock @@ -1311,11 +1311,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1751271578, - "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", + "lastModified": 1755186698, + "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", + "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", "type": "github" }, "original": { diff --git a/hosts/hakase/configuration.nix b/hosts/hakase/configuration.nix index 40d67a7..1efe95b 100644 --- a/hosts/hakase/configuration.nix +++ b/hosts/hakase/configuration.nix @@ -8,7 +8,6 @@ }: { imports = [ ./hardware-configuration.nix - ../../lanzaboote.nix ../../modules/default/apps.nix ../../modules/default/desktop.nix ../../modules/default/remote.nix @@ -107,7 +106,7 @@ systemd = { network.enable = true; - extraConfig = "DefaultTimeoutStopSec=5s"; + # extraConfig = "DefaultTimeoutStopSec=5s"; }; security.rtkit.enable = true; @@ -137,13 +136,13 @@ getty.autologinUser = lib.mkOverride 10 "${myConfig.essentials.Username}"; - # greetd = { - # enable = true; - # settings.default_session = { - # user = lib.mkOverride 10 "${myConfig.essentials.Username}"; - # command = lib.mkOverride 10 "Hyprland"; - # }; - # }; + greetd = { + enable = true; + settings.default_session = { + user = lib.mkOverride 10 "${myConfig.essentials.Username}"; + command = lib.mkOverride 10 "Hyprland"; + }; + }; flatpak.enable = true; seatd.enable = true; diff --git a/modules/default/apps.nix b/modules/default/apps.nix index 3d5a32d..678470a 100644 --- a/modules/default/apps.nix +++ b/modules/default/apps.nix @@ -7,5 +7,9 @@ dualsensectl protontricks wl-clipboard + tldr + ]; + imports = [ + ../../packages/virtualbox/default.nix ]; } diff --git a/modules/default/boot.nix b/modules/default/boot.nix index 3b28fa4..3130467 100644 --- a/modules/default/boot.nix +++ b/modules/default/boot.nix @@ -13,7 +13,13 @@ }; systemd-boot = lib.mkIf (myConfig.nixos.Boot.mode == "systemd") { enable = true; + # xbootldrMountPoint = "/boot"; + + edk2-uefi-shell.enable = true; + edk2-uefi-shell.sortKey = "z_edk2"; }; + + # grub ain't that great for advanced setups such as using a secure boot. grub = lib.mkIf (myConfig.nixos.Boot.mode == "grub") { enable = true; efiSupport = true; diff --git a/modules/default/security.nix b/modules/default/security.nix index c20e030..234f579 100644 --- a/modules/default/security.nix +++ b/modules/default/security.nix @@ -1,4 +1,7 @@ {pkgs, ...}: { + imports = [ + ../../lanzaboote.nix + ]; environment.systemPackages = with pkgs; [ niv sbctl diff --git a/modules/home/apps.nix b/modules/home/apps.nix index dfd94e8..58b0d06 100644 --- a/modules/home/apps.nix +++ b/modules/home/apps.nix @@ -9,5 +9,7 @@ fcitx5-mozc-ut kdePackages.fcitx5-configtool solaar + parted + edk2-uefi-shell ]; } diff --git a/packages/virtualbox/default.nix b/packages/virtualbox/default.nix index fed2a80..fb1bb87 100644 --- a/packages/virtualbox/default.nix +++ b/packages/virtualbox/default.nix @@ -1,5 +1,5 @@ -{ +{myConfig, ...}: { virtualisation.virtualbox.host.enable = true; - users.extraGroups.vboxusers.members = ["user-with-access-to-virtualbox"]; + users.extraGroups.vboxusers.members = ["${myConfig.essentials.Username}"]; virtualisation.virtualbox.host.enableExtensionPack = true; }