nix flake check passed

flake.nix

@@ -67,9 +67,21 @@
 
     catppuccin.url = "github:catppuccin/nix";
 
-    matugen = {
-      url = "github:InioX/matugen/module";
-      inputs.nixpkgs.follows = "nixpkgs";
+    hyprland-contrib = {
+      url = "github:hyprwm/contrib";
+      inputs.nixpkgs.follows = "hyprland/nixpkgs";
+    };
+
+    hyprland-plugins = {
+      url = "github:hyprwm/hyprland-plugins";
+      inputs.hyprland.follows = "hyprland";
+    };
+
+    hyprlock = {
+      url = "github:hyprwm/hyprlock";
+      inputs.hyprlang.follows = "hyprland/hyprlang";
+      inputs.nixpkgs.follows = "hyprland/nixpkgs";
+      inputs.systems.follows = "hyprland/systems";
     };
 
     dotzsh.url = "github:number5/dotzsh";
@@ -80,6 +92,12 @@
     parts.lib.mkFlake {inherit inputs;} {
       systems = ["x86_64-linux" "aarch64-darwin"];
 
+      perSystem = { config, self', inputs', pkgs, system, ... }: {
+        # Per-system attributes can be defined here. The self' and inputs'
+        # module parameters provide easy access to attributes of the same
+        # system.
+      };
+
       imports = [
         ./parts/auxiliary.nix
         ./parts/home_configs.nix

home/configurations/bruce_at_chestnut.nix

@@ -11,6 +11,7 @@
 
   imports = [
     ./chestnut_config.nix
+    ./catppuccin.nix
   ];
 
   config = {

home/configurations/catppuccin.nix

@@ -0,0 +1,8 @@
+{...} : {
+  catppuccin.flavor = "mocha";
+  gtk.catppuccin.enable = true;
+  programs.bat.catppuccin.enable = true;
+  programs.starship.catppuccin.enable = true;
+  services.polybar.catppuccin.enable = true;
+  wayland.windowManager.hyprland.catppuccin.enable = true;
+}

home/modules/home.nix

@@ -1,34 +1,31 @@
 {
-  unstable,
   self,
+  hyprland-contrib,
   ...
 }: {
   config,
   pkgs,
   lib,
   ...
-}: let
-  self' = self.packages.${pkgs.system};
-in {
+}: {
   _file = ./default.nix;
 
   imports = [
     ./starship.nix
   ];
 
+
   home = let
         cursor = {
           package = pkgs.catppuccin-cursors.macchiatoTeal;
           name = "catppuccin-macchiato-teal-cursors";
           size = 24;
         };
       in {
-    packages = let
-      p = pkgs;
-      s = self';
-    in [
-      p.exercism
-      p.lefthook
+    packages = [
+      pkgs.exercism
+      pkgs.lefthook
+      hyprland-contrib.packages.${pkgs.system}.grimblast
     ];
 
 

home/modules/wayland/hyprland/default.nix

@@ -9,10 +9,6 @@ _: {
     ./settings.nix
   ];
 
-  home.packages = [
-    inputs.hyprland-contrib.packages.${pkgs.system}.grimblast
-  ];
-
   # enable hyprland
   wayland.windowManager.hyprland = {
     enable = true;

home/modules/wayland/hyprland/settings.nix

@@ -1,6 +1,4 @@
 {config, ...}: let
-  variant = "dark";
-  c = config.programs.matugen.theme.colors.colors.${variant};
   pointer = config.home.pointerCursor;
 in {
   wayland.windowManager.hyprland.settings = {
@@ -63,19 +61,8 @@ in {
       ];
     };
 
-    group = {
-      groupbar = {
-        font_size = 10;
-        gradients = false;
-        text_color = "rgb(${c.primary})";
-      };
-
-      "col.border_active" = "rgba(${c.primary_container}88);";
-      "col.border_inactive" = "rgba(${c.on_primary_container}88)";
-    };
-
     input = {
-      kb_layout = "ro";
+      kb_layout = "us";
 
       # focus change on cursor move
       follow_mouse = 1;
@@ -84,7 +71,7 @@ in {
     };
 
     dwindle = {
-      # keep floating dimentions while tiling
+      # keep floating dimensions while tiling
       pseudotile = true;
       preserve_split = true;
     };