flake.nix

@@ -12,7 +12,10 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    hardware.url = "github:nixos/nixos-hardware";
+    hardware = {
+      url = "github:nixos/nixos-hardware";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
     disko = {
       url = "github:nix-community/disko";
@@ -70,12 +73,13 @@
     };
   };
 
-  outputs = {
+  outputs =
-    self,
+    { self
-    nixpkgs,
+    , nixpkgs
-    home-manager,
+    , home-manager
-    ...
+    , ...
-  } @ inputs: let
+    } @ inputs:
+    let
       inherit (self) outputs;
       # Supported systems for your flake packages, shell, etc.
       systems = [
@@ -89,7 +93,8 @@
       # pass to it, with each system as an argument
       forAllSystems = nixpkgs.lib.genAttrs systems;
       vars = import ./vars.nix;
-  in {
+    in
+    {
       # Your custom packages
       # Accessible through 'nix build', 'nix shell', etc
       packages = forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system});
@@ -98,7 +103,7 @@
       formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.alejandra);
 
       # Your custom packages and modifications, exported as overlays
-    overlays = import ./overlays {inherit inputs;};
+      overlays = import ./overlays { inherit inputs; };
       # Reusable nixos modules you might want to export
       # These are usually stuff you would upstream into nixpkgs
       nixosModules = import ./modules/nixos;
@@ -110,25 +115,25 @@
       # Available through 'nixos-rebuild --flake .#your-hostname'
       nixosConfigurations = {
         adalbert = nixpkgs.lib.nixosSystem {
-        specialArgs = {inherit inputs outputs vars;};
+          specialArgs = { inherit inputs outputs vars; };
           modules = [
             ./hosts/adalbert
           ];
         };
         ludwig = nixpkgs.lib.nixosSystem {
-        specialArgs = {inherit inputs outputs vars;};
+          specialArgs = { inherit inputs outputs vars; };
           modules = [
             ./hosts/ludwig
           ];
         };
         leopold = nixpkgs.lib.nixosSystem {
-        specialArgs = {inherit inputs outputs vars;};
+          specialArgs = { inherit inputs outputs vars; };
           modules = [
             ./hosts/leopold
           ];
         };
         franz = nixpkgs.lib.nixosSystem {
-        specialArgs = {inherit inputs outputs vars;};
+          specialArgs = { inherit inputs outputs vars; };
           modules = [
             ./hosts/franz
           ];
@@ -153,7 +158,7 @@
       homeConfigurations = {
         "${vars.user}@adalbert" = home-manager.lib.homeManagerConfiguration {
           pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance
-        extraSpecialArgs = {inherit inputs outputs vars;};
+          extraSpecialArgs = { inherit inputs outputs vars; };
           modules = [
             ./home/adalbert.nix
           ];
@@ -161,14 +166,14 @@
       };
       "${vars.user}@ludwig" = home-manager.lib.homeManagerConfiguration {
         pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance
-      extraSpecialArgs = {inherit inputs outputs vars;};
+        extraSpecialArgs = { inherit inputs outputs vars; };
         modules = [
           ./home/ludwig.nix
         ];
       };
       "${vars.user}@franz" = home-manager.lib.homeManagerConfiguration {
         pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance
-      extraSpecialArgs = {inherit inputs outputs vars;};
+        extraSpecialArgs = { inherit inputs outputs vars; };
         modules = [
           ./home/franz.nix
         ];

home/features/coding/nixvim/keymaps.nix

@@ -17,7 +17,6 @@
       key = "<leader>ch";
       action = "<cmd>noh<CR>";
       options = {
-        silent = true;
         desc = "Clear Highlighting";
       };
     }
@@ -42,7 +41,6 @@
       key = "<C-n>";
       action = "<Cmd>Neotree toggle<CR>";
       options = {
-        silent = true;
         desc = "Toggle Neotree";
       };
     }
@@ -83,7 +81,6 @@
       key = "<c-k>";
       action = ":wincmd k<CR>";
       options = {
-        silent = true;
         desc = "Go Up";
       };
     }
@@ -92,7 +89,6 @@
       key = "<c-j>";
       action = ":wincmd j<CR>";
       options = {
-        silent = true;
         desc = "Go Down";
       };
     }
@@ -101,7 +97,6 @@
       key = "<c-h>";
       action = ":wincmd h<CR>";
       options = {
-        silent = true;
         desc = "Go Left";
       };
     }
@@ -110,7 +105,6 @@
       key = "<c-l>";
       action = ":wincmd l<CR>";
       options = {
-        silent = true;
         desc = "Go Right";
       };
     }

