- Formatted everything using Alejandra

- Added 'ncli format' as a quick command to format everything

flake.nix

@@ -47,8 +47,19 @@
     grub2-themes.url = "github:vinceliuice/grub2-themes";
   };
 
-  outputs = inputs@{ nixpkgs, alejandra, home-manager, plasma-manager, nixos-hardware, stylix, niri, zen-browser, grub2-themes, nix-flatpak, ... }:
+  outputs = inputs @ {
-  let
+    nixpkgs,
+    alejandra,
+    home-manager,
+    plasma-manager,
+    nixos-hardware,
+    stylix,
+    niri,
+    zen-browser,
+    grub2-themes,
+    nix-flatpak,
+    ...
+  }: let
     username = "cookiez";
     hostname = "nixos";
     project = "NixOS";
@@ -57,8 +68,7 @@
     pkgs = import nixpkgs {inherit system;};
 
     framework13 = true;
-  in
+  in {
-  {
     formatter.${system} = nixpkgs.legacyPackages.${system}.alejandra;
 
     nixosConfigurations = {
@@ -73,10 +83,17 @@
           inherit alejandra;
           host = hostname;
         };
-        modules = [
+        modules =
+          [
             ./modules
             #Conditional Modules!
-          ] ++ (if framework13 then [ nixos-hardware.nixosModules.framework-13-7040-amd ] else [ ]) ++ [
+          ]
+          ++ (
+            if framework13
+            then [nixos-hardware.nixosModules.framework-13-7040-amd]
+            else []
+          )
+          ++ [
           ];
       };
     };

modules/boot-splash.nix

@@ -1,5 +1,9 @@
-{ config, lib, pkgs, ... }:
 {
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
   boot = {
     # silence first boot output
     consoleLogLevel = 3;

modules/configuration.nix

@@ -3,17 +3,25 @@
 #nmcli device wifi connect <ssid> password <password>
 # or if no password (open wifi)
 #nmcli device wifi connect <ssid>
-
-{ inputs, config, pkgs, lib, username, project, host, version, system, ... }:
 {
+  inputs,
+  config,
+  pkgs,
+  lib,
+  username,
+  project,
+  host,
+  version,
+  system,
+  ...
+}: {
   #Assign Swap to the PC
   #swapDevices = [{
   #  device = "/swapfile";
   #  size = 16 * 1024; # 16GB
   #}];
 
-  imports =
+  imports = [
-  [
     inputs.home-manager.nixosModules.home-manager
     inputs.grub2-themes.nixosModules.default
     inputs.nix-flatpak.nixosModules.nix-flatpak
@@ -63,7 +71,6 @@
   #Manage flags -> Add bios_grub
 
   networking = {
-  
     # Enable networking
     networkmanager.enable = true;
 

modules/default.nix

@@ -1,5 +1,4 @@
-{ config, ... }:
+{config, ...}: {
-{
   imports = [
     ./configuration.nix
 
@@ -43,6 +42,5 @@
         environment.etc."nixos-tags".text = "niri";
       };
     };
-
   };
 }

modules/desktop-entries.nix

@@ -1,5 +1,9 @@
-{ pkgs, username, project, ...}:
 {
+  pkgs,
+  username,
+  project,
+  ...
+}: {
   xdg = {
     desktopEntries.youtube = {
       name = "YouTube";
@@ -107,6 +111,5 @@
       name = "Discover";
       noDisplay = true;
     };
-
   };
 }

modules/firefox-home.nix

@@ -1,5 +1,4 @@
-{ username, ... }:
+{username, ...}: {
-{
   programs.firefox = {
     enable = true;
     profiles = {

modules/firefox.nix

@@ -1,6 +1,8 @@
-{ config, pkgs, ... }:
+{
-
+  config,
-  let
+  pkgs,
+  ...
+}: let
   lock-false = {
     Value = false;
     Status = "locked";
@@ -9,9 +11,7 @@
     Value = true;
     Status = "locked";
   };
-  in
+in {
-
-{
   home-manager.sharedModules = [
     ./firefox-home.nix
   ];
@@ -21,7 +21,9 @@
       enable = true;
       languagePacks = ["de" "en-US"];
 
-      /* ---- POLICIES ---- */
+      /*
+      ---- POLICIES ----
+      */
       # Check about:policies#documentation for options.
       policies = {
         PasswordManagerEnabled = false;
@@ -44,15 +46,15 @@
         DisplayMenuBar = "default-off"; # alternatives: "always", "never" or "default-on"
         SearchBar = "unified"; # alternative: "separate"
 
-        /* ---- EXTENSIONS ---- */
+        /*
+        ---- EXTENSIONS ----
+        */
         # Check about:support for extension/add-on ID strings.
         # Valid strings for installation_mode are "allowed", "blocked",
         # "force_installed" and "normal_installed".
 
         # How to: https://discourse.nixos.org/t/declare-firefox-extensions-and-settings/36265
-        ExtensionSettings =
+        ExtensionSettings = with builtins; let
-          with builtins;
-          let
           extension = shortId: uuid: {
             name = uuid;
             value = {
@@ -77,10 +79,15 @@
             (extension "darkreader" "addon@darkreader.org")
           ];
 
-        /* ---- PREFERENCES ---- */
+        /*
+        ---- PREFERENCES ----
+        */
         # Check about:config for options.
         Preferences = {
-          "browser.contentblocking.category" = { Value = "strict"; Status = "locked"; };
+          "browser.contentblocking.category" = {
+            Value = "strict";
+            Status = "locked";
+          };
           "extensions.pocket.enabled" = lock-false;
           "extensions.screenshots.disabled" = lock-true;
           "browser.topsites.contile.enabled" = lock-false;

modules/hardware-configuration.nix

@@ -1,11 +1,15 @@
 # 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 =
+  config,
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}: {
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
   boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "thunderbolt" "uas" "usbhid" "sd_mod"];
@@ -13,13 +17,13 @@
   boot.kernelModules = ["kvm-amd"];
   boot.extraModulePackages = [];
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "/dev/disk/by-uuid/af8fdb25-74d8-4b33-8413-bdcb66e0d22a";
+    device = "/dev/disk/by-uuid/af8fdb25-74d8-4b33-8413-bdcb66e0d22a";
     fsType = "ext4";
   };
 
-  fileSystems."/boot" =
+  fileSystems."/boot" = {
-    { device = "/dev/disk/by-uuid/58D5-0C06";
+    device = "/dev/disk/by-uuid/58D5-0C06";
     fsType = "vfat";
     options = ["fmask=0077" "dmask=0077"];
   };

modules/home.nix

@@ -1,18 +1,30 @@
-{ lib, inputs, config, pkgs, username, project, host, version, ... }:
 {
+  lib,
+  inputs,
+  config,
+  pkgs,
+  username,
+  project,
+  host,
+  version,
+  ...
+}: {
   # Home Manager needs a bit of information about you and the
   # paths it should manage.
   home.username = username;
   home.homeDirectory = "/home/${username}";
   home.packages = [
-    (import ./ncli.nix { inherit pkgs host project; backupFiles = [
+    (import ./ncli.nix {
+      inherit pkgs host project;
+      backupFiles = [
         ".gtkrc-2.0.backup"
         ".config/gtk-3.0/gtk.css.backup"
         ".config/gtk-3.0/settings.ini.backup"
         ".config/gtk-4.0/gtk.css.backup"
         ".config/gtk-4.0/settings.ini.backup"
         ".config/niri/config.kdl"
-    ]; })
+      ];
+    })
   ];
 
   imports = [
@@ -37,7 +49,6 @@
   programs = {
     home-manager = {enable = true;};
 
-    
     zoxide = {
       enable = true;
       #enableZshIntegration = true;
@@ -56,7 +67,6 @@
       };
     };
 
-
     git = {
       enable = true;
       settings = {
@@ -80,7 +90,6 @@
           path = "${username}.default";
           isDefault = true;
           settings = {
-            
           };
         };
       };
@@ -101,9 +110,7 @@
         OfferToSaveLogins = false;
         DisplayBookmarksToolbar = "always"; # alternatives: "always" or "newtab"
 
-        ExtensionSettings =
+        ExtensionSettings = with builtins; let
-          with builtins;
-          let
           extension = shortId: uuid: {
             name = uuid;
             value = {

modules/hyprlock/default.nix

@@ -1,5 +1,9 @@
-{ config, inputs, pkgs, ... }:
 {
+  config,
+  inputs,
+  pkgs,
+  ...
+}: {
   imports = [
   ];
 
@@ -7,8 +11,7 @@
     ./home.nix
   ];
 
-  environment.systemPackages = with pkgs;
+  environment.systemPackages = with pkgs; [
-  [
     hyprlock
   ];
 }

modules/hyprlock/home.nix

@@ -1,6 +1,9 @@
-{pkgs, inputs, username, ...}:
 {
-
+  pkgs,
+  inputs,
+  username,
+  ...
+}: {
   imports = [
   ];
 

modules/hyprpaper/default.nix

@@ -1,5 +1,9 @@
-{ config, inputs, pkgs, ... }:
 {
+  config,
+  inputs,
+  pkgs,
+  ...
+}: {
   imports = [
   ];
 
@@ -7,8 +11,7 @@
     ./home.nix
   ];
 
-  environment.systemPackages = with pkgs;
+  environment.systemPackages = with pkgs; [
-  [
     hyprpaper
   ];
 }

modules/hyprpaper/home.nix

@@ -1,6 +1,10 @@
-{pkgs, inputs, username, project, ...}:
 {
-
+  pkgs,
+  inputs,
+  username,
+  project,
+  ...
+}: {
   imports = [
   ];
 

modules/minimal.nix

@@ -3,11 +3,15 @@
 #nmcli device wifi connect <ssid> password <password>
 # or if no password (open wifi)
 #nmcli device wifi connect <ssid>
-
-{ config, pkgs, lib, username, version, ... }:
 {
-  imports =
+  config,
-    [
+  pkgs,
+  lib,
+  username,
+  version,
+  ...
+}: {
+  imports = [
     ./hardware-configuration.nix
     ./zsh.nix
     #./ncli.nix

modules/ncli.nix

@@ -261,6 +261,9 @@ in
         cd "$HOME/$PROJECT" || { echo "Error: Could not change to $HOME/$PROJECT"; exit 1; }
         git status
         ;;
+      format)
+        nix fmt .
+        ;;
       trim)
         echo "Running 'sudo fstrim -v /' may take a few minutes and impact system performance."
         read -p "Enter to run now or enter to exit (y/N): " -n 1 -r

modules/neovim/default.nix

@@ -1,7 +1,11 @@
-{ inputs, config, lib, pkgs, ... }:
 {
-  environment.systemPackages = with pkgs;
+  inputs,
-  [
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
+  environment.systemPackages = with pkgs; [
     neovim
     vimPlugins.LazyVim
     vimPlugins.lazygit-nvim
@@ -13,7 +17,6 @@
     ./home.nix
   ];
 
-
   #  programs.neovim = {
   #   enable = true;
   #};

modules/neovim/home.nix

@@ -1,5 +1,10 @@
-{ inputs, config, lib, pkgs, ... }:
 {
+  inputs,
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
   imports = [
     inputs.nixvim.homeModules.nixvim
   ];

modules/packages/cli.nix

@@ -1,5 +1,10 @@
-{config, pkgs, libs, inputs, ...}:
 {
+  config,
+  pkgs,
+  libs,
+  inputs,
+  ...
+}: {
   environment.systemPackages = with pkgs; [
     #CLI tools
     pdftk #PDF toolkit

modules/packages/default.nix

@@ -1,5 +1,4 @@
-{ ... }:
+{...}: {
-{
   imports = [
     ./desktop.nix
     ./cli.nix

modules/packages/desktop.nix

@@ -1,7 +1,11 @@
-{config, pkgs, libs, inputs, ...}:
 {
+  config,
+  pkgs,
+  libs,
+  inputs,
+  ...
+}: {
   environment.systemPackages = with pkgs; [
-
     #Programming
     jetbrains.pycharm #The PyCharm IDE to edit Python code
     jetbrains.idea #The IntelliJ IDE to edit Java code

modules/packages/essentials.nix

@@ -1,5 +1,12 @@
-{config, pkgs, libs, inputs, system, alejandra, ...}:
 {
+  config,
+  pkgs,
+  libs,
+  inputs,
+  system,
+  alejandra,
+  ...
+}: {
   environment.systemPackages = with pkgs; [
     #Essentials (CLI Only)
     wget #A tool for quickly downloading things from the Web

modules/packages/flatpak.nix

@@ -1,5 +1,11 @@
-{config, pkgs, libs, inputs, nix-flatpak, ...}:
 {
+  config,
+  pkgs,
+  libs,
+  inputs,
+  nix-flatpak,
+  ...
+}: {
   services.flatpak = {
     enable = true;
 

modules/stylix/default.nix

@@ -1,8 +1,10 @@
-{ pkgs, inputs, username, ... }:
 {
-
+  pkgs,
-  imports =
+  inputs,
-  [
+  username,
+  ...
+}: {
+  imports = [
     inputs.stylix.nixosModules.stylix
   ];
 

modules/stylix/home.nix

@@ -1,6 +1,9 @@
-{pkgs, inputs, username, ...}:
 {
-
+  pkgs,
+  inputs,
+  username,
+  ...
+}: {
   imports = [
   ];
 

modules/waybar/home.nix

@@ -1,5 +1,4 @@
-{ ... }:
+{...}: {
-{
   #  xdg.configFile."waybar/config.jsonc".source = ./config.jsonc;
   #  xdg.configFile."waybar/style.css".source = ./style.css;
 }

modules/zsh.nix

@@ -1,4 +1,10 @@
-{ config, pkgs, username, project, ... }: {
+{
+  config,
+  pkgs,
+  username,
+  project,
+  ...
+}: {
   programs.zsh = {
     enable = true;
     enableCompletion = false;

niri/autostart.nix

@@ -1,6 +1,10 @@
-{ config, pkgs, username, project, ... }:
 {
-  
+  config,
+  pkgs,
+  username,
+  project,
+  ...
+}: {
   #To show logs of services run:
   #journalctl --user-unit={service-name} --user
   systemd.user.services.niri-waybar = {

niri/default.nix

@@ -1,5 +1,9 @@
-{ config, inputs, pkgs, ... }:
 {
+  config,
+  inputs,
+  pkgs,
+  ...
+}: {
   imports = [
     ./autostart.nix
     ../modules/hyprlock
@@ -11,8 +15,7 @@
     ./home.nix
   ];
 
-  environment.systemPackages = with pkgs;
+  environment.systemPackages = with pkgs; [
-  [
     #mako
     fuzzel
     waybar
@@ -26,11 +29,11 @@
     xwayland.enable = true;
   };
 
-
   #services.xserver.enable = true;
   #services.xserver.displayManager.sddm.enable = true;
 
-  xdg.portal = {    #Needed for waybar
+  xdg.portal = {
+    #Needed for waybar
     enable = true;
     extraPortals = [pkgs.xdg-desktop-portal-gtk pkgs.xdg-desktop-portal-wlr];
     config.common.default = "*";
@@ -38,5 +41,4 @@
 
   #sound.enable = true;
   #security.rtkit.enable = true;
-
 }

niri/home.nix

@@ -1,6 +1,8 @@
-{pkgs, inputs, ...}:
 {
-
+  pkgs,
+  inputs,
+  ...
+}: {
   imports = [
     inputs.niri.homeModules.niri
     ../modules/waybar/home.nix

plasma/autostart.nix

@@ -1,6 +1,10 @@
-{ config, pkgs, username, project, ... }:
 {
-  
+  config,
+  pkgs,
+  username,
+  project,
+  ...
+}: {
   #To show logs of services run: journalctl --user-unit={service-name} --user
 
   systemd.user.services.autostart-yakuake = {

plasma/default.nix

@@ -1,5 +1,10 @@
-{config, pkgs, username, project, ...}:
+{
-let
+  config,
+  pkgs,
+  username,
+  project,
+  ...
+}: let
   # Define the custom background package with the correct relative path
   background-package = pkgs.stdenvNoCC.mkDerivation {
     name = "background-image";
@@ -12,10 +17,8 @@ let
 
   plasmaTheme = "desktop"; #Possible values are "laptop" or "desktop"
   powerProfile = "laptop"; #Possible values are "laptop" or "desktop"
-in
+in {
-{
+  imports = [
-  imports =
-  [
     ./autostart.nix
     ../modules/stylix
   ];
@@ -75,7 +78,6 @@ in
   '';
 
   environment = {
-    
     plasma6.excludePackages = with pkgs; [
       kdePackages.elisa
     ];

plasma/home.nix

@@ -1,7 +1,14 @@
-{pkgs, lib, inputs, username, project, plasmaTheme, ...}:
 {
-
+  pkgs,
-  imports = [
+  lib,
+  inputs,
+  username,
+  project,
+  plasmaTheme,
+  ...
+}: {
+  imports =
+    [
       ./settings/common.nix
       ./settings/powerProfile.nix
     ]

plasma/settings/common.nix

@@ -1,5 +1,11 @@
-{pkgs, inputs, username, project, plasmaTheme, ...}:
 {
+  pkgs,
+  inputs,
+  username,
+  project,
+  plasmaTheme,
+  ...
+}: {
   programs = {
     plasma = {
       enable = true;
@@ -51,7 +57,6 @@
           "Switch to Next Keyboard Layout" = [];
         };
 
-
         #kaccess."Toggle Screen Reader On and Off" = "Meta+Alt+S";
         #kcm_touchpad."Disable Touchpad" = "Touchpad Off";
         #kcm_touchpad."Enable Touchpad" = "Touchpad On";

plasma/settings/desktop.nix

@@ -1,5 +1,11 @@
-{pkgs, inputs, username, project, plasmaTheme, ...}:
 {
+  pkgs,
+  inputs,
+  username,
+  project,
+  plasmaTheme,
+  ...
+}: {
   programs = {
     plasma = {
       overrideConfig = true;
@@ -21,7 +27,8 @@
                   launchers = [
                     # optional pinned apps
                     "applications:org.kde.dolphin.desktop"
-                    "applications:systemsettings.desktop""applications:kitty.desktop"
+                    "applications:systemsettings.desktop"
+                    "applications:kitty.desktop"
                     "applications:firefox.desktop"
                   ];
                 };

plasma/settings/laptop.nix

@@ -1,6 +1,11 @@
-{pkgs, inputs, username, project, plasmaTheme, ...}:
 {
-
+  pkgs,
+  inputs,
+  username,
+  project,
+  plasmaTheme,
+  ...
+}: {
   programs = {
     plasma = {
       overrideConfig = true;
@@ -111,13 +116,13 @@
                   launchers = [
                     # optional pinned apps
                     "applications:org.kde.dolphin.desktop"
-                    "applications:systemsettings.desktop""applications:kitty.desktop"
+                    "applications:systemsettings.desktop"
+                    "applications:kitty.desktop"
                     "applications:firefox.desktop"
                   ];
                 };
               };
             }
-
           ];
         }
       ];

plasma/settings/powerProfile.nix

@@ -1,5 +1,11 @@
-{pkgs, inputs, username, project, powerProfile, ...}:
+{
-let
+  pkgs,
+  inputs,
+  username,
+  project,
+  powerProfile,
+  ...
+}: let
   profiles = {
     laptop = {
       AC.powerProfile = "powerSaving";
@@ -14,8 +20,7 @@ let
   };
 
   selectedProfile = profiles.${powerProfile};
-in
+in {
-{
   programs = {
     plasma = {
       overrideConfig = true;