initial reconvergence of hyprland to support multiple hosts or some shit

2025-07-07 11:11:01 -05:00
parent 5ba52331b2
commit 2bf33d8743
37 changed files with 121 additions and 102 deletions
--- a/modules/apps/your-spotify/default.nix
+++ b/modules/apps/your-spotify/default.nix
@@ -22,7 +22,7 @@ in
        CLIENT_ENDPOINT = "https://your-spotify.mjallen.dev";
        SPOTIFY_PUBLIC = "e270589d72a6494680a17d325af8670d";
        SPOTIFY_SECRET = "423cb7b69fe8486e89eccd01e0c22924";
-        MONGO_ENDPOINT = "mongodb://10.0.1.18:27017";
+        MONGO_ENDPOINT = "mongodb://10.0.1.3:27017";
      };
    };

--- a/modules/desktop-environments/hyprland/config/btop/default.nix
+++ b/modules/desktop-environments/hyprland/config/btop/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, hyprlandSettings, ... }:
 let
  settings = import ../../settings.nix { inherit pkgs; };
 in
--- a/modules/desktop-environments/hyprland/config/hypr/default.nix
+++ b/modules/desktop-environments/hyprland/config/hypr/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, hyprlandSettings, ... }:
 let
  settings = import ../../settings.nix { inherit pkgs; };
  drawer = "nwg-drawer -fm nautilus -term kitty -mb 10 -mt 10 -ml 10 -mr 10 -pbuseicontheme -i ${settings.iconTheme}";
@@ -123,10 +123,11 @@ in
        "$mod, XF86MonBrightnessDown, exec, brightnessctl -d kbd_backlight set 10%-"
      ];

-      monitor = [
-        "${settings.displayLeft.input},${settings.displayLeft.resolution}@${settings.displayLeft.refreshRate},0x0,1,bitdepth,10,cm,hdr,sdrbrightness,1.2,sdrsaturation,0.98"
-        # "${settings.displayRight.input},${settings.displayRight.resolution}@${settings.displayRight.refreshRate},3840x0,1,bitdepth,10,cm,hdr,sdrbrightness,1.5,sdrsaturation,0.98"
-      ];
+      # monitor = [
+      #   "${settings.displayLeft.input},${settings.displayLeft.resolution}@${settings.displayLeft.refreshRate},0x0,1.0,bitdepth,10,cm,hdr,sdrbrightness,1.2,sdrsaturation,0.98"
+      # ];
+
+      monitor = hyprlandSettings.monitor;

      render = {
        cm_fs_passthrough = 1;
@@ -192,11 +193,7 @@ in
        force_default_wallpaper = 0;
      };

-      workspace = [
-        "name:firefox, monitor:${settings.displayRight.input}, default:false, special, class:(.*firefox.*)"
-        "name:discord, monitor:${settings.displayRight.input}, default:true, special, title:(.*vesktop.*), title:(.*Apple Music.*)"
-        "name:steam, monitor:${settings.displayLeft.input}, default:false, special, class:(.*[Ss]team.*)"
-      ];
+      workspace = hyprlandSettings.workspace;

      windowrule = [
        "float, title:(file_progress)"
@@ -264,27 +261,9 @@ in
        "renderunfocused, tag:horizonrdp"
        "idleinhibit, tag:horizonrdp"
        "float, tag:horizonrdp"
-        "size 2160 7680, tag:horizonrdp"
        # float the vmware window cause its annoying to use in fullscreen
        "float, class:(.*[Vv][Mm]ware-view),title:([Vv][Mm]ware [Hh]orizon [Cc]lient)"
-
-
-
-
-
-        # "tag +fakefull, fullscreen: 0"
-        # "float, tag:fakefull"
-        # "size 3356 2160, tag:fakefull"
-        # "move 100 74, tag:fakefull"
-        # "noanim, tag:fakefull"
-        # "noblur, tag:fakefull"
-        # "norounding, tag:fakefull"
-        # "noshadow, tag:fakefull"
-        # "immediate, tag:fakefull"
-        # "noborder, tag:fakefull"
-        # "nodim, tag:fakefull"
-        # "idleinhibit, tag:fakefull"
-      ];
+      ] ++ hyprlandSettings.windowRule;

      input = {
        kb_layout = "us";
@@ -318,11 +297,6 @@ in
      exec-once = xhost +SI:localuser:root
      exec-once = nwg-look -a
      exec-once = nwg-dock-hyprland -d
-      exec-once = nm-applet
-      exec-once = [silent] firefox
-      exec-once = [silent] vesktop
-      exec-once = [silent] chromium --app="https://music.apple.com"
-      exec-once = [silent] steam
    '';
  };
 }
