From 20741967ef1e263ca2083d942546b7a421904722 Mon Sep 17 00:00:00 2001
From: Tristan Druyen <tristan@vault81.de>
Date: Mon, 18 Sep 2023 14:04:36 +0200
Subject: [PATCH] Back to 23.05 & remove unneeded dhcp conf

Signed-off-by: Tristan Druyen <tristan@vault81.de>
---
 configuration.nix |  2 +-
 flake.lock        | 29 +++++++++++++++++++++++++----
 flake.nix         |  7 ++++++-
 hardware.nix      |  2 --
 home.nix          |  2 +-
 5 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 6f8c021..561615b 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -27,7 +27,7 @@
   boot.initrd.luks.devices."luks-fa1e760a-71a3-4a79-a791-684cd82d9c3c".device = "/dev/disk/by-uuid/fa1e760a-71a3-4a79-a791-684cd82d9c3c";
   boot.initrd.luks.devices."luks-fa1e760a-71a3-4a79-a791-684cd82d9c3c".keyFile = "/crypto_keyfile.bin";
 
-  fonts.packages = with pkgs; [
+  fonts.fonts = with pkgs; [
     noto-fonts
     noto-fonts-cjk
     noto-fonts-emoji
diff --git a/flake.lock b/flake.lock
index 43b8a87..69c30dc 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,25 @@
 {
   "nodes": {
+    "disko": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1695000028,
+        "narHash": "sha256-PAZl5eDhj44b7+1JOdT+BGGK1UsCHWKG+v8tw/Gmy34=",
+        "owner": "nix-community",
+        "repo": "disko",
+        "rev": "7548ad94698adb90ee17ff62581f2b2457faaedd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "disko",
+        "type": "github"
+      }
+    },
     "emacs-overlay": {
       "inputs": {
         "flake-utils": "flake-utils",
@@ -79,16 +99,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1694593561,
-        "narHash": "sha256-WSaIQZ5s9N9bDFkEMTw6P9eaZ9bv39ZhsiW12GtTNM0=",
+        "lastModified": 1694937365,
+        "narHash": "sha256-iHZSGrb9gVpZRR4B2ishUN/1LRKWtSHZNO37C8z1SmA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1697b7d480449b01111e352021f46e5879e47643",
+        "rev": "5d017a8822e0907fb96f7700a319f9fe2434de02",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
+        "ref": "nixos-23.05",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -127,6 +147,7 @@
     },
     "root": {
       "inputs": {
+        "disko": "disko",
         "emacs-overlay": "emacs-overlay",
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs",
diff --git a/flake.nix b/flake.nix
index 21dc1c9..4a7d934 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,7 +4,7 @@
 
   inputs = {
     nixpkgs = {
-      url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+      url = "github:NixOS/nixpkgs/nixos-23.05";
     };
     tuxedo-nixos = {
       url = "github:blitz/tuxedo-nixos";
@@ -17,6 +17,10 @@
       url = "github:nix-community/emacs-overlay";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    disko = {
+      url = "github:nix-community/disko";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = {
@@ -25,6 +29,7 @@
     nixpkgs,
     tuxedo-nixos,
     emacs-overlay,
+    disko,
   }: {
     formatter = {
       x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.alejandra;
diff --git a/hardware.nix b/hardware.nix
index d29f2a0..43f1eb3 100644
--- a/hardware.nix
+++ b/hardware.nix
@@ -41,8 +41,6 @@
   networking = {
     useDHCP = lib.mkDefault true;
     interfaces = {
-      enp1s0.useDHCP = lib.mkDefault true;
-      wlp3s0.useDHCP = lib.mkDefault true;
       enp5s0f4u1u1c2 = {
         useDHCP = false;
         ipv4.addresses = [
diff --git a/home.nix b/home.nix
index c2139a2..0ea6804 100644
--- a/home.nix
+++ b/home.nix
@@ -1,5 +1,5 @@
 {pkgs, ...}: {
-  fonts.packages = [pkgs.emacs-all-the-icons-fonts];
+  fonts.fonts = [pkgs.emacs-all-the-icons-fonts];
 
   users.users.tristand = {
     isNormalUser = true;