[m] Various fixes and reverts

modules/home/cli/other/default.nix

@@ -13,5 +13,6 @@
     pipes-rs
     cmatrix
     cava
+    sl
   ];
 }

modules/home/wayland/apps/default.nix

@@ -1 +1 @@
-{ ... }: { imports = [ ./dunst ./eww ./kanshi ./waybar ./waylock ./wofi ]; }
+{ ... }: { imports = [ ./dunst ./eww ./kanshi ./waylock ./wofi ]; }

modules/home/wayland/apps/eww/bar/css/_sys.scss

@@ -23,15 +23,6 @@ color: $base0B;
     margin: $gaps-window 0;
 }
 
-
-.icon-text {
-    padding: 5pt;
-    font-size: 5pt;
-    font-weight: 900;
-}
-
-
-
 .cpu-core-usage, .gpu-core-usage, .memory-usage {
     background-color: $bg0;
     border-radius: $border-radius;

modules/home/wayland/apps/eww/bar/eww.scss

@@ -41,24 +41,30 @@ tooltip {
 .icon,
 .icon label { font-family: Material Design Icons; }
 
+.icon-text {
+  padding: 4pt;
+  font-size: 6pt;
+  font-weight: 900;
+}
+
 .grey {
-  background-color: $base02;
+  color: $base02;
 }
 
 .red {
-  background-color: $base0F;
+  color: $base0F;
 }
 
 .orange {
-  background-color: $base08;
+  color: $base08;
 }
 
 .green {
-  background-color: $base0B;
+  color: $base0B;
 }
 
 .blue {
-  background-color: $base0C;
+  color: $base0C;
 }
 
 /* WINDOW WRAPPER CSS */
@@ -116,17 +122,3 @@ tooltip {
 .bar label {
   font-size: 1.2rem;
 }
-
-/* WORKSPACE */
-
-.ws {
-  border-radius: $border-radius;
-  margin: $gaps-window;
-}
-
-.focused {
-  background-color: $bg1;
-  border-radius: 1rem;
-  margin: .3rem;
-  padding: .25rem;
-}

modules/home/wayland/apps/eww/bar/modules/workspaces.yuck

@@ -1,17 +1,22 @@
 (deflisten workspace :initial '[]' "scripts/workspaces")
 
 (defwidget workspace-mod []
-  (module
+  	(module
-  (eventbox
+  	  	(eventbox
 		:onscroll "echo {} | sed -e \"s/up/-1/g\" -e \"s/down/+1/g\" | xargs hyprctl dispatch workspace"
-		(box
+			(box
-			:class "module workspaces"
+				:class "module workspaces"
-            :orientation "v"
+				:orientation "v"
-		  (for ws in workspace
+				(for ws in workspace
-		    (button
+					(button
-					:onclick "hyprctl dispatch workspace ${ws.number}"
+						:onclick "hyprctl dispatch workspace ${ws.number}"
-					:class "ws icon ${ws.color}"
+						(label 
-					; :tooltip {ws.tooltip}
+							:class "icon-text  ${ws.color}"
-					(box
+							:text `${ws.focused ? "󰜗" : "󰝥"}`
-						:class `${ws.focused ? "focused" : ""}`
+						)
-						:height 3)))))))
+					)
+				)
+			)
+	  	)
+	)
+)

modules/home/wayland/apps/eww/default.nix

@@ -1,7 +1,7 @@
 { lib, config, pkgs, ... }: {
 
   config = lib.mkIf (config.homecfg.wm == "Wayland") {
-    home.packages = with pkgs; [ eww-wayland jaq ];
+    home.packages = with pkgs; [ eww-wayland jaq custom.amdgpu_top ];
 
     xdg.configFile."eww" = {
       source = lib.cleanSourceWith {

modules/home/wayland/apps/waylock/default.nix

@@ -50,59 +50,5 @@
       caps-lock-key-hl-color=${config.colorscheme.colors.base09}FF
       caps-lock-bs-hl-color=${config.colorscheme.colors.base09}FF
     '';
-
-    xdg.configFile."wlogout/style.css".text = ''
-      window {
-          font-family: Material Design Icons;
-          font-size: 64pt;
-          color: #${config.colorscheme.colors.base07};
-          background-color: alpha(#${config.colorscheme.colors.base00},0.6);
-      }
-
-      button {
-          border-radius:${config.colorscheme.colors.border-radius}px;
-          border-width: ${config.colorscheme.colors.border-width}px;
-          border-style: solid;
-          border-color: #${config.colorscheme.colors.base04};
-          color: #${config.colorscheme.colors.base07};
-          padding: 20px;
-          background-color: alpha(#${config.colorscheme.colors.base00},0.8);
-          transition: box-shadow 0.2s ease-in-out, background-color 0.2s ease-in-out;
-      }
-
-      button:hover {
-          background-color: alpha(#${config.colorscheme.colors.base02},0.8);
-      }
-
-      button:focus {
-          background-color: alpha(#${config.colorscheme.colors.base02},1.0);
-          border-radius:${config.colorscheme.colors.border-radius}px;
-          border-width: ${config.colorscheme.colors.border-width}px;
-          border-color: #${config.colorscheme.colors.base04};
-          border-style: solid;
-      }
-
-    '';
-
-    xdg.configFile."wlogout/layout".text = ''
-      {
-          "label" : "lock",
-          "action" : "swaylock",
-          "text" : "󰌾",
-          "keybind" : "l"
-      }
-      {
-          "label" : "reboot",
-          "action" : "systemctl reboot",
-          "text" : "󰜉",
-          "keybind" : "r"
-      }
-      {
-          "label" : "shutdown",
-          "action" : "systemctl poweroff",
-          "text" : "󰐥",
-          "keybind" : "s"
-      }
-    '';
   };
 }

modules/home/wayland/hyprland/config.nix

@@ -117,8 +117,6 @@
         windowrule = float, title:^(Volume Control)$
         windowrule = float, title:^(Picture-in-Picture)$
         windowrule = float, title:^(Steam)$
-        windowrule = fullscreen, title:^(wlogout)$
-        windowrule = float, title:^(wlogout)$
 
         windowrulev2 = workspace 2 silent, class:^(org.telegram.desktop)$
         windowrulev2 = workspace 2 silent, class:^(discord)$

modules/nixos/system/hw/fs/default.nix

@@ -1,5 +1,6 @@
 { pkgs, ... }: {
   services.fstrim.enable = true; # Improves SSD life
+  services.gvfs.enable = true; # User Mounted FS
 
-  environment.systemPackages = with pkgs; [ gvfs nfs-utils ];
+  environment.systemPackages = with pkgs; [ nfs-utils ];
 }

modules/nixos/system/network/bluetooth/default.nix

@@ -1,4 +1,5 @@
 { pkgs, ... }: {
   hardware.bluetooth.enable = true;
   services.blueman.enable = true;
+  environment.systemPackages = with pkgs; [ bluez bluez-tools ];
 }