Merge remote-tracking branch 'origin/stable' into minisforum
This commit is contained in:
commit
961e429b77
2 changed files with 5 additions and 3 deletions
|
|
@ -6,7 +6,6 @@ in
|
|||
imports = [
|
||||
];
|
||||
|
||||
boot.kernelPackages = pkgs.linuxPackages_6_12;
|
||||
boot.loader = {
|
||||
systemd-boot.enable = true;
|
||||
efi.canTouchEfiVariables = true;
|
||||
|
|
@ -48,6 +47,7 @@ in
|
|||
};
|
||||
};
|
||||
tailscale.enable = true;
|
||||
# zfs set com.sun:auto-snapshot=true DATASET
|
||||
zfs.autoSnapshot.enable = true;
|
||||
hardware.bolt.enable = true;
|
||||
nscd.enable = true;
|
||||
|
|
@ -161,6 +161,7 @@ in
|
|||
updatePkgs.signal-desktop
|
||||
gcc
|
||||
tree
|
||||
file
|
||||
|
||||
# emacs dependencies
|
||||
ispell
|
||||
|
|
|
|||
|
|
@ -4,12 +4,13 @@ let
|
|||
in
|
||||
{
|
||||
imports = [
|
||||
../common-config.nix
|
||||
../common/configuration.nix
|
||||
./hardware-configuration.nix
|
||||
./sunshine.nix
|
||||
nixos-hardware.nixosModules.framework-11th-gen-intel
|
||||
];
|
||||
|
||||
boot.kernelPackages = pkgs.linuxPackages_6_12;
|
||||
|
||||
networking = {
|
||||
hostId = "7be305c3";
|
||||
hostName = "sandy";
|
||||
|
|
|
|||
Loading…
Reference in a new issue