feat(flake): add i686-linux support and improve code structure

- Add i686-linux to supported systems - Reorganize flake inputs and structure - Simplify parameter naming in applications and applets modules
HeitorAugustoLN · Jan 26, 2025 · dcc24e2 · dcc24e2
1 parent 324b8d7
commit dcc24e2
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 21 deletions.
diff --git a/flake.nix b/flake.nix
@@ -6,33 +6,32 @@
       url = "github:hercules-ci/flake-parts";
       inputs.nixpkgs-lib.follows = "nixpkgs";
     };
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
   };
 
   outputs =
     inputs:
     inputs.flake-parts.lib.mkFlake { inherit inputs; } {
       systems = [
         "aarch64-linux"
+        "i686-linux"
         "x86_64-linux"
       ];
 
-      flake = {
-        homeManagerModules = {
-          default = inputs.self.homeManagerModules.cosmic-manager;
-          cosmic-manager = ./modules;
-        };
+      flake.homeManagerModules = {
+        default = inputs.self.homeManagerModules.cosmic-manager;
+        cosmic-manager = ./modules;
       };
 
       perSystem =
         { pkgs, self', ... }:
         let
-          inherit (pkgs) lib;
-
           version = inputs.self.shortRev or inputs.self.dirtyShortRev or "unknown";
 
           mkOptionsDoc = pkgs.callPackage ./docs/options.nix { };
@@ -60,13 +59,17 @@
 
             site =
               let
-                src = lib.fileset.toSource {
-                  root = ./.;
-                  fileset = lib.fileset.unions [
-                    ./docs/book.toml
-                    ./docs/src
-                  ];
-                };
+                src =
+                  let
+                    inherit (pkgs) lib;
+                  in
+                  lib.fileset.toSource {
+                    root = ./.;
+                    fileset = lib.fileset.unions [
+                      ./docs/book.toml
+                      ./docs/src
+                    ];
+                  };
               in
               mkSite {
                 pname = "cosmic-manager-website";

diff --git a/lib/applets.nix b/lib/applets.nix
@@ -4,7 +4,7 @@
     {
       configurationVersion,
       description ? null,
-      extraConfig ? _cfg: { },
+      extraConfig ? _: { },
       extraOptions ? { },
       hasSettings ? true,
       identifier,

diff --git a/lib/applications.nix b/lib/applications.nix
@@ -4,7 +4,7 @@
     {
       configurationVersion,
       description ? null,
-      extraConfig ? _cfg: { },
+      extraConfig ? _: { },
       extraOptions ? { },
       hasSettings ? true,
       identifier,

diff --git a/lib/extend-lib.nix b/lib/extend-lib.nix
@@ -1,10 +1,7 @@
 { lib, ... }:
 lib.extend (
   final: prev: {
-    cosmic = import ./. {
-      lib = final;
-    };
-
+    cosmic = import ./. { lib = final; };
     types = prev.types // import ./types.nix { lib = final; };
   }
 )