From 41f86baeadef464615a244ececdde62022a2b0d2 Mon Sep 17 00:00:00 2001
From: nomadics9 <binaskar9@gmail.com>
Date: Tue, 8 Oct 2024 23:02:31 +0300
Subject: [PATCH] fixes + dotfiles

---
 flake.lock                        |  8 ++++----
 home/features/desktop/wayland.nix | 19 +++++--------------
 home/nomad/dotfiles/default.nix   | 17 +++++++++--------
 3 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/flake.lock b/flake.lock
index ec4bd99..7231859 100644
--- a/flake.lock
+++ b/flake.lock
@@ -3,11 +3,11 @@
     "dotfiles": {
       "flake": false,
       "locked": {
-        "lastModified": 1728232635,
-        "narHash": "sha256-8c6BzMZYiCLQi4hjSGATAykleEyAbDOm6AVNLNuWXEc=",
+        "lastModified": 1728417457,
+        "narHash": "sha256-EIRJXszg7iXXnxgoUzcUAmG2yytk3rtROl8jWQqFvWE=",
         "ref": "refs/heads/main",
-        "rev": "04b816c129a511d5090c3088ee5fdc718c198b7a",
-        "revCount": 6,
+        "rev": "787d77b7de9949a5c312ee0ad9b812e83cb96768",
+        "revCount": 9,
         "type": "git",
         "url": "https://github.com/nomadics9/dotfiles.git"
       },
diff --git a/home/features/desktop/wayland.nix b/home/features/desktop/wayland.nix
index 3c43662..245f053 100644
--- a/home/features/desktop/wayland.nix
+++ b/home/features/desktop/wayland.nix
@@ -19,7 +19,7 @@ in
           layer = "top";
           modules-left = [ "custom/launcher" "cpu" "memory" "custom/weather" "hyprland/workspaces" ];
           modules-center = [ "mpris" ];
-          modules-right = [ "network" "pulseaudio" "backlight" "battery" "clock" "tray" "hyprland/language" "custom/wallpaper" "custom/power-menu" ];
+          modules-right = [ "network" "pulseaudio" "backlight" "battery" "clock" "tray" "hyprland/language" "custom/wallpaper" "custom/refresh-rate" ];
 
           "hyprland/workspaces" = {
             format = "{name}";
@@ -164,16 +164,7 @@ in
             };
           };
 
-          "custom/spotify" = {
-            exec = "nix-shell ~/.config/waybar/scripts/mediaplayer.py --player youtube-music";
-            format = " {}";
-            return-type = "json";
-            on-click = "playerctl play-pause";
-            on-double-click-right = "playerctl next";
-            on-scroll-down = "playerctl previous";
-          };
-
-          "custom/power-menu" = {
+          "custom/refresh-rate" = {
             format = "{percentage}Hz";
             on-click = "~/.config/hypr/scripts/screenHz.sh";
             return-type = "json";
@@ -189,7 +180,7 @@ in
 
           "custom/wallpaper" = {
             format = "󰸉";
-            on-click = "bash ~/.config/waybar/scripts/changewallpaper.sh";
+            on-click = "bash ~/.config/hypr/scripts/changewallpaper.sh";
           };
         };
       };
@@ -449,7 +440,7 @@ in
             margin-bottom: 7px;
           }
 
-          #custom-power-menu {
+          #custom-refresh-rate {
             color: #8a909e;
             margin-right: 12px;
             border-radius: 8px;
@@ -465,7 +456,7 @@ in
           }
           #custom-wallpaper,
           #language,
-          #custom-power-menu {
+          #custom-refresh-rate {
             background-color: #252733;
             padding: 0em 2em;
 
diff --git a/home/nomad/dotfiles/default.nix b/home/nomad/dotfiles/default.nix
index 9810a18..19296e9 100644
--- a/home/nomad/dotfiles/default.nix
+++ b/home/nomad/dotfiles/default.nix
@@ -1,4 +1,4 @@
-{ inputs, ... }: {
+{ inputs, pkgs, ... }: {
   imports = [
     ./bat.nix
     ./dunst.nix
@@ -14,13 +14,14 @@
     recursive = true;
   };
 
-  home.file.".config/hypr/" = {
-    source = "${inputs.dotfiles}/hypr/hyprlock/Style-2";
-    recursive = true;
-  };
-
-  home.file.".config/hypr/" = {
-    source = "${inputs.dotfiles}/hypr/hyprpaper.conf";
+  home.file.".config/hypr" = {
+    source = pkgs.symlinkJoin {
+      name = "hypr-config";
+      paths = [
+        "${inputs.dotfiles}/hypr/hyprlock/Style-2"
+        "${inputs.dotfiles}/hypr/hyprpaper"
+      ];
+    };
     recursive = true;
   };