home/features/coding/nixvim/lsp.nix

@@ -1,8 +1,5 @@
 {
-  programs.nixvim.plugins = {
+  programs.nixvim.plugins.lsp = {
-    rustaceanvim.enable = true;
-
-    lsp = {
     enable = true;
     inlayHints = true;
 
@@ -25,5 +22,4 @@
       };
     };
   };
-  };
 }

home/features/coding/nixvim/plugins.nix

@@ -1,4 +1,4 @@
-{pkgs, ...}: {
+{ pkgs, ... }: {
   programs.nixvim.plugins = {
     lualine.enable = true;
     oil.enable = true;
@@ -87,12 +87,12 @@
     todo-comments = {
       enable = true;
       settings.colors = {
-        error = ["DiagnosticError" "ErrorMsg" "#DC2626"];
+        error = [ "DiagnosticError" "ErrorMsg" "#DC2626" ];
-        warning = ["DiagnosticWarn" "WarningMsg" "#FBBF24"];
+        warning = [ "DiagnosticWarn" "WarningMsg" "#FBBF24" ];
-        info = ["DiagnosticInfo" "#2563EB"];
+        info = [ "DiagnosticInfo" "#2563EB" ];
-        hint = ["DiagnosticHint" "#10B981"];
+        hint = [ "DiagnosticHint" "#10B981" ];
-        default = ["Identifier" "#7C3AED"];
+        default = [ "Identifier" "#7C3AED" ];
-        test = ["Identifier" "#FF00FF"];
+        test = [ "Identifier" "#FF00FF" ];
       };
     };
 

home/features/desktop/common/firefox.nix

@@ -1,10 +1,9 @@
-{
+{ inputs
-  inputs,
+, pkgs
-  pkgs,
+, vars
-  vars,
+, ...
-  ...
 }: {
-  imports = [inputs.arkenfox.hmModules.default];
+  imports = [ inputs.arkenfox.hmModules.default ];
   home.file.".mozilla/native-messaging-hosts/org.kde.plasma.browser_integration.json".source = "${pkgs.plasma5Packages.plasma-browser-integration}/lib/mozilla/native-messaging-hosts/org.kde.plasma.browser_integration.json";
 
   programs.firefox = {
@@ -48,7 +47,7 @@
           ];
 
           icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
-          definedAliases = ["@np"];
+          definedAliases = [ "@np" ];
         };
 
         "Home Manager" = {
@@ -65,7 +64,7 @@
           ];
 
           icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
-          definedAliases = ["@hm"];
+          definedAliases = [ "@hm" ];
         };
 
         "Searx" = {
@@ -82,7 +81,7 @@
           ];
 
           iconUpdateURL = "https://paulgo.io/favicon.ico";
-          definedAliases = ["@sx"];
+          definedAliases = [ "@sx" ];
         };
 
         "Amazon" = {
@@ -99,7 +98,7 @@
           ];
 
           iconUpdateURL = "https://amazon.de/favicon.ico";
-          definedAliases = ["@a"];
+          definedAliases = [ "@a" ];
         };
 
         "YouTube" = {
@@ -116,7 +115,7 @@
           ];
 
           iconUpdateURL = "https://piped.video/favicon.ico";
-          definedAliases = ["yt"];
+          definedAliases = [ "yt" ];
         };
       };
       search.force = true;
@@ -191,9 +190,9 @@
   };
 
   xdg.mimeApps.defaultApplications = {
-    "text/html" = ["firefox.desktop"];
+    "text/html" = [ "firefox.desktop" ];
-    "text/xml" = ["firefox.desktop"];
+    "text/xml" = [ "firefox.desktop" ];
-    "x-scheme-handler/http" = ["firefox.desktop"];
+    "x-scheme-handler/http" = [ "firefox.desktop" ];
-    "x-scheme-handler/https" = ["firefox.desktop"];
+    "x-scheme-handler/https" = [ "firefox.desktop" ];
   };
 }

hosts/leopold/hardware-configuration.nix

@@ -1,21 +1,17 @@
 # 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, ... }:
+
 {
-  config,
+  imports =
-  lib,
+    [ (modulesPath + "/installer/scan/not-detected.nix")
-  pkgs,
-  modulesPath,
-  ...
-}: {
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = ["xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod"];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ];
-  boot.initrd.kernelModules = ["dm-snapshot"];
+  boot.initrd.kernelModules = [ "dm-snapshot" ];
-  boot.kernelModules = ["kvm-intel"];
+  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [];
+  boot.extraModulePackages = [ ];
 
   # 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