Flake: Fix shells

flake.nix

@@ -31,20 +31,10 @@
 
   outputs = inputs:
 
-    let
+    let gen = import ./generator.nix { inherit inputs; };
-      gen = import ./generator.nix { inherit inputs; };
-      forEachSystem =
-        inputs.nixpkgs.lib.genAttrs [ "aarch64-linux" "x86_64-linux" ];
-
     in {
 
-      devShells = forEachSystem (system:
+      devShells = import ./shells { inherit inputs; };
-        let
-          overlays = import ./pkgs/overlay.nix { inherit pkgs; };
-          overrides = { custom = import ./pkgs { inherit pkgs; }; };
-          pkgs = import inputs.nixpkgs { inherit system overlays; }
-            // overrides;
-        in { default = import ./shells/vevsh { inherit pkgs; }; });
 
       nixosConfigurations = {
         valinor = gen.generate {

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

@@ -12,7 +12,8 @@
           width = "400";
           scale = "0";
           origin = "top-right";
-          offset = "${config.colorScheme.colors.gaps-bar}x${config.colorScheme.colors.gaps-screen}";
+          offset =
+            "${config.colorScheme.colors.gaps-bar}x${config.colorScheme.colors.gaps-screen}";
           notification_limit = "0";
           progress_bar = "true";
           progress_bar_height = "10";

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

@@ -1,6 +1,10 @@
 { lib, config, pkgs, ... }:
 let
-  jsonOutput = name: { pre ? "", text ? "", tooltip ? "", alt ? "", class ? "", percentage ? "" }: "${pkgs.writeShellScriptBin "waybar-${name}" ''
+  jsonOutput = name:
+    { pre ? "", text ? "", tooltip ? "", alt ? "", class ? "", percentage ? ""
+    }:
+    "${
+      pkgs.writeShellScriptBin "waybar-${name}" ''
         set -euo pipefail
         ${pre}
         ${pkgs.jq}/bin/jq -cn \
@@ -10,7 +14,8 @@ let
           --arg class "${class}" \
           --arg percentage "${percentage}" \
           '{text:$text,tooltip:$tooltip,alt:$alt,class:$class,percentage:$percentage}'
-  ''}/bin/waybar-${name}";
+      ''
+    }/bin/waybar-${name}";
 in {
   config = lib.mkIf (config.homecfg.wm == "Wayland") {
 
@@ -105,11 +110,8 @@ in {
       settings = [{
         "layer" = "top";
         "position" = "right";
-        modules-left = [
+        modules-left = [ "hyprland/workspaces" ];
-          "hyprland/workspaces"
+        modules-center = [ ];
-        ];
-        modules-center = [
-        ];
         modules-right = [
           "pulseaudio"
           "backlight"
@@ -163,7 +165,8 @@ in {
           "on-click" = "amixer -D pulse sset Master toggle -q";
         };
         "battery" = {
-          "interval" = 30;          "states" = {
+          "interval" = 30;
+          "states" = {
             "warning" = 20;
             "critical" = 10;
           };
@@ -174,32 +177,41 @@ in {
         };
         "clock" = {
           "interval" = 30;
-          "format" = "{:<b>%H</b>\n%M}";
+          "format" = ''
-          "tooltip-format" = "<big><b>{:%d/%m/%Y}</b></big>\n<tt><small>{calendar}</small></tt>";
+            {:<b>%H</b>
-          "calendar" = {
+            %M}'';
-            "months"= "";
+          "tooltip-format" = ''
-          };
+            <big><b>{:%d/%m/%Y}</b></big>
+            <tt><small>{calendar}</small></tt>'';
+          "calendar" = { "months" = ""; };
         };
         "memory" = {
           "interval" = 5;
-          "format" = "󰍛\n{icon}";
+          "format" = ''
+            󰍛
+            {icon}'';
           "format-icons" = [ "󰝦" "󰪞" "󰪟" "󰪠" "󰪡" "󰪢" "󰪣" "󰪤" "󰪥" ];
           "states" = { "warning" = 85; };
         };
         "cpu" = {
           "interval" = 1;
           "format-icons" = [ "󰝦" "󰪞" "󰪟" "󰪠" "󰪡" "󰪢" "󰪣" "󰪤" "󰪥" ];
-          "format" = "󱛠\n{icon}";
+          "format" = ''
+            󱛠
+            {icon}'';
         };
         "custom/gpu" = {
           "exec" = jsonOutput "gpu" {
-            tooltip = ''...'';
+            tooltip = "...";
-            percentage = ''$(amdgpu_top -J -n 1 | jq -r '.devices[0].GRBM2."Command Processor -  Graphics".value')'';
+            percentage = ''
+              $(amdgpu_top -J -n 1 | jq -r '.devices[0].GRBM2."Command Processor -  Graphics".value')'';
           };
           "return-type" = "json";
           "interval" = 5;
           "format-icons" = [ "󰝦" "󰪞" "󰪟" "󰪠" "󰪡" "󰪢" "󰪣" "󰪤" "󰪥" ];
-          "format" = "󰇞\n{icon}";
+          "format" = ''
+            󰇞
+            {icon}'';
         };
         "network" = {
           "format-disconnected" = "󰯡";

packages/amdgpu_top/default.nix

@@ -1,16 +1,5 @@
-{ lib
+{ lib, rustPlatform, fetchFromGitHub, libdrm, libX11, libGL, wayland
-, rustPlatform
+, wayland-protocols, libxkbcommon, libXrandr, libXi, libXcursor }:
-, fetchFromGitHub
-, libdrm
-, libX11
-, libGL
-, wayland
-, wayland-protocols
-, libxkbcommon
-, libXrandr
-, libXi
-, libXcursor
-}:
 
 rustPlatform.buildRustPackage rec {
   pname = "amdgpu_top";
@@ -25,7 +14,8 @@ rustPlatform.buildRustPackage rec {
   cargoLock = {
     lockFile = ./Cargo.lock;
     outputHashes = {
-         "libdrm_amdgpu_sys-0.2.2" = "sha256-2QXT/6octEzokW8+0mHx02R8qQ3kCBDxZT4yyfDkM5A=";
+      "libdrm_amdgpu_sys-0.2.2" =
+        "sha256-2QXT/6octEzokW8+0mHx02R8qQ3kCBDxZT4yyfDkM5A=";
     };
   };
 

shells/default.nix

@@ -0,0 +1,15 @@
+{ ... }:
+let
+  forEachSystem =
+    inputs.nixpkgs.lib.genAttrs [ "aarch64-linux" "x86_64-linux" ];
+in 
+    forEachSystem (system:
+        let
+            overlays = import ./pkgs/overlay.nix { inherit pkgs; };
+            overrides = { custom = import ./pkgs { inherit pkgs; }; };
+            pkgs = import inputs.nixpkgs { inherit system overlays; } // overrides;
+        in { 
+            default = import ./shells/devsh { inherit pkgs; }; 
+            devsh = import ./shells/devsh { inherit pkgs; }; 
+        }
+    )