♻️ Replace imports with function argument, hyprpanel does not follow nixpkgs, git push alias

home-manager/hyprland/binds.nix

@@ -1,9 +1,8 @@
+{ common, ... }:
 let
-  common = import ../../common.nix;
   app = common.default;
 in
 {
-  # TODO binds to move focused window
   wayland.windowManager.hyprland.settings = {
     "$mainMod" = "SUPER";
     "$shiftMod" = "$mainMod SHIFT";

home-manager/hyprland/hyprlock/default.nix

@@ -1,8 +1,8 @@
-{ lib, ... }:
-let
-  theme = import ../../../theme.nix;
-in
+{ lib, theme, ... }:
+
 {
+  # TODO use catppuccin package
+
   programs.hyprlock = {
     enable = true;
     settings = {

home-manager/hyprland/hyprpanel/default.nix

@@ -1,14 +1,12 @@
 {
   pkgs,
   inputs,
+  common,
+  theme,
   lib,
   ...
 }:
-let
-  common = import ../../../common.nix;
-  theme = import ../../../theme.nix;
-  loader = import ../../secretsLoader.nix lib;
-in
+
 {
   imports = [ inputs.hyprpanel.homeManagerModules.hyprpanel ];
 
@@ -81,7 +79,7 @@ in
           weather = {
             unit = "metric";
             location = "Bergen, Norway";
-            key = loader.loadSecret ../../secrets/weather-api-key;
+            key = common.loadSecret lib ../../secrets/weather-api-key;
           };
         };
 
@@ -92,7 +90,7 @@ in
             shortcut1 = {
               command = common.default.browser;
               icon = ""; # TODO replace with Zen icon
-              tooltip = "Zen";
+              tooltip = "Zen Browser";
             };
             shortcut2 = {
               command = "spotify";

home-manager/hyprland/hyprpaper.nix

@@ -1,8 +1,6 @@
 # Wallpapers
-{ pkgs, ... }:
-let
-  common = import ../../common.nix;
-in
+{ pkgs, common, ... }:
+
 {
   home.packages = with pkgs; [
     hyprpaper

home-manager/hyprland/hyprshot.nix

@@ -1,6 +1,5 @@
-let
-  common = import ../../common.nix;
-in
+{ common, ... }:
+
 {
   wayland.windowManager.hyprland.settings = {
     "$mainMod" = "SUPER";

home-manager/hyprland/settings.nix

@@ -1,7 +1,10 @@
-{ lib, ... }:
+{
+  lib,
+  common,
+  theme,
+  ...
+}:
 let
-  common = import ../../common.nix;
-  theme = import ../../theme.nix;
   app = common.default;
 in
 {

home-manager/hyprland/swaync/default.nix

@@ -1,7 +1,5 @@
-{ lib, ... }:
-let
-  theme = import ../../../theme.nix;
-in
+{ lib, theme, ... }:
+
 {
   services.swaync = {
     enable = false;