feat: expanded desktop configuration options

Created sensible default waybar configuration

Enabled fish z plugins (NOTE: include git plugin next time)

DEFUNCT: Created wechat package that includes a license archive to circumvent restrictions

4 files changed, 61 insertions, 28 deletions

diff --git a/home-manager/stvnliu/hypr/hyprland.nix b/home-manager/stvnliu/hypr/hyprland.nix
index a57683a..4c89faa 100644
--- a/home-manager/stvnliu/hypr/hyprland.nix
+++ b/home-manager/stvnliu/hypr/hyprland.nix
@@ -3,22 +3,47 @@
   pkgs,
   ...
 }: {
-  home.packages = with pkgs; [
-    foot
-  ];
+  home.packages = with pkgs; [foot];
+  programs.waybar = {
+    enable = true;
+    settings = [
+      {
+        layer = "top";
+        position = "top";
+        height = 30;
+        output = ["eDP-1" "HDMI-A-1"];
+        modules-left = ["hyprland/window" "wlr/taskbar" "cpu" "memory" "idle-inhibitor"];
+        modules-center = ["hyprland/workspaces" "custom/hello-from-waybar"];
+        modules-right = ["mpd" "custom/mymodule#with-css-id" "temperature" "battery"];
+
+        "hyprland/workspaces" = {
+          disable-scroll = true;
+          all-outputs = true;
+        };
+        "custom/hello-from-waybar" = {
+          format = "hello {}";
+          max-length = 40;
+          interval = "once";
+          exec = pkgs.writeShellScript "hello-from-waybar" ''
+            echo "from within waybar"
+          '';
+        };
+      }
+    ];
+    systemd.enable = true;
+    systemd.target = "hyprland-session.target";
+  };
+
   wayland.windowManager.hyprland = {
     # Whether to enable Hyprland wayland compositor
     enable = true;
     # The hyprland package to use
     package = pkgs.hyprland;
-    plugins = with pkgs.hyprlandPlugins; [
-      hyprbars
-      hyprfocus
-      csgo-vulkan-fix
-    ];
+    plugins = with pkgs.hyprlandPlugins; [hyprfocus csgo-vulkan-fix];
     # Whether to enable XWayland
     xwayland.enable = true;
     settings = {
+      monitor = ",preferred,auto,1.6";
       input = {
         # xset rate 250 50 replacement on wayland...
         # FAST MODE LET'S GOOO
@@ -33,6 +58,8 @@
       "$mod" = "SUPER";
       bind =
         [
+          ", Print, exec, ${pkgs.grimblast}/bin/grimblast copy area"
+          "$mod, S, togglespecialworkspace"
           "$mod, F10, exec, ${pkgs.pamixer} --increase 10"
           "$mod, F9, exec, ${pkgs.pamixer} --decrease 10"
           "$mod, Q, killactive"
@@ -45,17 +72,12 @@
         ++ (
           # workspaces
           # binds $mod + [shift +] {1..10} to [move to] workspace {1..10}
-          builtins.concatLists (builtins.genList (
-              x: let
-                ws = let
-                  c = (x + 1) / 10;
-                in
-                  builtins.toString (x + 1 - (c * 10));
-              in [
-                "$mod, ${ws}, workspace, ${toString (x + 1)}"
-                "$mod SHIFT, ${ws}, movetoworkspace, ${toString (x + 1)}"
-              ]
-            )
+          builtins.concatLists (builtins.genList (x: let
+              ws = let c = (x + 1) / 10; in builtins.toString (x + 1 - (c * 10));
+            in [
+              "$mod, ${ws}, workspace, ${toString (x + 1)}"
+              "$mod SHIFT, ${ws}, movetoworkspace, ${toString (x + 1)}"
+            ])
             10)
         );
       bindm = [
diff --git a/home-manager/stvnliu/shells/fish.nix b/home-manager/stvnliu/shells/fish.nix
index d2f423c..438760f 100644
--- a/home-manager/stvnliu/shells/fish.nix
+++ b/home-manager/stvnliu/shells/fish.nix
@@ -16,16 +16,19 @@ in
       programs.fish = {
         enable = true;
         shellAliases = import ./aliases {inherit pkgs;};
+        interactiveShellInit = ''
+          ${pkgs.zoxide}/bin/zoxide init fish | source
+        '';
         plugins = [
-          #{
-          #	name = "z";
-          #	src = pkgs.fetchFromGitHub {
-          #		owner = "jethrokuan";
-          #		repo = "z";
-          #		rev = "ddeb28a7b6a1f0ec6dae40c636e5ca4908ad160a";
-          #		sha256 = "0c5i7sdrsp0q3vbziqzdyqn4fmp235ax4mn4zslrswvn8g3fvdyh";
-          #	};
-          #}
+          {
+            name = "z";
+            src = pkgs.fetchFromGitHub {
+              owner = "jethrokuan";
+              repo = "z";
+              rev = "ddeb28a7b6a1f0ec6dae40c636e5ca4908ad160a";
+              sha256 = "0c5i7sdrsp0q3vbziqzdyqn4fmp235ax4mn4zslrswvn8g3fvdyh";
+            };
+          }
         ];
       };
     };
diff --git a/home-manager/stvnliu/wechat/default.nix b/home-manager/stvnliu/wechat/default.nix
new file mode 100644
index 0000000..c20e301
--- /dev/null
+++ b/home-manager/stvnliu/wechat/default.nix
@@ -0,0 +1,8 @@
+{pkgs, ...}: {
+  nixpkgs.config.permittedInsecurePackages = [
+    "openssl-1.1.1w"
+  ];
+  home.packages = with pkgs; [
+    (wechat-uos.override {uosLicense = ./license.tar.gz;})
+  ];
+}
diff --git a/home-manager/stvnliu/wechat/license.tar.gz b/home-manager/stvnliu/wechat/license.tar.gz
new file mode 100644
index 0000000..fcef1de
--- /dev/null
+++ b/home-manager/stvnliu/wechat/license.tar.gz