🚧 hyprpanel

elythh · Oct 15, 2024 · 8ea04f9 · 8ea04f9
1 parent 22657e8
commit 8ea04f9
Show file tree

Hide file tree

Showing 10 changed files with 628 additions and 147 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -61,6 +61,11 @@
     # Hyprpaper, wallpaper manager for hyprland
     hyprpaper.url = "github:hyprwm/hyprpaper";
 
+    # hyprpanel
+    hyprpanel.url = "github:Jas-SinghFSU/HyprPanel";
+
+    apple-fonts.url = "github:Lyndeno/apple-fonts.nix";
+
     # Spicetify, a spotify theming tool
     spicetify.url = "github:Gerg-L/spicetify-nix";
     spicetify.inputs.nixpkgs.follows = "nixpkgs";

diff --git a/home/gwen/grovetender.nix b/home/gwen/grovetender.nix
@@ -27,7 +27,7 @@
       hyprlock.enable = true;
     };
     services = {
-      ags.enable = true;
+      ags.enable = false;
       cliphist.enable = true;
       hypridle.enable = true;
       hyprpaper.enable = true;

diff --git a/modules/home/core/overlays.nix b/modules/home/core/overlays.nix
@@ -2,16 +2,7 @@
 {
   nixpkgs.overlays = [
     inputs.nur.overlay
-    # (_: prev: {
-    #   # Fix slack screen sharing following: https://github.com/flathub/com.slack.Slack/issues/101#issuecomment-1807073763
-    #   slack = prev.slack.overrideAttrs (previousAttrs: {
-    #     installPhase =
-    #       previousAttrs.installPhase
-    #       + ''
-    #         sed -i'.backup' -e 's/,"WebRTCPipeWireCapturer"/,"LebRTCPipeWireCapturer"/' $out/lib/slack/resources/app.asar
-    #       '';
-    #   });
-    # })
     (_: prev: { zjstatus = inputs.zjstatus.packages.${prev.system}.default; })
+    inputs.hyprpanel.overlay
   ];
 }
diff --git a/modules/home/core/style/stylix.nix b/modules/home/core/style/stylix.nix
@@ -1,44 +1,48 @@
-{ pkgs, config, ... }:
+{
+  pkgs,
+  inputs,
+  config,
+  ...
+}:
 {
   stylix = {
     enable = true;
+
+    # Edited catppuccin
     base16Scheme = ./${config.theme}.yaml;
-    image = ../../../../home/shared/walls/${config.theme}.jpg;
-    polarity = "dark";
+
     cursor = {
-      name = "Bibata-Modern-Ice";
       package = pkgs.bibata-cursors;
-      size = 20;
-    };
-    opacity = {
-      popups = 1.0;
-    };
-
-    targets = {
-      nixvim.enable = true;
-      zellij.enable = true;
-      lazygit.enable = false;
-      hyprland.enable = false;
-      firefox.enable = false;
-      fzf.enable = false;
-      rofi.enable = true;
-      waybar.enable = false;
-      gtk.enable = true;
-      gtk.extraCss = with config.lib.stylix.colors; ''
-        @define-color accent_color #${base0D};
-        @define-color accent_bg_color #${base0D};
-      '';
+      name = "Bibata-Modern-Ice";
+      size = 24;
     };
 
     fonts = {
       monospace = {
-        name = "Iosevka Nerd Font";
-        package = pkgs.nerdfonts.override { fonts = [ "Iosevka" ]; };
+        package = pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; };
+        name = "JetBrains Mono Nerd Font";
       };
       sansSerif = {
-        name = "IBM Plex Sans";
-        package = pkgs.ibm-plex;
+        package = inputs.apple-fonts.packages.${pkgs.system}.sf-pro-nerd;
+        name = "SFProDisplay Nerd Font";
+      };
+      serif = {
+        package = inputs.apple-fonts.packages.${pkgs.system}.sf-pro-nerd;
+        name = "SFProDisplay Nerd Font";
+      };
+      emoji = {
+        package = pkgs.noto-fonts-emoji;
+        name = "Noto Color Emoji";
+      };
+      sizes = {
+        applications = 13;
+        desktop = 13;
+        popups = 13;
+        terminal = 13;
       };
     };
+
+    polarity = "dark";
+    image = ../../../../home/shared/walls/${config.theme}.jpg;
   };
 }
diff --git a/modules/home/opt/services/hyprpaper/default.nix b/modules/home/opt/services/hyprpaper/default.nix
@@ -1,7 +1,5 @@
 {
   lib,
-  inputs,
-  pkgs,
   config,
   ...
 }:
@@ -18,19 +16,5 @@ in
       preload = ${config.wallpaper}
       wallpaper = , ${config.wallpaper}
     '';
-
-    systemd.user.services.hyprpaper = {
-      Unit = {
-        Description = "Hyprland wallpaper daemon";
-        PartOf = [ "graphical-session.target" ];
-      };
-
-      Service = {
-        ExecStart = "${lib.getExe inputs.hyprpaper.packages.${pkgs.system}.default}";
-        Restart = "on-failure";
-      };
-
-      Install.WantedBy = [ "graphical-session.target" ];
-    };
   };
 }
diff --git a/modules/home/opt/wayland/default.nix b/modules/home/opt/wayland/default.nix
@@ -1 +1,6 @@
-{ imports = [ ./hyprland ]; }
+{
+  imports = [
+    ./hyprland
+    ./hyprpanel
+  ];
+}
diff --git a/modules/home/opt/wayland/hyprland/config/options.nix b/modules/home/opt/wayland/hyprland/config/options.nix
@@ -34,7 +34,7 @@
       rounding = "6";
       drop_shadow = "true";
       shadow_range = "16";
-      "col.shadow" = "rgba(050505ff)";
+      # "col.shadow" = "rgba(050505ff)";
       shadow_render_power = "12";
       inactive_opacity = "0.94";
 
@@ -64,8 +64,8 @@
       border_size = "0";
       layout = "dwindle";
       resize_on_border = "true";
-      "col.active_border" = "rgba(88888888)";
-      "col.inactive_border" = "rgba(00000088)";
+      # "col.active_border" = "rgba(88888888)";
+      # "col.inactive_border" = "rgba(00000088)";
 
       allow_tearing = true;
     };