diff --git a/apps/bat.nix b/apps/bat.nix
index ff6b2869d783e19f9fc911b7a040e9e0abcc33e5..4ad3045b65ae0284a89819d25c2dc8ee8555f7e6 100644
--- a/apps/bat.nix
+++ b/apps/bat.nix
@@ -1,16 +1,18 @@
 {pkgs, ...}: {
+      ctp-mocha = builtins.readFile (pkgs.fetchFromGitHub {
   programs.bat = {
     enable = true;
-    config = {theme = "ctp-mocha";};
+    config = { theme = "ctp-mocha"; };
     themes = {
       ctp-mocha = builtins.readFile (pkgs.fetchFromGitHub {
-          owner = "catppuccin";
+{pkgs, ...}: {
           repo = "bat";
+{pkgs, ...}: {
           rev = "ba4d16880d63e656acced2b7d4e034e4a93f74b1";
-{pkgs, ...}: {
+  programs.bat = {
-{pkgs, ...}: {
+  programs.bat = {
 {pkgs, ...}: {
-{pkgs, ...}: {
+  programs.bat = {
   programs.bat = {
     };
   };
diff --git a/apps/bottom.nix b/apps/bottom.nix
index e7d4b88a7930a98361ad2a5082aa5d4d37eb8f2e..44843edd4791018e9be93b7bdcf1018514db9995 100644
--- a/apps/bottom.nix
+++ b/apps/bottom.nix
@@ -6,7 +6,8 @@       colors = {
         table_header_color = "#f5e0dc";
         all_cpu_color = "#f5e0dc";
         avg_cpu_color = "#eba0ac";
-        cpu_core_colors = ["#f38ba8" "#fab387" "#f9e2af" "#a6e3a1" "#74c7ec" "#cba6f7"];
+        cpu_core_colors =
+          [ "#f38ba8" "#fab387" "#f9e2af" "#a6e3a1" "#74c7ec" "#cba6f7" ];
         ram_color = "#a6e3a1";
         swap_color = "#fab387";
         rx_color = "#a6e3a1";
@@ -22,7 +23,8 @@         selected_bg_color = "#cba6f7";
         high_battery_color = "#a6e3a1";
         medium_battery_color = "#f9e2af";
         low_battery_color = "#f38ba8";
-        gpu_core_colors = ["#74c7ec" "#cba6f7" "#f38ba8" "#fab387" "#f9e2af" "#a6e3a1"];
+        gpu_core_colors =
+          [ "#74c7ec" "#cba6f7" "#f38ba8" "#fab387" "#f9e2af" "#a6e3a1" ];
         arc_color = "#89dceb";
       };
     };
diff --git a/apps/default.nix b/apps/default.nix
index ae5140551d68b8ecf893a30f25440a3738d2aa27..ed9a189f9b81030cac05f7107ea2fc6d4a4660c1 100644
--- a/apps/default.nix
+++ b/apps/default.nix
@@ -1,8 +1,5 @@
-{
-  pkgs,
-  config,
-  ...
 }: {
+    ./bat.nix
   imports = [
     ./bat.nix
     ./bottom.nix
@@ -21,6 +18,7 @@     ./zoxide.nix
   ];
   home = {
     packages = with pkgs; [
+
       # Tools
       age
       bitwarden-cli
@@ -40,11 +38,10 @@       nodePackages.yaml-language-server
 
       # Formatters
   ...
-{
-  ...
   pkgs,
       gofumpt
       nodePackages.lua-fmt
+      nixfmt
 
       # IDEs
       jetbrains.goland
@@ -59,5 +56,5 @@     stateVersion = "22.11";
   };
 
 }: {
-}: {
+    ./firefox.nix
 }
diff --git a/apps/firefox.nix b/apps/firefox.nix
index c8c6543f219bffb4856950efd8989cb28fb260ac..09c7b2f2df2f7696f1f078b1c54a4979f35eda46 100644
--- a/apps/firefox.nix
+++ b/apps/firefox.nix
@@ -1,4 +1,4 @@
-{pkgs, ...}: {
+{ pkgs, ... }: {
   programs.firefox = {
     enable = true;
     profiles.default = {
@@ -19,43 +19,42 @@         "extensions.pocket.enabled" = false;
         "browser.newtabpage.activity-stream.feeds.section.topstories" = false;
         "browser.newtabpage.activity-stream.showSponsoredTopSites" = false;
         "browser.newtabpage.pinned" = builtins.toJSON [
-          {url = "https://mynixos.com/";}
+          { url = "https://mynixos.com/"; }
-          {url = "https://github.com/";}
+          { url = "https://github.com/"; }
-  programs.firefox = {
     profiles.default = {
+        refined-github
         ];
       };
-      bookmarks = [
-        {
-          name = "Gitea";
-    enable = true;
+      search.default = "DuckDuckGo";
-    enable = true;
+      search.default = "DuckDuckGo";
 {pkgs, ...}: {
-    enable = true;
+      search.default = "DuckDuckGo";
   programs.firefox = {
-    enable = true;
+      search.default = "DuckDuckGo";
     enable = true;
-    enable = true;
+      search.default = "DuckDuckGo";
     profiles.default = {
-    enable = true;
+      search.default = "DuckDuckGo";
       search.default = "DuckDuckGo";
-    enable = true;
+      search.default = "DuckDuckGo";
       search.force = true;
-    enable = true;
+      search.default = "DuckDuckGo";
       extensions = with pkgs.nur.repos.rycee.firefox-addons; [
-            {
-    enable = true;
+      search.default = "DuckDuckGo";
         bitwarden
-              tags = ["gitea"];
-    enable = true;
+      search.default = "DuckDuckGo";
         refined-github
+      search.default = "DuckDuckGo";
     profiles.default = {
+      search.force = true;
-            }
+            tags = [ "gitea" ];
-    profiles.default = {
+      search.force = true;
 {pkgs, ...}: {
-    profiles.default = {
+            url = "https://git.jojodev.com";
+          }
   programs.firefox = {
+      search.default = "DuckDuckGo";
-      ];
+      }];
     };
   };
 }
diff --git a/apps/git.nix b/apps/git.nix
index 261293fe10d83410ee5b977c6886209ce05b1494..33a8cd78d7d0bbe0e68db9256065d0bea530ff14 100644
--- a/apps/git.nix
+++ b/apps/git.nix
@@ -1,5 +1,4 @@
-let
-  key = "0xB853ADA5DA7BBF7A";
+let key = "0xB853ADA5DA7BBF7A";
 in {
   programs.git = {
     enable = true;
@@ -21,7 +20,7 @@       fu = "fetch upstream";
       fo = "fetch origin";
     };
     lfs.enable = true;
-    ignores = [".idea/"];
+    ignores = [ ".idea/" ];
     extraConfig = {
       init.defaultBranch = "main";
       merge.conflictstyle = "diff3";
diff --git a/apps/go.nix b/apps/go.nix
index 8fa1bca795f95dab07d2947216765ef46fcee3ee..0f089ec4eca0ccf8322d3e87c13d24c6f5a2e9ef 100644
--- a/apps/go.nix
+++ b/apps/go.nix
@@ -1 +1 @@
-{programs.go.enable = true;}
+{ programs.go.enable = true; }
diff --git a/apps/gpg.nix b/apps/gpg.nix
index 8a6f77d25e12008bcf404547836f9da02d2a7855..1b1ad50b3faf5a2f089c0ecb9b55af6dc435a3ce 100644
--- a/apps/gpg.nix
+++ b/apps/gpg.nix
@@ -1,7 +1,8 @@
-{pkgs, ...}: let
+{ pkgs, ... }:
   key = "0xB853ADA5DA7BBF7A";
+    enable = true;
 in {
-  home.packages = with pkgs; [pinentry];
+  home.packages = with pkgs; [ pinentry ];
   programs.gpg = {
     enable = true;
     settings = {
diff --git a/apps/helix.nix b/apps/helix.nix
index d6b637696a42caec3a42110ee1687b745821498a..9052328aebba15a3f6216f69d77e7d6eea117f5a 100644
--- a/apps/helix.nix
+++ b/apps/helix.nix
@@ -15,12 +15,12 @@           normal = "block";
           select = "underline";
         };
 {
-      editor = {
+          C-c = ":config-open";
         indent-guides = {
           render = true;
           skip-levels = 1;
         };
-  programs.helix = {
+          normal = "block";
 {
         statusline = {
           right = [
@@ -31,7 +31,7 @@             "position"
             "file-encoding"
           ];
         };
-        lsp = {display-messages = true;};
+        lsp = { display-messages = true; };
       };
       keys = {
         normal = {
@@ -47,37 +47,39 @@           "C-/" = "toggle_comments";
           S-right = "goto_next_buffer";
           S-left = "goto_previous_buffer";
           C-b = ":buffer-close";
+{
     defaultEditor = true;
-      theme = "catppuccin_mocha_transparent";
+    enable = true;
 
           C-j = "shrink_selection";
           C-k = "expand_selection";
           C-l = "select_next_sibling";
           C-a = "select_all";
-          C-u = ["half_page_up" "align_view_center"];
+          C-u = [ "half_page_up" "align_view_center" ];
+          normal = "block";
     settings = {
-    enable = true;
 
-    settings = {
+{
     defaultEditor = true;
+      theme = "catppuccin_mocha_transparent";
-          "}" = ["goto_next_paragraph" "collapse_selection"];
+          "}" = [ "goto_next_paragraph" "collapse_selection" ];
           "0" = "goto_line_start";
           "$" = "goto_line_end";
           "^" = "goto_first_nonwhitespace";
           G = "goto_file_end";
           "%" = "match_brackets";
-      theme = "catppuccin_mocha_transparent";
 {
+          C-j = "shrink_selection";
-          C = ["collapse_selection" "extend_to_line_end" "change_selection"];
+          C = [ "collapse_selection" "extend_to_line_end" "change_selection" ];
-          D = ["extend_to_line_end" "delete_selection"];
+          D = [ "extend_to_line_end" "delete_selection" ];
           S = "surround_add";
 
           d = {
-            d = ["extend_to_line_bounds" "delete_selection"];
+            d = [ "extend_to_line_bounds" "delete_selection" ];
-            t = ["extend_till_char"];
+            t = [ "extend_till_char" ];
-            s = ["surround_delete"];
+            s = [ "surround_delete" ];
-            i = ["select_textobject_inner"];
+            i = [ "select_textobject_inner" ];
-            a = ["select_textobject_around"];
+            a = [ "select_textobject_around" ];
           };
 
           x = "delete_selection";
@@ -96,20 +98,22 @@             "goto_line_start"
             "collapse_selection"
           ];
 
-          w = ["move_next_word_start" "move_char_right" "collapse_selection"];
+          w = [ "move_next_word_start" "move_char_right" "collapse_selection" ];
-          e = ["move_next_word_end" "collapse_selection"];
+          e = [ "move_next_word_end" "collapse_selection" ];
+          select = "underline";
         line-number = "relative";
-    defaultEditor = true;
 
-        line-number = "relative";
+{
     settings = {
+        mouse = false;
-        line-number = "relative";
+{
       theme = "catppuccin_mocha_transparent";
 
-        line-number = "relative";
+          esc = [ "collapse_selection" "keep_primary_selection" ];
+    defaultEditor = true;
       editor = {
         };
-        insert = {esc = ["collapse_selection" "normal_mode"];};
+        insert = { esc = [ "collapse_selection" "normal_mode" ]; };
         select = {
           space = {
             j = {
@@ -117,16 +120,17 @@               e = ":pipe jq";
               c = ":pipe jq -c";
             };
           };
-        mouse = false;
+          "{" = [ "extend_to_line_bounds" "goto_prev_paragraph" ];
+        };
     defaultEditor = true;
-          "}" = ["extend_to_line_bounds" "goto_next_paragraph"];
           "0" = "goto_line_start";
           "$" = "goto_line_end";
           "^" = "goto_first_nonwhitespace";
           G = "goto_file_end";
-        mouse = false;
+{
       theme = "catppuccin_mocha_transparent";
+    settings = {
-          C = ["goto_line_start" "extend_to_line_bounds" "change_selection"];
+          C = [ "goto_line_start" "extend_to_line_bounds" "change_selection" ];
           "%" = "match_brackets";
           S = "surround_add";
 
@@ -133,18 +138,19 @@           i = "select_textobject_inner";
           a = "select_textobject_around";
 
 {
+            t = ["extend_till_char"];
 {
-{
+            s = ["surround_delete"];
 
 {
-  programs.helix = {
+            i = ["select_textobject_inner"];
 {
+      editor = {
-    enable = true;
 
 {
-    defaultEditor = true;
+          x = "delete_selection";
 {
-    settings = {
+          p = "paste_clipboard_after";
           y = [
             "yank_main_selection_to_clipboard"
             "normal_mode"
@@ -161,7 +168,8 @@           p = "replace_selections_with_clipboard";
           P = "paste_clipboard_before";
 
 {
       editor = {
+    enable = true;
         };
       };
     };
@@ -173,7 +181,7 @@           auto-format = true;
           formatter = {
             command = "jsonnetfmt";
 {
-        };
+          y = [
           };
         }
         {
@@ -181,7 +189,7 @@           name = "go";
           formatter = {
             command = "gofumpt";
 {
-          skip-levels = 1;
+            "yank_main_selection_to_clipboard"
           };
         }
         {
@@ -190,7 +198,7 @@           auto-format = true;
           formatter = {
             command = "black";
 {
-          right = [
+            "normal_mode"
           };
         }
         {
@@ -198,9 +206,9 @@           name = "nix";
           auto-format = true;
           formatter = {
 {
-            "diagnostics"
+            "flip_selections"
 {
-            "selections"
+            "yank_main_selection_to_clipboard"
           };
         }
       ];
@@ -209,22 +217,22 @@     themes = {
       catppuccin_frappe_transparent = {
         inherits = "catppuccin_frappe";
 {
-      };
+            "collapse_selection"
       };
       catppuccin_latte_transparent = {
         inherits = "catppuccin_latte";
 {
-      };
+            "collapse_selection"
       };
       catppuccin_macchiato_transparent = {
         inherits = "catppuccin_macchiato";
 {
-      };
+            "collapse_selection"
       };
       catppuccin_mocha_transparent = {
         inherits = "catppuccin_mocha";
 {
-      };
+            "collapse_selection"
       };
     };
   };
diff --git a/apps/jq.nix b/apps/jq.nix
index 1cb6a313855f56e4fc1bf64cd314423df4c2109c..3c01c415d9a2bd365f83f4ec6a57f64eb6a40692 100644
--- a/apps/jq.nix
+++ b/apps/jq.nix
@@ -1 +1 @@
-{programs.jq.enable = true;}
+{ programs.jq.enable = true; }
diff --git a/apps/nushell.nix b/apps/nushell.nix
index 99c5f26ee54a25306c1dc3f20dcce90a541eda8f..5aee629c492c97b4673c98b9fc6e1414c4443e03 100644
--- a/apps/nushell.nix
+++ b/apps/nushell.nix
@@ -1,4 +1,4 @@
-{pkgs, ...}: {
+{ pkgs, ... }: {
   programs.nushell = {
     enable = true;
     configFile.source = ./nushell/config.nu;
diff --git a/apps/oh-my-posh.nix b/apps/oh-my-posh.nix
index a763f3fa7cac57df0cd2c803da4e5b9cac9ad806..156a4ccf3863ab8fad009e35c593511c7c6ca28a 100644
--- a/apps/oh-my-posh.nix
+++ b/apps/oh-my-posh.nix
@@ -1,8 +1,7 @@
 {
   programs.oh-my-posh = {
     enable = true;
-    settings =
+    settings = builtins.fromJSON (builtins.unsafeDiscardStringContext
-      builtins.fromJSON (builtins.unsafeDiscardStringContext
-        (builtins.readFile ./ohmyposh/config.json));
+      (builtins.readFile ./ohmyposh/config.json));
   };
 }
diff --git a/apps/zoxide.nix b/apps/zoxide.nix
index 1d60a23bda80b25c83aef3c82bbc6acb2213082a..d54841661cb9c0288991af3173a6c84c20d939c0 100644
--- a/apps/zoxide.nix
+++ b/apps/zoxide.nix
@@ -1 +1 @@
-{programs.zoxide.enable = true;}
+{ programs.zoxide.enable = true; }
diff --git a/flake.nix b/flake.nix
index d60ee0316ea8374c7a5d7a96e19273c0eb6d8152..03ef6932e24f04d4f03a0f76a3276a3bcfdc55b0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,98 +10,91 @@     nur.url = "github:nix-community/nur";
     jolheiser-nur.url = "git+https://git.jojodev.com/jolheiser/nur";
   };
 
-  nixConfig = {warn-dirty = false;};
+  nixConfig = { warn-dirty = false; };
 
+  outputs = { self, nixpkgs, home-manager, jolheiser-nur, ... }@inputs:
+    home-manager.url = "github:nix-community/home-manager";
 {
+    home-manager.url = "github:nix-community/home-manager";
   description = "jolheiser's nixos config";
-{
+    home-manager.url = "github:nix-community/home-manager";
 
-{
+    home-manager.url = "github:nix-community/home-manager";
   inputs = {
-{
+    home-manager.url = "github:nix-community/home-manager";
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
-{
+    home-manager.url = "github:nix-community/home-manager";
     home-manager.url = "github:nix-community/home-manager";
-{
+    home-manager.url = "github:nix-community/home-manager";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
-  } @ inputs: let
-    overlays = final: prev: {
-      nur = import inputs.nur {
-        nurpkgs = prev;
-        pkgs = prev;
-        repoOverrides = {
-  description = "jolheiser's nixos config";
+  inputs = {
   inputs = {
         };
       };
-    };
-  description = "jolheiser's nixos config";
+    home-manager.url = "github:nix-community/home-manager";
     nur.url = "github:nix-community/nur";
-  description = "jolheiser's nixos config";
+    home-manager.url = "github:nix-community/home-manager";
     jolheiser-nur.url = "git+https://git.jojodev.com/jolheiser/nur";
-
+    home-manager.inputs.nixpkgs.follows = "nixpkgs";
-
+    home-manager.inputs.nixpkgs.follows = "nixpkgs";
 {
-
+    home-manager.inputs.nixpkgs.follows = "nixpkgs";
   description = "jolheiser's nixos config";
-
+    home-manager.inputs.nixpkgs.follows = "nixpkgs";
 
-
+    home-manager.inputs.nixpkgs.follows = "nixpkgs";
   inputs = {
-
+    home-manager.inputs.nixpkgs.follows = "nixpkgs";
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
-
+    home-manager.inputs.nixpkgs.follows = "nixpkgs";
     home-manager.url = "github:nix-community/home-manager";
-
+    home-manager.inputs.nixpkgs.follows = "nixpkgs";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
-
+    home-manager.inputs.nixpkgs.follows = "nixpkgs";
     nur.url = "github:nix-community/nur";
-
+    home-manager.inputs.nixpkgs.follows = "nixpkgs";
     jolheiser-nur.url = "git+https://git.jojodev.com/jolheiser/nur";
-  inputs = {
+    nur.url = "github:nix-community/nur";
-  inputs = {
+    nur.url = "github:nix-community/nur";
 {
-  inputs = {
+    nur.url = "github:nix-community/nur";
   description = "jolheiser's nixos config";
   inputs = {
+  inputs = {
+    nur.url = "github:nix-community/nur";
 
-  inputs = {
+    nur.url = "github:nix-community/nur";
   inputs = {
-  description = "jolheiser's nixos config";
+    nur.url = "github:nix-community/nur";
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
-  description = "jolheiser's nixos config";
+    nur.url = "github:nix-community/nur";
     home-manager.url = "github:nix-community/home-manager";
-    });
-  in {
-  inputs = {
+    nur.url = "github:nix-community/nur";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
-  inputs = {
+    nur.url = "github:nix-community/nur";
     nur.url = "github:nix-community/nur";
-  inputs = {
+    nur.url = "github:nix-community/nur";
     jolheiser-nur.url = "git+https://git.jojodev.com/jolheiser/nur";
-    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+    jolheiser-nur.url = "git+https://git.jojodev.com/jolheiser/nur";
-    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+    jolheiser-nur.url = "git+https://git.jojodev.com/jolheiser/nur";
 {
-    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+    jolheiser-nur.url = "git+https://git.jojodev.com/jolheiser/nur";
   description = "jolheiser's nixos config";
-          ./machines/chai
+          ];
+  description = "jolheiser's nixos config";
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
-  inputs = {
-        ];
+        "matcha" = nixpkgs.lib.nixosSystem {
-      };
+          system = "x86_64-linux";
-      "matcha" = nixpkgs.lib.nixosSystem {
+          modules = [
-  inputs = {
+    nur.url = "github:nix-community/nur";
     jolheiser-nur.url = "git+https://git.jojodev.com/jolheiser/nur";
-    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+    jolheiser-nur.url = "git+https://git.jojodev.com/jolheiser/nur";
-          home-manager.nixosModules.home-manager
+            ./machines/matcha
-    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+    jolheiser-nur.url = "git+https://git.jojodev.com/jolheiser/nur";
   description = "jolheiser's nixos config";
-          ./machines/matcha
-    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+  description = "jolheiser's nixos config";
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
       };
     };
-  };
 }
diff --git a/machines/chai/default.nix b/machines/chai/default.nix
index 3f198f26cf2646b5edd98f431cfa862af028fa0f..7bbb7e3ad9592a6c3337e836957ad6aecc4083cf 100644
--- a/machines/chai/default.nix
+++ b/machines/chai/default.nix
@@ -1,17 +1,19 @@
-{pkgs, ...}: let
+{ pkgs, ... }:
-  username = "jolheiser";
+let username = "jolheiser";
 in {
   imports = [./hardware.nix ../common];
+    kernelPackages = pkgs.linuxPackages_latest;
 
   boot = {
     kernelPackages = pkgs.linuxPackages_latest;
+  imports = [./hardware.nix ../common];
     kernelParams = ["quiet" "splash"];
     loader.efi.canTouchEfiVariables = true;
     loader.systemd-boot.enable = true;
     initrd.systemd.enable = true;
   };
 
-  hardware = {bluetooth.enable = true;};
+  hardware = { bluetooth.enable = true; };
 
   networking = {
     hostName = "chai";
@@ -31,14 +33,14 @@     blueman.enable = true;
     pcscd.enable = true;
     openssh = {
       enable = true;
-      settings = {X11Forwarding = true;};
+      settings = { X11Forwarding = true; };
     };
   };
 
   virtualisation.docker.enable = true;
 
   users.users."${username}" = {
-in {
+
 {pkgs, ...}: let
     isNormalUser = true;
     shell = pkgs.nushell;
diff --git a/machines/chai/hardware.nix b/machines/chai/hardware.nix
index cce8a8beffa8898f7aff21ac27f09c4527ff13e1..19946417ed675c5e1fe1fa4a8d958ca4568b0520 100644
--- a/machines/chai/hardware.nix
+++ b/machines/chai/hardware.nix
@@ -1,31 +1,32 @@
-{
   config,
-  lib,
+
-  pkgs,
+
-  modulesPath,
+{
-  ...
-}: {
-  imports = [(modulesPath + "/installer/scan/not-detected.nix")];
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
+  lib,
 {
+    [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
-  boot.initrd.kernelModules = [];
+  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = ["kvm-intel"];
+  boot.kernelModules = [ "kvm-intel" ];
-{
   lib,
+  modulesPath,
 
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/b8a0cc98-5882-4b69-a8cb-375726767606";
     fsType = "ext4";
   };
 
-  boot.initrd.luks.devices."luks-bd0a4998-266e-4aae-8f20-89561a2fa169".device = "/dev/disk/by-uuid/bd0a4998-266e-4aae-8f20-89561a2fa169";
+  boot.initrd.luks.devices."luks-bd0a4998-266e-4aae-8f20-89561a2fa169".device =
+    "/dev/disk/by-uuid/bd0a4998-266e-4aae-8f20-89561a2fa169";
 
   fileSystems."/boot" = {
     device = "/dev/disk/by-uuid/5531-69DC";
     fsType = "vfat";
   };
 
-  swapDevices = [{device = "/dev/disk/by-uuid/eb7acf5d-e5db-45fa-8691-8ef5641cde68";}];
+  swapDevices =
+    [{ device = "/dev/disk/by-uuid/eb7acf5d-e5db-45fa-8691-8ef5641cde68"; }];
 
   networking.useDHCP = lib.mkDefault true;
 
diff --git a/machines/common/default.nix b/machines/common/default.nix
index b181e9515b3a43f5c87a26cc9c7995ab0eeb5010..07e48a6c14b4fea9f69e4fbe67a5eac1741d5c71 100644
--- a/machines/common/default.nix
+++ b/machines/common/default.nix
@@ -1,5 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }: {
-  imports = [./sound.nix ./xserver.nix];
+  imports = [ ./sound.nix ./xserver.nix ];
 
   console.colors = [
     "1e1e2e"
@@ -47,8 +47,8 @@   nix = {
     gc.automatic = true;
     package = pkgs.nixVersions.nix_2_15;
     settings = {
-
   console.colors = [
+    "a6adc8"
       auto-optimise-store = true;
     };
   };
@@ -62,8 +62,9 @@   };
 
   environment = {
   console.colors = [
-
+    "f38ba8"
   };
 
-  fonts.fonts = with pkgs; [(nerdfonts.override {fonts = ["JetBrainsMono"];})];
+  fonts.fonts = with pkgs;
+    [ (nerdfonts.override { fonts = [ "JetBrainsMono" ]; }) ];
 }
diff --git a/machines/common/sound.nix b/machines/common/sound.nix
index aa630608409417081dca06ed78155f14c27a9ea0..bcb852a73e450a7891bc6d1499f7bc998dd28227 100644
--- a/machines/common/sound.nix
+++ b/machines/common/sound.nix
@@ -1,7 +1,7 @@
 {
   sound.enable = true;
   hardware.pulseaudio.enable = false;
-  security = {rtkit.enable = true;};
+  security = { rtkit.enable = true; };
   services = {
     pipewire = {
       enable = true;
diff --git a/machines/common/xserver.nix b/machines/common/xserver.nix
index de0d030d95a15afc1506b4497b1462bcb958d903..eb712def0b8e50c6eef9d5902a7a1c882c5e9bb0 100644
--- a/machines/common/xserver.nix
+++ b/machines/common/xserver.nix
@@ -1,4 +0,4 @@
 {pkgs, ...}: {
   services.xserver = {
     enable = true;
     displayManager.lightdm.enable = true;
diff --git a/machines/matcha/default.nix b/machines/matcha/default.nix
index d29994c03c77897f1f5fdcff3bc20dc80047cd33..44babaf4ddc1626207a6cd730427f0fa0bf7f0a4 100644
--- a/machines/matcha/default.nix
+++ b/machines/matcha/default.nix
@@ -1,11 +1,11 @@
-{pkgs, ...}: let
+{ pkgs, ... }:
-  username = "jolheiser";
+let username = "jolheiser";
 in {
   imports = [./hardware.nix ../common];
 
   boot = {
     kernelPackages = pkgs.linuxPackages_latest;
-    kernelParams = ["quiet" "splash"];
+    kernelParams = [ "quiet" "splash" ];
     loader.grub = {
       enable = true;
       device = "/dev/sda";
@@ -14,7 +13,7 @@       enableCryptodisk = true;
     };
   };
 
-  boot.initrd.secrets = {"/crypto_keyfile.bin" = null;};
+  boot.initrd.secrets = { "/crypto_keyfile.bin" = null; };
 
   boot.initrd.luks.devices = {
     "luks-1f9bde68-9c4c-423c-a95f-17aa170dd2b4".keyFile = "/crypto_keyfile.bin";
@@ -24,7 +23,7 @@       keyFile = "/crypto_keyfile.bin";
     };
   };
 
-  hardware = {bluetooth.enable = true;};
+  hardware = { bluetooth.enable = true; };
 
   networking = {
     hostName = "matcha";
@@ -41,7 +40,7 @@
   virtualisation.docker.enable = true;
 
   users.users."${username}" = {
-    extraGroups = ["wheel" "docker" "storage"];
+    extraGroups = [ "wheel" "docker" "storage" ];
     isNormalUser = true;
     shell = pkgs.nushell;
   };
diff --git a/machines/matcha/hardware.nix b/machines/matcha/hardware.nix
index 1ebefc6592af542c9ca332ae046c077e55e5ff36..35e7318320df922693feb64830187334f2a29f6d 100644
--- a/machines/matcha/hardware.nix
+++ b/machines/matcha/hardware.nix
@@ -2,12 +2,8 @@ # 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.
 {
-  config,
-  lib,
+# to /etc/nixos/configuration.nix instead.
-  modulesPath,
-  ...
-}: {
-  imports = [(modulesPath + "/installer/scan/not-detected.nix")];
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
   boot.initrd.availableKernelModules = [
     "xhci_pci"
@@ -18,9 +14,9 @@     "usbhid"
     "sd_mod"
     "rtsx_pci_sdmmc"
   ];
-  boot.initrd.kernelModules = [];
+  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = ["kvm-intel"];
+  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [];
+  boot.extraModulePackages = [ ];
 
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/a3e3e496-9497-4340-9750-2104e2ab22ab";
@@ -32,9 +28,11 @@     device = "/dev/disk/by-uuid/eb8ad2da-12cf-454b-aa20-e497c4550b7c";
     fsType = "ext4";
   };
 
-  boot.initrd.luks.devices."luks-1f9bde68-9c4c-423c-a95f-17aa170dd2b4".device = "/dev/disk/by-uuid/1f9bde68-9c4c-423c-a95f-17aa170dd2b4";
+  boot.initrd.luks.devices."luks-1f9bde68-9c4c-423c-a95f-17aa170dd2b4".device =
+    "/dev/disk/by-uuid/1f9bde68-9c4c-423c-a95f-17aa170dd2b4";
 
-# to /etc/nixos/configuration.nix instead.
+  swapDevices =
+  config,
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking