changed to alejandra for formatting

configs/common.nix

@@ -4,9 +4,7 @@
   pkgs,
   inputs,
   ...
-}:
+}: {
-
-{
   imports = [
     /etc/nixos/hardware-configuration.nix
   ];
@@ -50,6 +48,9 @@
     };
   };
 
+  # Set <nixpkgs> correctly
+  nix.nixPath = ["nixpkgs=${inputs.nixpkgs}"];
+
   ## Optimise Nix store on rebuild and collect garbage as a service
   nix.optimise.automatic = true;
   nix.gc = {
@@ -154,110 +155,105 @@
       "docker"
       "wheel"
     ];
-    packages =
+    packages = with pkgs; let
-      with pkgs;
+      input = {
-      let
+        package,
-        input =
+        output ? "default",
-          {
+      }:
-            package,
+        inputs.${package}.packages.${pkgs.stdenv.hostPlatform.system}.${output};
-            output ? "default",
+      wrap = {
-          }:
+        name,
-          inputs.${package}.packages.${pkgs.stdenv.hostPlatform.system}.${output};
+        pkg,
-        wrap =
+        modules,
-          {
+      }:
-            name,
+        pkgs.symlinkJoin {
-            pkg,
+          inherit name;
-            modules,
+          paths = [pkg];
-          }:
+          nativeBuildInputs = [pkgs.makeWrapper];
-          pkgs.symlinkJoin {
+          postBuild = ''
-            inherit name;
+            wrapProgram $out/bin/${name} \
-            paths = [ pkg ];
+              --prefix PATH : ${pkgs.lib.makeBinPath modules}
-            nativeBuildInputs = [ pkgs.makeWrapper ];
+          '';
-            postBuild = ''
+        };
-              wrapProgram $out/bin/${name} \
+    in [
-                --prefix PATH : ${pkgs.lib.makeBinPath modules}
+      # Ricing
-            '';
+      ## Desktop
-          };
+      bibata-cursors
-      in
+      catppuccin-gtk
-      [
+      unstable.waybar
-        # Ricing
+      hyprlock
-        ## Desktop
+      dunst
-        bibata-cursors
+      wlogout
-        catppuccin-gtk
+      wpaperd
-        unstable.waybar
+      quickshell
-        hyprlock
-        dunst
-        wlogout
-        wpaperd
-        quickshell
 
-        ## Desktop Utilities
+      ## Desktop Utilities
-        grimblast
+      grimblast
-        gsettings-desktop-schemas
+      gsettings-desktop-schemas
-        wl-clipboard
+      wl-clipboard
-        (wrap {
+      (wrap {
-          name = "otter-launcher";
+        name = "otter-launcher";
-          pkg = (
+        pkg = (
-            input {
+          input {
-              package = "otter-launcher";
+            package = "otter-launcher";
-            }
+          }
-          );
+        );
-          modules = [
+        modules = [
-            chafa
+          chafa
-            jq
+          jq
-          ];
+        ];
-        })
+      })
-        (input { package = "fsel"; })
+      (input {package = "fsel";})
 
-        # Terminal
+      # Terminal
-        ## Styling / Functionality
+      ## Styling / Functionality
-        oh-my-posh
+      oh-my-posh
-        carapace
+      carapace
-        zsh-autocomplete
+      zsh-autocomplete
-        bat
+      bat
 
-        ## Tools
+      ## Tools
-        lazygit
+      lazygit
-        p7zip-rar
+      p7zip-rar
-        any-nix-shell
+      any-nix-shell
-        bluetui
+      bluetui
-        fzf
+      fzf
-        ripgrep
+      ripgrep
-        wget
+      wget
-        htop
+      htop
-        playerctl
+      playerctl
-        git
+      git
-        lsd
+      lsd
-        (input {
+      (input {
-          package = "doot";
+        package = "doot";
-        })
+      })
 
-        ## Other CLI Apps
+      ## Other CLI Apps
-        nodejs
+      nodejs
-        fastfetch
+      fastfetch
-        opencode
+      opencode
-        tailscale
+      tailscale
-        syncthing
+      syncthing
-        jellyfin-tui
+      jellyfin-tui
-        devenv
+      devenv
-        nix-output-monitor
+      nix-output-monitor
 
-        # Apps
+      # Apps
-        ## Actual Useful Stuff
+      ## Actual Useful Stuff
-        nemo
+      nemo
-        kitty
+      kitty
-        firefox
+      firefox
-        gotify-desktop
+      gotify-desktop
-        pavucontrol
+      pavucontrol
-        mpv
+      mpv
-        input-remapper
+      input-remapper
 
-        ## Other Nonsense
+      ## Other Nonsense
-        tor-browser
+      tor-browser
-        techmino
+      techmino
-        prismlauncher
+      prismlauncher
-        delfin
+      delfin
-      ];
+    ];
   };
 
   ## Zsh
@@ -283,7 +279,7 @@
   programs = {
     dconf.enable = true;
     xfconf.enable = true;
-    gdk-pixbuf.modulePackages = [ pkgs.librsvg ]; # For wlogout svgs
+    gdk-pixbuf.modulePackages = [pkgs.librsvg]; # For wlogout svgs
   };
 
   ## User Services
@@ -301,11 +297,10 @@
   fonts.packages = with pkgs; [
     nerd-fonts.fira-mono
   ];
-  fonts.fontconfig.defaultFonts.serif = [ "Fira Mono Nerd Font" ];
+  fonts.fontconfig.defaultFonts.serif = ["Fira Mono Nerd Font"];
 
   # System Packages
   environment.systemPackages = with pkgs; [
-
     # Utilities
     inputs.nvim-wrapped.packages.${stdenv.hostPlatform.system}.default
     vim
@@ -334,5 +329,4 @@
 
   # The comment
   system.stateVersion = "25.05"; # Did you read the comment?
-
 }

configs/configuration-laptop.nix

@@ -4,9 +4,7 @@
   pkgs,
   inputs,
   ...
-}:
+}: {
-
-{
   networking.hostName = "mobile02"; # Define your hostname.
 
   # Opengl and vulkan
@@ -36,7 +34,7 @@
 
   # Local User
   users.users.user01 = {
-    extraGroups = [ ];
+    extraGroups = [];
     packages = with pkgs; [
       # Ricing
       inputs.way-edges.packages.${stdenv.hostPlatform.system}.way-edges
@@ -48,5 +46,4 @@
   };
 
   programs.steam.enable = true;
-
 }

configs/configuration-pc.nix

@@ -4,9 +4,7 @@
   pkgs,
   inputs,
   ...
-}:
+}: {
-
-{
   networking.hostName = "HACKSTATION";
 
   # Enable nix-ld to run unpatched binaries

flake.lock

@@ -798,11 +798,11 @@
     },
     "nixpkgs_6": {
       "locked": {
-        "lastModified": 1781074563,
+        "lastModified": 1782467914,
-        "narHash": "sha256-md8WlXOlfnIeHeOScMTTHFyf2d6iaTwPl2apR5EQ3P4=",
+        "narHash": "sha256-pGvFkM8N0xEkIIXDe5YYfbEAvHrk4IxBrjB/x8OomhE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca",
+        "rev": "e73de5be04e0eff4190a1432b946d469c794e7b4",
         "type": "github"
       },
       "original": {
@@ -854,11 +854,11 @@
         "nixpkgs": "nixpkgs_6"
       },
       "locked": {
-        "lastModified": 1781453653,
+        "lastModified": 1782650144,
-        "narHash": "sha256-5XhbIAdcoVblquSRVbg5HUnRni96ksMqzGNTEGSb3Cg=",
+        "narHash": "sha256-E6SKjvY6Vz2mRok6ml8Dm4lMgUyfgtwHgwLlo93SLpI=",
         "ref": "refs/heads/main",
-        "rev": "e46d931775275918876fcde65d03e4dcffa45efa",
+        "rev": "45739fc4cf0ba3cdefab6593a0d629b637bb341a",
-        "revCount": 83,
+        "revCount": 88,
         "type": "git",
         "url": "file:///home/user01/.dotfiles/.config/nvim"
       },

flake.nix

@@ -51,42 +51,39 @@
     };
   };
 
-  outputs =
+  outputs = {
-    {
+    self,
-      self,
+    nixpkgs,
-      nixpkgs,
+    ...
-      ...
+  } @ inputs: let
-    }@inputs:
+    system = "x86_64-linux";
-    let
-      system = "x86_64-linux";
 
-      hardwareConfig = import /etc/nixos/hardware-configuration.nix;
+    hardwareConfig = import /etc/nixos/hardware-configuration.nix;
-      common = import ./configs/common.nix;
+    common = import ./configs/common.nix;
 
-      mkSystem =
+    mkSystem = extraModules:
-        extraModules:
+      nixpkgs.lib.nixosSystem {
-        nixpkgs.lib.nixosSystem {
+        inherit system;
-          inherit system;
+        specialArgs = {inherit inputs;};
-          specialArgs = { inherit inputs; };
+        modules =
-          modules = [
+          [
             common
             hardwareConfig
           ]
           ++ extraModules;
-        };
-    in
-    {
-      nixosConfigurations = {
-        mobile02 = mkSystem [ ./configs/configuration-laptop.nix ];
-        hackstation = mkSystem [
-          ./configs/configuration-pc.nix
-          # ./modules/davinci/davinci.nix
-          ./modules/i3/i3.nix
-          inputs.omnisearch.nixosModules.default
-          {
-            services.omnisearch.enable = true;
-          }
-        ];
       };
+  in {
+    nixosConfigurations = {
+      mobile02 = mkSystem [./configs/configuration-laptop.nix];
+      hackstation = mkSystem [
+        ./configs/configuration-pc.nix
+        # ./modules/davinci/davinci.nix
+        ./modules/i3/i3.nix
+        inputs.omnisearch.nixosModules.default
+        {
+          services.omnisearch.enable = true;
+        }
+      ];
     };
+  };
 }

modules/chataigne/flake.nix

@@ -5,78 +5,78 @@
     nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
   };
 
-  outputs =
+  outputs = {
-    { self, nixpkgs }:
+    self,
-    let
+    nixpkgs,
-      system = "x86_64-linux";
+  }: let
-      pkgs = import nixpkgs { inherit system; };
+    system = "x86_64-linux";
+    pkgs = import nixpkgs {inherit system;};
 
-      # The libraries you requested
+    # The libraries you requested
-      deps = with pkgs; [
+    deps = with pkgs; [
-        curlFull
+      curlFull
-        gnutls
+      gnutls
-        libxrandr
+      libxrandr
-        alsa-lib
+      alsa-lib
-        freetype
+      freetype
-        avahi
+      avahi
-        libglvnd
+      libglvnd
-        curl
+      curl
-        SDL2
+      SDL2
-        hidapi
+      hidapi
-        libpulseaudio
+      libpulseaudio
-        lz4
+      lz4
-        openssl
+      openssl
-        libcap
+      libcap
-        libxcrypt
+      libxcrypt
-        libgcrypt
+      libgcrypt
-        libbsd
+      libbsd
-        zlib
+      zlib
-        glib
+      glib
+    ];
+
+    # Wrap the local AppImage file
+    chataigne-bin = pkgs.appimageTools.wrapType2 {
+      pname = "chataigne";
+      version = "1.10.3";
+      # This points to the file in the same directory as flake.nix
+      src = ./Chataigne-linux-x64-1.10.3.AppImage;
+      extraPkgs = pkgs: deps;
+    };
+
+    # Create the Desktop Entry
+    chataigne-desktop = pkgs.makeDesktopItem {
+      name = "chataigne";
+      exec = "chataigne";
+      icon = "chataigne";
+      comment = "Modular machine for art and technology";
+      desktopName = "Chataigne";
+      categories = [
+        "AudioVideo"
+        "Development"
+      ];
+    };
+  in {
+    # packages.${system}.default = chataigne-bin;
+
+    devShells.${system}.default = pkgs.mkShell {
+      # Packages you want available in your shell
+      buildInputs = [
+        chataigne-bin
       ];
 
-      # Wrap the local AppImage file
+      # Environmental variables or shell hooks
-      chataigne-bin = pkgs.appimageTools.wrapType2 {
+      shellHook = ''
-        pname = "chataigne";
+        echo "something"
-        version = "1.10.3";
+      '';
-        # This points to the file in the same directory as flake.nix
-        src = ./Chataigne-linux-x64-1.10.3.AppImage;
-        extraPkgs = pkgs: deps;
-      };
-
-      # Create the Desktop Entry
-      chataigne-desktop = pkgs.makeDesktopItem {
-        name = "chataigne";
-        exec = "chataigne";
-        icon = "chataigne";
-        comment = "Modular machine for art and technology";
-        desktopName = "Chataigne";
-        categories = [
-          "AudioVideo"
-          "Development"
-        ];
-      };
-    in
-    {
-      # packages.${system}.default = chataigne-bin;
-
-      devShells.${system}.default = pkgs.mkShell {
-        # Packages you want available in your shell
-        buildInputs = [
-          chataigne-bin
-        ];
-
-        # Environmental variables or shell hooks
-        shellHook = ''
-          echo "something"
-        '';
-      };
-      # This allows you to run 'nix run' or install it via system config
-      packages.${system}.default = pkgs.symlinkJoin {
-        name = "chataigne";
-        paths = [
-          chataigne-bin
-          chataigne-desktop
-        ];
-      };
     };
+    # This allows you to run 'nix run' or install it via system config
+    packages.${system}.default = pkgs.symlinkJoin {
+      name = "chataigne";
+      paths = [
+        chataigne-bin
+        chataigne-desktop
+      ];
+    };
+  };
 }

modules/i3/i3.nix

@@ -4,8 +4,7 @@
   pkgs,
   inputs,
   ...
-}:
+}: {
-{
   services.libinput.enable = true;
 
   services.displayManager.defaultSession = "hyprland";