waybar ricing and alacritty transparency

home/common/core/nixvim/theme.nix

@@ -8,7 +8,7 @@
       dimInactive = true;
       terminalColors = true;
       theme = "wave";
-      transparent = false;
+      transparent = true;
       undercurl = true;
     };
   };

home/common/optional/desktop/common/alacritty.nix

@@ -1,7 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, pkgs, ... }:
-let
-  user = config.home.username;
-in
 {
   programs.alacritty = {
     enable = true;
@@ -38,10 +35,14 @@ in
         };
       };
 
-      window.padding = {
+      window = {
+        padding = {
           x = 5;
           y = 5;
         };
+        blur = true;
+        opacity = 0.9;
+      };
 
       shell.program = "${pkgs.zsh}/bin/zsh";
 

home/common/optional/desktop/hyprland/default.nix

@@ -1,8 +1,7 @@
-{
+{ lib
-  lib,
+, config
-  config,
+, pkgs
-  pkgs,
+, ...
-  ...
 }: {
 
   imports = [
@@ -25,7 +24,8 @@
         monitor = "${toString (builtins.map (m: "monitor=${ m.name },${ toString( m.width ) }x${ toString( m.height ) }@${ toString( m.refreshRate ) },${ toString( m.x ) }x${ toString( m.y ) },${ toString( m.scale ) }\n") config.monitors)}";
         active = "rgba(${config.colorScheme.colors.base08}ee)";
         inactive = "rgba(${config.colorScheme.colors.base0C}ee)";
-      in ''
+      in
+      ''
 
       ${monitor}
       $terminal = alacritty
@@ -155,7 +155,7 @@
       bindm = $mainMod, mouse:272, movewindow
       bindm = $mainMod, mouse:273, resizewindow
 
-      exec-once=bash ~/.config/hypr/start.sh
+      exec-once=swww-wallpaper-changer
     '';
   };
 }

home/common/optional/desktop/wayland/swww-wallpaper-changer.nix

@@ -1,37 +1,19 @@
+{ pkgs, ... }:
 {
-  pkgs,
+  home.packages = with pkgs; [
-  ...
+    (writeShellScriptBin "swww-wallpaper-changer" ''
-}:
-{
-  systemd.user.services.wallpaper-changer = {
-    Unit = {
-      Description = "Script to change wallpaper using swww";
-       PartOf = [ "hyprland-session.target" ];
-       After = [ "hyprland-session.target" ]; # or "wayland.target", depending on your system setup
-    };
-    Install = {
-      WantedBy = [ "default.target" ];
-    };
-    Service = {
-      Type = [ "simple" ];
-      ExecStart = "${pkgs.writeShellScript "swww-wallpaper-changer" ''
       export WAYLAND_DISPLAY="wayland-1"
       wallpaper_dir="$HOME/.local/share/bg/"
       [ -d "$wallpaper_dir" ] || mkdir -p "$wallpaper_dir"
-
+      ${swww}/bin/swww-daemon &
-        # Allow some time for desktop to start
-        sleep 3
-        echo "starting daemon..."
-        ${pkgs.swww}/bin/swww-daemon &
 
       while true; do
           find "$wallpaper_dir" -type f -follow \( -iname \*.jpg -o -iname \*.png -o -iname \*.gif -o -iname \*.bmp \) | shuf | while read -r file; do
-                ${pkgs.swww}/bin/swww img "$file" --transition-step 10 --transition-fps 60
+              ${swww}/bin/swww img "$file" --transition-step 10 --transition-fps 60
-                [ $? != 0 ] && echo "swww failed, reloading daemon" && ${pkgs.swww}/bin/swww-daemon &
+              [ $? != 0 ] && echo "swww failed, exiting" && exit 1
               sleep 600
           done
       done
-      ''}";
+    '')
-    };
+  ];
-  };
 }

home/common/optional/desktop/wayland/waybar.nix

@@ -1,8 +1,7 @@
-{
+{ lib
-  lib,
+, config
-  config,
+, pkgs
-  pkgs,
+, ...
-  ...
 }: {
   # Let it try to start a few more times
   systemd.user.services.waybar = {
@@ -20,10 +19,14 @@
         spacing = 5;
         modules-left = [
           "custom/menu"
-              "wlr/workspaces"];
+          "hyprland/workspaces"
+          "hyprland/window"
+        ];
+
         modules-center = [
           "clock"
         ];
+
         modules-right = [
           "cpu"
           "memory"
@@ -33,32 +36,40 @@
           "tray"
           "custom/exit"
           "custom/hostname"
+          "custom/ip"
         ];
-            "wlr/workspaces" = {
+
-                "format" = "{icon}";
+        "hyprland/window" = {
+          "format" = "{}";
+          "rewrite" = {
+            "(.*) — Mozilla Firefox" = "$1";
+          };
+          "separate-outputs" = true;
+        };
+
+        "hyprland/workspaces" = {
+          "format" = "{name}";
           "on-click" = "activate";
           "format-icons" = {
-                    "1" = "";
+            "urgent" = "";
-                    "2" = "";
+            "active" = "";
-                    "3" = "";
+            "default" = "";
-                    "4" = "";
-                    "5" = "";
-                    "urgent" = "";
-                    "active" = "";
-                    "default" = "";
           };
         };
+
         "clock" = {
-                "format" = "<span> </span>{:%m/%d %H:%M}";
+          "format" = "<span> </span>{:%y-%m-%d %H:%M:%S}";
           "tooltip-format" = "<big>{:%B %Y}</big>\n<tt><small>{calendar}</small></tt>";
           "on-click" = "calendar";
         };
+
         "cpu" = {
           "interval" = 10;
           "format" = " {}%";
           "max-length" = 10;
           "on-click" = "";
         };
+
         "memory" = {
           "interval" = 30;
           "format" = " {}%";
@@ -68,9 +79,8 @@
 
         "network" = {
           "format-wifi" = "直 {signalStrength}%";
-                "format-ethernet" = " wired";
+          "format-ethernet" = " wired ({ipaddr})";
           "format-disconnected" = "睊";
-                "on-click" = "bash ~/.config/waybar/scripts/rofi-wifi-menu.sh";
         };
 
         "battery" = {
@@ -97,13 +107,13 @@
         };
 
         "custom/menu" = {
-              "format" = "";
+          "format" = " Nixos";
-              "on-click" = "rofi -show drun";
+          "on-click" = "wofi --show drun";
         };
 
         "custom/hostname" = {
           "exec" = "echo $USER@$(hostname)";
-              "on-click" = "alacritty";
+          "on-click" = "$TERMINAL";
         };
 
         "custom/exit" = {

pkgs/sddm-theme/default.nix

@@ -1,16 +1,15 @@
-{ pkgs ? import <nixpkgs> { }, stdenv, fetchFromGitHub }:
+{ pkgs ? import <nixpkgs> { }, fetchFromGitHub }:
-pkgs.stdenv.mkDerivation rec {
+pkgs.stdenv.mkDerivation {
   pname = "sddm-theme";
   version = "1.6";
   dontBuild = true;
-#  nativeBuildInputs = with pkgs; [
+
-#    sddm
-#  ];
   installPhase = ''
     mkdir -p $out/share/sddm/themes
     cp -aR $src $out/share/sddm/themes/sugar-candy
     touch $out/share/sddm/themes/balls
   '';
+
   src = fetchFromGitHub {
     owner = "Kangie";
     repo = "sddm-sugar-candy";