feat: update to nixpkgs-23.11

mokrinsky · Jan 19, 2024 · 4648318 · 4648318
1 parent a22619b
commit 4648318
Show file tree

Hide file tree

Showing 12 changed files with 132 additions and 111 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -3,24 +3,26 @@
 
   inputs = {
     # core inputs
-    nixpkgs.url = "nixpkgs/nixpkgs-23.05-darwin";
+    nixpkgs.url = "nixpkgs/nixpkgs-23.11-darwin";
     nixpkgs-unstable.url = "github:nixos/nixpkgs";
     darwin = {
       url = "github:lnl7/nix-darwin";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     home-manager = {
-      url = "github:nix-community/home-manager/release-23.05";
+      url = "github:nix-community/home-manager/release-23.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
     # NUR inputs
     nur.url = "github:nix-community/NUR";
     yumi = {
       url = "github:mokrinsky/nix-packages";
-      inputs.flake-utils.follows = "flake-utils";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.pre-commit-hooks.follows = "pre-commit-hooks";
+      inputs = {
+        flake-utils.follows = "flake-utils";
+        nixpkgs.follows = "nixpkgs";
+        pre-commit-hooks.follows = "pre-commit-hooks";
+      };
     };
 
     # QoL inputs
@@ -42,15 +44,19 @@
     };
     sops = {
       url = "github:Mic92/sops-nix";
-      inputs.nixpkgs-stable.follows = "nixpkgs";
-      inputs.nixpkgs.follows = "nixpkgs-unstable";
+      inputs = {
+        nixpkgs-stable.follows = "nixpkgs";
+        nixpkgs.follows = "nixpkgs-unstable";
+      };
     };
 
     # Development inputs
     devshell = {
       url = "github:numtide/devshell";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.systems.follows = "systems";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        flake-utils.follows = "flake-utils";
+      };
     };
     # yumi-dev = {
     #   url = "path:/Users/yumi/git/nix-overlay";
@@ -123,6 +129,9 @@
               noLambdaPatternNames = true;
               noLambdaArg = true;
             };
+            settings.typos = {
+              exclude = ".sops.yaml --exclude secrets/*";
+            };
           };
         };
 

diff --git a/hosts/argolab/hardware-configuration.nix b/hosts/argolab/hardware-configuration.nix
@@ -7,10 +7,12 @@
     (modulesPath + "/profiles/qemu-guest.nix")
   ];
 
-  boot.initrd.availableKernelModules = ["ata_piix" "xhci_pci" "ahci" "sd_mod" "sr_mod"];
-  boot.initrd.kernelModules = [];
-  boot.kernelModules = [];
-  boot.extraModulePackages = [];
+  boot = {
+    initrd.availableKernelModules = ["ata_piix" "xhci_pci" "ahci" "sd_mod" "sr_mod"];
+    initrd.kernelModules = [];
+    kernelModules = [];
+    extraModulePackages = [];
+  };
 
   fileSystems."/" = {
     device = "/dev/disk/by-label/root";

diff --git a/hosts/common/default.nix b/hosts/common/default.nix
@@ -1,4 +1,7 @@
 {pkgs, ...}: {
+  nixpkgs.config = {
+    allowUnfree = true;
+  };
   nix = {
     package = pkgs.unstable.nixVersions.nix_2_15;
 

diff --git a/hosts/nl/configuration.nix b/hosts/nl/configuration.nix
@@ -30,13 +30,15 @@
     prefix = "  network ";
   };
 in {
-  boot.loader.grub.enable = true;
-  boot.loader.grub.device = "/dev/vda";
+  boot = {
+    loader.grub.enable = true;
+    loader.grub.device = "/dev/vda";
 
-  boot.kernel.sysctl = {
-    "net.ipv6.conf.all.forwarding" = "1";
-    "net.ipv6.conf.default.forwarding" = "1";
-    "net.ipv4.ip_forward" = "1";
+    kernel.sysctl = {
+      "net.ipv6.conf.all.forwarding" = "1";
+      "net.ipv6.conf.default.forwarding" = "1";
+      "net.ipv4.ip_forward" = "1";
+    };
   };
 
   time.timeZone = "Europe/Amsterdam";

diff --git a/hosts/nl/hardware-configuration.nix b/hosts/nl/hardware-configuration.nix
@@ -1,10 +1,12 @@
 {lib, ...}: {
   imports = [];
 
-  boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "sr_mod" "virtio_blk"];
-  boot.initrd.kernelModules = [];
-  boot.kernelModules = ["tap"];
-  boot.extraModulePackages = [];
+  boot = {
+    initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "sr_mod" "virtio_blk"];
+    initrd.kernelModules = [];
+    kernelModules = ["tap"];
+    extraModulePackages = [];
+  };
 
   fileSystems."/" = {
     device = "/dev/disk/by-label/root";

diff --git a/hosts/ru/configuration.nix b/hosts/ru/configuration.nix
@@ -10,13 +10,15 @@
     prefix = "  network ";
   };
 in {
-  boot.loader.grub.enable = true;
-  boot.loader.grub.device = "/dev/vda";
+  boot = {
+    loader.grub.enable = true;
+    loader.grub.device = "/dev/vda";
 
-  boot.kernel.sysctl = {
-    "net.ipv6.conf.all.forwarding" = "1";
-    "net.ipv6.conf.default.forwarding" = "1";
-    "net.ipv4.ip_forward" = "1";
+    kernel.sysctl = {
+      "net.ipv6.conf.all.forwarding" = "1";
+      "net.ipv6.conf.default.forwarding" = "1";
+      "net.ipv4.ip_forward" = "1";
+    };
   };
 
   time.timeZone = "Europe/Moscow";

diff --git a/hosts/ru/hardware-configuration.nix b/hosts/ru/hardware-configuration.nix
@@ -1,10 +1,12 @@
 {lib, ...}: {
   imports = [];
 
-  boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "sr_mod" "virtio_blk"];
-  boot.initrd.kernelModules = [];
-  boot.kernelModules = ["tap"];
-  boot.extraModulePackages = [];
+  boot = {
+    availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "sr_mod" "virtio_blk"];
+    initrd.kernelModules = [];
+    kernelModules = ["tap"];
+    extraModulePackages = [];
+  };
 
   fileSystems."/" = {
     device = "/dev/disk/by-label/root";