Merge remote-tracking branch 'refs/remotes/origin/main'

home/default.nix

@@ -33,6 +33,11 @@
       tags_separator = ";";
     };
   };
+  programs.password-store = {
+    enable = true;
+    package = pkgs.pass.withExtensions (exts: [exts.pass-otp]);
+  };
+    
   services.mpd = {
     enable = true;
     musicDirectory = "/home/${vars.user}/Music";

home/nixvim/default.nix

@@ -1,4 +1,4 @@
-{vars, ...}:{
+{vars, lib, ...}:{
   programs.nixvim = {
     enable = true;
     colorschemes.catppuccin.enable = true;
@@ -22,6 +22,7 @@
       };
       lsp = {
         enable = true;
+
 	servers.nixd = {
 	  enable = true;
 	  extraOptions.offset_encoding = "utf-8";

home/waybar/config

@@ -9,7 +9,7 @@
     "position": "top",
     "modules-center": ["group/mpdg"],
     "modules-left": ["group/dtray"],
-    "modules-right": ["battery", "battery#bat1", "battery#bat2", "clock", "group/audio"],
+    "modules-right": ["disk", "battery", "battery#bat1", "battery#bat2", "clock", "group/audio", "cpu"],
     "cava": {
         "method": "pipewire",
         "format-icons" : ["▁", "▂", "▃", "▄", "▅", "▆", "▇", "█" ],
@@ -19,9 +19,16 @@
         "hide_on_silence": true,
         "input_delay": 1,
         "autosens": 0,
+	"noise_reduction": 0.5,
         "sensitivity": 13,
     },
-
+    "disk": {
+    	"format": "  {free} {path}",
+    },
+    "cpu": {
+    	"format": "  {usage}% {max_frequency}GHz",
+	"states": { "highcpu": 85 },
+    },
     "group/dtray": {
     	"orientation": "inherit",
     	"drawer": {
@@ -32,7 +39,8 @@
     },
     "group/audio": {
         "orientation": "inherit",
-        "modules": ["wireplumber", "cava"]
+        "modules": ["wireplumber", "cava"],
+	"on-click": "pavucontrol",
     },
     "group/mpdg": {
       "orientation": "inherit",
@@ -67,6 +75,8 @@
     },
     "wireplumber": {
       "on-click": "pavucontrol",
+      "format": "󰓃 {volume}%",
+      "format-muted": "󰓄 {volume}%",
     },
     "mpd": {
       "on-click": "mpc toggle",

home/waybar/style.css

@@ -37,7 +37,9 @@ window#waybar {
 #clock,
 #audio,
 #mpd,
-#battery {
+#battery,
+#cpu,
+#disk {
 	padding: 5px; 
 	border-radius: 10px;
 	border: 0.2em solid #cba6f7;
@@ -95,3 +97,6 @@ window#waybar {
         margin-left: 0.2em;
         color: @mauve;
 }
+#cpu.highcpu {
+	background: @mauve;
+}