test

home/system/hyprland/default.nix

@@ -1,6 +1,4 @@
-{ pkgs, config, hyprland, ... }:
-let variable = import ../../../variables.nix;
-in {
+{ pkgs, config, hyprland, ... }: {
 
   imports = [ ./hyprlock.nix ./hypridle.nix ./hyprpaper.nix ];
 
@@ -41,8 +39,15 @@ in {
         "${pkgs.bitwarden}/bin/bitwarden"
       ];
 
-      monitor =
-        [ "eDP-2,highres,0x0,1" "DP-8,highrr,2560x0,1" ",prefered,auto,1" ];
+      monitor = [
+        "eDP-2,highres,0x0,1"
+        # "DP-9,highrr,2560x0,1"
+        # ",prefered,auto,1"
+        #"desc:,2560x1440@240.0,0x0,1.0"
+        #"desc:,2560x1440@60.0,645x4362,1.0"
+        "desc:AOC U34G2G1 0x00000E06,3440x1440@59.97,2560x0,1.0"
+        ",disable"
+      ];
 
       bind = [
         "$mod, RETURN, exec, ${pkgs.kitty}/bin/kitty"
@@ -101,6 +106,7 @@ in {
         "XDG_SESSION_TYPE,wayland"
         "XDG_CURRENT_DESKTOP,Hyprland"
         "XDG_SESSION_TYPE,wayland"
+        "GBM_BACKEND,nvidia-drm"
         "XDG_SESSION_DESKTOP,Hyprland"
         "QT_AUTO_SCREEN_SCALE_FACTOR,1"
         "QT_QPA_PLATFORM=wayland,xcb"
@@ -113,17 +119,17 @@ in {
 
       general = {
         resize_on_border = true;
-        gaps_in = config.theme.gaps-in;
-        gaps_out = config.theme.gaps-out;
-        border_size = config.theme.border-size;
-        "col.active_border" = "rgba(${config.theme.colors.primary-bg}ff)";
+        gaps_in = config.var.theme.gaps-in;
+        gaps_out = config.var.theme.gaps-out;
+        border_size = config.var.theme.border-size;
+        "col.active_border" = "rgba(${config.var.theme.colors.accent}ff)";
         "col.inactive_border" = "rgba(00000055)";
         border_part_of_window = true;
         layout = "master";
       };
 
       decoration = {
-        rounding = config.theme.rounding;
+        rounding = config.var.theme.rounding;
         drop_shadow = true;
         shadow_range = 20;
         shadow_render_power = 3;
@@ -143,7 +149,7 @@ in {
       };
 
       input = {
-        kb_layout = variable.keyboardLayout;
+        kb_layout = config.var.keyboardLayout;
 
         kb_options = "caps:escape";
         follow_mouse = 1;
@@ -251,7 +257,7 @@ in {
     };
 
     font = {
-      name = config.theme.font;
+      name = config.var.theme.font;
       size = 11;
     };
   };

home/system/hyprland/hyprlock.nix

@@ -5,8 +5,8 @@
   xdg.configFile."hypr/hyprlock.conf".text = ''
     background {
         monitor =
-        path = $HOME/.config/wallpapers/${config.theme.wallpaper}
-        color = rgb(${config.theme.colors.bg})
+        path = $HOME/.config/wallpapers/${config.var.theme.wallpaper}
+        color = rgb(${config.var.theme.colors.bg})
 
         blur_size = 4
         blur_passes = 3
@@ -24,9 +24,9 @@
         dots_size = 0.2 # Scale of input-field height, 0.2 - 0.8
         dots_spacing = 0.64 # Scale of dots' absolute size, 0.0 - 1.0
         dots_center = true
-        outer_color = rgb(${config.theme.colors.primary-bg})
-        inner_color = rgb(${config.theme.colors.bg})
-        font_color = rgb(${config.theme.colors.fg})
+        outer_color = rgb(${config.var.theme.colors.accent})
+        inner_color = rgb(${config.var.theme.colors.bg})
+        font_color = rgb(${config.var.theme.colors.fg})
         fade_on_empty = true
         placeholder_text = <i>Password...</i> # Text rendered in the input box when it's empty.
         hide_input = false
@@ -39,9 +39,9 @@
     label {
         monitor =
         text = cmd[update:1000] echo "<b><big> $(date +"%H:%M:%S") </big></b>"
-        color = rgb(${config.theme.colors.fg})
+        color = rgb(${config.var.theme.colors.fg})
         font_size = 64
-        font_family = ${config.theme.font}
+        font_family = ${config.var.theme.font}
         position = 0, 16
         halign = center
         valign = center
@@ -51,9 +51,9 @@
     label {
         monitor =
         text = Hey <span text_transform="capitalize" size="larger">$USER</span>
-        color = rgb(${config.theme.colors.fg})
+        color = rgb(${config.var.theme.colors.fg})
         font_size = 20
-        font_family = ${config.theme.font}
+        font_family = ${config.var.theme.font}
         position = 0, 0
         halign = center
         valign = center
@@ -64,9 +64,9 @@
     label {
         monitor =
         text = Type to unlock!
-        color = rgb(${config.theme.colors.fg})
+        color = rgb(${config.var.theme.colors.fg})
         font_size = 16
-        font_family = ${config.theme.font}
+        font_family = ${config.var.theme.font}
         position = 0, 30
         halign = center
         valign = bottom

home/system/hyprland/hyprpaper.nix

@@ -2,8 +2,8 @@
   home.packages = with pkgs; [ hyprpaper ];
 
   xdg.configFile."hypr/hyprpaper.conf".text = ''
-    preload = ~/.config/wallpapers/${config.theme.wallpaper}
-    wallpaper = ,~/.config/wallpapers/${config.theme.wallpaper}
+    preload = ~/wallpapers/${config.var.theme.wallpaper}
+    wallpaper = ,~/wallpapers/${config.var.theme.wallpaper}
     ipc=true
     splash=false
   '';