keyboard shortcuts: comprehensive keyboard shortcut management interface

- niri only for now
- requires quickshell-git, hidden otherwise
- Add, Edit, Delete keybinds
- Large suite of pre-defined and custom actions
- Works with niri 25.11+ include feature

core/cmd/dms/commands_keybinds.go

@@ -40,11 +40,34 @@ var keybindsShowCmd = &cobra.Command{
 	Run: runKeybindsShow,
 }
 
+var keybindsSetCmd = &cobra.Command{
+	Use:   "set <provider> <key> <action>",
+	Short: "Set a keybind override",
+	Long:  "Create or update a keybind override for the specified provider",
+	Args:  cobra.ExactArgs(3),
+	Run:   runKeybindsSet,
+}
+
+var keybindsRemoveCmd = &cobra.Command{
+	Use:   "remove <provider> <key>",
+	Short: "Remove a keybind override",
+	Long:  "Remove a keybind override from the specified provider",
+	Args:  cobra.ExactArgs(2),
+	Run:   runKeybindsRemove,
+}
+
 func init() {
 	keybindsShowCmd.Flags().String("path", "", "Override config path for the provider")
+	keybindsSetCmd.Flags().String("desc", "", "Description for hotkey overlay")
+	keybindsSetCmd.Flags().Bool("allow-when-locked", false, "Allow when screen is locked")
+	keybindsSetCmd.Flags().Int("cooldown-ms", 0, "Cooldown in milliseconds")
+	keybindsSetCmd.Flags().Bool("no-repeat", false, "Disable key repeat")
+	keybindsSetCmd.Flags().String("replace-key", "", "Original key to replace (removes old key)")
 
 	keybindsCmd.AddCommand(keybindsListCmd)
 	keybindsCmd.AddCommand(keybindsShowCmd)
+	keybindsCmd.AddCommand(keybindsSetCmd)
+	keybindsCmd.AddCommand(keybindsRemoveCmd)
 
 	keybinds.SetJSONProviderFactory(func(filePath string) (keybinds.Provider, error) {
 		return providers.NewJSONFileProvider(filePath)
@@ -82,69 +105,122 @@ func initializeProviders() {
 	}
 }
 
-func runKeybindsList(cmd *cobra.Command, args []string) {
-	registry := keybinds.GetDefaultRegistry()
-	providers := registry.List()
-
-	if len(providers) == 0 {
+func runKeybindsList(_ *cobra.Command, _ []string) {
+	providerList := keybinds.GetDefaultRegistry().List()
+	if len(providerList) == 0 {
 		fmt.Fprintln(os.Stdout, "No providers available")
 		return
 	}
-
 	fmt.Fprintln(os.Stdout, "Available providers:")
-	for _, name := range providers {
+	for _, name := range providerList {
 		fmt.Fprintf(os.Stdout, "  - %s\n", name)
 	}
 }
 
-func runKeybindsShow(cmd *cobra.Command, args []string) {
-	providerName := args[0]
-	registry := keybinds.GetDefaultRegistry()
-
-	customPath, _ := cmd.Flags().GetString("path")
-	if customPath != "" {
-		var provider keybinds.Provider
-		switch providerName {
-		case "hyprland":
-			provider = providers.NewHyprlandProvider(customPath)
-		case "mangowc":
-			provider = providers.NewMangoWCProvider(customPath)
-		case "sway":
-			provider = providers.NewSwayProvider(customPath)
-		case "niri":
-			provider = providers.NewNiriProvider(customPath)
-		default:
-			log.Fatalf("Provider %s does not support custom path", providerName)
-		}
-
-		sheet, err := provider.GetCheatSheet()
-		if err != nil {
-			log.Fatalf("Error getting cheatsheet: %v", err)
-		}
-
-		output, err := json.MarshalIndent(sheet, "", "  ")
-		if err != nil {
-			log.Fatalf("Error generating JSON: %v", err)
-		}
-
-		fmt.Fprintln(os.Stdout, string(output))
-		return
-	}
-
-	provider, err := registry.Get(providerName)
-	if err != nil {
-		log.Fatalf("Error: %v", err)
+func makeProviderWithPath(name, path string) keybinds.Provider {
+	switch name {
+	case "hyprland":
+		return providers.NewHyprlandProvider(path)
+	case "mangowc":
+		return providers.NewMangoWCProvider(path)
+	case "sway":
+		return providers.NewSwayProvider(path)
+	case "niri":
+		return providers.NewNiriProvider(path)
+	default:
+		return nil
 	}
+}
 
+func printCheatSheet(provider keybinds.Provider) {
 	sheet, err := provider.GetCheatSheet()
 	if err != nil {
 		log.Fatalf("Error getting cheatsheet: %v", err)
 	}
-
 	output, err := json.MarshalIndent(sheet, "", "  ")
 	if err != nil {
 		log.Fatalf("Error generating JSON: %v", err)
 	}
-
+	fmt.Fprintln(os.Stdout, string(output))
+}
+
+func runKeybindsShow(cmd *cobra.Command, args []string) {
+	providerName := args[0]
+	customPath, _ := cmd.Flags().GetString("path")
+
+	if customPath != "" {
+		provider := makeProviderWithPath(providerName, customPath)
+		if provider == nil {
+			log.Fatalf("Provider %s does not support custom path", providerName)
+		}
+		printCheatSheet(provider)
+		return
+	}
+
+	provider, err := keybinds.GetDefaultRegistry().Get(providerName)
+	if err != nil {
+		log.Fatalf("Error: %v", err)
+	}
+	printCheatSheet(provider)
+}
+
+func getWritableProvider(name string) keybinds.WritableProvider {
+	provider, err := keybinds.GetDefaultRegistry().Get(name)
+	if err != nil {
+		log.Fatalf("Error: %v", err)
+	}
+	writable, ok := provider.(keybinds.WritableProvider)
+	if !ok {
+		log.Fatalf("Provider %s does not support writing keybinds", name)
+	}
+	return writable
+}
+
+func runKeybindsSet(cmd *cobra.Command, args []string) {
+	providerName, key, action := args[0], args[1], args[2]
+	writable := getWritableProvider(providerName)
+
+	if replaceKey, _ := cmd.Flags().GetString("replace-key"); replaceKey != "" && replaceKey != key {
+		_ = writable.RemoveBind(replaceKey)
+	}
+
+	options := make(map[string]any)
+	if v, _ := cmd.Flags().GetBool("allow-when-locked"); v {
+		options["allow-when-locked"] = true
+	}
+	if v, _ := cmd.Flags().GetInt("cooldown-ms"); v > 0 {
+		options["cooldown-ms"] = v
+	}
+	if v, _ := cmd.Flags().GetBool("no-repeat"); v {
+		options["repeat"] = false
+	}
+
+	desc, _ := cmd.Flags().GetString("desc")
+	if err := writable.SetBind(key, action, desc, options); err != nil {
+		log.Fatalf("Error setting keybind: %v", err)
+	}
+
+	output, _ := json.MarshalIndent(map[string]any{
+		"success": true,
+		"key":     key,
+		"action":  action,
+		"path":    writable.GetOverridePath(),
+	}, "", "  ")
+	fmt.Fprintln(os.Stdout, string(output))
+}
+
+func runKeybindsRemove(_ *cobra.Command, args []string) {
+	providerName, key := args[0], args[1]
+	writable := getWritableProvider(providerName)
+
+	if err := writable.RemoveBind(key); err != nil {
+		log.Fatalf("Error removing keybind: %v", err)
+	}
+
+	output, _ := json.MarshalIndent(map[string]any{
+		"success": true,
+		"key":     key,
+		"removed": true,
+	}, "", "  ")
 	fmt.Fprintln(os.Stdout, string(output))
 }

core/internal/keybinds/providers/niri.go

@@ -3,14 +3,19 @@ package providers
 import (
 	"fmt"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"strings"
 
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/keybinds"
+	"github.com/sblinch/kdl-go"
+	"github.com/sblinch/kdl-go/document"
 )
 
 type NiriProvider struct {
-	configDir string
+	configDir        string
+	dmsBindsIncluded bool
+	parsed           bool
 }
 
 func NewNiriProvider(configDir string) *NiriProvider {
@@ -23,8 +28,7 @@ func NewNiriProvider(configDir string) *NiriProvider {
 }
 
 func defaultNiriConfigDir() string {
-	configHome := os.Getenv("XDG_CONFIG_HOME")
-	if configHome != "" {
+	if configHome := os.Getenv("XDG_CONFIG_HOME"); configHome != "" {
 		return filepath.Join(configHome, "niri")
 	}
 
@@ -40,21 +44,40 @@ func (n *NiriProvider) Name() string {
 }
 
 func (n *NiriProvider) GetCheatSheet() (*keybinds.CheatSheet, error) {
-	section, err := ParseNiriKeys(n.configDir)
+	result, err := ParseNiriKeys(n.configDir)
 	if err != nil {
 		return nil, fmt.Errorf("failed to parse niri config: %w", err)
 	}
 
+	n.dmsBindsIncluded = result.DMSBindsIncluded
+	n.parsed = true
+
 	categorizedBinds := make(map[string][]keybinds.Keybind)
-	n.convertSection(section, "", categorizedBinds)
+	n.convertSection(result.Section, "", categorizedBinds)
 
 	return &keybinds.CheatSheet{
-		Title:    "Niri Keybinds",
-		Provider: n.Name(),
-		Binds:    categorizedBinds,
+		Title:            "Niri Keybinds",
+		Provider:         n.Name(),
+		Binds:            categorizedBinds,
+		DMSBindsIncluded: result.DMSBindsIncluded,
 	}, nil
 }
 
+func (n *NiriProvider) HasDMSBindsIncluded() bool {
+	if n.parsed {
+		return n.dmsBindsIncluded
+	}
+
+	result, err := ParseNiriKeys(n.configDir)
+	if err != nil {
+		return false
+	}
+
+	n.dmsBindsIncluded = result.DMSBindsIncluded
+	n.parsed = true
+	return n.dmsBindsIncluded
+}
+
 func (n *NiriProvider) convertSection(section *NiriSection, subcategory string, categorizedBinds map[string][]keybinds.Keybind) {
 	currentSubcat := subcategory
 	if section.Name != "" {
@@ -106,19 +129,19 @@ func (n *NiriProvider) categorizeByAction(action string) string {
 }
 
 func (n *NiriProvider) convertKeybind(kb *NiriKeyBinding, subcategory string) keybinds.Keybind {
-	key := n.formatKey(kb)
-	desc := kb.Description
 	rawAction := n.formatRawAction(kb.Action, kb.Args)
 
-	if desc == "" {
-		desc = rawAction
+	source := "config"
+	if strings.Contains(kb.Source, "dms/binds.kdl") {
+		source = "dms"
 	}
 
 	return keybinds.Keybind{
-		Key:         key,
-		Description: desc,
+		Key:         n.formatKey(kb),
+		Description: kb.Description,
 		Action:      rawAction,
 		Subcategory: subcategory,
+		Source:      source,
 	}
 }
 
@@ -126,6 +149,15 @@ func (n *NiriProvider) formatRawAction(action string, args []string) string {
 	if len(args) == 0 {
 		return action
 	}
+
+	if action == "spawn" && len(args) >= 3 && args[1] == "-c" {
+		switch args[0] {
+		case "sh", "bash":
+			cmd := strings.Join(args[2:], " ")
+			return fmt.Sprintf("spawn %s -c \"%s\"", args[0], strings.ReplaceAll(cmd, "\"", "\\\""))
+		}
+	}
+
 	return action + " " + strings.Join(args, " ")
 }
 
@@ -135,3 +167,308 @@ func (n *NiriProvider) formatKey(kb *NiriKeyBinding) string {
 	parts = append(parts, kb.Key)
 	return strings.Join(parts, "+")
 }
+
+func (n *NiriProvider) GetOverridePath() string {
+	return filepath.Join(n.configDir, "dms", "binds.kdl")
+}
+
+func (n *NiriProvider) validateAction(action string) error {
+	action = strings.TrimSpace(action)
+	switch {
+	case action == "":
+		return fmt.Errorf("action cannot be empty")
+	case action == "spawn" || action == "spawn ":
+		return fmt.Errorf("spawn command requires arguments")
+	case strings.HasPrefix(action, "spawn "):
+		rest := strings.TrimSpace(strings.TrimPrefix(action, "spawn "))
+		switch rest {
+		case "":
+			return fmt.Errorf("spawn command requires arguments")
+		case "sh -c \"\"", "sh -c ''", "bash -c \"\"", "bash -c ''":
+			return fmt.Errorf("shell command cannot be empty")
+		}
+	}
+	return nil
+}
+
+func (n *NiriProvider) SetBind(key, action, description string, options map[string]any) error {
+	if err := n.validateAction(action); err != nil {
+		return err
+	}
+
+	overridePath := n.GetOverridePath()
+
+	if err := os.MkdirAll(filepath.Dir(overridePath), 0755); err != nil {
+		return fmt.Errorf("failed to create dms directory: %w", err)
+	}
+
+	existingBinds, err := n.loadOverrideBinds()
+	if err != nil {
+		existingBinds = make(map[string]*overrideBind)
+	}
+
+	existingBinds[key] = &overrideBind{
+		Key:         key,
+		Action:      action,
+		Description: description,
+		Options:     options,
+	}
+
+	return n.writeOverrideBinds(existingBinds)
+}
+
+func (n *NiriProvider) RemoveBind(key string) error {
+	existingBinds, err := n.loadOverrideBinds()
+	if err != nil {
+		return nil
+	}
+
+	delete(existingBinds, key)
+	return n.writeOverrideBinds(existingBinds)
+}
+
+type overrideBind struct {
+	Key         string
+	Action      string
+	Description string
+	Options     map[string]any
+}
+
+func (n *NiriProvider) loadOverrideBinds() (map[string]*overrideBind, error) {
+	overridePath := n.GetOverridePath()
+	binds := make(map[string]*overrideBind)
+
+	data, err := os.ReadFile(overridePath)
+	if os.IsNotExist(err) {
+		return binds, nil
+	}
+	if err != nil {
+		return nil, err
+	}
+
+	parser := NewNiriParser(filepath.Dir(overridePath))
+	parser.currentSource = overridePath
+
+	doc, err := kdl.Parse(strings.NewReader(string(data)))
+	if err != nil {
+		return nil, err
+	}
+
+	for _, node := range doc.Nodes {
+		if node.Name.String() != "binds" || node.Children == nil {
+			continue
+		}
+		for _, child := range node.Children {
+			kb := parser.parseKeybindNode(child, "")
+			if kb == nil {
+				continue
+			}
+			keyStr := parser.formatBindKey(kb)
+			binds[keyStr] = &overrideBind{
+				Key:         keyStr,
+				Action:      n.formatRawAction(kb.Action, kb.Args),
+				Description: kb.Description,
+				Options:     n.extractOptions(child),
+			}
+		}
+	}
+
+	return binds, nil
+}
+
+func (n *NiriProvider) extractOptions(node *document.Node) map[string]any {
+	if node.Properties == nil {
+		return make(map[string]any)
+	}
+
+	opts := make(map[string]any)
+	if val, ok := node.Properties.Get("repeat"); ok {
+		opts["repeat"] = val.String() == "true"
+	}
+	if val, ok := node.Properties.Get("cooldown-ms"); ok {
+		opts["cooldown-ms"] = val.String()
+	}
+	if val, ok := node.Properties.Get("allow-when-locked"); ok {
+		opts["allow-when-locked"] = val.String() == "true"
+	}
+	return opts
+}
+
+func (n *NiriProvider) isRecentWindowsAction(action string) bool {
+	switch action {
+	case "next-window", "previous-window":
+		return true
+	default:
+		return false
+	}
+}
+
+func (n *NiriProvider) parseSpawnArgs(s string) []string {
+	var args []string
+	var current strings.Builder
+	var inQuote, escaped bool
+
+	for _, r := range s {
+		switch {
+		case escaped:
+			current.WriteRune(r)
+			escaped = false
+		case r == '\\':
+			escaped = true
+		case r == '"':
+			inQuote = !inQuote
+		case r == ' ' && !inQuote:
+			if current.Len() > 0 {
+				args = append(args, current.String())
+				current.Reset()
+			}
+		default:
+			current.WriteRune(r)
+		}
+	}
+	if current.Len() > 0 {
+		args = append(args, current.String())
+	}
+	return args
+}
+
+func (n *NiriProvider) buildBindNode(bind *overrideBind) *document.Node {
+	node := document.NewNode()
+	node.SetName(bind.Key)
+
+	if bind.Options != nil {
+		if v, ok := bind.Options["repeat"]; ok && v == false {
+			node.AddProperty("repeat", false, "")
+		}
+		if v, ok := bind.Options["cooldown-ms"]; ok {
+			node.AddProperty("cooldown-ms", v, "")
+		}
+		if v, ok := bind.Options["allow-when-locked"]; ok && v == true {
+			node.AddProperty("allow-when-locked", true, "")
+		}
+	}
+
+	if bind.Description != "" {
+		node.AddProperty("hotkey-overlay-title", bind.Description, "")
+	}
+
+	actionNode := n.buildActionNode(bind.Action)
+	node.AddNode(actionNode)
+
+	return node
+}
+
+func (n *NiriProvider) buildActionNode(action string) *document.Node {
+	action = strings.TrimSpace(action)
+	node := document.NewNode()
+
+	if !strings.HasPrefix(action, "spawn ") {
+		node.SetName(action)
+		return node
+	}
+
+	node.SetName("spawn")
+	args := n.parseSpawnArgs(strings.TrimPrefix(action, "spawn "))
+	for _, arg := range args {
+		node.AddArgument(arg, "")
+	}
+	return node
+}
+
+func (n *NiriProvider) writeOverrideBinds(binds map[string]*overrideBind) error {
+	overridePath := n.GetOverridePath()
+	content := n.generateBindsContent(binds)
+
+	if err := n.validateBindsContent(content); err != nil {
+		return err
+	}
+
+	return os.WriteFile(overridePath, []byte(content), 0644)
+}
+
+func (n *NiriProvider) generateBindsContent(binds map[string]*overrideBind) string {
+	if len(binds) == 0 {
+		return "binds {}\n"
+	}
+
+	var regularBinds, recentWindowsBinds []*overrideBind
+	for _, bind := range binds {
+		switch {
+		case n.isRecentWindowsAction(bind.Action):
+			recentWindowsBinds = append(recentWindowsBinds, bind)
+		default:
+			regularBinds = append(regularBinds, bind)
+		}
+	}
+
+	var sb strings.Builder
+
+	sb.WriteString("binds {\n")
+	for _, bind := range regularBinds {
+		n.writeBindNode(&sb, bind, "    ")
+	}
+	sb.WriteString("}\n")
+
+	if len(recentWindowsBinds) > 0 {
+		sb.WriteString("\nrecent-windows {\n")
+		sb.WriteString("    binds {\n")
+		for _, bind := range recentWindowsBinds {
+			n.writeBindNode(&sb, bind, "        ")
+		}
+		sb.WriteString("    }\n")
+		sb.WriteString("}\n")
+	}
+
+	return sb.String()
+}
+
+func (n *NiriProvider) writeBindNode(sb *strings.Builder, bind *overrideBind, indent string) {
+	node := n.buildBindNode(bind)
+
+	sb.WriteString(indent)
+	sb.WriteString(node.Name.String())
+
+	if node.Properties.Exist() {
+		sb.WriteString(" ")
+		sb.WriteString(strings.TrimLeft(node.Properties.String(), " "))
+	}
+
+	sb.WriteString(" { ")
+	if len(node.Children) > 0 {
+		child := node.Children[0]
+		sb.WriteString(child.Name.String())
+		for _, arg := range child.Arguments {
+			sb.WriteString(" ")
+			n.writeQuotedArg(sb, arg.ValueString())
+		}
+	}
+	sb.WriteString("; }\n")
+}
+
+func (n *NiriProvider) writeQuotedArg(sb *strings.Builder, val string) {
+	sb.WriteString("\"")
+	sb.WriteString(strings.ReplaceAll(val, "\"", "\\\""))
+	sb.WriteString("\"")
+}
+
+func (n *NiriProvider) validateBindsContent(content string) error {
+	tmpFile, err := os.CreateTemp("", "dms-binds-*.kdl")
+	if err != nil {
+		return fmt.Errorf("failed to create temp file: %w", err)
+	}
+	defer os.Remove(tmpFile.Name())
+
+	if _, err := tmpFile.WriteString(content); err != nil {
+		tmpFile.Close()
+		return fmt.Errorf("failed to write temp file: %w", err)
+	}
+	tmpFile.Close()
+
+	cmd := exec.Command("niri", "validate", "-c", tmpFile.Name())
+	output, err := cmd.CombinedOutput()
+	if err != nil {
+		return fmt.Errorf("invalid config: %s", strings.TrimSpace(string(output)))
+	}
+
+	return nil
+}

core/internal/keybinds/providers/niri_parser.go

@@ -16,6 +16,7 @@ type NiriKeyBinding struct {
 	Action      string
 	Args        []string
 	Description string
+	Source      string
 }
 
 type NiriSection struct {
@@ -25,10 +26,12 @@ type NiriSection struct {
 }
 
 type NiriParser struct {
-	configDir      string
-	processedFiles map[string]bool
-	bindMap        map[string]*NiriKeyBinding
-	bindOrder      []string
+	configDir        string
+	processedFiles   map[string]bool
+	bindMap          map[string]*NiriKeyBinding
+	bindOrder        []string
+	currentSource    string
+	dmsBindsIncluded bool
 }
 
 func NewNiriParser(configDir string) *NiriParser {
@@ -37,6 +40,7 @@ func NewNiriParser(configDir string) *NiriParser {
 		processedFiles: make(map[string]bool),
 		bindMap:        make(map[string]*NiriKeyBinding),
 		bindOrder:      []string{},
+		currentSource:  "",
 	}
 }
 
@@ -101,6 +105,7 @@ func (p *NiriParser) parseFile(filePath, sectionName string) (*NiriSection, erro
 		Name: sectionName,
 	}
 
+	p.currentSource = absPath
 	baseDir := filepath.Dir(absPath)
 	p.processNodes(doc.Nodes, section, baseDir)
 
@@ -127,14 +132,14 @@ func (p *NiriParser) handleInclude(node *document.Node, section *NiriSection, ba
 		return
 	}
 
-	includePath := node.Arguments[0].String()
-	includePath = strings.Trim(includePath, "\"")
+	includePath := strings.Trim(node.Arguments[0].String(), "\"")
+	if includePath == "dms/binds.kdl" || strings.HasSuffix(includePath, "/dms/binds.kdl") {
+		p.dmsBindsIncluded = true
+	}
 
-	var fullPath string
+	fullPath := filepath.Join(baseDir, includePath)
 	if filepath.IsAbs(includePath) {
 		fullPath = includePath
-	} else {
-		fullPath = filepath.Join(baseDir, includePath)
 	}
 
 	includedSection, err := p.parseFile(fullPath, "")
@@ -145,6 +150,10 @@ func (p *NiriParser) handleInclude(node *document.Node, section *NiriSection, ba
 	section.Children = append(section.Children, includedSection.Children...)
 }
 
+func (p *NiriParser) HasDMSBindsIncluded() bool {
+	return p.dmsBindsIncluded
+}
+
 func (p *NiriParser) handleRecentWindows(node *document.Node, section *NiriSection) {
 	if node.Children == nil {
 		return
@@ -172,7 +181,7 @@ func (p *NiriParser) extractBinds(node *document.Node, section *NiriSection, sub
 	}
 }
 
-func (p *NiriParser) parseKeybindNode(node *document.Node, subcategory string) *NiriKeyBinding {
+func (p *NiriParser) parseKeybindNode(node *document.Node, _ string) *NiriKeyBinding {
 	keyCombo := node.Name.String()
 	if keyCombo == "" {
 		return nil
@@ -182,19 +191,18 @@ func (p *NiriParser) parseKeybindNode(node *document.Node, subcategory string) *
 
 	var action string
 	var args []string
-
 	if len(node.Children) > 0 {
 		actionNode := node.Children[0]
 		action = actionNode.Name.String()
 		for _, arg := range actionNode.Arguments {
-			args = append(args, strings.Trim(arg.String(), "\""))
+			args = append(args, arg.ValueString())
 		}
 	}
 
-	description := ""
+	var description string
 	if node.Properties != nil {
 		if val, ok := node.Properties.Get("hotkey-overlay-title"); ok {
-			description = strings.Trim(val.String(), "\"")
+			description = val.ValueString()
 		}
 	}
 
@@ -204,26 +212,36 @@ func (p *NiriParser) parseKeybindNode(node *document.Node, subcategory string) *
 		Action:      action,
 		Args:        args,
 		Description: description,
+		Source:      p.currentSource,
 	}
 }
 
 func (p *NiriParser) parseKeyCombo(combo string) ([]string, string) {
 	parts := strings.Split(combo, "+")
-	if len(parts) == 0 {
+
+	switch len(parts) {
+	case 0:
 		return nil, combo
-	}
-
-	if len(parts) == 1 {
+	case 1:
 		return nil, parts[0]
+	default:
+		return parts[:len(parts)-1], parts[len(parts)-1]
 	}
-
-	mods := parts[:len(parts)-1]
-	key := parts[len(parts)-1]
-
-	return mods, key
 }
 
-func ParseNiriKeys(configDir string) (*NiriSection, error) {
+type NiriParseResult struct {
+	Section          *NiriSection
+	DMSBindsIncluded bool
+}
+
+func ParseNiriKeys(configDir string) (*NiriParseResult, error) {
 	parser := NewNiriParser(configDir)
-	return parser.Parse()
+	section, err := parser.Parse()
+	if err != nil {
+		return nil, err
+	}
+	return &NiriParseResult{
+		Section:          section,
+		DMSBindsIncluded: parser.HasDMSBindsIncluded(),
+	}, nil
 }

core/internal/keybinds/providers/niri_parser_test.go

@@ -57,20 +57,20 @@ func TestNiriParseBasicBinds(t *testing.T) {
 		t.Fatalf("Failed to write test config: %v", err)
 	}
 
-	section, err := ParseNiriKeys(tmpDir)
+	result, err := ParseNiriKeys(tmpDir)
 	if err != nil {
 		t.Fatalf("ParseNiriKeys failed: %v", err)
 	}
 
-	if len(section.Keybinds) != 3 {
-		t.Errorf("Expected 3 keybinds, got %d", len(section.Keybinds))
+	if len(result.Section.Keybinds) != 3 {
+		t.Errorf("Expected 3 keybinds, got %d", len(result.Section.Keybinds))
 	}
 
 	foundClose := false
 	foundFullscreen := false
 	foundTerminal := false
 
-	for _, kb := range section.Keybinds {
+	for _, kb := range result.Section.Keybinds {
 		switch kb.Action {
 		case "close-window":
 			foundClose = true
@@ -116,19 +116,19 @@ func TestNiriParseRecentWindows(t *testing.T) {
 		t.Fatalf("Failed to write test config: %v", err)
 	}
 
-	section, err := ParseNiriKeys(tmpDir)
+	result, err := ParseNiriKeys(tmpDir)
 	if err != nil {
 		t.Fatalf("ParseNiriKeys failed: %v", err)
 	}
 
-	if len(section.Keybinds) != 2 {
-		t.Errorf("Expected 2 keybinds from recent-windows, got %d", len(section.Keybinds))
+	if len(result.Section.Keybinds) != 2 {
+		t.Errorf("Expected 2 keybinds from recent-windows, got %d", len(result.Section.Keybinds))
 	}
 
 	foundNext := false
 	foundPrev := false
 
-	for _, kb := range section.Keybinds {
+	for _, kb := range result.Section.Keybinds {
 		switch kb.Action {
 		case "next-window":
 			foundNext = true
@@ -172,13 +172,13 @@ include "dms/binds.kdl"
 		t.Fatalf("Failed to write include config: %v", err)
 	}
 
-	section, err := ParseNiriKeys(tmpDir)
+	result, err := ParseNiriKeys(tmpDir)
 	if err != nil {
 		t.Fatalf("ParseNiriKeys failed: %v", err)
 	}
 
-	if len(section.Keybinds) != 2 {
-		t.Errorf("Expected 2 keybinds (1 main + 1 include), got %d", len(section.Keybinds))
+	if len(result.Section.Keybinds) != 2 {
+		t.Errorf("Expected 2 keybinds (1 main + 1 include), got %d", len(result.Section.Keybinds))
 	}
 }
 
@@ -209,17 +209,17 @@ include "dms/binds.kdl"
 		t.Fatalf("Failed to write include config: %v", err)
 	}
 
-	section, err := ParseNiriKeys(tmpDir)
+	result, err := ParseNiriKeys(tmpDir)
 	if err != nil {
 		t.Fatalf("ParseNiriKeys failed: %v", err)
 	}
 
-	if len(section.Keybinds) != 1 {
-		t.Errorf("Expected 1 keybind (later overrides earlier), got %d", len(section.Keybinds))
+	if len(result.Section.Keybinds) != 1 {
+		t.Errorf("Expected 1 keybind (later overrides earlier), got %d", len(result.Section.Keybinds))
 	}
 
-	if len(section.Keybinds) > 0 {
-		kb := section.Keybinds[0]
+	if len(result.Section.Keybinds) > 0 {
+		kb := result.Section.Keybinds[0]
 		if kb.Description != "Override Terminal" {
 			t.Errorf("Expected description 'Override Terminal' (from include), got %q", kb.Description)
 		}
@@ -253,13 +253,13 @@ include "config.kdl"
 		t.Fatalf("Failed to write other config: %v", err)
 	}
 
-	section, err := ParseNiriKeys(tmpDir)
+	result, err := ParseNiriKeys(tmpDir)
 	if err != nil {
 		t.Fatalf("ParseNiriKeys failed (should handle circular includes): %v", err)
 	}
 
-	if len(section.Keybinds) != 2 {
-		t.Errorf("Expected 2 keybinds (circular include handled), got %d", len(section.Keybinds))
+	if len(result.Section.Keybinds) != 2 {
+		t.Errorf("Expected 2 keybinds (circular include handled), got %d", len(result.Section.Keybinds))
 	}
 }
 
@@ -276,13 +276,13 @@ include "nonexistent/file.kdl"
 		t.Fatalf("Failed to write test config: %v", err)
 	}
 
-	section, err := ParseNiriKeys(tmpDir)
+	result, err := ParseNiriKeys(tmpDir)
 	if err != nil {
 		t.Fatalf("ParseNiriKeys failed (should skip missing include): %v", err)
 	}
 
-	if len(section.Keybinds) != 1 {
-		t.Errorf("Expected 1 keybind (missing include skipped), got %d", len(section.Keybinds))
+	if len(result.Section.Keybinds) != 1 {
+		t.Errorf("Expected 1 keybind (missing include skipped), got %d", len(result.Section.Keybinds))
 	}
 }
 
@@ -305,13 +305,13 @@ input {
 		t.Fatalf("Failed to write test config: %v", err)
 	}
 
-	section, err := ParseNiriKeys(tmpDir)
+	result, err := ParseNiriKeys(tmpDir)
 	if err != nil {
 		t.Fatalf("ParseNiriKeys failed: %v", err)
 	}
 
-	if len(section.Keybinds) != 0 {
-		t.Errorf("Expected 0 keybinds, got %d", len(section.Keybinds))
+	if len(result.Section.Keybinds) != 0 {
+		t.Errorf("Expected 0 keybinds, got %d", len(result.Section.Keybinds))
 	}
 }
 
@@ -352,18 +352,18 @@ func TestNiriBindOverrideBehavior(t *testing.T) {
 		t.Fatalf("Failed to write test config: %v", err)
 	}
 
-	section, err := ParseNiriKeys(tmpDir)
+	result, err := ParseNiriKeys(tmpDir)
 	if err != nil {
 		t.Fatalf("ParseNiriKeys failed: %v", err)
 	}
 
-	if len(section.Keybinds) != 3 {
-		t.Fatalf("Expected 3 unique keybinds, got %d", len(section.Keybinds))
+	if len(result.Section.Keybinds) != 3 {
+		t.Fatalf("Expected 3 unique keybinds, got %d", len(result.Section.Keybinds))
 	}
 
 	var modT *NiriKeyBinding
-	for i := range section.Keybinds {
-		kb := &section.Keybinds[i]
+	for i := range result.Section.Keybinds {
+		kb := &result.Section.Keybinds[i]
 		if len(kb.Mods) == 1 && kb.Mods[0] == "Mod" && kb.Key == "T" {
 			modT = kb
 			break
@@ -416,18 +416,18 @@ binds {
 		t.Fatalf("Failed to write include config: %v", err)
 	}
 
-	section, err := ParseNiriKeys(tmpDir)
+	result, err := ParseNiriKeys(tmpDir)
 	if err != nil {
 		t.Fatalf("ParseNiriKeys failed: %v", err)
 	}
 
-	if len(section.Keybinds) != 4 {
-		t.Errorf("Expected 4 unique keybinds, got %d", len(section.Keybinds))
+	if len(result.Section.Keybinds) != 4 {
+		t.Errorf("Expected 4 unique keybinds, got %d", len(result.Section.Keybinds))
 	}
 
 	bindMap := make(map[string]*NiriKeyBinding)
-	for i := range section.Keybinds {
-		kb := &section.Keybinds[i]
+	for i := range result.Section.Keybinds {
+		kb := &result.Section.Keybinds[i]
 		key := ""
 		for _, m := range kb.Mods {
 			key += m + "+"
@@ -475,16 +475,16 @@ func TestNiriParseMultipleArgs(t *testing.T) {
 		t.Fatalf("Failed to write test config: %v", err)
 	}
 
-	section, err := ParseNiriKeys(tmpDir)
+	result, err := ParseNiriKeys(tmpDir)
 	if err != nil {
 		t.Fatalf("ParseNiriKeys failed: %v", err)
 	}
 
-	if len(section.Keybinds) != 1 {
-		t.Fatalf("Expected 1 keybind, got %d", len(section.Keybinds))
+	if len(result.Section.Keybinds) != 1 {
+		t.Fatalf("Expected 1 keybind, got %d", len(result.Section.Keybinds))
 	}
 
-	kb := section.Keybinds[0]
+	kb := result.Section.Keybinds[0]
 	if len(kb.Args) != 5 {
 		t.Errorf("Expected 5 args, got %d: %v", len(kb.Args), kb.Args)
 	}

core/internal/keybinds/providers/niri_test.go

@@ -186,6 +186,144 @@ func TestNiriDefaultConfigDir(t *testing.T) {
 	}
 }
 
+func TestNiriGenerateBindsContent(t *testing.T) {
+	provider := NewNiriProvider("")
+
+	tests := []struct {
+		name     string
+		binds    map[string]*overrideBind
+		expected string
+	}{
+		{
+			name:     "empty binds",
+			binds:    map[string]*overrideBind{},
+			expected: "binds {}\n",
+		},
+		{
+			name: "simple spawn bind",
+			binds: map[string]*overrideBind{
+				"Mod+T": {
+					Key:         "Mod+T",
+					Action:      "spawn kitty",
+					Description: "Open Terminal",
+				},
+			},
+			expected: `binds {
+    Mod+T hotkey-overlay-title="Open Terminal" { spawn "kitty"; }
+}
+`,
+		},
+		{
+			name: "spawn with multiple args",
+			binds: map[string]*overrideBind{
+				"Mod+Space": {
+					Key:         "Mod+Space",
+					Action:      `spawn "dms" "ipc" "call" "spotlight" "toggle"`,
+					Description: "Application Launcher",
+				},
+			},
+			expected: `binds {
+    Mod+Space hotkey-overlay-title="Application Launcher" { spawn "dms" "ipc" "call" "spotlight" "toggle"; }
+}
+`,
+		},
+		{
+			name: "bind with allow-when-locked",
+			binds: map[string]*overrideBind{
+				"XF86AudioMute": {
+					Key:     "XF86AudioMute",
+					Action:  `spawn "dms" "ipc" "call" "audio" "mute"`,
+					Options: map[string]any{"allow-when-locked": true},
+				},
+			},
+			expected: `binds {
+    XF86AudioMute allow-when-locked=true { spawn "dms" "ipc" "call" "audio" "mute"; }
+}
+`,
+		},
+		{
+			name: "simple action without args",
+			binds: map[string]*overrideBind{
+				"Mod+Q": {
+					Key:         "Mod+Q",
+					Action:      "close-window",
+					Description: "Close Window",
+				},
+			},
+			expected: `binds {
+    Mod+Q hotkey-overlay-title="Close Window" { close-window; }
+}
+`,
+		},
+		{
+			name: "recent-windows action",
+			binds: map[string]*overrideBind{
+				"Alt+Tab": {
+					Key:    "Alt+Tab",
+					Action: "next-window",
+				},
+			},
+			expected: `binds {
+}
+
+recent-windows {
+    binds {
+        Alt+Tab { next-window; }
+    }
+}
+`,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result := provider.generateBindsContent(tt.binds)
+			if result != tt.expected {
+				t.Errorf("generateBindsContent() =\n%q\nwant:\n%q", result, tt.expected)
+			}
+		})
+	}
+}
+
+func TestNiriGenerateBindsContentRoundTrip(t *testing.T) {
+	provider := NewNiriProvider("")
+
+	binds := map[string]*overrideBind{
+		"Mod+Space": {
+			Key:         "Mod+Space",
+			Action:      `spawn "dms" "ipc" "call" "spotlight" "toggle"`,
+			Description: "Application Launcher",
+		},
+		"XF86AudioMute": {
+			Key:     "XF86AudioMute",
+			Action:  `spawn "dms" "ipc" "call" "audio" "mute"`,
+			Options: map[string]any{"allow-when-locked": true},
+		},
+		"Mod+Q": {
+			Key:         "Mod+Q",
+			Action:      "close-window",
+			Description: "Close Window",
+		},
+	}
+
+	content := provider.generateBindsContent(binds)
+
+	tmpDir := t.TempDir()
+	configFile := filepath.Join(tmpDir, "config.kdl")
+	if err := os.WriteFile(configFile, []byte(content), 0644); err != nil {
+		t.Fatalf("Failed to write temp file: %v", err)
+	}
+
+	result, err := ParseNiriKeys(tmpDir)
+	if err != nil {
+		t.Fatalf("Failed to parse generated content: %v\nContent was:\n%s", err, content)
+	}
+
+	if len(result.Section.Keybinds) != 3 {
+		t.Errorf("Expected 3 keybinds after round-trip, got %d", len(result.Section.Keybinds))
+	}
+}
+
 func TestNiriProviderWithRealWorldConfig(t *testing.T) {
 	tmpDir := t.TempDir()
 	configFile := filepath.Join(tmpDir, "config.kdl")

core/internal/keybinds/types.go

@@ -5,15 +5,24 @@ type Keybind struct {
 	Description string `json:"desc"`
 	Action      string `json:"action,omitempty"`
 	Subcategory string `json:"subcat,omitempty"`
+	Source      string `json:"source,omitempty"`
 }
 
 type CheatSheet struct {
-	Title    string               `json:"title"`
-	Provider string               `json:"provider"`
-	Binds    map[string][]Keybind `json:"binds"`
+	Title            string               `json:"title"`
+	Provider         string               `json:"provider"`
+	Binds            map[string][]Keybind `json:"binds"`
+	DMSBindsIncluded bool                 `json:"dmsBindsIncluded"`
 }
 
 type Provider interface {
 	Name() string
 	GetCheatSheet() (*CheatSheet, error)
 }
+
+type WritableProvider interface {
+	Provider
+	SetBind(key, action, description string, options map[string]any) error
+	RemoveBind(key string) error
+	GetOverridePath() string
+}

quickshell/DMSShellIPC.qml

@@ -329,79 +329,79 @@ Item {
 
     IpcHandler {
         function toggle(provider: string): string {
-            if (!provider) {
+            if (!provider)
                 return "ERROR: No provider specified";
-            }
 
-            KeybindsService.loadProvider(provider);
+            KeybindsService.currentProvider = provider;
+            KeybindsService.loadBinds();
             root.hyprKeybindsModalLoader.active = true;
 
-            if (root.hyprKeybindsModalLoader.item) {
-                if (root.hyprKeybindsModalLoader.item.shouldBeVisible) {
-                    root.hyprKeybindsModalLoader.item.close();
-                } else {
-                    root.hyprKeybindsModalLoader.item.open();
-                }
-                return `KEYBINDS_TOGGLE_SUCCESS: ${provider}`;
+            if (!root.hyprKeybindsModalLoader.item)
+                return `KEYBINDS_TOGGLE_FAILED: ${provider}`;
+
+            if (root.hyprKeybindsModalLoader.item.shouldBeVisible) {
+                root.hyprKeybindsModalLoader.item.close();
+            } else {
+                root.hyprKeybindsModalLoader.item.open();
             }
-            return `KEYBINDS_TOGGLE_FAILED: ${provider}`;
+            return `KEYBINDS_TOGGLE_SUCCESS: ${provider}`;
         }
 
         function toggleWithPath(provider: string, path: string): string {
-            if (!provider) {
+            if (!provider)
                 return "ERROR: No provider specified";
-            }
 
-            KeybindsService.loadProviderWithPath(provider, path);
+            KeybindsService.currentProvider = provider;
+            KeybindsService.loadBinds();
             root.hyprKeybindsModalLoader.active = true;
 
-            if (root.hyprKeybindsModalLoader.item) {
-                if (root.hyprKeybindsModalLoader.item.shouldBeVisible) {
-                    root.hyprKeybindsModalLoader.item.close();
-                } else {
-                    root.hyprKeybindsModalLoader.item.open();
-                }
-                return `KEYBINDS_TOGGLE_SUCCESS: ${provider} (${path})`;
+            if (!root.hyprKeybindsModalLoader.item)
+                return `KEYBINDS_TOGGLE_FAILED: ${provider}`;
+
+            if (root.hyprKeybindsModalLoader.item.shouldBeVisible) {
+                root.hyprKeybindsModalLoader.item.close();
+            } else {
+                root.hyprKeybindsModalLoader.item.open();
             }
-            return `KEYBINDS_TOGGLE_FAILED: ${provider}`;
+            return `KEYBINDS_TOGGLE_SUCCESS: ${provider} (${path})`;
         }
 
         function open(provider: string): string {
-            if (!provider) {
+            if (!provider)
                 return "ERROR: No provider specified";
-            }
 
-            KeybindsService.loadProvider(provider);
+            KeybindsService.currentProvider = provider;
+            KeybindsService.loadBinds();
             root.hyprKeybindsModalLoader.active = true;
 
-            if (root.hyprKeybindsModalLoader.item) {
-                root.hyprKeybindsModalLoader.item.open();
-                return `KEYBINDS_OPEN_SUCCESS: ${provider}`;
-            }
-            return `KEYBINDS_OPEN_FAILED: ${provider}`;
+            if (!root.hyprKeybindsModalLoader.item)
+                return `KEYBINDS_OPEN_FAILED: ${provider}`;
+
+            root.hyprKeybindsModalLoader.item.open();
+            return `KEYBINDS_OPEN_SUCCESS: ${provider}`;
         }
 
         function openWithPath(provider: string, path: string): string {
-            if (!provider) {
+            if (!provider)
                 return "ERROR: No provider specified";
-            }
 
-            KeybindsService.loadProviderWithPath(provider, path);
+            KeybindsService.currentProvider = provider;
+            KeybindsService.loadBinds();
             root.hyprKeybindsModalLoader.active = true;
 
-            if (root.hyprKeybindsModalLoader.item) {
-                root.hyprKeybindsModalLoader.item.open();
-                return `KEYBINDS_OPEN_SUCCESS: ${provider} (${path})`;
-            }
-            return `KEYBINDS_OPEN_FAILED: ${provider}`;
+            if (!root.hyprKeybindsModalLoader.item)
+                return `KEYBINDS_OPEN_FAILED: ${provider}`;
+
+            root.hyprKeybindsModalLoader.item.open();
+            return `KEYBINDS_OPEN_SUCCESS: ${provider} (${path})`;
         }
 
         function close(): string {
-            if (root.hyprKeybindsModalLoader.item) {
-                root.hyprKeybindsModalLoader.item.close();
-                return "KEYBINDS_CLOSE_SUCCESS";
-            }
-            return "KEYBINDS_CLOSE_FAILED";
+            if (!root.hyprKeybindsModalLoader.item)
+                return "KEYBINDS_CLOSE_FAILED";
+
+            root.hyprKeybindsModalLoader.item.close();
+            return "KEYBINDS_CLOSE_SUCCESS";
         }
 
         target: "keybinds"
@@ -409,44 +409,48 @@ Item {
 
     IpcHandler {
         function openBinds(): string {
-            if (!CompositorService.isHyprland) {
+            if (!CompositorService.isHyprland)
                 return "HYPR_NOT_AVAILABLE";
-            }
-            KeybindsService.loadProvider("hyprland");
+
+            KeybindsService.currentProvider = "hyprland";
+            KeybindsService.loadBinds();
             root.hyprKeybindsModalLoader.active = true;
-            if (root.hyprKeybindsModalLoader.item) {
-                root.hyprKeybindsModalLoader.item.open();
-                return "HYPR_KEYBINDS_OPEN_SUCCESS";
-            }
-            return "HYPR_KEYBINDS_OPEN_FAILED";
+
+            if (!root.hyprKeybindsModalLoader.item)
+                return "HYPR_KEYBINDS_OPEN_FAILED";
+
+            root.hyprKeybindsModalLoader.item.open();
+            return "HYPR_KEYBINDS_OPEN_SUCCESS";
         }
 
         function closeBinds(): string {
-            if (!CompositorService.isHyprland) {
+            if (!CompositorService.isHyprland)
                 return "HYPR_NOT_AVAILABLE";
-            }
-            if (root.hyprKeybindsModalLoader.item) {
-                root.hyprKeybindsModalLoader.item.close();
-                return "HYPR_KEYBINDS_CLOSE_SUCCESS";
-            }
-            return "HYPR_KEYBINDS_CLOSE_FAILED";
+
+            if (!root.hyprKeybindsModalLoader.item)
+                return "HYPR_KEYBINDS_CLOSE_FAILED";
+
+            root.hyprKeybindsModalLoader.item.close();
+            return "HYPR_KEYBINDS_CLOSE_SUCCESS";
         }
 
         function toggleBinds(): string {
-            if (!CompositorService.isHyprland) {
+            if (!CompositorService.isHyprland)
                 return "HYPR_NOT_AVAILABLE";
-            }
-            KeybindsService.loadProvider("hyprland");
+
+            KeybindsService.currentProvider = "hyprland";
+            KeybindsService.loadBinds();
             root.hyprKeybindsModalLoader.active = true;
-            if (root.hyprKeybindsModalLoader.item) {
-                if (root.hyprKeybindsModalLoader.item.shouldBeVisible) {
-                    root.hyprKeybindsModalLoader.item.close();
-                } else {
-                    root.hyprKeybindsModalLoader.item.open();
-                }
-                return "HYPR_KEYBINDS_TOGGLE_SUCCESS";
+
+            if (!root.hyprKeybindsModalLoader.item)
+                return "HYPR_KEYBINDS_TOGGLE_FAILED";
+
+            if (root.hyprKeybindsModalLoader.item.shouldBeVisible) {
+                root.hyprKeybindsModalLoader.item.close();
+            } else {
+                root.hyprKeybindsModalLoader.item.open();
             }
-            return "HYPR_KEYBINDS_TOGGLE_FAILED";
+            return "HYPR_KEYBINDS_TOGGLE_SUCCESS";
         }
 
         function toggleOverview(): string {
@@ -490,60 +494,108 @@ Item {
 
     function getBarConfig(selector: string, value: string): var {
         const barSelectors = ["id", "name", "index"];
-        if (!barSelectors.includes(selector)) return { error: "BAR_INVALID_SELECTOR" };
+        if (!barSelectors.includes(selector))
+            return {
+                error: "BAR_INVALID_SELECTOR"
+            };
         const index = selector === "index" ? Number(value) : SettingsData.barConfigs.findIndex(bar => bar[selector] == value);
         const barConfig = SettingsData.barConfigs?.[index];
-        if (!barConfig) return { error: "BAR_NOT_FOUND" };
-        return { barConfig };
+        if (!barConfig)
+            return {
+                error: "BAR_NOT_FOUND"
+            };
+        return {
+            barConfig
+        };
     }
 
     IpcHandler {
         function reveal(selector: string, value: string): string {
-            const { barConfig, error } = getBarConfig(selector, value);
-            if (error) return error;
-            SettingsData.updateBarConfig(barConfig.id, {visible: true});
+            const {
+                barConfig,
+                error
+            } = getBarConfig(selector, value);
+            if (error)
+                return error;
+            SettingsData.updateBarConfig(barConfig.id, {
+                visible: true
+            });
             return "BAR_SHOW_SUCCESS";
         }
 
         function hide(selector: string, value: string): string {
-            const { barConfig, error } = getBarConfig(selector, value);
-            if (error) return error;
-            SettingsData.updateBarConfig(barConfig.id, {visible: false});
+            const {
+                barConfig,
+                error
+            } = getBarConfig(selector, value);
+            if (error)
+                return error;
+            SettingsData.updateBarConfig(barConfig.id, {
+                visible: false
+            });
             return "BAR_HIDE_SUCCESS";
         }
 
         function toggle(selector: string, value: string): string {
-            const { barConfig, error } = getBarConfig(selector, value);
-            if (error) return error;
-            SettingsData.updateBarConfig(barConfig.id, {visible: !barConfig.visible});
+            const {
+                barConfig,
+                error
+            } = getBarConfig(selector, value);
+            if (error)
+                return error;
+            SettingsData.updateBarConfig(barConfig.id, {
+                visible: !barConfig.visible
+            });
             return !barConfig.visible ? "BAR_SHOW_SUCCESS" : "BAR_HIDE_SUCCESS";
         }
 
         function status(selector: string, value: string): string {
-            const { barConfig, error } = getBarConfig(selector, value);
-            if (error) return error;
+            const {
+                barConfig,
+                error
+            } = getBarConfig(selector, value);
+            if (error)
+                return error;
             return barConfig.visible ? "visible" : "hidden";
         }
 
         function autoHide(selector: string, value: string): string {
-            const { barConfig, error } = getBarConfig(selector, value);
-            if (error) return error;
-            SettingsData.updateBarConfig(barConfig.id, {autoHide: true});
+            const {
+                barConfig,
+                error
+            } = getBarConfig(selector, value);
+            if (error)
+                return error;
+            SettingsData.updateBarConfig(barConfig.id, {
+                autoHide: true
+            });
             return "BAR_AUTO_HIDE_SUCCESS";
         }
 
         function manualHide(selector: string, value: string): string {
-            const { barConfig, error } = getBarConfig(selector, value);
-            if (error) return error;
-            SettingsData.updateBarConfig(barConfig.id, {autoHide: false});
+            const {
+                barConfig,
+                error
+            } = getBarConfig(selector, value);
+            if (error)
+                return error;
+            SettingsData.updateBarConfig(barConfig.id, {
+                autoHide: false
+            });
             return "BAR_MANUAL_HIDE_SUCCESS";
         }
 
         function toggleAutoHide(selector: string, value: string): string {
-            const { barConfig, error } = getBarConfig(selector, value);
-            if (error) return error;
-            SettingsData.updateBarConfig(barConfig.id, {autoHide: !barConfig.autoHide});
-            return barConfig.autoHide ?  "BAR_MANUAL_HIDE_SUCCESS": "BAR_AUTO_HIDE_SUCCESS";
+            const {
+                barConfig,
+                error
+            } = getBarConfig(selector, value);
+            if (error)
+                return error;
+            SettingsData.updateBarConfig(barConfig.id, {
+                autoHide: !barConfig.autoHide
+            });
+            return barConfig.autoHide ? "BAR_MANUAL_HIDE_SUCCESS" : "BAR_AUTO_HIDE_SUCCESS";
         }
 
         target: "bar"
@@ -570,20 +622,20 @@ Item {
         }
 
         function autoHide(): string {
-            SettingsData.dockAutoHide = true
-            SettingsData.saveSettings()
+            SettingsData.dockAutoHide = true;
+            SettingsData.saveSettings();
             return "BAR_AUTO_HIDE_SUCCESS";
         }
 
         function manualHide(): string {
-            SettingsData.dockAutoHide = false
-            SettingsData.saveSettings()
+            SettingsData.dockAutoHide = false;
+            SettingsData.saveSettings();
             return "BAR_MANUAL_HIDE_SUCCESS";
         }
 
         function toggleAutoHide(): string {
-            SettingsData.dockAutoHide = !SettingsData.dockAutoHide
-            SettingsData.saveSettings()
+            SettingsData.dockAutoHide = !SettingsData.dockAutoHide;
+            SettingsData.saveSettings();
             return SettingsData.dockAutoHide ? "BAR_AUTO_HIDE_SUCCESS" : "BAR_MANUAL_HIDE_SUCCESS";
         }
 
@@ -612,49 +664,51 @@ Item {
         }
 
         function get(key: string): string {
-            return JSON.stringify(SettingsData?.[key])
+            return JSON.stringify(SettingsData?.[key]);
         }
 
         function set(key: string, value: string): string {
-
             if (!(key in SettingsData)) {
-                console.warn("Cannot set property, not found:", key)
-                return "SETTINGS_INVALID_KEY"
+                console.warn("Cannot set property, not found:", key);
+                return "SETTINGS_INVALID_KEY";
             }
 
-            const typeName = typeof SettingsData?.[key]
+            const typeName = typeof SettingsData?.[key];
 
             try {
                 switch (typeName) {
                 case "boolean":
-                    if (value === "true" || value === "false") value = (value === "true")
-                    else throw `${value} is not a Boolean`
-                    break
+                    if (value === "true" || value === "false")
+                        value = (value === "true");
+                    else
+                        throw `${value} is not a Boolean`;
+                    break;
                 case "number":
-                    value = Number(value)
-                    if (isNaN(value)) throw `${value} is not a Number`
-                    break
+                    value = Number(value);
+                    if (isNaN(value))
+                        throw `${value} is not a Number`;
+                    break;
                 case "string":
-                    value = String(value)
-                    break
+                    value = String(value);
+                    break;
                 case "object":
                     // NOTE: Parsing lists is messed up upstream and not sure if we want
                     // to make sure objects are well structured or just let people set
                     // whatever they want but risking messed up settings.
                     // Objects & Arrays are disabled for now
                     // https://github.com/quickshell-mirror/quickshell/pull/22
-                    throw "Setting Objects and Arrays not supported"
+                    throw "Setting Objects and Arrays not supported";
                 default:
-                    throw "Unsupported type"
+                    throw "Unsupported type";
                 }
 
-                console.warn("Setting:", key, value)
-                SettingsData[key] = value
-                SettingsData.saveSettings()
-                return "SETTINGS_SET_SUCCESS"
+                console.warn("Setting:", key, value);
+                SettingsData[key] = value;
+                SettingsData.saveSettings();
+                return "SETTINGS_SET_SUCCESS";
             } catch (e) {
-                console.warn("Failed to set property:", key, "error:", e)
-                return "SETTINGS_SET_FAILURE"
+                console.warn("Failed to set property:", key, "error:", e);
+                return "SETTINGS_SET_FAILURE";
             }
         }
 

quickshell/Modals/KeybindsModal.qml

@@ -97,14 +97,12 @@ DankModal {
                                 const bind = binds[i];
                                 if (bind.subcat) {
                                     hasSubcats = true;
-                                    if (!subcats[bind.subcat]) {
+                                    if (!subcats[bind.subcat])
                                         subcats[bind.subcat] = [];
-                                    }
                                     subcats[bind.subcat].push(bind);
                                 } else {
-                                    if (!subcats["_root"]) {
+                                    if (!subcats["_root"])
                                         subcats["_root"] = [];
-                                    }
                                     subcats["_root"].push(bind);
                                 }
                             }
@@ -121,12 +119,10 @@ DankModal {
 
                     function distributeCategories(cols) {
                         const columns = [];
-                        for (let i = 0; i < cols; i++) {
+                        for (let i = 0; i < cols; i++)
                             columns.push([]);
-                        }
-                        for (let i = 0; i < categoryKeys.length; i++) {
+                        for (let i = 0; i < categoryKeys.length; i++)
                             columns[i % cols].push(categoryKeys[i]);
-                        }
                         return columns;
                     }
 

quickshell/Modals/Settings/SettingsContent.qml

@@ -57,13 +57,32 @@ FocusScope {
         }
 
         Loader {
-            id: topBarLoader
+            id: keybindsLoader
 
             anchors.fill: parent
             active: root.currentIndex === 2
             visible: active
             focus: active
 
+            sourceComponent: KeybindsTab {
+                parentModal: root.parentModal
+            }
+
+            onActiveChanged: {
+                if (active && item) {
+                    Qt.callLater(() => item.forceActiveFocus());
+                }
+            }
+        }
+
+        Loader {
+            id: topBarLoader
+
+            anchors.fill: parent
+            active: root.currentIndex === 3
+            visible: active
+            focus: active
+
             sourceComponent: DankBarTab {
                 parentModal: root.parentModal
             }
@@ -79,7 +98,7 @@ FocusScope {
             id: widgetsLoader
 
             anchors.fill: parent
-            active: root.currentIndex === 3
+            active: root.currentIndex === 4
             visible: active
             focus: active
 
@@ -96,7 +115,7 @@ FocusScope {
             id: dockLoader
 
             anchors.fill: parent
-            active: root.currentIndex === 4
+            active: root.currentIndex === 5
             visible: active
             focus: active
 
@@ -115,7 +134,7 @@ FocusScope {
             id: displaysLoader
 
             anchors.fill: parent
-            active: root.currentIndex === 5
+            active: root.currentIndex === 6
             visible: active
             focus: active
 
@@ -132,7 +151,7 @@ FocusScope {
             id: networkLoader
 
             anchors.fill: parent
-            active: root.currentIndex === 6
+            active: root.currentIndex === 7
             visible: active
             focus: active
 
@@ -149,7 +168,7 @@ FocusScope {
             id: printerLoader
 
             anchors.fill: parent
-            active: root.currentIndex === 7
+            active: root.currentIndex === 8
             visible: active
             focus: active
 
@@ -166,7 +185,7 @@ FocusScope {
             id: launcherLoader
 
             anchors.fill: parent
-            active: root.currentIndex === 8
+            active: root.currentIndex === 9
             visible: active
             focus: active
 
@@ -183,7 +202,7 @@ FocusScope {
             id: themeColorsLoader
 
             anchors.fill: parent
-            active: root.currentIndex === 9
+            active: root.currentIndex === 10
             visible: active
             focus: active
 
@@ -200,7 +219,7 @@ FocusScope {
             id: powerLoader
 
             anchors.fill: parent
-            active: root.currentIndex === 10
+            active: root.currentIndex === 11
             visible: active
             focus: active
 
@@ -217,7 +236,7 @@ FocusScope {
             id: pluginsLoader
 
             anchors.fill: parent
-            active: root.currentIndex === 11
+            active: root.currentIndex === 12
             visible: active
             focus: active
 
@@ -236,7 +255,7 @@ FocusScope {
             id: aboutLoader
 
             anchors.fill: parent
-            active: root.currentIndex === 12
+            active: root.currentIndex === 13
             visible: active
             focus: active
 

quickshell/Modals/Settings/SettingsSidebar.qml

@@ -22,62 +22,68 @@ Rectangle {
             "icon": "schedule",
             "tabIndex": 1
         },
+        {
+            "text": I18n.tr("Keyboard Shortcuts"),
+            "icon": "keyboard",
+            "shortcutsOnly": true,
+            "tabIndex": 2
+        },
         {
             "text": I18n.tr("Dank Bar"),
             "icon": "toolbar",
-            "tabIndex": 2
+            "tabIndex": 3
         },
         {
             "text": I18n.tr("Widgets"),
             "icon": "widgets",
-            "tabIndex": 3
+            "tabIndex": 4
         },
         {
             "text": I18n.tr("Dock"),
             "icon": "dock_to_bottom",
-            "tabIndex": 4
+            "tabIndex": 5
         },
         {
             "text": I18n.tr("Displays"),
             "icon": "monitor",
-            "tabIndex": 5
+            "tabIndex": 6
         },
         {
             "text": I18n.tr("Network"),
             "icon": "wifi",
             "dmsOnly": true,
-            "tabIndex": 6
+            "tabIndex": 7
         },
         {
             "text": I18n.tr("Printers"),
             "icon": "print",
             "cupsOnly": true,
-            "tabIndex": 7
+            "tabIndex": 8
         },
         {
             "text": I18n.tr("Launcher"),
             "icon": "apps",
-            "tabIndex": 8
+            "tabIndex": 9
         },
         {
             "text": I18n.tr("Theme & Colors"),
             "icon": "palette",
-            "tabIndex": 9
+            "tabIndex": 10
         },
         {
             "text": I18n.tr("Power & Security"),
             "icon": "power",
-            "tabIndex": 10
+            "tabIndex": 11
         },
         {
             "text": I18n.tr("Plugins"),
             "icon": "extension",
-            "tabIndex": 11
+            "tabIndex": 12
         },
         {
             "text": I18n.tr("About"),
             "icon": "info",
-            "tabIndex": 12
+            "tabIndex": 13
         }
     ]
     readonly property var sidebarItems: allSidebarItems.filter(item => {
@@ -85,6 +91,8 @@ Rectangle {
             return false;
         if (item.cupsOnly && !CupsService.cupsAvailable)
             return false;
+        if (item.shortcutsOnly && !KeybindsService.available)
+            return false;
         return true;
     })
 

quickshell/Modules/Settings/KeybindsTab.qml

@@ -0,0 +1,548 @@
+pragma ComponentBehavior: Bound
+
+import QtQuick
+import Quickshell
+import qs.Common
+import qs.Services
+import qs.Widgets
+
+Item {
+    id: keybindsTab
+
+    property var parentModal: null
+    property string selectedCategory: ""
+    property string searchQuery: ""
+    property string expandedKey: ""
+    property bool showingNewBind: false
+
+    property int _lastDataVersion: -1
+    property var _cachedCategories: []
+    property var _filteredBinds: []
+
+    function _updateFiltered() {
+        const allBinds = KeybindsService.getFlatBinds();
+        if (!searchQuery && !selectedCategory) {
+            _filteredBinds = allBinds;
+            return;
+        }
+
+        const q = searchQuery.toLowerCase();
+        const isOverrideFilter = selectedCategory === "__overrides__";
+        const result = [];
+
+        for (let i = 0; i < allBinds.length; i++) {
+            const group = allBinds[i];
+            if (q) {
+                let keyMatch = false;
+                for (let k = 0; k < group.keys.length; k++) {
+                    if (group.keys[k].key.toLowerCase().indexOf(q) !== -1) {
+                        keyMatch = true;
+                        break;
+                    }
+                }
+                if (!keyMatch && group.desc.toLowerCase().indexOf(q) === -1 && group.action.toLowerCase().indexOf(q) === -1)
+                    continue;
+            }
+            if (isOverrideFilter) {
+                let hasOverride = false;
+                for (let k = 0; k < group.keys.length; k++) {
+                    if (group.keys[k].isOverride) {
+                        hasOverride = true;
+                        break;
+                    }
+                }
+                if (!hasOverride)
+                    continue;
+            } else if (selectedCategory && group.category !== selectedCategory) {
+                continue;
+            }
+            result.push(group);
+        }
+        _filteredBinds = result;
+    }
+
+    function _updateCategories() {
+        _cachedCategories = ["__overrides__"].concat(KeybindsService.getCategories());
+    }
+
+    function getCategoryLabel(cat) {
+        if (cat === "__overrides__")
+            return I18n.tr("Overrides");
+        return cat;
+    }
+
+    function toggleExpanded(action) {
+        expandedKey = expandedKey === action ? "" : action;
+    }
+
+    function startNewBind() {
+        showingNewBind = true;
+        expandedKey = "";
+    }
+
+    function cancelNewBind() {
+        showingNewBind = false;
+    }
+
+    function saveNewBind(bindData) {
+        KeybindsService.saveBind("", bindData);
+        showingNewBind = false;
+    }
+
+    function scrollToTop() {
+        flickable.contentY = 0;
+    }
+
+    Timer {
+        id: searchDebounce
+        interval: 150
+        onTriggered: keybindsTab._updateFiltered()
+    }
+
+    Connections {
+        target: KeybindsService
+        function onBindsLoaded() {
+            keybindsTab._lastDataVersion = KeybindsService._dataVersion;
+            keybindsTab._updateCategories();
+            keybindsTab._updateFiltered();
+        }
+    }
+
+    function _ensureNiriProvider() {
+        if (!KeybindsService.available)
+            return;
+        const cachedProvider = KeybindsService.keybinds?.provider;
+        if (cachedProvider !== "niri" || KeybindsService._dataVersion === 0) {
+            KeybindsService.currentProvider = "niri";
+            KeybindsService.loadBinds();
+            return;
+        }
+        if (_lastDataVersion !== KeybindsService._dataVersion) {
+            _lastDataVersion = KeybindsService._dataVersion;
+            _updateCategories();
+            _updateFiltered();
+        }
+    }
+
+    Component.onCompleted: _ensureNiriProvider()
+
+    onVisibleChanged: {
+        if (!visible)
+            return;
+        Qt.callLater(scrollToTop);
+        _ensureNiriProvider();
+    }
+
+    DankFlickable {
+        id: flickable
+        anchors.fill: parent
+        clip: true
+        contentWidth: width
+        contentHeight: contentColumn.implicitHeight
+
+        Column {
+            id: contentColumn
+            width: flickable.width
+            spacing: Theme.spacingL
+            topPadding: Theme.spacingXL
+            bottomPadding: Theme.spacingXL
+
+            StyledRect {
+                width: Math.min(650, parent.width - Theme.spacingL * 2)
+                height: headerSection.implicitHeight + Theme.spacingL * 2
+                anchors.horizontalCenter: parent.horizontalCenter
+                radius: Theme.cornerRadius
+                color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
+                border.width: 0
+
+                Column {
+                    id: headerSection
+                    anchors.fill: parent
+                    anchors.margins: Theme.spacingL
+                    spacing: Theme.spacingM
+
+                    Row {
+                        width: parent.width
+                        spacing: Theme.spacingM
+
+                        DankIcon {
+                            name: "keyboard"
+                            size: Theme.iconSize
+                            color: Theme.primary
+                            anchors.verticalCenter: parent.verticalCenter
+                        }
+
+                        Column {
+                            width: parent.width - Theme.iconSize - Theme.spacingM * 2
+                            spacing: Theme.spacingXS
+                            anchors.verticalCenter: parent.verticalCenter
+
+                            StyledText {
+                                text: I18n.tr("Keyboard Shortcuts")
+                                font.pixelSize: Theme.fontSizeLarge
+                                font.weight: Font.Medium
+                                color: Theme.surfaceText
+                            }
+
+                            StyledText {
+                                text: I18n.tr("Click any shortcut to edit. Changes save to dms/binds.kdl")
+                                font.pixelSize: Theme.fontSizeSmall
+                                color: Theme.surfaceVariantText
+                                wrapMode: Text.WordWrap
+                                width: parent.width
+                            }
+                        }
+                    }
+
+                    Row {
+                        width: parent.width
+                        spacing: Theme.spacingM
+
+                        DankTextField {
+                            id: searchField
+                            width: parent.width - addButton.width - Theme.spacingM
+                            height: 44
+                            placeholderText: I18n.tr("Search keybinds...")
+                            leftIconName: "search"
+                            onTextChanged: {
+                                keybindsTab.searchQuery = text;
+                                searchDebounce.restart();
+                            }
+                        }
+
+                        DankActionButton {
+                            id: addButton
+                            width: 44
+                            height: 44
+                            circular: false
+                            iconName: "add"
+                            iconSize: Theme.iconSize
+                            iconColor: Theme.primary
+                            anchors.verticalCenter: parent.verticalCenter
+                            enabled: !keybindsTab.showingNewBind
+                            opacity: enabled ? 1 : 0.5
+                            onClicked: keybindsTab.startNewBind()
+                        }
+                    }
+                }
+            }
+
+            StyledRect {
+                width: Math.min(650, parent.width - Theme.spacingL * 2)
+                height: warningSection.implicitHeight + Theme.spacingL * 2
+                anchors.horizontalCenter: parent.horizontalCenter
+                radius: Theme.cornerRadius
+                color: Theme.withAlpha(Theme.error, 0.15)
+                border.color: Theme.withAlpha(Theme.error, 0.3)
+                border.width: 1
+                visible: !KeybindsService.dmsBindsIncluded && !KeybindsService.loading
+
+                Column {
+                    id: warningSection
+                    anchors.fill: parent
+                    anchors.margins: Theme.spacingL
+                    spacing: Theme.spacingM
+
+                    Row {
+                        width: parent.width
+                        spacing: Theme.spacingM
+
+                        DankIcon {
+                            name: "warning"
+                            size: Theme.iconSize
+                            color: Theme.error
+                            anchors.verticalCenter: parent.verticalCenter
+                        }
+
+                        Column {
+                            width: parent.width - Theme.iconSize - 100 - Theme.spacingM * 2
+                            spacing: Theme.spacingXS
+                            anchors.verticalCenter: parent.verticalCenter
+
+                            StyledText {
+                                text: I18n.tr("Binds Include Missing")
+                                font.pixelSize: Theme.fontSizeMedium
+                                font.weight: Font.Medium
+                                color: Theme.error
+                            }
+
+                            StyledText {
+                                text: I18n.tr("dms/binds.kdl is not included in config.kdl. Custom keybinds will not work until this is fixed.")
+                                font.pixelSize: Theme.fontSizeSmall
+                                color: Theme.surfaceVariantText
+                                wrapMode: Text.WordWrap
+                                width: parent.width
+                            }
+                        }
+
+                        Rectangle {
+                            id: fixButton
+                            width: fixButtonText.implicitWidth + Theme.spacingL * 2
+                            height: 36
+                            radius: Theme.cornerRadius
+                            color: KeybindsService.fixing ? Theme.withAlpha(Theme.error, 0.6) : Theme.error
+                            anchors.verticalCenter: parent.verticalCenter
+
+                            StyledText {
+                                id: fixButtonText
+                                text: KeybindsService.fixing ? I18n.tr("Fixing...") : I18n.tr("Fix Now")
+                                font.pixelSize: Theme.fontSizeSmall
+                                font.weight: Font.Medium
+                                color: Theme.surface
+                                anchors.centerIn: parent
+                            }
+
+                            MouseArea {
+                                anchors.fill: parent
+                                cursorShape: Qt.PointingHandCursor
+                                enabled: !KeybindsService.fixing
+                                onClicked: KeybindsService.fixDmsBindsInclude()
+                            }
+                        }
+                    }
+                }
+            }
+
+            StyledRect {
+                width: Math.min(650, parent.width - Theme.spacingL * 2)
+                height: categorySection.implicitHeight + Theme.spacingL * 2
+                anchors.horizontalCenter: parent.horizontalCenter
+                radius: Theme.cornerRadius
+                color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
+                border.width: 0
+
+                Column {
+                    id: categorySection
+                    anchors.fill: parent
+                    anchors.margins: Theme.spacingL
+                    spacing: Theme.spacingM
+
+                    Flow {
+                        width: parent.width
+                        spacing: Theme.spacingS
+
+                        Rectangle {
+                            width: allChip.implicitWidth + Theme.spacingL
+                            height: 32
+                            radius: 16
+                            color: !keybindsTab.selectedCategory ? Theme.primary : Theme.surfaceContainerHighest
+
+                            StyledText {
+                                id: allChip
+                                text: I18n.tr("All")
+                                font.pixelSize: Theme.fontSizeSmall
+                                color: !keybindsTab.selectedCategory ? Theme.primaryText : Theme.surfaceVariantText
+                                anchors.centerIn: parent
+                            }
+
+                            MouseArea {
+                                anchors.fill: parent
+                                cursorShape: Qt.PointingHandCursor
+                                onClicked: {
+                                    keybindsTab.selectedCategory = "";
+                                    keybindsTab._updateFiltered();
+                                }
+                            }
+                        }
+
+                        Repeater {
+                            model: keybindsTab._cachedCategories
+
+                            delegate: Rectangle {
+                                required property string modelData
+                                required property int index
+
+                                width: catText.implicitWidth + Theme.spacingL
+                                height: 32
+                                radius: 16
+                                color: keybindsTab.selectedCategory === modelData ? Theme.primary : (modelData === "__overrides__" ? Theme.withAlpha(Theme.primary, 0.15) : Theme.surfaceContainerHighest)
+
+                                StyledText {
+                                    id: catText
+                                    text: keybindsTab.getCategoryLabel(modelData)
+                                    font.pixelSize: Theme.fontSizeSmall
+                                    color: keybindsTab.selectedCategory === modelData ? Theme.primaryText : (modelData === "__overrides__" ? Theme.primary : Theme.surfaceVariantText)
+                                    anchors.centerIn: parent
+                                }
+
+                                MouseArea {
+                                    anchors.fill: parent
+                                    cursorShape: Qt.PointingHandCursor
+                                    onClicked: {
+                                        keybindsTab.selectedCategory = modelData;
+                                        keybindsTab._updateFiltered();
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            StyledRect {
+                width: Math.min(650, parent.width - Theme.spacingL * 2)
+                height: newBindSection.implicitHeight + Theme.spacingL * 2
+                anchors.horizontalCenter: parent.horizontalCenter
+                radius: Theme.cornerRadius
+                color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
+                border.color: Theme.outlineVariant
+                border.width: 1
+                visible: keybindsTab.showingNewBind
+
+                Column {
+                    id: newBindSection
+                    anchors.fill: parent
+                    anchors.margins: Theme.spacingL
+                    spacing: Theme.spacingM
+
+                    Row {
+                        width: parent.width
+                        spacing: Theme.spacingM
+
+                        DankIcon {
+                            name: "add"
+                            size: Theme.iconSize
+                            color: Theme.surfaceText
+                            anchors.verticalCenter: parent.verticalCenter
+                        }
+
+                        StyledText {
+                            text: I18n.tr("New Keybind")
+                            font.pixelSize: Theme.fontSizeMedium
+                            font.weight: Font.Medium
+                            color: Theme.surfaceText
+                            anchors.verticalCenter: parent.verticalCenter
+                        }
+                    }
+
+                    KeybindItem {
+                        width: parent.width
+                        isNew: true
+                        isExpanded: true
+                        bindData: ({
+                                keys: [
+                                    {
+                                        key: "",
+                                        source: "dms",
+                                        isOverride: true
+                                    }
+                                ],
+                                action: "",
+                                desc: ""
+                            })
+                        panelWindow: keybindsTab.parentModal
+                        onSaveBind: (originalKey, newData) => keybindsTab.saveNewBind(newData)
+                        onCancelEdit: keybindsTab.cancelNewBind()
+                    }
+                }
+            }
+
+            StyledRect {
+                width: Math.min(650, parent.width - Theme.spacingL * 2)
+                height: bindsListHeader.implicitHeight + Theme.spacingL * 2
+                anchors.horizontalCenter: parent.horizontalCenter
+                radius: Theme.cornerRadius
+                color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
+                border.width: 0
+
+                Column {
+                    id: bindsListHeader
+                    anchors.fill: parent
+                    anchors.margins: Theme.spacingL
+                    spacing: Theme.spacingM
+
+                    Row {
+                        width: parent.width
+                        spacing: Theme.spacingM
+
+                        DankIcon {
+                            name: "list"
+                            size: Theme.iconSize
+                            color: Theme.primary
+                            anchors.verticalCenter: parent.verticalCenter
+                        }
+
+                        StyledText {
+                            text: KeybindsService.loading ? I18n.tr("Shortcuts") : I18n.tr("Shortcuts") + " (" + keybindsTab._filteredBinds.length + ")"
+                            font.pixelSize: Theme.fontSizeMedium
+                            font.weight: Font.Medium
+                            color: Theme.surfaceText
+                            anchors.verticalCenter: parent.verticalCenter
+                        }
+                    }
+
+                    Row {
+                        width: parent.width
+                        spacing: Theme.spacingM
+                        visible: KeybindsService.loading
+
+                        DankIcon {
+                            id: loadingIcon
+                            name: "sync"
+                            size: 20
+                            color: Theme.primary
+                            anchors.verticalCenter: parent.verticalCenter
+
+                            RotationAnimation on rotation {
+                                from: 0
+                                to: 360
+                                duration: 1000
+                                loops: Animation.Infinite
+                                running: KeybindsService.loading
+                            }
+                        }
+
+                        StyledText {
+                            text: I18n.tr("Loading keybinds...")
+                            font.pixelSize: Theme.fontSizeMedium
+                            color: Theme.surfaceVariantText
+                            anchors.verticalCenter: parent.verticalCenter
+                        }
+                    }
+
+                    StyledText {
+                        text: I18n.tr("No keybinds found")
+                        font.pixelSize: Theme.fontSizeMedium
+                        color: Theme.surfaceVariantText
+                        visible: !KeybindsService.loading && keybindsTab._filteredBinds.length === 0
+                    }
+                }
+            }
+
+            Column {
+                width: parent.width
+                spacing: Theme.spacingXS
+
+                Repeater {
+                    model: ScriptModel {
+                        values: keybindsTab._filteredBinds
+                        objectProp: "action"
+                    }
+
+                    delegate: Item {
+                        required property var modelData
+                        required property int index
+
+                        width: parent.width
+                        height: bindItem.height
+
+                        KeybindItem {
+                            id: bindItem
+                            width: Math.min(650, parent.width - Theme.spacingL * 2)
+                            anchors.horizontalCenter: parent.horizontalCenter
+                            bindData: modelData
+                            isExpanded: keybindsTab.expandedKey === modelData.action
+                            panelWindow: keybindsTab.parentModal
+                            onToggleExpand: keybindsTab.toggleExpanded(modelData.action)
+                            onSaveBind: (originalKey, newData) => {
+                                KeybindsService.saveBind(originalKey, newData);
+                                keybindsTab.expandedKey = modelData.action;
+                            }
+                            onRemoveBind: key => KeybindsService.removeBind(key)
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

quickshell/Modules/Toast.qml

@@ -2,8 +2,6 @@ import QtQuick
 import QtQuick.Effects
 import Quickshell
 import Quickshell.Wayland
-import Quickshell.Widgets
-import Quickshell.Io
 import qs.Common
 import qs.Services
 import qs.Widgets
@@ -22,13 +20,13 @@ PanelWindow {
         target: ToastService
         function onToastVisibleChanged() {
             if (ToastService.toastVisible) {
-                shouldBeVisible = true
-                visible = true
+                shouldBeVisible = true;
+                visible = true;
             } else {
                 // Freeze the width before starting exit animation
-                frozenWidth = toast.width
-                shouldBeVisible = false
-                closeTimer.restart()
+                frozenWidth = toast.width;
+                shouldBeVisible = false;
+                closeTimer.restart();
             }
         }
     }
@@ -38,7 +36,7 @@ PanelWindow {
         interval: Theme.mediumDuration + 50
         onTriggered: {
             if (!shouldBeVisible) {
-                visible = false
+                visible = false;
             }
         }
     }
@@ -65,7 +63,7 @@ PanelWindow {
         Connections {
             target: ToastService
             function onResetToastState() {
-                toast.expanded = false
+                toast.expanded = false;
             }
         }
 
@@ -76,13 +74,13 @@ PanelWindow {
         color: {
             switch (ToastService.currentLevel) {
             case ToastService.levelError:
-                return Theme.error
+                return Theme.error;
             case ToastService.levelWarn:
-                return Theme.warning
+                return Theme.warning;
             case ToastService.levelInfo:
-                return Theme.surfaceContainer
+                return Theme.surfaceContainer;
             default:
-                return Theme.surfaceContainer
+                return Theme.surfaceContainer;
             }
         }
         radius: Theme.cornerRadius
@@ -109,13 +107,13 @@ PanelWindow {
                     name: {
                         switch (ToastService.currentLevel) {
                         case ToastService.levelError:
-                            return "error"
+                            return "error";
                         case ToastService.levelWarn:
-                            return "warning"
+                            return "warning";
                         case ToastService.levelInfo:
-                            return "info"
+                            return "info";
                         default:
-                            return "info"
+                            return "info";
                         }
                     }
                     size: Theme.iconSize
@@ -123,9 +121,9 @@ PanelWindow {
                         switch (ToastService.currentLevel) {
                         case ToastService.levelError:
                         case ToastService.levelWarn:
-                            return SessionData.isLightMode ? Theme.surfaceText : Theme.background
+                            return SessionData.isLightMode ? Theme.surfaceText : Theme.background;
                         default:
-                            return Theme.surfaceText
+                            return Theme.surfaceText;
                         }
                     }
                     anchors.left: parent.left
@@ -140,9 +138,9 @@ PanelWindow {
                         switch (ToastService.currentLevel) {
                         case ToastService.levelError:
                         case ToastService.levelWarn:
-                            return SessionData.isLightMode ? Theme.surfaceText : Theme.background
+                            return SessionData.isLightMode ? Theme.surfaceText : Theme.background;
                         default:
-                            return Theme.surfaceText
+                            return Theme.surfaceText;
                         }
                     }
                     font.weight: Font.Medium
@@ -163,9 +161,9 @@ PanelWindow {
                         switch (ToastService.currentLevel) {
                         case ToastService.levelError:
                         case ToastService.levelWarn:
-                            return SessionData.isLightMode ? Theme.surfaceText : Theme.background
+                            return SessionData.isLightMode ? Theme.surfaceText : Theme.background;
                         default:
-                            return Theme.surfaceText
+                            return Theme.surfaceText;
                         }
                     }
                     buttonSize: Theme.iconSize + 8
@@ -175,11 +173,11 @@ PanelWindow {
                     visible: ToastService.hasDetails
 
                     onClicked: {
-                        toast.expanded = !toast.expanded
+                        toast.expanded = !toast.expanded;
                         if (toast.expanded) {
-                            ToastService.stopTimer()
+                            ToastService.stopTimer();
                         } else {
-                            ToastService.restartTimer()
+                            ToastService.restartTimer();
                         }
                     }
                 }
@@ -192,9 +190,9 @@ PanelWindow {
                         switch (ToastService.currentLevel) {
                         case ToastService.levelError:
                         case ToastService.levelWarn:
-                            return SessionData.isLightMode ? Theme.surfaceText : Theme.background
+                            return SessionData.isLightMode ? Theme.surfaceText : Theme.background;
                         default:
-                            return Theme.surfaceText
+                            return Theme.surfaceText;
                         }
                     }
                     buttonSize: Theme.iconSize + 8
@@ -203,7 +201,7 @@ PanelWindow {
                     visible: ToastService.hasDetails || ToastService.currentLevel === ToastService.levelError
 
                     onClicked: {
-                        ToastService.hideToast()
+                        ToastService.hideToast();
                     }
                 }
             }
@@ -211,7 +209,7 @@ PanelWindow {
             Rectangle {
                 width: parent.width
                 height: detailsColumn.height + Theme.spacingS * 2
-                color: Qt.rgba(0, 0, 0, 0.2)
+                color: ToastService.currentDetails.length > 0 ? Qt.rgba(0, 0, 0, 0.2) : "transparent"
                 radius: Theme.cornerRadius / 2
                 visible: toast.expanded && ToastService.hasDetails
                 anchors.horizontalCenter: parent.horizontalCenter
@@ -232,9 +230,9 @@ PanelWindow {
                             switch (ToastService.currentLevel) {
                             case ToastService.levelError:
                             case ToastService.levelWarn:
-                                return SessionData.isLightMode ? Theme.surfaceText : Theme.background
+                                return SessionData.isLightMode ? Theme.surfaceText : Theme.background;
                             default:
-                                return Theme.surfaceText
+                                return Theme.surfaceText;
                             }
                         }
                         visible: ToastService.currentDetails.length > 0
@@ -259,9 +257,9 @@ PanelWindow {
                                 switch (ToastService.currentLevel) {
                                 case ToastService.levelError:
                                 case ToastService.levelWarn:
-                                    return SessionData.isLightMode ? Theme.surfaceText : Theme.background
+                                    return SessionData.isLightMode ? Theme.surfaceText : Theme.background;
                                 default:
-                                    return Theme.surfaceText
+                                    return Theme.surfaceText;
                                 }
                             }
                             isMonospace: true
@@ -281,9 +279,9 @@ PanelWindow {
                                 switch (ToastService.currentLevel) {
                                 case ToastService.levelError:
                                 case ToastService.levelWarn:
-                                    return SessionData.isLightMode ? Theme.surfaceText : Theme.background
+                                    return SessionData.isLightMode ? Theme.surfaceText : Theme.background;
                                 default:
-                                    return Theme.surfaceText
+                                    return Theme.surfaceText;
                                 }
                             }
                             buttonSize: Theme.iconSizeSmall + 8
@@ -295,9 +293,9 @@ PanelWindow {
                             property bool showTooltip: false
 
                             onClicked: {
-                                Quickshell.execDetached(["wl-copy", ToastService.currentCommand])
-                                showTooltip = true
-                                tooltipTimer.start()
+                                Quickshell.execDetached(["wl-copy", ToastService.currentCommand]);
+                                showTooltip = true;
+                                tooltipTimer.start();
                             }
 
                             Timer {
@@ -346,7 +344,6 @@ PanelWindow {
             shadowOpacity: 0.3
         }
 
-
         Behavior on opacity {
             NumberAnimation {
                 duration: Theme.mediumDuration

quickshell/Services/CompositorService.qml

@@ -422,7 +422,6 @@ Singleton {
                     isLabwc = false;
                     compositor = "niri";
                     console.info("CompositorService: Detected Niri with socket:", niriSocket);
-                    NiriService.generateNiriBinds();
                     NiriService.generateNiriBlurrule();
                 }
             }, 0);

quickshell/Services/niri-binds.kdl

@@ -1,59 +0,0 @@
-binds {
-    Mod+Space hotkey-overlay-title="Application Launcher" { 
-        spawn "dms" "ipc" "call" "spotlight" "toggle"; 
-    }
-
-    Mod+V hotkey-overlay-title="Clipboard Manager" { 
-        spawn "dms" "ipc" "call" "clipboard" "toggle"; 
-    }
-
-    Mod+M hotkey-overlay-title="Task Manager" { 
-        spawn "dms" "ipc" "call" "processlist" "toggle"; 
-    }
-
-    Mod+Comma hotkey-overlay-title="Settings" { 
-        spawn "dms" "ipc" "call" "settings" "toggle"; 
-    }
-
-    Mod+N hotkey-overlay-title="Notification Center" {
-        spawn "dms" "ipc" "call" "notifications" "toggle"; 
-    }
-
-    Mod+Y hotkey-overlay-title="Browse Wallpapers" {
-        spawn "dms" "ipc" "call" "dankdash" "wallpaper";
-    }
-
-    Mod+Shift+N hotkey-overlay-title="Notepad" {
-      spawn "dms" "ipc" "call" "notepad" "toggle";  
-    }
-    
-    Mod+Alt+L hotkey-overlay-title="Lock Screen" { 
-        spawn "dms" "ipc" "call" "lock" "lock"; 
-    }
-
-    Ctrl+Alt+Delete hotkey-overlay-title="Task Manager" { 
-        spawn "dms" "ipc" "call" "processlist" "toggle"; 
-    }    
-
-    // Audio
-    XF86AudioRaiseVolume allow-when-locked=true {
-        spawn "dms" "ipc" "call" "audio" "increment" "3";
-    }
-    XF86AudioLowerVolume allow-when-locked=true {
-        spawn "dms" "ipc" "call" "audio" "decrement" "3";
-    }
-    XF86AudioMute allow-when-locked=true {
-        spawn "dms" "ipc" "call" "audio" "mute";
-    }
-    XF86AudioMicMute allow-when-locked=true {
-        spawn "dms" "ipc" "call" "audio" "micmute";
-    }
-    
-    // BL
-    XF86MonBrightnessUp allow-when-locked=true {
-       spawn "dms" "ipc" "call" "brightness" "increment" "5" "";
-    }
-    XF86MonBrightnessDown allow-when-locked=true {
-       spawn "dms" "ipc" "call" "brightness" "decrement" "5" "";
-    }  
-}