Add encrypted swap, restic, pass, hypr

This commit is contained in:
Hunter Haugen 2025-05-06 15:08:51 -07:00
parent 0aaf596af3
commit beb898562a
Signed by: hunner
GPG key ID: EF99694AA599DDAD
2 changed files with 19 additions and 6 deletions

View file

@ -22,8 +22,8 @@ in
boot = { boot = {
loader.systemd-boot.enable = true; loader.systemd-boot.enable = true;
loader.efi.canTouchEfiVariables = true; loader.efi.canTouchEfiVariables = true;
#initrd.luks.devices."cryptroot".device = "/dev/disk/by-partlabel/cryptroot"; #initrd.luks.devices."cryptroot".device = "/dev/disk/by-partlabel/disk-nvme0n1-cryptroot";
#initrd.luks.devices."cryptswap".device = "/dev/disk/by-partlabel/cryptswap"; initrd.luks.devices."cryptswap".device = "/dev/disk/by-partlabel/disk-nvme0n1-swap";
resumeDevice = "/dev/nvme0n1p2"; resumeDevice = "/dev/nvme0n1p2";
kernelParams = [ kernelParams = [
@ -31,6 +31,9 @@ in
"mem_sleep_default=deep" "mem_sleep_default=deep"
]; ];
}; };
swapDevices = [ {
device = "/dev/mapper/cryptswap";
} ];
services.fwupd.enable = true; services.fwupd.enable = true;
hardware.framework.enableKmod = true; hardware.framework.enableKmod = true;
@ -99,6 +102,7 @@ in
enable = true; enable = true;
extraOptions = "--storage-driver=overlay2"; extraOptions = "--storage-driver=overlay2";
}; };
programs.hyprland.enable = true;
programs.zsh.enable = true; programs.zsh.enable = true;
services.openssh.enable = true; services.openssh.enable = true;
services.openssh.settings.PermitRootLogin = "yes"; services.openssh.settings.PermitRootLogin = "yes";
@ -110,6 +114,8 @@ in
# Enable the GNOME Desktop Environment. # Enable the GNOME Desktop Environment.
services.xserver.displayManager.gdm.enable = true; services.xserver.displayManager.gdm.enable = true;
services.xserver.displayManager.gdm.wayland = true;
services.xserver.displayManager.gdm.autoSuspend = true;
services.xserver.desktopManager.gnome.enable = true; services.xserver.desktopManager.gnome.enable = true;
services.xserver.windowManager.xmonad = { services.xserver.windowManager.xmonad = {
@ -152,7 +158,8 @@ in
}; };
# Enable touchpad support (enabled default in most desktopManager). # Enable touchpad support (enabled default in most desktopManager).
# services.xserver.libinput.enable = true; services.libinput.enable = true;
services.touchegg.enable = true;
# Define a user account. Don't forget to set a password with 'passwd'. # Define a user account. Don't forget to set a password with 'passwd'.
users.users.hunner = { users.users.hunner = {
@ -174,6 +181,8 @@ in
obs-studio obs-studio
mplayer mplayer
ffmpeg ffmpeg
jetbrains-toolbox
pass
]; ];
}; };
systemd.user.services = { systemd.user.services = {
@ -245,6 +254,10 @@ in
hp15c hp15c
#nonpareil #nonpareil
unstable.framework-tool unstable.framework-tool
kitty # for Hyprland
unstable._1password-gui
unstable._1password-cli
restic
]; ];
services.clipmenu.enable = true; services.clipmenu.enable = true;

View file

@ -56,9 +56,9 @@
options = [ "subvol=var/log" ]; options = [ "subvol=var/log" ];
}; };
swapDevices = #swapDevices =
[ { device = "/dev/disk/by-uuid/4ad150c5-5d21-422c-8038-18952e1d999d"; } # [ { device = "/dev/disk/by-uuid/4ad150c5-5d21-422c-8038-18952e1d999d"; }
]; # ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's # (the default) this is the recommended approach. When using systemd-networkd it's