Compare commits

..

2 commits

Author SHA1 Message Date
8b9f8347c3 enable hyprland 2026-10-01 22:21:15 -05:00
274512810c revert changes, coming back later 2026-10-01 22:21:06 -05:00
3 changed files with 20 additions and 24 deletions

View file

@ -1,10 +1,9 @@
{ pkgs, lib, inputs, ... }: { pkgs, lib, inputs, ... }:
{ {
boot.kernelParams = [ "rd.luks.options=timeout=0,tries=1" ];
boot.initrd = { boot.initrd = {
supportedFilesystems = [ "ext4" "zfs" ]; supportedFilesystems = [ "ext4" "zfs" ];
availableKernelModules = [ "hid_apple" "igc" ]; availableKernelModules = [ "hid_apple" ];
systemd = { systemd = {
enable = true; enable = true;
fido2.enable = true; fido2.enable = true;
@ -25,33 +24,11 @@
crypttabExtraOpts = [ "fido2-device=auto" ]; crypttabExtraOpts = [ "fido2-device=auto" ];
}; };
systemd.services."systemd-cryptsetup@" = {
overrideStrategy = "asDropin";
serviceConfig = {
Restart = "no";
OnFailureJobMode = "fail";
};
};
systemd.services."zfs-import-nix-root" = { systemd.services."zfs-import-nix-root" = {
wants = [ "keys.mount" ]; wants = [ "keys.mount" ];
after = [ "keys.mount" ]; after = [ "keys.mount" ];
}; };
network = {
enable = true;
ssh = {
enable = true;
port = 2222;
hostKeys = [ "/etc/secrets/initrd/ssh_host_ed25519_key" ];
# Use an inline string to prepend the forced systemd command to your key
authorizedKeys = [
''command="${pkgs.systemd}/bin/systemd-tty-ask-password-agent --watch" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIjed9TzAaS6afEilS6CQAyz7DRJUNeLWGeboB3Ma3Rb remote-fido-unlock''
];
};
};
}; };
systemd.services."zfs-import-nix-main" = { systemd.services."zfs-import-nix-main" = {

View file

@ -9,4 +9,20 @@
networking.hostName = "apollo"; networking.hostName = "apollo";
networking.hostId = "40ced703"; networking.hostId = "40ced703";
networking.networkmanager.insertNameservers = [ "10.5.0.1" "1.1.1.1" ]; networking.networkmanager.insertNameservers = [ "10.5.0.1" "1.1.1.1" ];
programs.hyprland = {
enable = true;
withUWSM = true;
xwayland.enable = true;
};
environment.systemPackages = with pkgs; [
kitty
];
programs.zsh.loginShellInit = ''
if [[ $(tty) == "/dev/tty1" ] && uwsm check may-start; then
exec uwsm start hyprland-uwsm.desktop
fi
'';
} }

View file

@ -61,6 +61,9 @@
variant = ""; variant = "";
}; };
programs.zsh.enable = true;
users.defaultUserShell = pkgs.zsh;
users.users.nyxerinys = { users.users.nyxerinys = {
isNormalUser = true; isNormalUser = true;
description = "Nyx"; description = "Nyx";