feat(hypr): back to hyprland, and fix some clib importing stuffs

hosts/default.nix

@@ -4,111 +4,116 @@
   homeImports,
   self,
   ...
-}: {
-  flake.nixosConfigurations = let
-    # clib = import ../lib inputs.nixpkgs.lib;
-    userConfig = "${self}/home";
-    systemConfig = "${self}/system";
-    hostConfig = "${self}/hosts";
+}:
+{
+  flake.nixosConfigurations =
+    let
+      clib = import ../lib inputs.nixpkgs.lib;
+      userConfig = "${self}/home";
+      systemConfig = "${self}/system";
+      hostConfig = "${self}/hosts";
 
-    cnstConfig = "${self}/users/cnst";
-    toothpickConfig = "${self}/users/toothpick";
+      cnstConfig = "${self}/users/cnst";
+      toothpickConfig = "${self}/users/toothpick";
 
-    umodPath = "${self}/modules/home";
-    smodPath = "${self}/modules/system";
+      umodPath = "${self}/modules/home";
+      smodPath = "${self}/modules/system";
 
-    inherit (inputs.nixpkgs.lib) nixosSystem;
-    inherit (self) outputs;
+      inherit (inputs.nixpkgs.lib) nixosSystem;
+      inherit (self) outputs;
 
-    specialArgs = {
-      inherit
-        # clib
-        inputs
-        outputs
-        self
-        userConfig
-        systemConfig
-        hostConfig
-        cnstConfig
-        toothpickConfig
-        umodPath
-        smodPath
-        ;
+      specialArgs = {
+        inherit
+          inputs
+          outputs
+          self
+          userConfig
+          systemConfig
+          hostConfig
+          cnstConfig
+          toothpickConfig
+          umodPath
+          smodPath
+          ;
+      };
+      specialArgsWithClib = specialArgs // {
+        inherit clib;
+      };
+    in
+    {
+      kima = nixosSystem {
+        specialArgs = specialArgsWithClib;
+        modules = [
+          ./kima
+          "${self}/nix"
+          {
+            home-manager = {
+              users.cnst.imports = homeImports."cnst@kima";
+              extraSpecialArgs = specialArgsWithClib;
+            };
+          }
+          self.nixosModules.nixos
+          self.nixosModules.settings
+          inputs.chaotic.nixosModules.default
+          inputs.agenix.nixosModules.default
+        ];
+      };
+      bunk = nixosSystem {
+        specialArgs = specialArgsWithClib;
+        modules = [
+          ./bunk
+          "${self}/nix"
+          {
+            home-manager = {
+              users.cnst.imports = homeImports."cnst@bunk";
+              extraSpecialArgs = specialArgsWithClib;
+            };
+          }
+          self.nixosModules.nixos
+          self.nixosModules.settings
+          inputs.chaotic.nixosModules.default
+          inputs.agenix.nixosModules.default
+        ];
+      };
+      sobotka = nixosSystem {
+        inherit specialArgs;
+        modules = [
+          ./sobotka
+          "${self}/nix"
+          self.nixosModules.nixos
+          self.nixosModules.settings
+          self.nixosModules.server
+          inputs.agenix.nixosModules.default
+          inputs.authentik.nixosModules.default
+        ];
+      };
+      ziggy = nixosSystem {
+        inherit specialArgs;
+        modules = [
+          ./ziggy
+          "${self}/nix"
+          self.nixosModules.nixos
+          self.nixosModules.settings
+          self.nixosModules.server
+          inputs.agenix.nixosModules.default
+        ];
+      };
+      toothpc = nixosSystem {
+        specialArgs = specialArgsWithClib;
+        modules = [
+          ./toothpc
+          "${self}/nix"
+          {
+            home-manager = {
+              users.toothpick.imports = homeImports."toothpick@toothpc";
+              extraSpecialArgs = specialArgsWithClib;
+            };
+          }
+          self.nixosModules.nixos
+          self.nixosModules.settings
+          inputs.chaotic.nixosModules.default
+          inputs.agenix.nixosModules.default
+        ];
+      };
     };
-  in {
-    kima = nixosSystem {
-      inherit specialArgs;
-      modules = [
-        ./kima
-        "${self}/nix"
-        {
-          home-manager = {
-            users.cnst.imports = homeImports."cnst@kima";
-            extraSpecialArgs = specialArgs;
-          };
-        }
-        self.nixosModules.nixos
-        self.nixosModules.settings
-        inputs.chaotic.nixosModules.default
-        inputs.agenix.nixosModules.default
-      ];
-    };
-    bunk = nixosSystem {
-      inherit specialArgs;
-      modules = [
-        ./bunk
-        "${self}/nix"
-        {
-          home-manager = {
-            users.cnst.imports = homeImports."cnst@bunk";
-            extraSpecialArgs = specialArgs;
-          };
-        }
-        self.nixosModules.nixos
-        self.nixosModules.settings
-        inputs.chaotic.nixosModules.default
-        inputs.agenix.nixosModules.default
-      ];
-    };
-    sobotka = nixosSystem {
-      inherit specialArgs;
-      modules = [
-        ./sobotka
-        "${self}/nix"
-        self.nixosModules.nixos
-        self.nixosModules.settings
-        self.nixosModules.server
-        inputs.agenix.nixosModules.default
-        inputs.authentik.nixosModules.default
-      ];
-    };
-    ziggy = nixosSystem {
-      inherit specialArgs;
-      modules = [
-        ./ziggy
-        "${self}/nix"
-        self.nixosModules.nixos
-        self.nixosModules.settings
-        self.nixosModules.server
-        inputs.agenix.nixosModules.default
-      ];
-    };
-    toothpc = nixosSystem {
-      inherit specialArgs;
-      modules = [
-        ./toothpc
-        "${self}/nix"
-        {
-          home-manager = {
-            users.toothpick.imports = homeImports."toothpick@toothpc";
-            extraSpecialArgs = specialArgs;
-          };
-        }
-        self.nixosModules.nixos
-        self.nixosModules.settings
-        inputs.chaotic.nixosModules.default
-        inputs.agenix.nixosModules.default
-      ];
-    };
-  };
 }

hosts/kima/modules.nix

@@ -82,8 +82,8 @@
         enable = false;
       };
       hyprland = {
-        enable = false;
-        withUWSM = false;
+        enable = true;
+        withUWSM = true;
       };
       inkscape = {
         enable = false;
@@ -98,7 +98,7 @@
         enable = true;
       };
       niri = {
-        enable = true;
+        enable = false;
       };
       pkgs = {
         enable = true;