From d258257f5e349af78816d08595a4349e8bb9bca0 Mon Sep 17 00:00:00 2001
From: Guanran Wang <guanran928@outlook.com>
Date: Fri, 2 Feb 2024 20:49:19 +0800
Subject: [PATCH] nixos: drop scripts

---
 home/applications/i3status-rust/default.nix        |  1 +
 home/applications/sway/default.nix                 | 12 +++++-------
 .../scripts/{bin => _bin}/wrapped-brightnessctl    |  0
 .../home/scripts/{bin => _bin}/wrapped-mpvpaper    |  0
 .../home/scripts/{bin => _bin}/wrapped-pamixer     |  0
 .../home/scripts/{bin => _bin}/wrapped-swww        |  0
 .../common/graphical/home/scripts/default.nix      | 14 +++++++-------
 7 files changed, 13 insertions(+), 14 deletions(-)
 rename nixos/profiles/common/graphical/home/scripts/{bin => _bin}/wrapped-brightnessctl (100%)
 rename nixos/profiles/common/graphical/home/scripts/{bin => _bin}/wrapped-mpvpaper (100%)
 rename nixos/profiles/common/graphical/home/scripts/{bin => _bin}/wrapped-pamixer (100%)
 rename nixos/profiles/common/graphical/home/scripts/{bin => _bin}/wrapped-swww (100%)

diff --git a/home/applications/i3status-rust/default.nix b/home/applications/i3status-rust/default.nix
index 08e9f67..cb56482 100644
--- a/home/applications/i3status-rust/default.nix
+++ b/home/applications/i3status-rust/default.nix
@@ -15,6 +15,7 @@
           {block = "load";}
 
           ### Stuff that I actually need
+          {block = "backlight";}
           {block = "sound";}
           {block = "battery";}
           {block = "time";}
diff --git a/home/applications/sway/default.nix b/home/applications/sway/default.nix
index 96b2388..d454732 100644
--- a/home/applications/sway/default.nix
+++ b/home/applications/sway/default.nix
@@ -67,8 +67,6 @@
       modifier = "Mod4";
       keybindings = let
         inherit (config.wayland.windowManager.sway.config) modifier;
-        setBrightness = "/home/guanranwang/.local/bin/wrapped-brightnessctl";
-        setVolume = "/home/guanranwang/.local/bin/wrapped-pamixer";
         screenshot = "/home/guanranwang/.local/bin/screenshot";
       in
         {
@@ -108,11 +106,11 @@
           "Print+Control" = "exec ${screenshot} swappy";
 
           # Fn keys
-          "XF86MonBrightnessUp" = "exec ${setBrightness} up";
-          "XF86MonBrightnessDown" = "exec ${setBrightness} down";
-          "XF86AudioRaiseVolume" = "exec ${setVolume} up";
-          "XF86AudioLowerVolume" = "exec ${setVolume} down";
-          "XF86AudioMute" = "exec ${setVolume} mute";
+          "XF86MonBrightnessUp" = "exec ${lib.getExe pkgs.brightnessctl} set 5%+";
+          "XF86MonBrightnessDown" = "exec ${lib.getExe pkgs.brightnessctl} set 5%-";
+          "XF86AudioRaiseVolume" = "exec ${lib.getExe pkgs.pamixer} -i5";
+          "XF86AudioLowerVolume" = "exec ${lib.getExe pkgs.pamixer} -d5";
+          "XF86AudioMute" = "exec ${lib.getExe pkgs.pamixer} -t";
           "XF86AudioPlay" = "exec ${lib.getExe pkgs.playerctl} play";
           "XF86AudioPause" = "exec ${lib.getExe pkgs.playerctl} pause";
           "XF86AudioPrev" = "exec ${lib.getExe pkgs.playerctl} previous";
diff --git a/nixos/profiles/common/graphical/home/scripts/bin/wrapped-brightnessctl b/nixos/profiles/common/graphical/home/scripts/_bin/wrapped-brightnessctl
similarity index 100%
rename from nixos/profiles/common/graphical/home/scripts/bin/wrapped-brightnessctl
rename to nixos/profiles/common/graphical/home/scripts/_bin/wrapped-brightnessctl
diff --git a/nixos/profiles/common/graphical/home/scripts/bin/wrapped-mpvpaper b/nixos/profiles/common/graphical/home/scripts/_bin/wrapped-mpvpaper
similarity index 100%
rename from nixos/profiles/common/graphical/home/scripts/bin/wrapped-mpvpaper
rename to nixos/profiles/common/graphical/home/scripts/_bin/wrapped-mpvpaper
diff --git a/nixos/profiles/common/graphical/home/scripts/bin/wrapped-pamixer b/nixos/profiles/common/graphical/home/scripts/_bin/wrapped-pamixer
similarity index 100%
rename from nixos/profiles/common/graphical/home/scripts/bin/wrapped-pamixer
rename to nixos/profiles/common/graphical/home/scripts/_bin/wrapped-pamixer
diff --git a/nixos/profiles/common/graphical/home/scripts/bin/wrapped-swww b/nixos/profiles/common/graphical/home/scripts/_bin/wrapped-swww
similarity index 100%
rename from nixos/profiles/common/graphical/home/scripts/bin/wrapped-swww
rename to nixos/profiles/common/graphical/home/scripts/_bin/wrapped-swww
diff --git a/nixos/profiles/common/graphical/home/scripts/default.nix b/nixos/profiles/common/graphical/home/scripts/default.nix
index 0689e93..6a30c68 100644
--- a/nixos/profiles/common/graphical/home/scripts/default.nix
+++ b/nixos/profiles/common/graphical/home/scripts/default.nix
@@ -2,8 +2,8 @@
   binPATH = ".local/bin";
 in {
   home.packages = with pkgs; [
-    pamixer
-    brightnessctl
+    #pamixer
+    #brightnessctl
     grim
     slurp
     swappy
@@ -11,14 +11,14 @@ in {
     #mpvpaper
     #swww
     libnotify
-    dunst
+    #dunst
   ];
   home.sessionPath = ["$HOME/${binPATH}"];
   home.file = builtins.mapAttrs (_name: value: value // {executable = true;}) {
-    ${binPATH} = {
-      source = ./bin;
-      recursive = true;
-    };
+    #${binPATH} = {
+    #  source = ./bin;
+    #  recursive = true;
+    #};
 
     "${binPATH}/lofi".source = pkgs.fetchurl {
       url = "https://raw.githubusercontent.com/lime-desu/bin/69422c37582c5914863997c75c268791a0de136e/lofi";