From af22f92f4390801d963fa5cd7be03ee93138b2da Mon Sep 17 00:00:00 2001 From: moons-14 Date: Thu, 28 May 2026 16:39:29 +0900 Subject: [PATCH] feat --- modules/nix/boot/default.nix | 11 +++++++++-- modules/nix/boot/latest-kernel.nix | 4 ---- modules/nix/greetd.nix | 12 ++++++++++++ modules/nix/hardware/bluetooth.nix | 6 ++++++ modules/nix/hardware/default.nix | 7 +++++++ modules/nix/hardware/gui.nix | 5 +++++ profiles/base.nix | 1 + profiles/gui.nix | 4 ++++ profiles/laptop.nix | 2 ++ 9 files changed, 46 insertions(+), 6 deletions(-) delete mode 100644 modules/nix/boot/latest-kernel.nix create mode 100644 modules/nix/greetd.nix create mode 100644 modules/nix/hardware/bluetooth.nix create mode 100644 modules/nix/hardware/default.nix create mode 100644 modules/nix/hardware/gui.nix diff --git a/modules/nix/boot/default.nix b/modules/nix/boot/default.nix index 381fb0e..81bb87b 100644 --- a/modules/nix/boot/default.nix +++ b/modules/nix/boot/default.nix @@ -1,4 +1,11 @@ -{ lib, ... }: { - boot.loader.systemd-boot.configurationLimit = lib.mkDefault 8; + pkgs, + lib, + ... +}: +{ + boot = { + loader.systemd-boot.configurationLimit = lib.mkDefault 8; + kernelPackages = pkgs.linuxPackages_latest; + }; } diff --git a/modules/nix/boot/latest-kernel.nix b/modules/nix/boot/latest-kernel.nix deleted file mode 100644 index 50d146f..0000000 --- a/modules/nix/boot/latest-kernel.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ pkgs, ... }: -{ - boot.kernelPackages = pkgs.linuxPackages_latest; -} diff --git a/modules/nix/greetd.nix b/modules/nix/greetd.nix new file mode 100644 index 0000000..22f1bee --- /dev/null +++ b/modules/nix/greetd.nix @@ -0,0 +1,12 @@ +{ pkgs, ... }: +{ + services.greetd = { + enable = true; + settings = { + default_session = { + user = "greeter"; + command = "${pkgs.tuigreet}/bin/tuigreet --time --remember --cmd niri-session"; + }; + }; + }; +} diff --git a/modules/nix/hardware/bluetooth.nix b/modules/nix/hardware/bluetooth.nix new file mode 100644 index 0000000..e3b8d15 --- /dev/null +++ b/modules/nix/hardware/bluetooth.nix @@ -0,0 +1,6 @@ +_: { + hardware = { + bluetooth.enable = true; + bluetooth.powerOnBoot = true; + }; +} diff --git a/modules/nix/hardware/default.nix b/modules/nix/hardware/default.nix new file mode 100644 index 0000000..6ccc795 --- /dev/null +++ b/modules/nix/hardware/default.nix @@ -0,0 +1,7 @@ +{ lib, ... }: +{ + hardware = { + enableRedistributableFirmware = lib.mkDefault true; + keyboard.qmk.enable = true; + }; +} diff --git a/modules/nix/hardware/gui.nix b/modules/nix/hardware/gui.nix new file mode 100644 index 0000000..1f17346 --- /dev/null +++ b/modules/nix/hardware/gui.nix @@ -0,0 +1,5 @@ +_: { + hardware = { + graphics.enable = true; + }; +} diff --git a/profiles/base.nix b/profiles/base.nix index d846e9a..19a03c7 100644 --- a/profiles/base.nix +++ b/profiles/base.nix @@ -4,6 +4,7 @@ ../modules/nix/boot ../modules/nix/caches.nix ../modules/nix/gc.nix + ../modules/nix/hardware ]; home-manager.users.${userName}.imports = [ ]; } diff --git a/profiles/gui.nix b/profiles/gui.nix index 9f62175..d9dad16 100644 --- a/profiles/gui.nix +++ b/profiles/gui.nix @@ -2,6 +2,10 @@ { imports = [ ./cli-minimal.nix + ../modules/nix/hardware/gui.nix + ../modules/nix/camera.nix + ../modules/nix/fonts.nix + ../modules/nix/greetd.nix ]; home-manager.users.${userName}.imports = [ ]; } diff --git a/profiles/laptop.nix b/profiles/laptop.nix index a2adab2..dcf88a0 100644 --- a/profiles/laptop.nix +++ b/profiles/laptop.nix @@ -2,6 +2,8 @@ { imports = [ ./gui.nix + ../modules/nix/bluetooth.nix + ../modules/nix/fingerprint.nix ]; home-manager.users.${userName}.imports = [ ]; }