diff --git a/flake.nix b/flake.nix
index a847827..c3bd795 100644
--- a/flake.nix
+++ b/flake.nix
@@ -30,7 +30,7 @@
     };
     # Wayland packages
     nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland";
-	neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
+    neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
     doomemacs = {
       url = "github:doomemacs/doomemacs";
       flake = false;
diff --git a/hosts/vali/hermit/configuration.nix b/hosts/vali/hermit/configuration.nix
index a873d4e..7def965 100644
--- a/hosts/vali/hermit/configuration.nix
+++ b/hosts/vali/hermit/configuration.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }: {
+{pkgs, ...}: {
   # allow unfree packages
   nixpkgs.config.allowUnfree = true;
   # Time Zone
@@ -8,17 +8,17 @@
   console.keyMap = "de";
   nix = {
     settings = {
-      substituters = [ "https://hyprland.cachix.org" ];
+      substituters = ["https://hyprland.cachix.org"];
       trusted-public-keys = [
         "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
       ];
       # enable flakes
-      experimental-features = [ "nix-command" "flakes" ];
+      experimental-features = ["nix-command" "flakes"];
       # reduce file size used & automatic garbage collector
       auto-optimise-store = true;
     };
   };
-  security.sudo.package = pkgs.sudo.override { withInsults = true; };
+  security.sudo.package = pkgs.sudo.override {withInsults = true;};
   security.polkit.enable = true;
   programs.kdeconnect.enable = true;
   programs.dconf.enable = true;
@@ -81,7 +81,7 @@
       helix.enable = true;
       kakoune.enable = true;
       nixvim.enable = false; # broken at the moment
-#      neovim.enable = true;
+      #      neovim.enable = true;
     };
     services = {
       pipewire.enable = true;
@@ -91,14 +91,14 @@
       stylix = {
         enable = true;
         scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-pale.yaml";
-        cursor = { size = 16; };
+        cursor = {size = 16;};
         fontsizes = {
           terminal = 12;
           popups = 12;
         };
         image = ../../../assets/wallpapers/tiredgod.png;
       };
-      gtk = { enable = true; };
+      gtk = {enable = true;};
       qt = {
         enable = true;
         package = pkgs.kde-gruvbox;
diff --git a/hosts/vali/hermit/hardware-configuration.nix b/hosts/vali/hermit/hardware-configuration.nix
index 0663cff..76ffc17 100644
--- a/hosts/vali/hermit/hardware-configuration.nix
+++ b/hosts/vali/hermit/hardware-configuration.nix
@@ -1,33 +1,37 @@
-	# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# 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, pkgs, modulesPath, ... }:
-
 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}: {
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
+  boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"];
+  boot.initrd.kernelModules = [];
+  boot.kernelModules = ["kvm-intel"];
+  boot.extraModulePackages = [];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/b51d0f6c-2980-4117-b9df-5cc2c8ddd2d6";
-      fsType = "ext4";
-    };
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/b51d0f6c-2980-4117-b9df-5cc2c8ddd2d6";
+    fsType = "ext4";
+  };
 
   boot.initrd.luks.devices."luks-f1b24c23-8211-433e-983e-2ebad020826e".device = "/dev/disk/by-uuid/f1b24c23-8211-433e-983e-2ebad020826e";
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/E355-67EA";
-      fsType = "vfat";
-      options = [ "fmask=0022" "dmask=0022" ];
-    };
-#  swapDevices =
-#    [ { device = "/dev/disk/by-uuid/3518272e-1051-41e2-a7f0-f5c744e46789"; }
-#    ];
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/E355-67EA";
+    fsType = "vfat";
+    options = ["fmask=0022" "dmask=0022"];
+  };
+  #  swapDevices =
+  #    [ { device = "/dev/disk/by-uuid/3518272e-1051-41e2-a7f0-f5c744e46789"; }
+  #    ];
 
   # 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
