Flake update, fix zfs, format

joinemm · Dec 16, 2024 · 193fe4e · 193fe4e
1 parent 11a0ed2
commit 193fe4e
Show file tree

Hide file tree

Showing 12 changed files with 67 additions and 77 deletions.
diff --git a/aoc2024/day1.nix b/aoc2024/day1.nix
@@ -1,7 +1,7 @@
 let
   lib = import <nixpkgs/lib>;
 
-  divWith = f: lib.sort (a: b: a < b) (map (x: f x) nums);
+  divWith = f: lib.sort (a: b: a < b) (map f nums);
   abs = x: if x < 0 then (-x) else x;
   sum = x: lib.foldl (a: b: a + b) 0 x;
 

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -16,9 +16,6 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
 
-    # nixpkgs that still has the 6.10 kernel because zfs is lagging behind
-    nixpkgs-old.url = "github:NixOS/nixpkgs/dd50f99e26d30c115ae970e51103f89fde5d2b44";
-
     treefmt-nix = {
       url = "github:numtide/treefmt-nix";
       inputs.nixpkgs.follows = "nixpkgs";

diff --git a/hosts/carbon/default.nix b/hosts/carbon/default.nix
@@ -15,6 +15,7 @@
     (with self.nixosModules; [
       laptop
       kanata
+      zfs
     ])
     (with inputs.nixos-hardware.nixosModules; [
       lenovo-thinkpad-x1-11th-gen
@@ -35,8 +36,6 @@
     hostId = "c08d7d71";
   };
 
-  boot.kernelPackages = inputs.nixpkgs-old.legacyPackages.${pkgs.system}.linuxPackages_6_10;
-
   hardware.graphics = {
     extraPackages = with pkgs; [
       intel-compute-runtime

diff --git a/hosts/cobalt/default.nix b/hosts/cobalt/default.nix
@@ -2,7 +2,6 @@
   inputs,
   lib,
   user,
-  pkgs,
   self,
   ...
 }:
@@ -15,6 +14,7 @@
     (with self.nixosModules; [
       desktop
       virtualization
+      zfs
     ])
     (with inputs.nixos-hardware.nixosModules; [
       common-cpu-amd
@@ -49,9 +49,6 @@
     ];
   };
 
-  # latest ZFS compatible kernel
-  boot.kernelPackages = inputs.nixpkgs-old.legacyPackages.${pkgs.system}.linuxPackages_6_10;
-
   # Sample rates for Topping D10 USB DAC
   services.pipewire.extraConfig = {
     pipewire."99-topping-D10" = {

diff --git a/hosts/nickel/default.nix b/hosts/nickel/default.nix
@@ -279,7 +279,8 @@
         locations."/".proxyPass = "http://127.0.0.1:${toString config.services.immich.port}";
       };
       "scrutiny.${labDomain}" = labCert // {
-        locations."/".proxyPass = "http://127.0.0.1:${toString config.services.scrutiny.settings.web.listen.port}";
+        locations."/".proxyPass =
+          "http://127.0.0.1:${toString config.services.scrutiny.settings.web.listen.port}";
       };
     };
 

diff --git a/modules/default.nix b/modules/default.nix
@@ -37,6 +37,7 @@ let
         ./virtualization.nix
         ./dev.nix
         ./gc.nix
+        ./zfs.nix
       ]
   );
 in

diff --git a/modules/home/common.nix b/modules/home/common.nix
@@ -61,6 +61,8 @@
     (btop.override { rocmSupport = true; })
     onefetch
     immich-go
+    czkawka
+    exif
 
     # utils
     tree

diff --git a/modules/home/neovim.nix b/modules/home/neovim.nix
@@ -173,9 +173,9 @@
         };
       };
 
-      nvim-colorizer = {
+      colorizer = {
         enable = true;
-        userDefaultOptions.names = false;
+        settings.user_default_options.names = false;
       };
       fidget.enable = true;
       lightline.enable = true;

diff --git a/modules/laptop.nix b/modules/laptop.nix
@@ -41,8 +41,6 @@
       percentageLow = 10;
       percentageCritical = 5;
       percentageAction = 2;
-      # zfs doesn't support Hibernation
-      criticalPowerAction = "HybridSleep";
     };
 
     # Enable the auto-cpufreq daemon

diff --git a/modules/remotebuild.nix b/modules/remotebuild.nix
@@ -36,7 +36,9 @@
   };
 
   programs.ssh.knownHosts = {
-    "hetzarm.vedenemo.dev".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILx4zU4gIkTY/1oKEOkf9gTJChdx/jR3lDgZ7p/c7LEK";
-    "builder.vedenemo.dev".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHSI8s/wefXiD2h3I3mIRdK+d9yDGMn0qS5fpKDnSGqj";
+    "hetzarm.vedenemo.dev".publicKey =
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILx4zU4gIkTY/1oKEOkf9gTJChdx/jR3lDgZ7p/c7LEK";
+    "builder.vedenemo.dev".publicKey =
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHSI8s/wefXiD2h3I3mIRdK+d9yDGMn0qS5fpKDnSGqj";
   };
 }
diff --git a/modules/zfs.nix b/modules/zfs.nix
@@ -0,0 +1,10 @@
+{ pkgs, ... }:
+{
+  boot = {
+    kernelPackages = pkgs.linuxPackages_6_11;
+    zfs.package = pkgs.zfsUnstable;
+  };
+
+  # zfs doesn't support Hibernation
+  services.upower.criticalPowerAction = "HybridSleep";
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -61,6 +61,8 @@ @@
         (btop.override { rocmSupport = true; })
         onefetch
         immich-go
+        czkawka
+        exif
         # utils
         tree
@@ Expand Down @@