added lots

moduler/programs/beets/default.nix

@@ -15,6 +15,9 @@ let
       move: yes
       write: yes
 
+    paths:
+      default: $albumartist/$album ($year)/$track $title
+
     fetchart:
       auto: yes
 
@@ -60,7 +63,8 @@ in
         "BEETSCONFIG=${config.xdg.configHome}/beets/config.yaml"
       ];
     };
-    Install = { WantedBy = [ "default.target" ]; };
+    Install = {
+      WantedBy = [ "default.target" ];
+    };
   };
 }
-

moduler/programs/hyprland/default.nix

@@ -285,10 +285,12 @@ with lib;
               "$mod, l, movefocus, r"
               "$mod, k, movefocus, u"
               "$mod, j, movefocus, d"
+			  "$mod, b, exec, pkill -INT .waybar-wrapped"
 
               # Applications
               "$mod, q, exec, ${pkgs.librewolf}/bin/librewolf"
               "$mod, d, exec, ${pkgs.rofi}/bin/rofi -show drun -p 'Run: '"
+              ", F19, exec, ${pkgs.rofi}/bin/rofi -show drun -p 'Run: '"
 
               # Screencapture
               "$mod SHIFT, s, exec, ${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp)\" - | ${pkgs.wl-clipboard}/bin/wl-copy -t image/png"

moduler/programs/nixvim/default.nix

@@ -263,25 +263,25 @@ with lib;
         #   };
         # };
 
-        treesitter = {
-          enable = true;
-
-          grammarPackages = with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [
-            bash
-            json
-            lua
-            make
-            markdown
-            helm
-            nix
-            regex
-            toml
-            vim
-            vimdoc
-            xml
-            yaml
-          ];
-        };
+        # treesitter = {
+        #   enable = true;
+        #
+        #   grammarPackages = with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [
+        #     bash
+        #     json
+        #     lua
+        #     make
+        #     markdown
+        #     helm
+        #     nix
+        #     regex
+        #     toml
+        #     vim
+        #     vimdoc
+        #     xml
+        #     yaml
+        #   ];
+        # };
         oil = {
           enable = true;
           settings = {

moduler/programs/waybar/default.nix

@@ -59,6 +59,7 @@ let
           "upower"
           "custom/tailscale"
           "custom/netbird"
+          "custom/bitwarden"
           "network"
           "clock"
         ]
@@ -69,6 +70,7 @@ let
           "bluetooth"
           "custom/tailscale"
           "custom/netbird"
+          "custom/bitwarden"
           "network"
           "clock"
         ];
@@ -189,6 +191,20 @@ let
       return-type = "json";
       interval = 5;
     };
+
+    "custom/bitwarden" = {
+      exec = "/home/fw/.config/waybar/scripts/bitwarden.sh --status";
+      on-click = "/home/fw/.config/waybar/scripts/bitwarden.sh --toggle";
+      exec-on-event = true;
+      format = "BW {icon} {text}";
+      format-icons = {
+        connected = "";
+        stopped = "";
+      };
+      tooltip = true;
+      return-type = "json";
+      interval = 5;
+    };
   };
 
   waybarStyle = ''
@@ -238,7 +254,8 @@ let
     #upower,
     #network,
     #custom-tailscale,
-    #custom-netbird {
+    #custom-netbird,
+    #custom-bitwarden {
       background: @base;
       border: none;
       border-radius: 5px;
@@ -305,6 +322,7 @@ let
     #upower,
     #custom-tailscale,
     #custom-netbird,
+    #custom-bitwarden,
     #network {
       background: @peach;
       color: @base;
@@ -755,6 +773,68 @@ with lib;
         		'';
       executable = true;
     };
+    xdg.configFile."waybar/scripts/bitwarden.sh" = {
+      text = ''
+        #!${pkgs.bash}/bin/bash
+
+        PATH=${
+          lib.makeBinPath [
+            pkgs.coreutils
+            pkgs.procps
+            pkgs.bitwarden-desktop
+          ]
+        }
+
+        BITWARDEN_SSH_SOCK="''${HOME}/.bitwarden-ssh-agent.sock"
+
+        is_socket_active() {
+            [[ -S "$BITWARDEN_SSH_SOCK" ]]
+        }
+
+        show_status() {
+            if is_socket_active; then
+                echo "{\"text\":\"\",\"class\":\"connected\",\"alt\":\"connected\",\"tooltip\":\"Bitwarden SSH agent socket is active: $BITWARDEN_SSH_SOCK\"}"
+            else
+                echo "{\"text\":\"\",\"class\":\"stopped\",\"alt\":\"stopped\",\"tooltip\":\"Bitwarden SSH agent socket is inactive: $BITWARDEN_SSH_SOCK\"}"
+            fi
+        }
+
+        open_bitwarden() {
+            bitwarden >/dev/null 2>&1 &
+            show_status
+        }
+
+        stop_bitwarden() {
+            pkill -x bitwarden >/dev/null 2>&1 || true
+            show_status
+        }
+
+        toggle_bitwarden() {
+            if is_socket_active; then
+                stop_bitwarden
+            else
+                open_bitwarden
+            fi
+        }
+
+        case "$1" in
+            --status)
+                show_status
+                ;;
+            --open)
+                open_bitwarden
+                ;;
+            --toggle)
+                toggle_bitwarden
+                ;;
+            *)
+                echo "Usage: $0 {--status|--open|--toggle}"
+                exit 1
+                ;;
+        esac
+      '';
+      executable = true;
+    };
   };
   # catppuccin.waybar = {
   #   enable = true;