diff --git a/hosts/vali/hermit/programs.nix b/hosts/vali/hermit/programs.nix
index 597be74..bc3d17a 100644
--- a/hosts/vali/hermit/programs.nix
+++ b/hosts/vali/hermit/programs.nix
@@ -1,5 +1,8 @@
-{ inputs, pkgs, ... }:
-let
+{
+  inputs,
+  pkgs,
+  ...
+}: let
   fenix = inputs.fenix.packages.${pkgs.system};
   nixpkgs-wayland = inputs.nixpkgs-wayland.packages.${pkgs.system};
 in {
diff --git a/modules/editors/nvf/default.nix b/modules/editors/nvf/default.nix
index 03519e8..db35a18 100644
--- a/modules/editors/nvf/default.nix
+++ b/modules/editors/nvf/default.nix
@@ -1,22 +1,22 @@
 {
-inputs,
-lib,
-... 
+  inputs,
+  lib,
+  ...
 }: let
   inherit (builtins) filter map toString elem;
   inherit (lib.filesystem) listFilesRecursive;
   inherit (lib.strings) hasSuffix;
-  inherit(lib.lists) concatLists;
+  inherit (lib.lists) concatLists;
 
-  mkNeovimModule ={
-    path, 
+  mkNeovimModule = {
+    path,
     ingoredPaths ? [./nvf.nix],
   }:
     filter (hasSuffix ".nix") (
       map toString (
         filter (path: path != ./default.nix && !elem path ingoredPaths) (listFilesRecursive path)
-        )
-      );
+      )
+    );
 
   nvf = inputs.neovim-flake;
 in {
@@ -28,4 +28,4 @@ in {
     # which means all default.nix files will be imported automtically
     (mkNeovimModule {path = ./.;})
   ];
-	}
+}
diff --git a/modules/editors/nvf/nvf.nix b/modules/editors/nvf/nvf.nix
index 84d41ac..677d4d8 100644
--- a/modules/editors/nvf/nvf.nix
+++ b/modules/editors/nvf/nvf.nix
@@ -1,6 +1,11 @@
 # Thank your Mr. poz! (https://git.jacekpoz.pl/jacekpoz/niksos)
-{ config, inputs, lib, pkgs, ... }:
-let
+{
+  config,
+  inputs,
+  lib,
+  pkgs,
+  ...
+}: let
   cfg = config.modules.editors.neovim;
   inherit (config.modules.other.system) username;
 
