diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b2be92b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +result diff --git a/TODO b/TODO new file mode 100644 index 0000000..f2e7213 --- /dev/null +++ b/TODO @@ -0,0 +1 @@ +https://community.frame.work/t/nixos-on-the-framework-laptop-16/46743/11?u=ghett_klapson diff --git a/result b/result deleted file mode 120000 index cfb8765..0000000 --- a/result +++ /dev/null @@ -1 +0,0 @@ -/nix/store/0s7qbfkwgrvg31j2bq0659h04q1aj78z-nixos-24.05.20240316.c75037b-x86_64-linux.iso \ No newline at end of file diff --git a/systems/NOlaptop.nix b/systems/NOlaptop.nix index 1c3d829..06e5092 100644 --- a/systems/NOlaptop.nix +++ b/systems/NOlaptop.nix @@ -12,20 +12,24 @@ services.xserver.displayManager.defaultSession = "plasma"; 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" = { - device = "/dev/disk/by-uuid/2e1ba9af-4224-48a3-b935-519947da97db"; + device = "/dev/disk/by-uuid/d97a81dc-669c-41d1-912b-829f88fd6f69"; fsType = "btrfs"; 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."/" = { - device = "/dev/disk/by-uuid/2e1ba0af-4224-48a3-b935-519947da97db"; + device = "/dev/disk/by-uuid/d97a81dc-669c-41d1-912b-829f88fd6f69"; 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";}]; @@ -39,6 +43,10 @@ "usbhid" "uas" ]; + boot.kernelParams = [ + # "mem_sleep_default=deep" + "nvme.noacpi=1" + ]; boot.kernelModules = ["kvm-amd"]; powerManagement.cpuFreqGovernor = "powersave"; systemd.sleep.extraConfig = "HibernateDelaySec=180m"; diff --git a/systems/NOmom.nix b/systems/NOmom.nix index 3c32a1f..3ef380b 100644 --- a/systems/NOmom.nix +++ b/systems/NOmom.nix @@ -61,7 +61,7 @@ ]; boot.kernelParams = [ "acpi_osi=\"!Windows 2020\"" - "mem_sleep_default=s2idle" + "mem_sleep_default=deep" "nvme.noacpi=1" "i915.enable_psr=1" ]; diff --git a/users/tao.nix b/users/tao.nix index 839f277..d6dd96e 100644 --- a/users/tao.nix +++ b/users/tao.nix @@ -78,7 +78,7 @@ services.syncthing = { enable = true; user = "tao"; - dataDir = "/home/tao/Sync"; + dataDir = "/home/tao/sync"; configDir = "/home/tao/.config/syncthing"; }; diff --git a/users/tao/HOME.nix b/users/tao/HOME.nix index c95e3db..cfb2dc9 100644 --- a/users/tao/HOME.nix +++ b/users/tao/HOME.nix @@ -8,6 +8,7 @@ in { imports = [ (import ./helix.nix {inherit pkgs inputs;}) + ./plasma.nix ]; home.file.".cargo/config.toml".text = cargoConfig; diff --git a/users/tao/nushell/stuff.nu b/users/tao/nushell/stuff.nu index d76e365..95fe5e8 100644 --- a/users/tao/nushell/stuff.nu +++ b/users/tao/nushell/stuff.nu @@ -7,8 +7,8 @@ alias gc = sudo nix-collect-garbage -d alias js = jj status alias jd = jj diff alias pu = pueue -alias rb = sudo nice -n19 nixos-rebuild boot --flake ~/Projects/NOflake/ -alias rs = sudo nice -n19 nixos-rebuild switch --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 t = task alias ts = tailscale alias tss = tailscale status