Jimbo/NixOS-Config
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Update Blender and add SSD trimming

Browse source
This commit is contained in:
Jimbo 2024-11-20 13:55:44 -05:00
parent 0717e2c401
commit 3b524a882e
8 changed files with 27 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
flake.lock
View file

@ -5,16 +5,16 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1731926665, "lastModified": 1732104555,
"narHash": "sha256-T8QeAgxEROprA2xy8YtnK3JtT7u4lOL4Ve86vez5fNg=", "narHash": "sha256-BS1EcK6ChKS0073IPEMsYXr56sax9fut8Rfm8uk8YJw=",
"rev": "3e13b35b779258838684391b40512a44f637ea25", "rev": "35b4a56ef326c382c01d148142f45cb83374b654",
"revCount": 127, "revCount": 128,
"type": "tarball", "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": { "original": {
"type": "tarball", "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": { "blobs": {
@ -61,11 +61,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731895210, "lastModified": 1732109232,
"narHash": "sha256-z76Q/OXLxO/RxMII3fIt/TG665DANiE2lVvnolK2lXk=", "narHash": "sha256-iYh6h8yueU8IyOfNclbiBG2+fBFcjjUfXm90ZBzk0c0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "639d1520df9417ca2761536c3072688569e83c80", "rev": "a0c384e0a3b8bcaed30a6bcf3783f8a7c8b35be4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -310,11 +310,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1731981116, "lastModified": 1732067443,
"narHash": "sha256-SgnDCrAuX9JxRk7NqGJCXYmt+EUkDF2rfL7QjtNImuk=", "narHash": "sha256-CPNSYmlv8Hp1GHLPKq4RE1ujnOpwGEZKHZDWb1b1ZNc=",
"owner": "Infinidoge", "owner": "Infinidoge",
"repo": "nix-minecraft", "repo": "nix-minecraft",
"rev": "3b71545aa21e6fe9eb7690be7ee2ee3d633b1990", "rev": "ca645f4163a501a3302e4afeb25f52906493bfd3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -416,11 +416,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1732025389, "lastModified": 1732115975,
"narHash": "sha256-UMZbNhr9AtGMlV6Sgj2CIb+R3xFTc8sXKcUtAzWKJUw=", "narHash": "sha256-arKN32R6RbBo4Bm5s29QUFAMufGAonNpjdUmCKSLslE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "5128049be5e7a1cc3cad4b2b7bbcefc08af20eef", "rev": "ac7a0e7173912ef48579ffe9e3ec0ab991c3fa8a",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
flake.nix
View file

@ -26,7 +26,7 @@
}; };
nur.url = "github:nix-community/NUR"; 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 = { outputs = {

2
modules/home/programs/misc/production/default.nix
View file

@ -6,7 +6,7 @@
krita krita
inkscape inkscape
audacity audacity
blender_4_2 blender_4_3
]; ];
nixpkgs.overlays = [ blender-bin.overlays.default ]; nixpkgs.overlays = [ blender-bin.overlays.default ];

2
modules/home/programs/terminal/zsh/default.nix
View file

@ -11,7 +11,7 @@
}; };
shellAliases = { shellAliases = {
# NixOS aliases # NixOS aliases
flakedate = "doas nix flake update /etc/nixos"; flakedate = "doas nix flake update --flake /etc/nixos";
nhs = "doas nh os switch -R"; nhs = "doas nh os switch -R";
nhu = "flakedate && nhs"; nhu = "flakedate && nhs";
ns = "nix-shell -p"; ns = "nix-shell -p";

1
modules/system/devices/disks/default.nix
View file

@ -1,7 +1,6 @@
{ ... }: { ... }:
{ {
imports = [ imports = [
./btrfs
./filesystems ./filesystems
./immutable ./immutable
./impermanence ./impermanence

0
modules/system/devices/disks/btrfs/default.nix → modules/system/devices/disks/filesystems/btrfs/default.nix
View file

5
modules/system/devices/disks/filesystems/default.nix
View file

@ -1,5 +1,10 @@
{ lib, ... }: { lib, ... }:
{ {
imports = [
./btrfs
./fstrim
];
boot.supportedFilesystems = { boot.supportedFilesystems = {
ntfs = true; ntfs = true;
zfs = lib.mkForce false; zfs = lib.mkForce false;

4
modules/system/devices/disks/filesystems/fstrim/default.nix Normal file
View file

@ -0,0 +1,4 @@
{ ... }:
{
services.fstrim.enable = true;
}