flake.nix

@@ -18,14 +18,7 @@
     nvf.url = "github:notashelf/nvf";
   };
 
-  outputs =
+  outputs = { self, nixpkgs, nix-flatpak, nvf, ... } @ inputs:
-    {
-      self,
-      nixpkgs,
-      nix-flatpak,
-      nvf,
-      ...
-    }@inputs:
     let
       system = "x86_64-linux";
       overlays = builtins.attrValues (import ./overlays);

hosts/common/common.nix

@@ -1,12 +1,8 @@
-{
+{ inputs, pkgs, overlays, ... }:
-  inputs,
-  pkgs,
-  overlays,
-  ...
-}:
 {
 
-  imports = [
+  imports =
+    [
       inputs.home-manager.nixosModules.home-manager
       ../../modules/nix/default.nix
    ];
@@ -16,10 +12,7 @@
   users.users.smayzy = {
     isNormalUser = true;
     description = "smayzy";
-    extraGroups = [
+    extraGroups = [ "networkmanager" "wheel" ];
-      "networkmanager"
-      "wheel"
-    ];
   };
 
   environment.systemPackages = with pkgs; [

hosts/common/home.nix

@@ -1,7 +1,8 @@
 { pkgs, ... }:
 
 {
-  imports = [
+  imports =
+  [
   ../../modules/home-manager/default.nix
   ];
 
@@ -40,8 +41,8 @@
 
   dconf.settings = {
     "org/virt-manager/virt-manager/connections" = {
-      autoconnect = [ "qemu:///system" ];
+      autoconnect = ["qemu:///system"];
-      uris = [ "qemu:///system" ];
+      uris = ["qemu:///system"];
     };
   };
 

hosts/desktop1/configuration.nix

@@ -1,7 +1,8 @@
 { inputs, config, ... }:
 
 {
-  imports = [
+  imports =
+    [
       ../common/common.nix
       ./hardware-configuration.nix
     ];

hosts/desktop1/hardware-configuration.nix

@@ -1,40 +1,24 @@
-{
+{ config, lib, pkgs, modulesPath, ... }:
-  config,
-  lib,
-  pkgs,
-  modulesPath,
-  ...
-}:
 
 {
-  imports = [
+  imports =
-    (modulesPath + "/installer/scan/not-detected.nix")
+    [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
-    "xhci_pci"
-    "ahci"
-    "nvme"
-    "usb_storage"
-    "usbhid"
-    "sd_mod"
-  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
+  fileSystems."/" =
-    device = "/dev/disk/by-uuid/976bcf9c-3b56-4aa6-98f8-1c899af2b0f8";
+    { device = "/dev/disk/by-uuid/976bcf9c-3b56-4aa6-98f8-1c899af2b0f8";
       fsType = "ext4";
     };
 
-  fileSystems."/boot" = {
+  fileSystems."/boot" =
-    device = "/dev/disk/by-uuid/8E7F-2417";
+    { device = "/dev/disk/by-uuid/8E7F-2417";
       fsType = "vfat";
-    options = [
+      options = [ "fmask=0077" "dmask=0077" ];
-      "fmask=0077"
-      "dmask=0077"
-    ];
     };
 
   swapDevices = [ ];

hosts/desktop1/home.nix

@@ -1,7 +1,8 @@
 { ... }:
 
 {
-  imports = [
+  imports =
+  [
   ../common/home.nix
   ];
 }

hosts/laptop1/configuration.nix

@@ -1,7 +1,8 @@
 { inputs, config, ... }:
 
 {
-  imports = [
+  imports =
+    [
       ../common/common.nix
       ./hardware-configuration.nix
     ];

hosts/laptop1/hardware-configuration.nix

@@ -1,45 +1,31 @@
 # 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,
-  lib,
-  pkgs,
-  modulesPath,
-  ...
-}:
 
 {
-  imports = [
+  imports =
-    (modulesPath + "/installer/scan/not-detected.nix")
+    [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [
+  boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ];
-    "xhci_pci"
-    "nvme"
-    "usb_storage"
-    "sd_mod"
-  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
+  fileSystems."/" =
-    device = "/dev/disk/by-uuid/fa4f1a61-338b-4f1e-9f6c-2b2f2cd12f38";
+    { device = "/dev/disk/by-uuid/fa4f1a61-338b-4f1e-9f6c-2b2f2cd12f38";
       fsType = "ext4";
     };
 
-  fileSystems."/boot" = {
+  fileSystems."/boot" =
-    device = "/dev/disk/by-uuid/8E15-A6E3";
+    { device = "/dev/disk/by-uuid/8E15-A6E3";
       fsType = "vfat";
-    options = [
+      options = [ "fmask=0077" "dmask=0077" ];
-      "fmask=0077"
-      "dmask=0077"
-    ];
     };
 
-  swapDevices = [
+  swapDevices =
-    { device = "/dev/disk/by-uuid/b451db56-e0a5-4799-88a1-34a31ffe3b08"; }
+    [ { device = "/dev/disk/by-uuid/b451db56-e0a5-4799-88a1-34a31ffe3b08"; }
     ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking

hosts/laptop1/home.nix

@@ -1,7 +1,8 @@
 { ... }:
 
 {
-  imports = [
+  imports =
+  [
   ../common/home.nix
   ];
 }

modules/home-manager/lf/lf.nix

@@ -1,9 +1,4 @@
-{
+{ pkgs, lib, config, ... }:
-  pkgs,
-  lib,
-  config,
-  ...
-}:
 let
   inherit (lib) mkIf mkOption types;
 in
@@ -14,6 +9,7 @@ in
     description = "set to true if you want to use a nvidia GC";
   };
   
+
   config = mkIf config.smayzy.lf.enable {
     xdg.configFile."lf/icons".source = ./icons;
   
@@ -62,7 +58,8 @@ in
   
       extraConfig = 
       let 
-          previewer = pkgs.writeShellScriptBin "pv.sh" ''
+        previewer = 
+          pkgs.writeShellScriptBin "pv.sh" ''
           file=$1
           w=$2
           h=$3

modules/home-manager/webapps.nix

@@ -1,9 +1,4 @@
-{
+{ lib, pkgs, config, ... }:
-  lib,
-  pkgs,
-  config,
-  ...
-}:
 let
   browser = lib.getExe pkgs.firefox;
   inherit (lib) mkIf mkOption types;

modules/home-manager/wm/hyprland.nix

@@ -1,10 +1,4 @@
-{
+{ lib, config, pkgs, smayzy, ... }:
-  lib,
-  config,
-  pkgs,
-  smayzy,
-  ...
-}:
 let
   mkIf = lib.mkIf;
 in
@@ -75,3 +69,4 @@ in
 
   };
 }
+

modules/nix/base-cli/fzf.nix

@@ -1,9 +1,4 @@
-{
+{ config, lib, pkgs, ...}:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 let
   inherit (lib) mkIf mkOption types;
 in

modules/nix/base-cli/nh.nix

@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ config, lib, ...}:
 let
   inherit (lib) mkIf mkOption types;
 in
@@ -12,7 +12,7 @@ in
   config = mkIf config.smayzy.nh.enable {
     programs.nh = {
       enable = true;
-      clean = {
+      clean= {
         enable = true;
         extraArgs = "--keep 10";
         dates = "hourly";

modules/nix/base-cli/nvf.nix

@@ -1,9 +1,4 @@
-{
+{ config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 let
   inherit (lib) mkIf mkOption types;
 in

modules/nix/base-cli/pkgs.nix

@@ -1,9 +1,4 @@
-{
+{ config, lib, pkgs, ...}:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 let
   inherit (lib) mkIf mkOption types;
 in
@@ -26,7 +21,6 @@ in
       fastfetch
       lf
       tshark
-      nixfmt
     ];
   };
 }

modules/nix/browser/floorp.nix

@@ -1,9 +1,4 @@
-{
+{  lib, config, pkgs, ... }:
-  lib,
-  config,
-  pkgs,
-  ...
-}:
 let
   inherit (lib) mkIf mkOption types;
 in

modules/nix/browser/librewolf.nix

@@ -1,9 +1,4 @@
-{
+{  lib, config, pkgs, ... }:
-  lib,
-  config,
-  pkgs,
-  ...
-}:
 let
   inherit (lib) mkIf mkOption types;
 in

modules/nix/cad/freecad.nix

@@ -1,9 +1,4 @@
-{
+{  lib, config, pkgs, ... }:
-  lib,
-  config,
-  pkgs,
-  ...
-}:
 let
   inherit (lib) mkIf mkOption types;
 in

modules/nix/cad/fritzing.nix

@@ -1,9 +1,4 @@
-{
+{  lib, config, pkgs, ... }:
-  lib,
-  config,
-  pkgs,
-  ...
-}:
 let
   inherit (lib) mkIf mkOption types;
 in

modules/nix/comm/element.nix

@@ -1,9 +1,4 @@
-{
+{  lib, config, pkgs, ... }:
-  lib,
-  config,
-  pkgs,
-  ...
-}:
 let
   inherit (lib) mkIf mkOption types;
 in

modules/nix/comm/thunderbird.nix

@@ -1,9 +1,4 @@
-{
+{  lib, config, pkgs, ... }:
-  lib,
-  config,
-  pkgs,
-  ...
-}:
 let
   inherit (lib) mkIf mkOption types;
 in

modules/nix/comm/webcord.nix

@@ -1,9 +1,4 @@
-{
+{  lib, config, pkgs, ... }:
-  lib,
-  config,
-  pkgs,
-  ...
-}:
 let
   inherit (lib) mkIf mkOption types;
 in

modules/nix/default.nix

@@ -28,9 +28,7 @@
   i18n.defaultLocale = "en_US.UTF-8";
   time.timeZone = "Europe/Paris";
 
-  nixpkgs.config.allowUnfreePredicate =
+  nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
-    pkg:
-    builtins.elem (lib.getName pkg) [
     "steam"
     "steam-original"
     "steam-unwrapped"
@@ -45,10 +43,7 @@
   };
   console.keyMap = "fr";
 
-  nix.settings.experimental-features = [
+  nix.settings.experimental-features = [ "nix-command" "flakes" ];
-    "nix-command"
-    "flakes"
-  ];
 
   networking.networkmanager.enable = true;
 }

modules/nix/ebook/calibre.nix

@@ -1,9 +1,4 @@
-{
+{  lib, config, pkgs, ... }:
-  lib,
-  config,
-  pkgs,
-  ...
-}:
 let
   inherit (lib) mkIf mkOption types;
 in

modules/nix/flatpak/flatpak.nix

@@ -21,10 +21,10 @@ let
   ];
 
   flatpaks =
-    (if config.smayzy.flatpak.gaming.enable then gaming else [ ])
+    (if config.smayzy.flatpak.gaming.enable then gaming else [])
-    ++ (if config.smayzy.flatpak.dev.enable then dev else [ ])
+    ++ (if config.smayzy.flatpak.dev.enable then dev else [])
-    ++ (if config.smayzy.flatpak.utils.enable then utils else [ ])
+    ++ (if config.smayzy.flatpak.utils.enable then utils else [])
-    ++ (if config.smayzy.flatpak.media.enable then media else [ ]);
+    ++ (if config.smayzy.flatpak.media.enable then media else []);
 in
 {
   options.smayzy.flatpak = mkOption {

modules/nix/games/prism.nix

@@ -1,9 +1,4 @@
-{
+{  lib, config, pkgs, ... }:
-  lib,
-  config,
-  pkgs,
-  ...
-}:
 let
   inherit (lib) mkIf mkOption types;
 in

modules/nix/games/steam.nix

@@ -1,9 +1,4 @@
-{
+{  lib, config, pkgs, ... }:
-  lib,
-  config,
-  pkgs,
-  ...
-}:
 let
   inherit (lib) mkIf mkOption types;
 in

modules/nix/groups/laptop.nix

@@ -20,7 +20,7 @@ in
       floorp.enable = true;
       stylix.enable = true;
       audio.enable = true;
-      office.enable = true;
+      office.enable= true;
       webcord.enable = true;
       element.enable = true;
       sddm.enable = true;

modules/nix/hardware/grub.nix

@@ -1,6 +1,6 @@
 { config, lib, ... }:
 
-with lib;
+  with lib;
 
 {
   options.smayzy.grub-on-lap.enable = mkOption {

modules/nix/hardware/power.nix

@@ -1,15 +1,7 @@
 { config, lib, ... }:
 let
-  inherit (lib)
+  inherit (lib) mkIf mkOption types mkMerge;
-    mkIf
+  validOptions = [ "desktop" "laptop" ];
-    mkOption
-    types
-    mkMerge
-    ;
-  validOptions = [
-    "desktop"
-    "laptop"
-  ];
 in
 {
   options.smayzy.power = mkOption {

modules/nix/ide/arduino.nix

@@ -1,9 +1,4 @@
-{
+{  lib, config, pkgs, ... }:
-  lib,
-  config,
-  pkgs,
-  ...
-}:
 let
   inherit (lib) mkIf mkOption types;
 in

modules/nix/office/aegisub.nix

@@ -1,9 +1,4 @@
-{
+{  lib, config, pkgs, ... }:
-  lib,
-  config,
-  pkgs,
-  ...
-}:
 let
   inherit (lib) mkIf mkOption types;
 in

modules/nix/office/blender.nix

@@ -1,9 +1,4 @@
-{
+{  lib, config, pkgs, ... }:
-  lib,
-  config,
-  pkgs,
-  ...
-}:
 let
   inherit (lib) mkIf mkOption types;
 in

modules/nix/office/inkscape.nix

@@ -1,9 +1,4 @@
-{
+{  lib, config, pkgs, ... }:
-  lib,
-  config,
-  pkgs,
-  ...
-}:
 let
   inherit (lib) mkIf mkOption types;
 in

modules/nix/office/kdenlive.nix

@@ -1,9 +1,4 @@
-{
+{  lib, config, pkgs, ... }:
-  lib,
-  config,
-  pkgs,
-  ...
-}:
 let
   inherit (lib) mkIf mkOption types;
 in

modules/nix/office/komikku.nix

@@ -1,9 +1,4 @@
-{
+{  lib, config, pkgs, ... }:
-  lib,
-  config,
-  pkgs,
-  ...
-}:
 let
   inherit (lib) mkIf mkOption types;
 in

modules/nix/office/obsidian.nix

@@ -1,9 +1,4 @@
-{
+{  lib, config, pkgs, ... }:
-  lib,
-  config,
-  pkgs,
-  ...
-}:
 let
   inherit (lib) mkIf mkOption types;
 in

modules/nix/office/office.nix

@@ -1,9 +1,4 @@
-{
+{  lib, config, pkgs, ... }:
-  lib,
-  config,
-  pkgs,
-  ...
-}:
 let
   inherit (lib) mkIf mkOption types;
 in

modules/nix/rice/stylix.nix

@@ -1,9 +1,4 @@
-{
+{  lib, config, pkgs, ... }:
-  lib,
-  config,
-  pkgs,
-  ...
-}:
 let
   inherit (lib) mkIf mkOption types;
 in

modules/nix/shell/zsh.nix

@@ -1,9 +1,4 @@
-{
+{  lib, config, pkgs, ... }:
-  lib,
-  config,
-  pkgs,
-  ...
-}:
 let
   inherit (lib) mkIf mkOption types;
 in

modules/nix/terminal/alacritty.nix

@@ -1,9 +1,4 @@
-{
+{ config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 let
   inherit (lib) mkIf mkOption types;
 in

modules/nix/utilities/gui-utilities.nix

@@ -1,9 +1,4 @@
-{
+{  lib, config, pkgs, ... }:
-  lib,
-  config,
-  pkgs,
-  ...
-}:
 let
   inherit (lib) mkIf mkOption types;
 in

modules/nix/utilities/mouse.nix

@@ -1,9 +1,4 @@
-{
+{  lib, config, pkgs, ... }:
-  lib,
-  config,
-  pkgs,
-  ...
-}:
 let
   inherit (lib) mkIf mkOption types;
 in

modules/nix/virt/qemu.nix

@@ -1,9 +1,4 @@
-{
+{ config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 let
   inherit (lib) mkIf mkOption types;
 in
@@ -16,7 +11,7 @@ in
 
   config = mkIf config.smayzy.virt.enable {
     programs.virt-manager.enable = true;
-    users.groups.libvirtd.members = [ "smayzy" ];
+    users.groups.libvirtd.members = ["smayzy"];
     virtualisation.libvirtd.enable = true;
     virtualisation.libvirtd.qemu.runAsRoot = false;
     virtualisation.libvirtd.qemu.ovmf.enable = true;

modules/nix/vpn/mullvad.nix

@@ -1,9 +1,4 @@
-{
+{  lib, config, pkgs, ... }:
-  lib,
-  config,
-  pkgs,
-  ...
-}:
 let
   inherit (lib) mkIf mkOption types;
 in

modules/nix/vpn/tor.nix

@@ -1,9 +1,4 @@
-{
+{  lib, config, pkgs, ... }:
-  lib,
-  config,
-  pkgs,
-  ...
-}:
 let
   inherit (lib) mkIf mkOption types;
 in

modules/nix/vpn/wireguard.nix

@@ -1,9 +1,4 @@
-{
+{  lib, config, pkgs, ... }:
-  lib,
-  config,
-  pkgs,
-  ...
-}:
 let
   inherit (lib) mkIf mkOption types;
 in

modules/nix/wm/hyprland.nix

@@ -1,9 +1,4 @@
-{
+{  lib, config, pkgs, ... }:
-  lib,
-  config,
-  pkgs,
-  ...
-}:
 let
   inherit (lib) mkIf mkOption types;
 in