taotien/NOflake
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix boot issue

Browse source
This commit is contained in:
Tao Tien 2024-03-19 18:12:55 -07:00
parent 0f8a1aa7e1
commit 82d146ef58
8 changed files with 23 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored Normal file
View file

@ -0,0 +1 @@
result

1
TODO Normal file
View file

@ -0,0 +1 @@
https://community.frame.work/t/nixos-on-the-framework-laptop-16/46743/11?u=ghett_klapson

1
result
View file

@ -1 +0,0 @@
/nix/store/0s7qbfkwgrvg31j2bq0659h04q1aj78z-nixos-24.05.20240316.c75037b-x86_64-linux.iso

24
systems/NOlaptop.nix
View file

@ -12,20 +12,24 @@
services.xserver.displayManager.defaultSession = "plasma"; services.xserver.displayManager.defaultSession = "plasma";
services.xserver.displayManager.sddm.wayland.enable = true; services.xserver.displayManager.sddm.wayland.enable = true;
fileSystems."/home/tao/games" = {
device = "/dev/disk/by-uuid/d97a81dc-669c-41d1-912b-829f88fd6f69";
fsType = "btrfs";
options = ["subvol=/home/tao/games" "nosuid" "nodev" "noatime" "compress-force=zstd:3" "users" "rw" "exec" "discard=async"];
};
fileSystems."/home" = { fileSystems."/home" = {
device = "/dev/disk/by-uuid/2e1ba9af-4224-48a3-b935-519947da97db"; device = "/dev/disk/by-uuid/d97a81dc-669c-41d1-912b-829f88fd6f69";
fsType = "btrfs"; fsType = "btrfs";
options = ["subvol=home" "noatime" "compress-force=zstd:3" "discard=async"]; options = ["subvol=home" "noatime" "compress-force=zstd:3" "discard=async"];
}; };
# fileSystems."/home/tao/Games" = {
# device = "/dev/disk/by-uuid/e4244a97-9b48-49f0-8093-782163045020";
# fsType = "btrfs";
# options = ["subvol=games" "nosuid" "nodev" "noatime" "compress-force=zstd:3" "users" "rw" "exec" "discard=async"];
# };
fileSystems."/" = { fileSystems."/" = {
device = "/dev/disk/by-uuid/2e1ba0af-4224-48a3-b935-519947da97db"; device = "/dev/disk/by-uuid/d97a81dc-669c-41d1-912b-829f88fd6f69";
fsType = "btrfs"; fsType = "btrfs";
options = ["subvol=nixos" "noatime" "compress-force=zstd:3" "discard=async"]; options = ["noatime" "compress-force=zstd:3" "discard=async"];
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/8E28-E53F";
fsType = "vfat";
}; };
swapDevices = [{device = "/dev/disk/by-uuid/36216521-db46-4bb0-8994-38a36d5c4528";}]; swapDevices = [{device = "/dev/disk/by-uuid/36216521-db46-4bb0-8994-38a36d5c4528";}];
@ -39,6 +43,10 @@
"usbhid" "usbhid"
"uas" "uas"
]; ];
boot.kernelParams = [
# "mem_sleep_default=deep"
"nvme.noacpi=1"
];
boot.kernelModules = ["kvm-amd"]; boot.kernelModules = ["kvm-amd"];
powerManagement.cpuFreqGovernor = "powersave"; powerManagement.cpuFreqGovernor = "powersave";
systemd.sleep.extraConfig = "HibernateDelaySec=180m"; systemd.sleep.extraConfig = "HibernateDelaySec=180m";

2
systems/NOmom.nix
View file

@ -61,7 +61,7 @@
]; ];
boot.kernelParams = [ boot.kernelParams = [
"acpi_osi=\"!Windows 2020\"" "acpi_osi=\"!Windows 2020\""
"mem_sleep_default=s2idle" "mem_sleep_default=deep"
"nvme.noacpi=1" "nvme.noacpi=1"
"i915.enable_psr=1" "i915.enable_psr=1"
]; ];

2
users/tao.nix
View file

@ -78,7 +78,7 @@
services.syncthing = { services.syncthing = {
enable = true; enable = true;
user = "tao"; user = "tao";
dataDir = "/home/tao/Sync"; dataDir = "/home/tao/sync";
configDir = "/home/tao/.config/syncthing"; configDir = "/home/tao/.config/syncthing";
}; };

1
users/tao/HOME.nix
View file

@ -8,6 +8,7 @@
in { in {
imports = [ imports = [
(import ./helix.nix {inherit pkgs inputs;}) (import ./helix.nix {inherit pkgs inputs;})
./plasma.nix
]; ];
home.file.".cargo/config.toml".text = cargoConfig; home.file.".cargo/config.toml".text = cargoConfig;

4
users/tao/nushell/stuff.nu
View file

@ -7,8 +7,8 @@ alias gc = sudo nix-collect-garbage -d
alias js = jj status alias js = jj status
alias jd = jj diff alias jd = jj diff
alias pu = pueue alias pu = pueue
alias rb = sudo nice -n19 nixos-rebuild boot --flake ~/Projects/NOflake/ alias rb = sudo nice -n19 nixos-rebuild boot --flake ~/projects/NOflake/
alias rs = sudo nice -n19 nixos-rebuild switch --flake ~/Projects/NOflake/ alias rs = sudo nice -n19 nixos-rebuild switch --flake ~/projects/NOflake/
alias t = task alias t = task
alias ts = tailscale alias ts = tailscale
alias tss = tailscale status alias tss = tailscale status