From 2f100687a74bf647067ea3e4ba26d1a71f3a72ae Mon Sep 17 00:00:00 2001
From: victor <victor@xirion.net>
Date: Wed, 28 Sep 2022 12:20:54 +0200
Subject: [PATCH] flake update

---
 flake.lock                                  | 18 +++++++++---------
 nixos/hosts/thalassa/null/configuration.nix |  1 +
 nixos/hosts/thalassa/null/home/default.nix  | 16 ++++++++++++++--
 nixos/hosts/thalassa/null/networking.nix    |  1 +
 4 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/flake.lock b/flake.lock
index 9599a1b..4627a4e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -420,11 +420,11 @@
         "utils": "utils_3"
       },
       "locked": {
-        "lastModified": 1664273942,
-        "narHash": "sha256-PFQR1UJQs7a7eaH5YoCZky5dmxR5cjaKRK+MpPbR7YE=",
+        "lastModified": 1664286632,
+        "narHash": "sha256-fKENvLanhmBENlIbmDAVB8SKSbwdLLBYKu6B7oJ0rLc=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "1f5ef2bb419a327fae28a83b50fab50959132c24",
+        "rev": "6dc8a43f397c92afbc3f771385ac803d96d5eeb5",
         "type": "github"
       },
       "original": {
@@ -550,11 +550,11 @@
         "utils": "utils_5"
       },
       "locked": {
-        "lastModified": 1664243684,
-        "narHash": "sha256-n1rNou0jFpAyuObl2w+kRK11xDXWFwZgNztOvGLOh2Q=",
+        "lastModified": 1664330076,
+        "narHash": "sha256-pBEkfVmPVwBAluYEn5BbCb40PkKlqAb/DBF4fdPLitw=",
         "owner": "jyooru",
         "repo": "nix-minecraft-servers",
-        "rev": "489b7f7e7b4281a41f5f4407960e93d2d80fffc5",
+        "rev": "89e7d9e1f5aadad0634b62d55d826d8278dd2bb8",
         "type": "github"
       },
       "original": {
@@ -698,11 +698,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1664292984,
-        "narHash": "sha256-1XO4acnMXSXyq2R8tzWTH74bZPWtKjAu+hAHOPxaU8k=",
+        "lastModified": 1664359465,
+        "narHash": "sha256-Bx1bjo3d77UqoheOeLbbBOyPvuNLedEkgTx3nDO2QJE=",
         "owner": "NULLx76",
         "repo": "nixpkgs",
-        "rev": "e50c95c983718b250df260fe8e855b6e05d0fba2",
+        "rev": "43377d2818041a0e40ac769b3d8897c2c74ba816",
         "type": "github"
       },
       "original": {
diff --git a/nixos/hosts/thalassa/null/configuration.nix b/nixos/hosts/thalassa/null/configuration.nix
index c53902e..2f0d446 100644
--- a/nixos/hosts/thalassa/null/configuration.nix
+++ b/nixos/hosts/thalassa/null/configuration.nix
@@ -74,6 +74,7 @@ in
   };
 
   # Bootloader.
+  # boot.initrd.systemd.enable = true; # Experimental
   boot.loader.systemd-boot.enable = true;
   boot.loader.systemd-boot.configurationLimit = 6;
   boot.loader.efi.canTouchEfiVariables = true;
diff --git a/nixos/hosts/thalassa/null/home/default.nix b/nixos/hosts/thalassa/null/home/default.nix
index 449556a..5798570 100644
--- a/nixos/hosts/thalassa/null/home/default.nix
+++ b/nixos/hosts/thalassa/null/home/default.nix
@@ -42,7 +42,6 @@
     ripgrep
     rnix-lsp
     rsync
-    rust-analyzer
     rustup
     saleae-logic-2
     solo2-cli
@@ -120,10 +119,23 @@
     enable = true;
     package = pkgs.firefox-devedition-bin;
   };
-
+  
   programs.vscode = {
     enable = true;
     package = pkgs.vscode;
+    userSettings = {
+      "ltex.language" = "en-GB";
+      "workbench.colorTheme" = "Catppuccin Frappé";
+      "editor.fontFamily" = "'DejaVuSansMono Nerd Font', 'monospace', monospace";
+      "keyboard.dispatch" = "keyCode";
+      "rust-analyzer.server.path" = "${pkgs.rust-analyzer}/bin/rust-analyzer";
+      "terminal.integrated.defaultProfile.linux" = "zsh";
+      "nix.enableLanguageServer" = true; # Enable LSP.
+      "nix.serverPath" = "${pkgs.nil}/bin/nil"; # The path to the LSP server executable.
+      "[nix]" = {
+        "editor.defaultFormatter" = "jnoortheen.nix-ide";
+      };
+    };
     extensions = with pkgs.vscode-extensions; [
       catppuccin.catppuccin-vsc
       codezombiech.gitignore
diff --git a/nixos/hosts/thalassa/null/networking.nix b/nixos/hosts/thalassa/null/networking.nix
index c82e873..944d801 100644
--- a/nixos/hosts/thalassa/null/networking.nix
+++ b/nixos/hosts/thalassa/null/networking.nix
@@ -7,6 +7,7 @@
   };
   networking = {
     useDHCP = true;
+    dhcpcd.wait = "background";
     wireless = {
       enable = true;
       environmentFile = "/var/lib/secrets/wireless.env";