fix flutter flake

packages/waybar/config

@@ -5,7 +5,13 @@
   "spacing": 0,
   "modules-left": ["clock", "sway/workspaces","sway/mode"],
   "modules-center": ["sway/window"],
-  "modules-right": ["network","battery", "pulseaudio", "tray"],
+  "modules-right": ["network", "cpu", "memory", "custom/keyboard-layout", "pulseaudio", "tray"],
+
+"custom/keyboard-layout": {
+  "interval": 1,
+  "exec": "swaymsg -t get_inputs | jq -r '.[] | select(.type == \"keyboard\") | .xkb_active_layout_name'"
+},
+
 
   "cpu": {
     "interval": 5,
@@ -17,19 +23,6 @@
     "format": "RAM: {used} GiB"
   },
 
-  "battery": {
-    "bat": "BAT0",
-    "states": {
-      "good": 90,
-      "warning": 20,
-      "critical": 7
-    },
-    "format": "{icon}  {capacity}%",
-        "format-charging": " {capacity}%",
-        "format-plugged": " {capacity}%",
-        "format-alt": "{time}  {icon}",
-        "format-icons": ["",  "", "" , "", ""] 
-  },
 
   "pulseaudio": {
     "format": "{icon}   {volume}%",

packages/waybar/config~

@@ -0,0 +1,56 @@
+{
+  "layer": "bottom",
+  "position": "top",
+  "height": 35,
+  "spacing": 0,
+  "modules-left": ["clock", "sway/workspaces","sway/mode"],
+  "modules-center": ["sway/window"],
+  "modules-right": ["network", "battery", "cpu", "memory", "custom/keyboard-layout", "pulseaudio", "tray"],
+
+"custom/keyboard-layout": {
+  "interval": 1,
+  "exec": "swaymsg -t get_inputs | jq -r '.[] | select(.type == \"keyboard\") | .xkb_active_layout_name'"
+},
+
+
+  "cpu": {
+    "interval": 5,
+    "format": "CPU: {usage}% {avg_frequency} GHz"
+  },
+
+  "memory": {
+    "interval": 5,
+    "format": "RAM: {used} GiB"
+  },
+
+  "battery": {
+    "bat": "BAT0",
+    "states": {
+      "good": 90,
+      "warning": 20,
+      "critical": 7
+    },
+    "format": "{icon}  {capacity}%",
+        "format-charging": " {capacity}%",
+        "format-plugged": " {capacity}%",
+        "format-alt": "{time}  {icon}",
+        "format-icons": ["",  "", "" , "", ""] 
+  },
+
+  "pulseaudio": {
+    "format": "{icon}   {volume}%",
+    "format-muted": " Muted",
+    "format-icons": ["", "", ""]
+  },
+
+  "clock": {
+    "format": "{:%d.%m.%Y | %H:%M}"
+  },
+
+  "network": {
+    "format-wifi": "   {essid} {signalStrength}%",
+    "format-disconnected": "  No Connection"
+  }
+
+
+}

packages/waybar/default.nix

@@ -1,7 +1,7 @@
 { pkgs, config, lib,... }:
 {
  home.packages = with pkgs; [
-
+   jq
  ];
 
  home.file =

packages/waybar/default.nix~

@@ -0,0 +1,15 @@
+{ pkgs, config, lib,... }:
+{
+ home.packages = with pkgs; [
+
+ ];
+
+ home.file =
+  lib.mkMerge [
+   {
+    ".config/waybar/config".source = ./config;
+    ".config/waybar/style.css".source = ./style.css;
+    ".config/waybar/mocha.css".source = ./mocha.css;
+   }
+  ];
+}

packages/waybar/style.css

@@ -21,6 +21,7 @@ window#waybar {
 #memory,
 #network,
 #pulseaudio,
+#custom-keyboard-layout,
 #battery{
 	background: rgba(10,10,10,100);
 	opacity: 0.8;

packages/waybar/style.css~

@@ -0,0 +1,78 @@
+@import "mocha.css";
+
+* {
+	border: none;
+	border-radius: 0;
+	font-family: "Fira Code";
+	font-weight: bold;
+	font-size: 13px;
+	min-height: 0;
+}
+
+window#waybar {
+/*	background: rgba(0,130,130,0); */
+	background: @base;
+}
+
+#clock,
+#workspaces,
+#window,
+#cpu,
+#memory,
+#network,
+#pulseaudio,
+#battery{
+	background: rgba(10,10,10,100);
+	opacity: 0.8;
+/*	color: #00ffff; */
+	color: @mauve;
+	padding: 0px 10px ;
+	margin: 3px 0px;
+}
+
+#workspaces button{
+	color: @mauve;
+	border-radius: 7px;
+	margin: 3px 0px;
+	margin-left: 6px;
+}
+
+#workspaces button.focused{
+	background: @mauve;
+	color: @base;
+	opacity: 0.8;
+	transition: 0.3s;
+}
+
+#workspaces button:hover{
+	background: @mauve;
+	color: @base;
+	opacity: 0.8;
+	transition: 0.5s;
+}
+
+#window{
+	border-radius: 10px;
+}
+
+#waybar.empty #window {
+	background: none;
+}
+
+#network{
+	border-radius: 10px 0px 0px 10px;
+}
+
+#pulseaudio{
+	border-radius: 0px 10px 10px 0px;
+	margin-right: 5px
+}
+
+#workspaces{
+	border-radius: 0px 10px 10px 0px;
+}
+
+#clock{
+	border-radius: 10px 0px 0px 10px;
+	margin-left: 5px
+}