Merged sketchybar config into declaritive Nix Repo

home/default.nix

@@ -1,34 +1,20 @@
-{
-  config,
-  primaryUser,
-  inputs,
-  self,
-  pkgs,
-  lib,
-  ...
-}:
-{
+{ config, primaryUser, inputs, self, lib, isDarwin, ... }: {
   imports = [
-
     ./packages.nix
     ./git.nix
     ./shell.nix
-
+    ./xdg.nix
     ./neovim
     ./python.nix
-
     ./nixcord.nix
-
     ./spicetify.nix
-
     ./floorp.nix
     ./obsidian.nix
-
-    ./desktop
-    ./xdg.nix
     inputs.sops-nix.homeManagerModules.sops
+  ] ++ lib.optionals (!isDarwin) [ ./desktop ] ++ lib.optionals isDarwin [
+    ./desktop/sketchybar
+    inputs.catppuccin.homeModules.catppuccin
   ];
-
   nixpkgs.config.allowUnfree = true;
 
   catppuccin = {
@@ -40,14 +26,14 @@
     fzf.enable = true;
     bat.enable = true;
 
-    element-desktop = pkgs.lib.mkIf (!pkgs.stdenv.isDarwin) {
+    element-desktop = lib.mkIf (!isDarwin) {
       enable = true;
       accent = "green";
     };
 
     btop.enable = true;
 
-    cava = pkgs.lib.mkIf (!pkgs.stdenv.isDarwin) {
+    cava = lib.mkIf (!isDarwin) {
       enable = true;
       transparent = true;
     };
@@ -57,31 +43,31 @@
     yazi.enable = true;
     fish.enable = true;
 
-    cursors = pkgs.lib.mkIf (!pkgs.stdenv.isDarwin) {
+    cursors = lib.mkIf (!isDarwin) {
       enable = true;
       accent = "sapphire";
     };
 
-    hyprland = pkgs.lib.mkIf (!pkgs.stdenv.isDarwin) { enable = true; };
+    hyprland = lib.mkIf (!isDarwin) { enable = true; };
 
-    hyprlock = pkgs.lib.mkIf (!pkgs.stdenv.isDarwin) {
+    hyprlock = lib.mkIf (!isDarwin) {
       enable = true;
       useDefaultConfig = false;
     };
 
-    waybar = pkgs.lib.mkIf (!pkgs.stdenv.isDarwin) {
+    waybar = lib.mkIf (!isDarwin) {
       enable = true;
       mode = "createLink";
     };
 
-    mako.enable = pkgs.lib.mkIf (!pkgs.stdenv.isDarwin) true;
-    mpv.enable = pkgs.lib.mkIf (!pkgs.stdenv.isDarwin) true;
-    newsboat.enable = pkgs.lib.mkIf (!pkgs.stdenv.isDarwin) true;
-    mangohud.enable = pkgs.lib.mkIf (!pkgs.stdenv.isDarwin) true;
+    mako.enable = lib.mkIf (!isDarwin) true;
+    mpv.enable = lib.mkIf (!isDarwin) true;
+    newsboat.enable = lib.mkIf (!isDarwin) true;
+    mangohud.enable = lib.mkIf (!isDarwin) true;
 
-    gtk.icon.enable = pkgs.lib.mkIf (!pkgs.stdenv.isDarwin) true;
+    gtk.icon.enable = lib.mkIf (!isDarwin) true;
 
-    kvantum = pkgs.lib.mkIf (!pkgs.stdenv.isDarwin) {
+    kvantum = lib.mkIf (!isDarwin) {
       enable = true;
       apply = true;
     };
@@ -90,7 +76,7 @@
   home = {
     username = primaryUser;
     stateVersion = "26.05";
-    sessionVariables = lib.mkIf (!pkgs.stdenv.isDarwin) {
+    sessionVariables = lib.mkIf (!isDarwin) {
       GROQ_API_KEY = config.sops.secrets.GROQ_API_KEY.path;
       OPENWEATHER_API_KEY = config.sops.secrets.OPENWEATHER_API_KEY.path;
     };
@@ -111,18 +97,19 @@
   sops = {
     defaultSopsFile = ../secrets/secrets.yaml;
     defaultSopsFormat = "yaml";
-    age.keyFile =
-      if pkgs.stdenv.isDarwin then
-        "/Users/${primaryUser}/.config/nix/secrets/keys.txt"
-      else
-        "/home/${primaryUser}/.config/nix/secrets/keys.txt";
+    age.keyFile = if isDarwin then
+      "/Users/${primaryUser}/.config/nix/secrets/keys.txt"
+    else
+      "/home/${primaryUser}/.config/nix/secrets/keys.txt";
 
     secrets = {
       GROQ_API_KEY = { };
       OPENWEATHER_API_KEY = { };
       ssh_private_key = {
-        path =
-          if pkgs.stdenv.isDarwin then "/Users/${primaryUser}/.ssh/ssh" else "/home/${primaryUser}/.ssh/ssh";
+        path = if isDarwin then
+          "/Users/${primaryUser}/.ssh/ssh"
+        else
+          "/home/${primaryUser}/.ssh/ssh";
         mode = "0600";
       };
     };