@@ -9,10 +14,10 @@ in {
   options.modules.editors.neovim.enable = mkEnableOption "neovim";
 
   config = mkIf cfg.enable {
-    environment.sessionVariables = { EDITOR = "nvim"; };
+    environment.sessionVariables = {EDITOR = "nvim";};
 
     home-manager.users.${username} = {
-      imports = [ inputs.neovim-flake.homeManagerModules.default ];
+      imports = [inputs.neovim-flake.homeManagerModules.default];
 
       programs.nvf = {
         enable = true;
@@ -77,7 +82,7 @@ in {
             alwaysComplete = false;
           };
 
-          filetree.nvimTree = { enable = true; };
+          filetree.nvimTree = {enable = true;};
 
           terminal.toggleterm = {
             enable = true;
@@ -172,7 +177,7 @@ in {
             orgmode = {
               enable = true;
               setupOpts = {
-                org_agenda_files = [ "~/Notes/org" ];
+                org_agenda_files = ["~/Notes/org"];
                 org_default_notes_file = "~/Notes/org/refile.org";
               };
               treesitter.enable = true;
diff --git a/modules/editors/nvf/plugins/extra.nix b/modules/editors/nvf/plugins/extra.nix
index e19f353..7ec0089 100644
--- a/modules/editors/nvf/plugins/extra.nix
+++ b/modules/editors/nvf/plugins/extra.nix
@@ -1,12 +1,14 @@
 {
+  config,
   self,
   pkgs,
   ...
 }: let
+  inherit (config.modules.other.system) username;
   inherit (pkgs.vimPlugins) friendly-snippets aerial-nvim nvim-surround undotree mkdir-nvim ssr-nvim direnv-vim legendary-nvim;
   pluginSources = import ./sources {inherit self pkgs;};
 in {
-  programs.neovim-flake.settings.vim.extraPlugins = {
+  home-manager.users.${username}.programs.neovim-flake.settings.vim.extraPlugins = {
     # plugins that are pulled from nixpkgs
     direnv = {package = direnv-vim;};
     friendly-snippets = {package = friendly-snippets;};
diff --git a/modules/editors/nvf/plugins/settings/assistant.nix b/modules/editors/nvf/plugins/settings/assistant.nix
index f1267f8..91471ba 100644
--- a/modules/editors/nvf/plugins/settings/assistant.nix
+++ b/modules/editors/nvf/plugins/settings/assistant.nix
@@ -1,5 +1,7 @@
-{
-  programs.neovim-flake.settings.vim = {
+{config, ...}: let
+  inherit (config.modules.other.system) username;
+in {
+  home-manager.${username}.programs.neovim-flake.settings.vim = {
     assistant.copilot = {
       enable = true;
       cmp.enable = true;
diff --git a/modules/editors/nvf/plugins/settings/autocomplete.nix b/modules/editors/nvf/plugins/settings/autocomplete.nix
index 61bbd28..400bafb 100644
--- a/modules/editors/nvf/plugins/settings/autocomplete.nix
+++ b/modules/editors/nvf/plugins/settings/autocomplete.nix
@@ -1,5 +1,7 @@
-{
-  programs.neovim-flake.settings.vim = {
+{config, ...}: let
+  inherit (config.modules.other.system) username;
+in {
+  home-manager.${username}.programs.neovim-flake.settings.vim = {
     autocomplete = {
       enable = true;
       type = "nvim-cmp";
diff --git a/modules/editors/nvf/plugins/settings/autopairs.nix b/modules/editors/nvf/plugins/settings/autopairs.nix
index 11286de..26d331e 100644
--- a/modules/editors/nvf/plugins/settings/autopairs.nix
+++ b/modules/editors/nvf/plugins/settings/autopairs.nix
@@ -1,5 +1,7 @@
-{
-  programs.neovim-flake.settings.vim = {
+{config, ...}: let
+  inherit (config.modules.other.system) username;
+in {
+  home-manager.${username}.programs.neovim-flake.settings.vim = {
     autopairs.enable = true;
   };
 }
diff --git a/modules/editors/nvf/plugins/settings/binds.nix b/modules/editors/nvf/plugins/settings/binds.nix
index d626547..e1bed17 100644
--- a/modules/editors/nvf/plugins/settings/binds.nix
+++ b/modules/editors/nvf/plugins/settings/binds.nix
@@ -1,5 +1,7 @@
-{
-  programs.neovim-flake.settings.vim = {
+{config, ...}: let
+  inherit (config.modules.other.system) username;
+in {
+  home-manager.${username}.programs.neovim-flake.settings.vim = {
     binds = {
       whichKey.enable = true;
       cheatsheet.enable = false;
diff --git a/modules/editors/nvf/plugins/settings/comments.nix b/modules/editors/nvf/plugins/settings/comments.nix
index 4f0a7a7..3c6693c 100644
--- a/modules/editors/nvf/plugins/settings/comments.nix
+++ b/modules/editors/nvf/plugins/settings/comments.nix
@@ -1,5 +1,7 @@
-{
-  programs.neovim-flake.settings.vim = {
+{config, ...}: let
+  inherit (config.modules.other.system) username;
+in {
+  home-manager.${username}.programs.neovim-flake.settings.vim = {
     comments.comment-nvim.enable = true;
   };
 }
diff --git a/modules/editors/nvf/plugins/settings/dashboard.nix b/modules/editors/nvf/plugins/settings/dashboard.nix
index 81e8542..a5b5788 100644
--- a/modules/editors/nvf/plugins/settings/dashboard.nix
+++ b/modules/editors/nvf/plugins/settings/dashboard.nix
@@ -1,5 +1,7 @@
-{
-  programs.neovim-flake.settings.vim = {
+{config, ...}: let
+  inherit (config.modules.other.system) username;
+in {
+  home-manager.${username}.programs.neovim-flake.settings.vim = {
     dashboard = {
       alpha.enable = true;
     };
diff --git a/modules/editors/nvf/plugins/settings/debugger.nix b/modules/editors/nvf/plugins/settings/debugger.nix
index a40e92d..d116ced 100644
--- a/modules/editors/nvf/plugins/settings/debugger.nix
+++ b/modules/editors/nvf/plugins/settings/debugger.nix
@@ -1,5 +1,7 @@
-{
-  programs.neovim-flake.settings.vim = {
+{config, ...}: let
+  inherit (config.modules.other.system) username;
+in {
+  home-manager.${username}.programs.neovim-flake.settings.vim = {
     debugger.nvim-dap = {
       enable = true;
       ui.enable = true;
diff --git a/modules/editors/nvf/plugins/settings/filetree.nix b/modules/editors/nvf/plugins/settings/filetree.nix
index 5128b83..6ca1a3c 100644
--- a/modules/editors/nvf/plugins/settings/filetree.nix
+++ b/modules/editors/nvf/plugins/settings/filetree.nix
@@ -1,4 +1,7 @@
-{
+{config, ...}: let
+  inherit (config.modules.other.system) username;
+in {
+  home-manager.${username}.
   programs.neovim-flake.settings.vim = {
     filetree = {
       nvimTree = {
diff --git a/modules/editors/nvf/plugins/settings/gestures.nix b/modules/editors/nvf/plugins/settings/gestures.nix
index d9e24e8..d3e7370 100644
--- a/modules/editors/nvf/plugins/settings/gestures.nix
+++ b/modules/editors/nvf/plugins/settings/gestures.nix
@@ -1,4 +1,7 @@
-{
+{config, ...}: let
+  inherit (config.modules.other.system) username;
+in {
+  home-manager.${username}.
   programs.neovim-flake.settings.vim = {
     gestures.gesture-nvim.enable = false;
   };
diff --git a/modules/editors/nvf/plugins/settings/git.nix b/modules/editors/nvf/plugins/settings/git.nix
index 65895ab..5f2f1d1 100644
--- a/modules/editors/nvf/plugins/settings/git.nix
+++ b/modules/editors/nvf/plugins/settings/git.nix
@@ -1,4 +1,7 @@
-{
+{config, ...}: let
+  inherit (config.modules.other.system) username;
+in {
+  home-manager.${username}.
   programs.neovim-flake.settings.vim = {
     git = {
       enable = true;
diff --git a/modules/editors/nvf/plugins/settings/languages.nix b/modules/editors/nvf/plugins/settings/languages.nix
index 86f9b63..bebd7ac 100644
--- a/modules/editors/nvf/plugins/settings/languages.nix
+++ b/modules/editors/nvf/plugins/settings/languages.nix
@@ -3,8 +3,10 @@
   pkgs,
   lib,
   ...
-}: {
-  programs.neovim-flake.settings.vim = {
+}: let
+  inherit (config.modules.other.system) username;
+in {
+  home-manager.users.${username}.programs.neovim-flake.settings.vim = {
     languages = {
       enableLSP = true;
       enableFormat = true;
diff --git a/modules/editors/nvf/plugins/settings/lsp.nix b/modules/editors/nvf/plugins/settings/lsp.nix
index ae8c807..b76eab2 100644
--- a/modules/editors/nvf/plugins/settings/lsp.nix
+++ b/modules/editors/nvf/plugins/settings/lsp.nix
@@ -1,4 +1,7 @@
-{
+{config, ...}: let
+  inherit (config.modules.other.system) username;
+in {
+  home-manager.${username}.
   programs.neovim-flake.settings.vim = {
     lsp = {
       formatOnSave = true;
diff --git a/modules/editors/nvf/plugins/settings/minimap.nix b/modules/editors/nvf/plugins/settings/minimap.nix
index 42bd866..5b3894e 100644
--- a/modules/editors/nvf/plugins/settings/minimap.nix
+++ b/modules/editors/nvf/plugins/settings/minimap.nix
@@ -1,4 +1,7 @@
-{
+{config, ...}: let
+  inherit (config.modules.other.system) username;
+in {
+  home-manager.${username}.
   programs.neovim-flake.settings.vim = {
     minimap = {
       # cool for vanity but practically useless on small screens
diff --git a/modules/editors/nvf/plugins/settings/notes.nix b/modules/editors/nvf/plugins/settings/notes.nix
index 2a02e37..4d9f976 100644
--- a/modules/editors/nvf/plugins/settings/notes.nix
+++ b/modules/editors/nvf/plugins/settings/notes.nix
@@ -1,4 +1,7 @@
-{
+{config, ...}: let
+  inherit (config.modules.other.system) username;
+in {
+  home-manager.${username}.
   programs.neovim-flake.settings.vim = {
     notes = {
       todo-comments.enable = true;
diff --git a/modules/editors/nvf/plugins/settings/notify.nix b/modules/editors/nvf/plugins/settings/notify.nix
index 040aa7f..e9e0dc2 100644
--- a/modules/editors/nvf/plugins/settings/notify.nix
+++ b/modules/editors/nvf/plugins/settings/notify.nix
@@ -1,4 +1,7 @@
-{
+{config, ...}: let
+  inherit (config.modules.other.system) username;
+in {
+  home-manager.${username}.
   programs.neovim-flake.settings.vim = {
     notify = {
       nvim-notify.enable = true;
diff --git a/modules/editors/nvf/plugins/settings/presence.nix b/modules/editors/nvf/plugins/settings/presence.nix
index 83e4dd8..5855335 100644
--- a/modules/editors/nvf/plugins/settings/presence.nix
+++ b/modules/editors/nvf/plugins/settings/presence.nix
@@ -1,4 +1,7 @@
-{
+{config, ...}: let
+  inherit (config.modules.other.system) username;
+in {
+  home-manager.${username}.
   programs.neovim-flake.settings.vim = {
     presence.neocord.enable = false;
   };
diff --git a/modules/editors/nvf/plugins/settings/projects.nix b/modules/editors/nvf/plugins/settings/projects.nix
index 9d200d8..edf63ce 100644
--- a/modules/editors/nvf/plugins/settings/projects.nix
+++ b/modules/editors/nvf/plugins/settings/projects.nix
@@ -1,4 +1,7 @@
-{
+{config, ...}: let
+  inherit (config.modules.other.system) username;
+in {
+  home-manager.${username}.
   programs.neovim-flake.settings.vim = {
     projects = {
       project-nvim = {
diff --git a/modules/editors/nvf/plugins/settings/session.nix b/modules/editors/nvf/plugins/settings/session.nix
index a76394d..b882aaf 100644
--- a/modules/editors/nvf/plugins/settings/session.nix
+++ b/modules/editors/nvf/plugins/settings/session.nix
@@ -1,4 +1,7 @@
-{
+{config, ...}: let
+  inherit (config.modules.other.system) username;
+in {
+  home-manager.${username}.
   programs.neovim-flake.settings.vim = {
     session.nvim-session-manager = {
       enable = false;
diff --git a/modules/editors/nvf/plugins/settings/statusline.nix b/modules/editors/nvf/plugins/settings/statusline.nix
index 1190f35..d2f90fe 100644
--- a/modules/editors/nvf/plugins/settings/statusline.nix
+++ b/modules/editors/nvf/plugins/settings/statusline.nix
@@ -1,4 +1,7 @@
-{
+{config, ...}: let
+  inherit (config.modules.other.system) username;
+in {
+  home-manager.${username}.
   programs.neovim-flake.settings.vim = {
     statusline = {
       lualine = {
diff --git a/modules/editors/nvf/plugins/settings/tabline.nix b/modules/editors/nvf/plugins/settings/tabline.nix
index 5771d16..67fe3a6 100644
--- a/modules/editors/nvf/plugins/settings/tabline.nix
+++ b/modules/editors/nvf/plugins/settings/tabline.nix
@@ -1,4 +1,7 @@
-{
+{config, ...}: let
+  inherit (config.modules.other.system) username;
+in {
+  home-manager.${username}.
   programs.neovim-flake.settings.vim = {
     tabline = {
       nvimBufferline.enable = true;
diff --git a/modules/editors/nvf/plugins/settings/telescope.nix b/modules/editors/nvf/plugins/settings/telescope.nix
index f96b419..8dcebb9 100644
--- a/modules/editors/nvf/plugins/settings/telescope.nix
+++ b/modules/editors/nvf/plugins/settings/telescope.nix
@@ -1,4 +1,7 @@
-{
+{config, ...}: let
+  inherit (config.modules.other.system) username;
+in {
+  home-manager.${username}.
   programs.neovim-flake.settings.vim = {
     telescope.enable = true;
   };
diff --git a/modules/editors/nvf/plugins/settings/template.nix b/modules/editors/nvf/plugins/settings/template.nix
index ecf1b40..c992af0 100644
--- a/modules/editors/nvf/plugins/settings/template.nix
+++ b/modules/editors/nvf/plugins/settings/template.nix
@@ -1,4 +1,7 @@
-{
+{config, ...}: let
+  inherit (config.modules.other.system) username;
+in {
+  home-manager.${username}.
   programs.neovim-flake.settings.vim = {
   };
 }
diff --git a/modules/editors/nvf/plugins/settings/terminal.nix b/modules/editors/nvf/plugins/settings/terminal.nix
index b53f695..d17d424 100644
--- a/modules/editors/nvf/plugins/settings/terminal.nix
+++ b/modules/editors/nvf/plugins/settings/terminal.nix
@@ -1,4 +1,7 @@
-{
+{config, ...}: let
+  inherit (config.modules.other.system) username;
+in {
+  home-manager.${username}.
   programs.neovim-flake.settings.vim = {
     terminal = {
       toggleterm = {
diff --git a/modules/editors/nvf/plugins/settings/theme.nix b/modules/editors/nvf/plugins/settings/theme.nix
index 93824f3..7470f7b 100644
--- a/modules/editors/nvf/plugins/settings/theme.nix
+++ b/modules/editors/nvf/plugins/settings/theme.nix
@@ -1,4 +1,7 @@
-{
+{config, ...}: let
+  inherit (config.modules.other.system) username;
+in {
+  home-manager.${username}.
   programs.neovim-flake.settings.vim = {
     theme = {
       enable = true;
diff --git a/modules/editors/nvf/plugins/settings/treesitter.nix b/modules/editors/nvf/plugins/settings/treesitter.nix
index 6e74280..85a8c83 100644
--- a/modules/editors/nvf/plugins/settings/treesitter.nix
+++ b/modules/editors/nvf/plugins/settings/treesitter.nix
@@ -1,4 +1,11 @@
-{pkgs, ...}: {
+{
+  config,
+  pkgs,
+  ...
+}: let
+  inherit (config.modules.other.system) username;
+in {
+  home-manager.${username}.
   programs.neovim-flake.settings.vim = {
     treesitter = {
       fold = true;
diff --git a/modules/editors/nvf/plugins/settings/ui.nix b/modules/editors/nvf/plugins/settings/ui.nix
index 8edab0c..41e118b 100644
--- a/modules/editors/nvf/plugins/settings/ui.nix
+++ b/modules/editors/nvf/plugins/settings/ui.nix
@@ -1,4 +1,11 @@
 {
+  config,
+  pkgs,
+  ...
+}: let
+  inherit (config.modules.other.system) username;
+in {
+  home-manager.${username}.
   programs.neovim-flake.settings.vim = {
     ui = {
       noice.enable = true;
diff --git a/modules/editors/nvf/plugins/settings/utility.nix b/modules/editors/nvf/plugins/settings/utility.nix
index 3e93a35..a130056 100644
--- a/modules/editors/nvf/plugins/settings/utility.nix
+++ b/modules/editors/nvf/plugins/settings/utility.nix
@@ -1,4 +1,11 @@
-{pkgs, ...}: {
+{
+  config,
+  pkgs,
+  ...
+}: let
+  inherit (config.modules.other.system) username;
+in {
+  home-manager.${username}.
   programs.neovim-flake.settings.vim = {
     utility = {
       ccc.enable = true;
diff --git a/modules/editors/nvf/plugins/settings/visuals.nix b/modules/editors/nvf/plugins/settings/visuals.nix
index 9edf972..18edd68 100644
--- a/modules/editors/nvf/plugins/settings/visuals.nix
+++ b/modules/editors/nvf/plugins/settings/visuals.nix
@@ -1,4 +1,7 @@
-{
+{config, ...}: let
+  inherit (config.modules.other.system) username;
+in {
+  home-manager.${username}.
   programs.neovim-flake.settings.vim = {
     visuals = {
       enable = true;
diff --git a/modules/editors/nvf/plugins/sources/default.nix b/modules/editors/nvf/plugins/sources/default.nix
index 7438d02..27b2da8 100644
--- a/modules/editors/nvf/plugins/sources/default.nix
+++ b/modules/editors/nvf/plugins/sources/default.nix
@@ -15,71 +15,69 @@
 
     smart-splits = buildVimPlugin {
       name = "smart-splits";
-      src = pins."smart-splits.nvim";
-    };
-
-    slides-nvim = buildVimPlugin {
-      name = "slides.nvim";
-      src = pins."slides.nvim";
-    };
-
-    regexplainer = buildVimPlugin {
-      name = "nvim-regexplainer";
       src = fetchFromGitHub {
-        owner = "bennypowers";
-        repo = "nvim-regexplainer";
-        rev = "4250c8f3c1307876384e70eeedde5149249e154f";
-        hash = "sha256-15DLbKtOgUPq4DcF71jFYu31faDn52k3P1x47GL3+b0=";
+        owner = "mrjones2014";
+        repo = "smart-splits.nvim";
+        rev = "95833675cd92538bf9cded1d2d58d1fc271c5428";
+        hash = "";
       };
-    };
 
-    specs-nvim = buildVimPlugin {
-      name = "specs.nvim";
-      src = fetchFromGitHub {
-        owner = "notashelf";
-        repo = "specs.nvim";
-        rev = "0792aaebf8cbac0c8545c43ad648b98deb83af42";
-        hash = "sha256-doHE/3bRuC8lyYxMk927JmwLfiy7aR22+i+BNefEGJ4=";
+      regexplainer = buildVimPlugin {
+        name = "nvim-regexplainer";
+        src = fetchFromGitHub {
+          owner = "bennypowers";
+          repo = "nvim-regexplainer";
+          rev = "4250c8f3c1307876384e70eeedde5149249e154f";
+          hash = "sha256-15DLbKtOgUPq4DcF71jFYu31faDn52k3P1x47GL3+b0=";
+        };
       };
-    };
 
-    deferred-clipboard = buildVimPlugin {
-      name = "deferred-clipboard";
-      src = fetchFromGitHub {
-        owner = "EtiamNullam";
-        repo = "deferred-clipboard.nvim";
-        rev = "810a29d166eaa41afc220cc7cd85eeaa3c43b37f";
-        hash = "sha256-nanNQEtpjv0YKEkkrPmq/5FPxq+Yj/19cs0Gf7YgKjU=";
+      specs-nvim = buildVimPlugin {
+        name = "specs.nvim";
+        src = fetchFromGitHub {
+          owner = "notashelf";
+          repo = "specs.nvim";
+          rev = "0792aaebf8cbac0c8545c43ad648b98deb83af42";
+          hash = "sha256-doHE/3bRuC8lyYxMk927JmwLfiy7aR22+i+BNefEGJ4=";
+        };
       };
-    };
 
-    data-viewer-nvim = buildVimPlugin {
-      name = "data-viewer.nvim";
-      src = fetchFromGitHub {
-        owner = "VidocqH";
-        repo = "data-viewer.nvim";
-        rev = "40ddf37bb7ab6c04ff9e820812d1539afe691668";
-        hash = "sha256-D5hvLhsYski11H9qiDDL2zlZMtYmbpHgpewiWR6C7rE=";
+      deferred-clipboard = buildVimPlugin {
+        name = "deferred-clipboard";
+        src = fetchFromGitHub {
+          owner = "EtiamNullam";
+          repo = "deferred-clipboard.nvim";
+          rev = "810a29d166eaa41afc220cc7cd85eeaa3c43b37f";
+          hash = "sha256-nanNQEtpjv0YKEkkrPmq/5FPxq+Yj/19cs0Gf7YgKjU=";
+        };
       };
-    };
-
-    vim-nftables = buildVimPlugin {
-      name = "vim-nftables";
-      src = fetchFromGitHub {
-        owner = "awisse";
-        repo = "vim-nftables";
-        rev = "bc29309080b4c7e1888ffb1a830846be16e5b8e7";
-        hash = "sha256-L1x3Hv95t/DBBrLtPBKrqaTbIPor/NhVuEHVIYo/OaA=";
+      data-viewer-nvim = buildVimPlugin {
+        name = "data-viewer.nvim";
+        src = fetchFromGitHub {
+          owner = "VidocqH";
+          repo = "data-viewer.nvim";
+          rev = "40ddf37bb7ab6c04ff9e820812d1539afe691668";
+          hash = "sha256-D5hvLhsYski11H9qiDDL2zlZMtYmbpHgpewiWR6C7rE=";
+        };
+      };
+      vim-nftables = buildVimPlugin {
+        name = "vim-nftables";
+        src = fetchFromGitHub {
+          owner = "awisse";
+          repo = "vim-nftables";
+          rev = "bc29309080b4c7e1888ffb1a830846be16e5b8e7";
+          hash = "sha256-L1x3Hv95t/DBBrLtPBKrqaTbIPor/NhVuEHVIYo/OaA=";
+        };
       };
-    };
 
-    neotab-nvim = buildVimPlugin {
-      name = "neotab.nvim";
-      src = fetchFromGitHub {
-        owner = "kawre";
-        repo = "neotab.nvim";
-        rev = "6c6107dddaa051504e433608f59eca606138269b";
-        hash = "sha256-bSFKbjj8fJHdfBzYoQ9l3NU0GAYfdfCbESKbwdbLNSw=";
+      neotab-nvim = buildVimPlugin {
+        name = "neotab.nvim";
+        src = fetchFromGitHub {
+          owner = "kawre";
+          repo = "neotab.nvim";
+          rev = "6c6107dddaa051504e433608f59eca606138269b";
+          hash = "sha256-bSFKbjj8fJHdfBzYoQ9l3NU0GAYfdfCbESKbwdbLNSw=";
+        };
       };
     };
   };
diff --git a/modules/editors/nvf/settings.nix b/modules/editors/nvf/settings.nix
index 7f02d24..2403bf2 100644
--- a/modules/editors/nvf/settings.nix
+++ b/modules/editors/nvf/settings.nix
@@ -50,7 +50,7 @@ in {
           useSystemClipboard = true;
           spellcheck = {
             enable = true;
-            languages = ["en" "de" ];
+            languages = ["en" "de"];
           };
 
           enableLuaLoader = true;
diff --git a/modules/gui/foot.nix b/modules/gui/foot.nix
index ad1d9e0..c5d2aa7 100644
--- a/modules/gui/foot.nix
+++ b/modules/gui/foot.nix
@@ -1,5 +1,10 @@
-{ config, inputs, lib, pkgs, ... }:
-let
+{
+  config,
+  inputs,
+  lib,
+  pkgs,
+  ...
+}: let
   cfg = config.modules.programs.foot;
   inherit (config.modules.other.system) username;
 
@@ -11,7 +16,7 @@ in {
   };
 
   config = mkIf cfg.enable {
-    environment.sessionVariables = { TERM = "foot"; };
+    environment.sessionVariables = {TERM = "foot";};
     home-manager.users.${username} = {
       programs.foot = {
         enable = true;
@@ -36,8 +41,7 @@ in {
             pad = "5x5 center";
             resize-delay-ms = 100;
 
-            notify =
-              "${pkgs.libnotify}/bin/notify-send -a \${app-id} -i \${app-id} \${title} \${body}";
+            notify = "${pkgs.libnotify}/bin/notify-send -a \${app-id} -i \${app-id} \${title} \${body}";
 
             bold-text-in-bright = "no";
             word-delimiters = '',│`|:"'()[]{}<>'';
@@ -59,8 +63,7 @@ in {
             launch = "${pkgs.xdg-utils}/bin/xdg-open \${url}";
             label-letters = "sadfjklewcmpgh";
             osc8-underline = "always";
-            protocols =
-              "http, https, ftp, ftps, file, gemini, gopher, irc, ircs";
+            protocols = "http, https, ftp, ftps, file, gemini, gopher, irc, ircs";
             uri-characters = ''
               abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_.,~:;/?#@!$&%*+="'()[]'';
           };
@@ -93,7 +96,7 @@ in {
           #   bright6 = "94e2d5"; # teal
           #   bright7 = "a6adc8"; # Subtext 0
           # };
-          csd = { preferred = "server"; };
+          csd = {preferred = "server";};
           key-bindings = {
             show-urls-launch = "Control+Shift+u";
             unicode-input = "Control+Shift+i";
diff --git a/modules/gui/steam.nix b/modules/gui/steam.nix
index d16accb..130c961 100644
--- a/modules/gui/steam.nix
+++ b/modules/gui/steam.nix
@@ -22,7 +22,7 @@ in {
     programs.gamemode.enable = true;
     environment.systemPackages = [pkgs.protonup];
     environment.sessionVariables = {
-        STEAM_EXTRA_COMPAT_TOOLS_PATHS = "/home/${username}/.steam/root/compatibilitytoolds.d";
+      STEAM_EXTRA_COMPAT_TOOLS_PATHS = "/home/${username}/.steam/root/compatibilitytoolds.d";
     };
   };
 }
diff --git a/modules/wms/wayland/hypr/land.nix b/modules/wms/wayland/hypr/land.nix
index cb79512..1b8c92e 100644
--- a/modules/wms/wayland/hypr/land.nix
+++ b/modules/wms/wayland/hypr/land.nix
@@ -61,7 +61,6 @@ in {
           ];
           # Workspace config
           workspace = [
-
             "1,monitor:HDMI-A-1, default:true"
             "2,monitor:HDMI-A-1"
             "3,monitor:HDMI-A-1"
diff --git a/options/common/bluetooth.nix b/options/common/bluetooth.nix
index 37ee1ee..f08d5aa 100644
--- a/options/common/bluetooth.nix
+++ b/options/common/bluetooth.nix
@@ -1,5 +1,10 @@
-{ config, lib, pkgs, ... }:
-let inherit (config.modules.other.system) username;
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  inherit (config.modules.other.system) username;
 in {
   hardware.bluetooth = {
     enable = true;
@@ -11,8 +16,8 @@ in {
   # Bluetooth headset media control buttons
   systemd.user.services.mpris-proxy = {
     description = "Mpris proxy";
-    after = [ "network.target" "sound.target" ];
-    wantedBy = [ "default.target" ];
+    after = ["network.target" "sound.target"];
+    wantedBy = ["default.target"];
     serviceConfig.ExecStart = "${pkgs.bluez}/bin/mpris-proxy";
   };
 }
diff --git a/options/common/gpu/nvidia.nix b/options/common/gpu/nvidia.nix
index 913364d..c85efd4 100644
--- a/options/common/gpu/nvidia.nix
+++ b/options/common/gpu/nvidia.nix
@@ -7,7 +7,7 @@
   hardware.graphics = {
     enable = true;
     package = pkgs.mesa.drivers;
- #   driSupport32Bit = true;
+    #   driSupport32Bit = true;
   };
   hardware.nvidia = {
     modesetting.enable = true;