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

home-manager/btop.nix

@@ -1,6 +1,5 @@
-let
-  theme = import ../theme.nix;
-in
+{ theme, ... }:
+
 {
   catppuccin.btop = {
     enable = true;

home-manager/cava/default.nix

@@ -1,9 +1,6 @@
 ## Audio visualizer
-{ pkgs, ... }:
+{ pkgs, theme, ... }:
 
-let
-  theme = import ../../theme.nix;
-in
 {
   catppuccin.cava = {
     enable = true;
@@ -20,7 +17,7 @@ in
     genericName = "Audio visualizer";
     terminal = true;
     exec = "${pkgs.cava}/bin/cava";
-    icon = ./cava.png;
+    icon = ./cava.png; # TODO icon not displaying in runner
     categories = [
       "Audio"
       "AudioVideo"

home-manager/cursors.nix

@@ -1,6 +1,5 @@
-let
-  theme = import ../theme.nix;
-in
+{ theme, ... }:
+
 {
   catppuccin.cursors = {
     enable = true;

home-manager/default.nix

@@ -1,10 +1,10 @@
 {
   pkgs,
   inputs,
+  common,
   ...
 }:
 let
-  common = import ../common.nix;
   username = common.username;
   dir = common.dir;
 in
@@ -26,7 +26,7 @@ in
     ./rofi
     ./wlogout
     ./hyprland
-    ./spicetify.nix # TODO env conflict on latest version
+    ./spicetify.nix
     ./yazi
     ./zen
   ];

home-manager/development/git.nix

@@ -17,6 +17,7 @@
         amend = "commit --amend";
         cm = "commit";
         s = "status";
+        p = "push";
       };
 
       signing = {

home-manager/development/zed.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, theme, ... }:
 
 {
   programs.zed-editor = {
@@ -15,7 +15,6 @@
     ];
     userSettings =
       let
-        theme = import ../../theme.nix;
         font = "${theme.nerdFont} Nerd Font";
         fontSize = 14;
       in
@@ -31,7 +30,7 @@
         base_keymap = "JetBrains";
         buffer_font_family = font;
         features = {
-          inline_completion_provider = "zed";
+          edit_completion_provider = "zed";
         };
         icon_theme = "Catppuccin Mocha";
         # icon_theme = { TODO replace icon theme above with below

home-manager/fastfetch.nix

@@ -1,6 +1,7 @@
 {
   programs = {
     fish.shellAliases.fetch = "fastfetch";
+
     fastfetch = {
       enable = true;
       settings = {

home-manager/fish.nix

@@ -1,7 +1,5 @@
-{ pkgs, ... }:
-let
-  theme = import ../theme.nix;
-in
+{ pkgs, theme, ... }:
+
 {
   catppuccin = {
     fish = {
@@ -36,7 +34,7 @@ in
         }
       ];
       shellAliases = {
-        nix-shell = "nix-shell --run fish"; # Start nix-shells using fishcd
+        nix-shell = "nix-shell --run fish"; # Start nix-shells using fish
       };
     };
 

home-manager/gtk.nix

@@ -1,11 +1,11 @@
-let
-  theme = import ../theme.nix;
-in
+{ theme, ... }:
+
 {
-  gtk.enable = true;
   catppuccin.gtk = {
     enable = true;
     flavor = theme.flavor;
     icon.enable = true;
   };
+
+  gtk.enable = true;
 }

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;

home-manager/kitty.nix

@@ -1,7 +1,5 @@
-let
-  common = import ../common.nix;
-  theme = import ../theme.nix;
-in
+{ common, theme, ... }:
+
 {
   catppuccin.kitty = {
     enable = true;

home-manager/mpv.nix

@@ -1,12 +1,10 @@
+{ theme, ... }:
+
 {
-  catppuccin.mpv =
-    let
-      theme = import ../theme.nix;
-    in
-    {
-      enable = true;
-      flavor = theme.flavor;
-    };
+  catppuccin.mpv = {
+    enable = true;
+    flavor = theme.flavor;
+  };
 
   programs = {
     fish.shellAliases.mpvl = "mpv --profile=loop";

home-manager/rofi/default.nix

@@ -15,6 +15,7 @@
     ".config/rofimoji.rc".source = ./rofimoji.rc;
   };
 
+  # TODO use catppuccin package
   # TODO Use programs.rofi. Theme is not applied correctly
   #  programs.rofi = {
   #    enable = true;

home-manager/secretsLoader.nix

@@ -1,6 +0,0 @@
-lib:
-
-{
-  loadSecret =
-    filePath: lib.strings.trim (lib.strings.removeSuffix "\n" (builtins.readFile filePath));
-}

home-manager/spicetify.nix

@@ -2,6 +2,7 @@
   pkgs,
   inputs,
   lib,
+  theme,
   ...
 }:
 
@@ -10,7 +11,6 @@
   programs.spicetify =
     let
       spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system};
-      theme = import ../theme.nix;
     in
     {
       enable = true;

home-manager/yazi/default.nix

@@ -1,9 +1,9 @@
-{ lib, ... }:
+{ lib, theme, ... }:
 let
-  theme = import ../../theme.nix;
   batTheme = ".config/yazi/catppuccin-${theme.flavor}.tmTheme";
 in
 {
+  # TODO use catppuccin theme
   home.file.${batTheme}.source = ./catppuccin-mocha.tmTheme;
 
   programs.yazi = {