--- a/modules/desktop-environments/hyprland/config/kitty/default.nix
+++ b/modules/desktop-environments/hyprland/config/kitty/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, hyprlandSettings, ... }:
 let
  settings = import ../../settings.nix { inherit pkgs; };
 in
--- a/modules/desktop-environments/hyprland/config/mako/default.nix
+++ b/modules/desktop-environments/hyprland/config/mako/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, hyprlandSettings, ... }:
 let
  settings = import ../../settings.nix { inherit pkgs; };
 in
--- a/modules/desktop-environments/hyprland/config/nwg-dock/default.nix
+++ b/modules/desktop-environments/hyprland/config/nwg-dock/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, hyprlandSettings, ... }:
 let
  settings = import ../../settings.nix { inherit pkgs; };
 in
--- a/modules/desktop-environments/hyprland/config/nwg-drawer/default.nix
+++ b/modules/desktop-environments/hyprland/config/nwg-drawer/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, hyprlandSettings, ... }:
 let
  settings = import ../../settings.nix { inherit pkgs; };
 in
--- a/modules/desktop-environments/hyprland/config/nwg-panel/default.nix
+++ b/modules/desktop-environments/hyprland/config/nwg-panel/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, hyprlandSettings, ... }:
 let
  settings = import ../../settings.nix { inherit pkgs; };
 in
--- a/modules/desktop-environments/hyprland/config/waybar/default.nix
+++ b/modules/desktop-environments/hyprland/config/waybar/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, hyprlandSettings, ... }:
 let
  settings = import ../../settings.nix { inherit pkgs; };

@@ -56,21 +56,7 @@ in

        modules-center = [ "hyprland/window" ];

-        modules-right = [
-          "tray"
-          # "custom/lights"
-          "temperature"
-          "temperature#gpu"
-          "keyboard-state#capslock"
-          "keyboard-state#numlock"
-          "wireplumber#sink"
-          # "wireplumber#source"
-          "bluetooth"
-          "network"
-          "clock"
-          "battery"
-          "custom/weather"
-        ];
+        modules-right = hyprlandSettings.waybar.modules-right;

        # Module Definitions
        # Left
--- a/modules/desktop-environments/hyprland/config/wlogout/default.nix
+++ b/modules/desktop-environments/hyprland/config/wlogout/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, hyprlandSettings, ... }:
 let
  settings = import ../../settings.nix { inherit pkgs; };
 in
--- a/modules/desktop-environments/hyprland/config/wofi/default.nix
+++ b/modules/desktop-environments/hyprland/config/wofi/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, hyprlandSettings, ... }:
 let
  settings = import ../../settings.nix { inherit pkgs; };
 in
--- a/modules/desktop-environments/hyprland/default.nix
+++ b/modules/desktop-environments/hyprland/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, ... }:
+{ config, pkgs, lib, hyprlandSettings, ... }:
 let
  settings = import ./settings.nix { inherit pkgs; };

@@ -21,7 +21,7 @@ in

  environment.systemPackages = [ bing-wallpaper pkgs.jq ];

-  home-manager.users."${settings.user}" = import ./home.nix;
+  home-manager.users."${settings.user}" = (import ./home.nix {inherit lib pkgs hyprlandSettings;});

  services = {
    displayManager = {
--- a/modules/desktop-environments/hyprland/home.nix
+++ b/modules/desktop-environments/hyprland/home.nix
@@ -1,16 +1,16 @@
-{ lib, pkgs, ... }:
+{ lib, pkgs, hyprlandSettings, ... }:
 let
-  settings = import ./settings.nix { inherit pkgs; };
+  settings = import ./settings.nix { inherit pkgs hyprlandSettings; };
  wallpaper = "/run/wallpaper.jpg";
 in
 {
  imports = [
    ./config.nix
    ./config/btop
-    ./config/hypr
+    (import ./config/hypr {inherit pkgs hyprlandSettings;})
    ./config/kitty
    ./config/mako
-    ./config/waybar
+    (import ./config/waybar {inherit pkgs hyprlandSettings;})
    ./config/wofi
  ];