From c25a5759ca74150ab098b776664e3d8921a8602b Mon Sep 17 00:00:00 2001
From: Filippo Berto <berto.f@protonmail.com>
Date: Fri, 3 Jun 2022 17:49:24 +0200
Subject: [PATCH] Fix loki configuration

---
 flake.nix                       |  4 ++--
 home_manager/modules/helix.nix  |  1 +
 loki/configuration.nix          |  4 +++-
 loki/hardware-configuration.nix | 22 +++++++++++++++++-----
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/flake.nix b/flake.nix
index bc19dad..e0527fb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -151,7 +151,7 @@
         odin-intel-stable = odinStable [ ./odin/configuration-intel.nix ./nixos_modules/pro_audio.nix ./nixos_modules/sesar.nix ];
         odin-nvidia-stable = odinStable [ ./odin/configuration-nvidia.nix ./nixos_modules/pro_audio.nix ./nixos_modules/sesar.nix ];
 
-        loki = loki-unstable;
+        loki = loki-stable;
         loki-stable = lokiStable [ ];
         loki-unstable = lokiUnstable [ ];
 
@@ -169,7 +169,7 @@
 
       devShells.default = unstablePkgs.mkShell {
         shellHook = ''
-          ${self.checks.${system}.pre-commit-check.shellHook}            
+          ${self.checks.${system}.pre-commit-check.shellHook}
         '';
       };
     }));
diff --git a/home_manager/modules/helix.nix b/home_manager/modules/helix.nix
index 6291346..7f63097 100644
--- a/home_manager/modules/helix.nix
+++ b/home_manager/modules/helix.nix
@@ -17,6 +17,7 @@
   ];
   programs.helix = {
     enable = true;
+    package = pkgs.unstable.helix;
     languages = [ ];
     settings = {
       theme = "monokai_pro_octagon";
diff --git a/loki/configuration.nix b/loki/configuration.nix
index 259f0ef..83615b5 100644
--- a/loki/configuration.nix
+++ b/loki/configuration.nix
@@ -21,6 +21,8 @@
   };
 
   hardware = {
+    enableRedistributableFirmware = true;
+
     nvidia.package = config.boot.kernelPackages.nvidiaPackages.legacy_470;
     nvidia.prime = {
       offload.enable = false;
@@ -78,7 +80,7 @@
     gvfs = { enable = true; package = lib.mkForce pkgs.gnome3.gvfs; };
     jackett = { enable = true; openFirewall = true; group = "users"; };
     logind.lidSwitch = "ignore";
-    node-red = { enable = true; openFirewall = true; withNpmAndGcc = true; };
+    node-red = { enable = false; openFirewall = true; withNpmAndGcc = true; };
     openssh = { enable = true; openFirewall = true; permitRootLogin = "no"; passwordAuthentication = false; };
     plex = { enable = true; openFirewall = true; group = "users"; };
     power-profiles-daemon.enable = true;
diff --git a/loki/hardware-configuration.nix b/loki/hardware-configuration.nix
index a114627..048107e 100644
--- a/loki/hardware-configuration.nix
+++ b/loki/hardware-configuration.nix
@@ -1,7 +1,7 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ modulesPath, ... }:
+{ config, lib, modulesPath, ... }:
 
 {
   imports = [
@@ -23,16 +23,28 @@
     fsType = "vfat";
   };
 
-  fileSystems."/mnt/raid" = {
-    device = "/dev/sdc";
+  fileSystems."/mnt/raid1" = {
+    device = "/dev/disk/by-uuid/c84a38dc-9cc7-4762-b509-8fce1c1d95c8";
     fsType = "btrfs";
   };
 
-  fileSystems."/mnt/raid1" = {
-    device = "/dev/sde1";
+  fileSystems."/mnt/raid" = {
+    device = "/dev/disk/by-uuid/7ca4d382-eed7-4b49-b7d8-4b5ca139dd9c";
     fsType = "btrfs";
   };
 
   swapDevices = [ ];
 
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.docker0.useDHCP = lib.mkDefault true;
+  networking.interfaces.eno1.useDHCP = lib.mkDefault true;
+  # networking.interfaces.vboxnet0.useDHCP = lib.mkDefault true;
+  networking.interfaces.wlp7s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.ztmjfdwjkp.useDHCP = lib.mkDefault true;
+
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }