Move bootloader.nix to modules

configuration.nix

@@ -1,13 +1,20 @@
 { config, lib, ... }:
 
-# This should be in /etc/nixos/ together with the rest.
+/*
+  This should be in /etc/nixos/ together with the rest.
 
-# For the nixos channel
+  For the nixos channel:
-# nix-channel --add https://channels.nixos.org/nixos-unstable nixos && nix-channel --update
+  sudo nix-channel --add https://channels.nixos.org/nixos-unstable nixos && nix-channel --update
 
-# To fix problems sometimes:
+  To rebuild for the first time:
-# sudo nixos-rebuild switch -I nixos-config=/etc/nixos/configuration.nix
+  sudo nixos-rebuild switch --option extra-experimental-features "blake3-hashes"
 
+  To fix problems sometimes:
+  sudo nixos-rebuild switch -I nixos-config=/etc/nixos/configuration.nix
+
+  To make an ISO:
+  sudo nixos-rebuild build-image
+*/
 let
   nixtamal = import ./tamal {
     bootstrap-nixpkgs = <nixpkgs>; # Apparently a little bit impure but faster. (can be removed)
@@ -41,10 +48,11 @@ in
     [
       ./local.nix
       ./hardware-configuration.nix # Results of the hardware scan ("nixos-generate-config" command)
+      ./modules/filesystems.nix
       "${nixtamal.home-manager}/nixos"
       "${nixtamal.catppuccin}/modules/nixos"
       "${nixtamal.nix-cachyos-settings}/module.nix"
-      ./bootloader.nix
+      ./modules/bootloader.nix
       ./modules/system-packages.nix
       ./modules/fonts.nix
       ./modules/hyprland.nix

home/doggo/doggo.nix

@@ -52,6 +52,7 @@
     })
     (functions.mkUnstable ani-cli)
     anime4k
+    yt-dlp
     spotify
     jetbrains.idea
     jetbrains.clion

local.nix

@@ -42,7 +42,7 @@ in
   boot.loader.limine.extraEntries = lib.mkIf (!isLaptop) ''
     /Windows
       protocol: efi
-      path: uuid(F19E62C8-6ED1-4482-976A-6CCF5F561FDD):/EFI/Microsoft/Boot/bootmgfw.efi
+      path: label(windows_efi):/EFI/Microsoft/Boot/bootmgfw.efi
   '';
 
   powerManagement.cpuFreqGovernor = if !isLaptop then "performance" else "schedutil";

modules/filesystems.nix

@@ -0,0 +1,25 @@
+{ config, lib, ... }:
+
+{
+  # Note: for f2fs, create it with "sudo fsck.f2fs -O extra_attr,flexible_inline_xattr,inode_checksum,sb_checksum,compression,lost_found /dev/sdxY"
+  fileSystems."/".options = lib.mkIf (config.fileSystems."/".fsType == "f2fs")
+    (lib.mkAfter [
+      "discard" # Better (on f2fs) than fstrim
+      "X-fstrim.notrim" # To avoid fstrim
+      "compress_algorithm=lzo-rle"
+      "compress_extension=*"
+      #"nocompress_extension=avif,bmp,gif,heic,heif,ico,jpe,jpeg,jpg,png,svg,tif,tiff,webp,3gp,avi,flv,m4v,mkv,mov,mp4,mpeg,mpg,webm,wmv,aac,flac,m4a,mid,midi,mp3,ogg,opus,wav,wma,7z,bz2,gz,rar,tar,tgz,xz,zip,zst,docx,odt,odp,ods,pptx,xlsx,pdf,db,gpg,key,p12,pem,sqlite,sqlite3,enc,aab,apk,appimage,bin,deb,dll,elf,exe,jar,so,rpm,img,iso,qcow2,vdi,vhd,vmdk,otf,ttf,class,dump,log,swp,tmp,bak,cache,part,old,new,core"
+      "compress_chksum"
+      "atgc"
+      "gc_merge"
+      "checkpoint=enable"
+      "checkpoint_merge"
+      "fsync_mode=posix"
+      "nat_bits"
+    ]);
+
+  services.fstrim.enable = true;
+
+  # Link to nix-hardware configs in case I get a new laptop some day:
+  # https://github.com/NixOS/nixos-hardware
+}