diff --git a/flake.lock b/flake.lock index 9d1a225..14ad3eb 100644 --- a/flake.lock +++ b/flake.lock @@ -5,16 +5,16 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1731926665, - "narHash": "sha256-T8QeAgxEROprA2xy8YtnK3JtT7u4lOL4Ve86vez5fNg=", - "rev": "3e13b35b779258838684391b40512a44f637ea25", - "revCount": 127, + "lastModified": 1732104555, + "narHash": "sha256-BS1EcK6ChKS0073IPEMsYXr56sax9fut8Rfm8uk8YJw=", + "rev": "35b4a56ef326c382c01d148142f45cb83374b654", + "revCount": 128, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/blender-bin/1.0.10/01933ee1-cdef-7d5b-afe8-7085844ac73d/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/edolstra/blender-bin/1.0.11/0193497b-0d96-7d62-b941-1fe51ce62934/source.tar.gz" }, "original": { "type": "tarball", - "url": "https://flakehub.com/f/edolstra/blender-bin/1.0.9.tar.gz" + "url": "https://flakehub.com/f/edolstra/blender-bin/1.0.11.tar.gz" } }, "blobs": { @@ -61,11 +61,11 @@ ] }, "locked": { - "lastModified": 1731895210, - "narHash": "sha256-z76Q/OXLxO/RxMII3fIt/TG665DANiE2lVvnolK2lXk=", + "lastModified": 1732109232, + "narHash": "sha256-iYh6h8yueU8IyOfNclbiBG2+fBFcjjUfXm90ZBzk0c0=", "owner": "nix-community", "repo": "disko", - "rev": "639d1520df9417ca2761536c3072688569e83c80", + "rev": "a0c384e0a3b8bcaed30a6bcf3783f8a7c8b35be4", "type": "github" }, "original": { @@ -310,11 +310,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1731981116, - "narHash": "sha256-SgnDCrAuX9JxRk7NqGJCXYmt+EUkDF2rfL7QjtNImuk=", + "lastModified": 1732067443, + "narHash": "sha256-CPNSYmlv8Hp1GHLPKq4RE1ujnOpwGEZKHZDWb1b1ZNc=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "3b71545aa21e6fe9eb7690be7ee2ee3d633b1990", + "rev": "ca645f4163a501a3302e4afeb25f52906493bfd3", "type": "github" }, "original": { @@ -416,11 +416,11 @@ }, "nur": { "locked": { - "lastModified": 1732025389, - "narHash": "sha256-UMZbNhr9AtGMlV6Sgj2CIb+R3xFTc8sXKcUtAzWKJUw=", + "lastModified": 1732115975, + "narHash": "sha256-arKN32R6RbBo4Bm5s29QUFAMufGAonNpjdUmCKSLslE=", "owner": "nix-community", "repo": "NUR", - "rev": "5128049be5e7a1cc3cad4b2b7bbcefc08af20eef", + "rev": "ac7a0e7173912ef48579ffe9e3ec0ab991c3fa8a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 4883dd4..98ffca7 100644 --- a/flake.nix +++ b/flake.nix @@ -26,7 +26,7 @@ }; nur.url = "github:nix-community/NUR"; - blender-bin.url = "https://flakehub.com/f/edolstra/blender-bin/1.0.9.tar.gz"; + blender-bin.url = "https://flakehub.com/f/edolstra/blender-bin/1.0.11.tar.gz"; }; outputs = { diff --git a/modules/home/programs/misc/production/default.nix b/modules/home/programs/misc/production/default.nix index 180b51f..5d0c16e 100644 --- a/modules/home/programs/misc/production/default.nix +++ b/modules/home/programs/misc/production/default.nix @@ -6,7 +6,7 @@ krita inkscape audacity - blender_4_2 + blender_4_3 ]; nixpkgs.overlays = [ blender-bin.overlays.default ]; diff --git a/modules/home/programs/terminal/zsh/default.nix b/modules/home/programs/terminal/zsh/default.nix index bb96cfb..4289067 100644 --- a/modules/home/programs/terminal/zsh/default.nix +++ b/modules/home/programs/terminal/zsh/default.nix @@ -11,7 +11,7 @@ }; shellAliases = { # NixOS aliases - flakedate = "doas nix flake update /etc/nixos"; + flakedate = "doas nix flake update --flake /etc/nixos"; nhs = "doas nh os switch -R"; nhu = "flakedate && nhs"; ns = "nix-shell -p"; diff --git a/modules/system/devices/disks/default.nix b/modules/system/devices/disks/default.nix index 652aa03..727bef5 100644 --- a/modules/system/devices/disks/default.nix +++ b/modules/system/devices/disks/default.nix @@ -1,7 +1,6 @@ { ... }: { imports = [ - ./btrfs ./filesystems ./immutable ./impermanence diff --git a/modules/system/devices/disks/btrfs/default.nix b/modules/system/devices/disks/filesystems/btrfs/default.nix similarity index 100% rename from modules/system/devices/disks/btrfs/default.nix rename to modules/system/devices/disks/filesystems/btrfs/default.nix diff --git a/modules/system/devices/disks/filesystems/default.nix b/modules/system/devices/disks/filesystems/default.nix index 522fb9f..cebdfd4 100644 --- a/modules/system/devices/disks/filesystems/default.nix +++ b/modules/system/devices/disks/filesystems/default.nix @@ -1,5 +1,10 @@ { lib, ... }: { + imports = [ + ./btrfs + ./fstrim + ]; + boot.supportedFilesystems = { ntfs = true; zfs = lib.mkForce false; diff --git a/modules/system/devices/disks/filesystems/fstrim/default.nix b/modules/system/devices/disks/filesystems/fstrim/default.nix new file mode 100644 index 0000000..c7d1151 --- /dev/null +++ b/modules/system/devices/disks/filesystems/fstrim/default.nix @@ -0,0 +1,4 @@ +{ ... }: +{ + services.fstrim.enable = true; +}