🖼️ Changed wallpaper, added usericon, readded profile image on

lockscreen

home-manager/fish.nix

@@ -5,7 +5,7 @@ let
     if current == from then to else current;
   toSingleLine =
     with lib.strings;
-    s: concatMapStrings (stringAsChars (replace "\n" "")) (splitString "n" s);
+    s: concatMapStrings (stringAsChars (replace "\n" "")) (splitString "\n" s);
   theme = import ../theme.nix;
 in
 {

home-manager/hyprland/hyprlock/default.nix

@@ -46,6 +46,17 @@ in
           valign = "top";
         }
       ];
+
+      # USER AVATAR
+      image = {
+        path = "${../../face.png}";
+        size = 100;
+        border_color = "${theme.mauveRgb}";
+        position = "0, 75";
+        halign = "center";
+        valign = "center";
+      };
+
       # INPUT FIELD
       input-field = {
         size = "300, 60";
@@ -53,17 +64,17 @@ in
         dots_size = 0.2;
         dots_spacing = 0.2;
         dots_center = true;
-        outer_color = lib.mkDefault "${theme.mauve}";
+        outer_color = lib.mkDefault "${theme.mauveRgb}";
         inner_color = lib.mkDefault "${theme.surface0Rgb}";
         font_color = lib.mkDefault "${theme.textRgb}";
         fade_on_empty = false;
         placeholder_text = "<span foreground=\"##${theme.textAlpha}\"><i>󰌾 Logged in as </i><span foreground=\"##${theme.mauveAlpha}\">$USER</span></span>";
         hide_input = false;
-        check_color = lib.mkDefault "${theme.mauve}";
+        check_color = lib.mkDefault "${theme.mauveRgb}";
         fail_color = lib.mkDefault "${theme.redRgb}";
         fail_text = "<i>$FAIL <b>($ATTEMPTS)</b></i>";
         capslock_color = lib.mkDefault "${theme.yellowRgb}";
-        position = "0, -200"; # TODO change -200 to -20% at 25.05
+        position = "0, -47"; # TODO change to use % at 25.05
         halign = "center";
         valign = "center";
       };

home-manager/hyprland/hyprpanel/default.nix

@@ -1,4 +1,4 @@
-{ inputs, ... }:
+{ pkgs, inputs, ... }:
 let
   common = import ../../../common.nix;
   theme = import ../../../theme.nix;
@@ -58,13 +58,18 @@ in
         customModules.kbLayout.leftClick = "hyprctl switchxkblayout keychron-keychron-k8-pro next";
         launcher.autoDetectIcon = true;
         network.label = false;
+        volume = {
+          scrollDown = "${pkgs.hyprpanel}/bin/hyprpanel 'vol -1'";
+          scrollUp = "${pkgs.hyprpanel}/bin/hyprpanel 'vol +1'";
+        };
         workspaces = {
           show_icons = false;
           show_numbered = true;
         };
       };
 
-      menus.clock = {
+      menus = {
+        clock = {
           time = {
             military = true;
             hideSeconds = true;
@@ -75,8 +80,9 @@ in
           };
         };
 
-      menus.dashboard = {
+        dashboard = {
           directories.enabled = false;
+          powermenu.avatar.image = "${../../face.png}";
           shortcuts.left = {
             shortcut1 = {
               command = common.default.browser;
@@ -93,6 +99,7 @@ in
           };
           stats.enable_gpu = true;
         };
+      };
 
       scalingPriority = "hyprland";
 

home-manager/hyprland/settings.nix

@@ -8,7 +8,7 @@ in
   wayland.windowManager.hyprland.settings = {
     monitor = [
       "DP-1, 1920x1080@144, 0x0, 1"
-      "DP-3, 2560x1440@59.95, 1920x0, 1"
+      "DP-3, 3840x2160@60, 1920x0, 1.5"
     ];
 
     # Autostart
@@ -96,9 +96,7 @@ in
       preserve_split = true; # You probably want this
     };
 
-    master = {
+    master.new_status = "master";
-      new_status = "master";
-    };
 
     misc = {
       force_default_wallpaper = 0;

modules/stylix.nix

@@ -5,7 +5,7 @@ in
 {
   stylix = {
     enable = true;
-    image = ../catppuccin.png;
+    image = ../tropic_island_night.jpg; # TODO overrides swww
     base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-${theme.flavor}.yaml";
     polarity = "dark";
     opacity.terminal = 0.8;