wip

number5 · Jun 3, 2024 · b0ef930 · b0ef930
1 parent 03301cf
commit b0ef930
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 8 deletions.
diff --git a/home/modules/swappy.nix b/home/modules/swappy.nix
@@ -9,7 +9,7 @@
 }: {
   options.programs.swappy.enable = lib.mkEnableOption "swappy";
 
-  config.hm.home.packages = lib.mkIf config.programs.swappy.enable [
+  config.home.packages = lib.mkIf config.programs.swappy.enable [
     (pkgs.swappy.overrideAttrs (old: {
       patches = [
         (pkgs.fetchpatch

diff --git a/home/modules/wayland/eww/default.nix b/home/modules/wayland/eww/default.nix
@@ -1,9 +1,8 @@
-{
+{self, ...} @inputs: {
   inputs,
   pkgs,
   config,
   lib,
-  hmConfig,
   ...
 }: {
   options.programs.eww = {
@@ -18,7 +17,6 @@
   };
 
   config = lib.mkIf config.programs.eww.enable {
-    hm = {
       home.packages = with pkgs; [
         (inputs.eww.packages.${pkgs.system}.eww-wayland.overrideAttrs (old: {
           nativeBuildInputs = old.nativeBuildInputs ++ [pkgs.wrapGAppsHook];
@@ -72,6 +70,5 @@
           };
         })
         files;
-    };
   };
 }
diff --git a/home/modules/wayland/hyprland.nix b/home/modules/wayland/hyprland.nix
@@ -135,14 +135,14 @@ in {
       xdg.portal.wlr.enable = lib.mkForce false;
     };
 
-    hm = let
+    home = let
       cursor = {
         package = pkgs.catppuccin-cursors.macchiatoPink;
         name = "Catppuccin-Macchiato-Pink-Cursors";
         size = 24;
       };
     in {
-      home.packages = with pkgs;
+      packages = with pkgs;
       with inputs.hyprcontrib.packages.${pkgs.system};
       with inputs.shadower.packages.${pkgs.system}; [
         pulseaudio

diff --git a/parts/home_configs.nix b/parts/home_configs.nix
@@ -99,6 +99,7 @@ in {
               {home = {inherit (config) username homeDirectory;};}
               {systemd.user.startServices = "legacy";}
               inputs.sops-nix.homeManagerModules.sops
+              inputs.catppuccin.homeManagerModules.catppuccin
             ]
             ++ config.modules
             ++ builtins.attrValues self.homeModules

diff --git a/parts/system_configs.nix b/parts/system_configs.nix
@@ -94,7 +94,6 @@ in {
               {documentation.man.generateCaches = true;}
               inputs.disko.nixosModules.disko
               inputs.sops-nix.nixosModules.sops
-              inputs.catppuccin.nixosModules.catppuccin
             ]
             ++ config.modules
             ++ builtins.attrValues {