Stuff

5 files changed, 119 insertions, 107 deletions

diff --git a/common/modules/mango/default.nix b/common/modules/mango/default.nix
index be210ed..95066e3 100644
--- a/common/modules/mango/default.nix
+++ b/common/modules/mango/default.nix
@@ -302,7 +302,8 @@ in
             bind=ALT,x,switch_proportion_preset,
 
             # switch layout
-            bind=SUPER,n,switch_layout
+            # bind=SUPER,n,switch_layout
+            bind=SUPER,n,spawn,beesettings layout
 
             # tag switch
             bind=SUPER,1,view,1,0
diff --git a/common/modules/mango/scripts.nix b/common/modules/mango/scripts.nix
index 28a388e..fd12ddd 100644
--- a/common/modules/mango/scripts.nix
+++ b/common/modules/mango/scripts.nix
@@ -71,7 +71,7 @@ let
     init_settings() {
         if [ ! -f "$CONFIG_FILE" ]; then
             mkdir -p "$(dirname "$CONFIG_FILE")"
-            echo -e "theme=dark\nnightlight=off\nwallpaper=$WALL_DIR/default.jpg" > "$CONFIG_FILE"
+            echo -e "theme=dark\nnightlight=off\nwallpaper=$WALL_DIR/default.jpg\ncolor_type=scheme-tonal-spot" > "$CONFIG_FILE"
         fi
     }
 
@@ -82,16 +82,17 @@ let
     apply_all() {
         local theme=$(get_val "theme")
         local wall=$(get_val "wallpaper")
+        local color_type=$(get_val "color_type")
         local mode_flag="dark"
         [ "$theme" == "light" ] && mode_flag="light"
 
-        matugen image "$wall" -m "$mode_flag" -t scheme-content --source-color-index 0 2>/dev/null
+        matugen image "$wall" -m "$mode_flag" -t "$color_type" --source-color-index 0 2>/dev/null
         wallust -q -s run "$wall" 2>/dev/null
 
         dconf write /org/gnome/desktop/interface/color-scheme "'prefer-$mode_flag'"
 
         if [ -z "$WAYLAND_DISPLAY" ] && [ -n "$DISPLAY" ]; then
-            xrdb -merge "$HOME/.Xresources"
+        xrdb -merge "$HOME/.Xresources"
         fi
         [ -f "$HOME/.config/sequences" ] && sh "$HOME/.config/sequences"
     }
@@ -113,7 +114,7 @@ let
         if [ -n "$SELECTED" ]; then
             FULL_PATH="$WALL_DIR/$SELECTED"
             set_val "wallpaper" "$FULL_PATH"
-            
+
             if [ -n "$WAYLAND_DISPLAY" ]; then
                 if command -v swww >/dev/null 2>&1; then
                     swww img "$FULL_PATH" --transition-type grow --transition-fps 120 --transition-step 60 --transition-duration 1.5
@@ -128,68 +129,83 @@ let
         fi
     }
 
+    clr_type() {
+        local types=(
+        "scheme-tonal-spot"
+        "scheme-content"
+        "scheme-expressive"
+        "scheme-fidelity"
+        "scheme-fruit-salad"
+        "scheme-monochrome"
+        "scheme-neutral"
+        "scheme-rainbow"
+        "scheme-vibrant"
+    )
+
+        local selection
+        selection=$(printf "%s\n" "''${types[@]}" | rofi -dmenu -i -p "Coloscheme Types")
+
+        if [[ -n "$selection" ]]; then
+            set_val "color_type" "$selection"
+            apply_all
+        fi
+    }
+
+    cmd_layout() {
+        declare -A layouts=(
+        ["tile"]="T"
+        ["monocle"]="M"
+        ["scroller"]="S"
+        ["tgmix"]="TG"
+        ["grid"]="G"
+        ["deck"]="K"
+        ["center tile"]="CT"
+        ["right tile"]="RT"
+        ["vertical scroller"]="VS"
+        ["vertical tile"]="VT"
+        ["vertical grid"]="VG"
+        ["vertical deck"]="VK"
+    )
+
+        local selection
+        selection=$(printf "%s\n" "''${!layouts[@]}" | sort | rofi -dmenu -i -p "Layout")
+
+        if [[ -n "''${layouts[$selection]}" ]]; then
+            set_layout "''${layouts[$selection]}"
+        fi
+    }
+
     cmd_settings() {
         local theme=$(get_val "theme")
         local nl=$(get_val "nightlight")
+        local ct=$(get_val "color_type")
 
-        CHOICE=$(echo -e "Mode: $theme\nNight Light: $nl\nWallpaper\nLayouts" | rofi -dmenu -p "Settings" -i)
+        local options=(
+        "Mode: $theme"
+        "Night Light: $nl"
+        "Wallpaper"
+        "Colorscheme Type: $ct"
+        "Layouts"
+    )
 
-        case "$CHOICE" in
+        local choice
+        choice=$(printf "%s\n" "''${options[@]}" | rofi -dmenu -p "Settings" -i)
+
+        case "$choice" in
             "Mode: "*)
-                [ "$theme" == "dark" ] && set_val "theme" "light" || set_val "theme" "dark"
+                [[ "$theme" == "dark" ]] && set_val "theme" "light" || set_val "theme" "dark"
                 apply_all
                 ;;
             "Night Light: "*)
-                if [ "$nl" == "on" ]; then
+                if [[ "$nl" == "on" ]]; then
                     set_val "nightlight" "off"; pkill wlsunset
                 else
                     set_val "nightlight" "on"; wlsunset -T 4500 &
                 fi
                 ;;
-            "Wallpaper")
-                cmd_wall
-                ;;
-            "Layouts")
-                L=$(echo -e "tile\nmonocle\nscroller\ntgmix\ngrid\ndeck\ncenter tile\nright tile\nvertical scroller\nvertical tile\nvertical grid\nvertical deck" | rofi -dmenu -p "Layout")
-                case "$L" in
-                    "tile")
-                    set_layout "T"
-                    ;;
-                    "monocle")
-                    set_layout "M"
-                    ;;
-                    "scroller")
-                    set_layout "S"
-                    ;;
-                    "tgmix")
-                    set_layout "TG"
-                    ;;
-                    "grid")
-                    set_layout "G"
-                    ;;
-                    "deck")
-                    set_layout "K"
-                    ;;
-                    "center tile")
-                    set_layout "CT"
-                    ;;
-                    "right tile")
-                    set_layout "RT"
-                    ;;
-                    "vertical grid")
-                    set_layout "VG"
-                    ;;
-                    "vertical tile")
-                    set_layout "VT"
-                    ;;
-                    "vertical deck")
-                    set_layout "VK"
-                    ;;
-                    "vertical scroller")
-                    set_layout "VS"
-                    ;;
-                esac
-                ;;
+            "Wallpaper")        cmd_wall ;;
+            "Colorscheme Type:"*) clr_type ;;
+            "Layouts")          cmd_layout ;;
         esac
     }
 
@@ -198,6 +214,7 @@ let
     case "$1" in
         wall)     cmd_wall ;;
         settings) cmd_settings ;;
+        layout)   cmd_layout ;;
         apply)    apply_all ;; 
         *)        echo "Usage: bee {wall|settings|apply}" ;;
     esac
diff --git a/common/modules/matugen/templates/matugen-dunst.nix b/common/modules/matugen/templates/matugen-dunst.nix
index 443feeb..dae700f 100644
--- a/common/modules/matugen/templates/matugen-dunst.nix
+++ b/common/modules/matugen/templates/matugen-dunst.nix
@@ -4,20 +4,14 @@
       [global]
       frame_color = "{{colors.primary.default.hex}}"
       separator_color = "{{colors.primary_container.default.hex}}"
+      foreground = "{{colors.on_surface.default.hex}}"
+      highlight = "{{colors.primary.default.hex}}"
       <* if {{ is_dark_mode }} *>
-      background = '{{colors.background.default.hex}}'
+      background = "{{colors.surface.default.hex}}"
       <* else *>
-      background = '{{colors.surface_container.default.hex}}'
+      background = "{{colors.surface_container.default.hex}}"
       <* endif *>
 
-      [urgency_low]
-      foreground = "{{colors.on_surface.default.hex}}"
-      highlight = "{{colors.primary.default.hex}}"
-
-      [urgency_normal]
-      foreground = "{{colors.on_surface.default.hex}}"
-      highlight = "{{colors.primary.default.hex}}"
-
       [urgency_critical]
       background = "{{colors.error_container.default.hex}}"
       foreground = "{{colors.on_error_container.default.hex}}"
diff --git a/flake.lock b/flake.lock
index 9bdaf6c..a5aaea9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -15,11 +15,11 @@
         "plugins-rustaceanvim": "plugins-rustaceanvim"
       },
       "locked": {
-        "lastModified": 1773522455,
-        "narHash": "sha256-GqX0MMC857VOfZh3Us3wiD6Q0rTf5ZyQc/Ln8nOfnfw=",
+        "lastModified": 1773655569,
+        "narHash": "sha256-ZCuq5RR+98VYcfVh1RbOPLHHmboEonw1/5DofTVjX+c=",
         "ref": "refs/heads/main",
-        "rev": "308050915920dc2e78a22b974bc38ae7ffc51a37",
-        "revCount": 6,
+        "rev": "21186cad972a0b50b7b6125632d9c3e38ebca9f4",
+        "revCount": 9,
         "type": "git",
         "url": "https://codeberg.org/brustybee/beeVim"
       },
@@ -230,11 +230,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1773179137,
-        "narHash": "sha256-EdW2bwzlfme0vbMOcStnNmKlOAA05Bp6su2O8VLGT0k=",
+        "lastModified": 1773608492,
+        "narHash": "sha256-QZteyExJYSQzgxqdsesDPbQgjctGG7iKV/6ooyQPITk=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "3f98e2bbc661ec0aaf558d8a283d6955f05f1d09",
+        "rev": "9a40ec3b78fc688d0908485887d355caa5666d18",
         "type": "github"
       },
       "original": {
@@ -268,11 +268,11 @@
         "scenefx": "scenefx"
       },
       "locked": {
-        "lastModified": 1773112723,
-        "narHash": "sha256-MXCXjnGPE+wagrHR8cxGTDhJO4xYp+aBQPApV3JG9XY=",
+        "lastModified": 1773633401,
+        "narHash": "sha256-dkqs7Bk3099dLGY6x9/Mp6lpieFJ8tKAe6wr59CknMc=",
         "owner": "mangowm",
         "repo": "mango",
-        "rev": "1fc89d01eb5aa0f3784fb4006bf9af47826444d2",
+        "rev": "028cf6e49ed91de967a38516522e2f91d1a830a7",
         "type": "github"
       },
       "original": {
@@ -308,11 +308,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1773014724,
-        "narHash": "sha256-foUFwEwhjSnjJVD6gkiR2SlaYhvzV9bwsUQlLUu2DjQ=",
+        "lastModified": 1773619513,
+        "narHash": "sha256-2xCVm8ajE9pNngv489dPKOUa5P0tlmJRwgVPjhy7c8w=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "b955e58bea690fdbfc20ff7c249e481ca169ca33",
+        "rev": "07227cc79efb9c1744ec99d51f98c7a3584a62d2",
         "type": "github"
       },
       "original": {
@@ -344,11 +344,11 @@
     "neovim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1773014294,
-        "narHash": "sha256-JLAIrpQTp8u6blb5iZrAx36fNe65LT+JOUvxiLxlN+8=",
+        "lastModified": 1773615769,
+        "narHash": "sha256-qU71k2BTckpJDHpjxaU4aQwl14+iApnAycq+IJDTmO0=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "61f166ec409b7621fcc42e4da40d6ccb19973749",
+        "rev": "16f7440cc7b59b7e5c79f593fedc117d2d16d7dd",
         "type": "github"
       },
       "original": {
@@ -390,11 +390,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1772771118,
-        "narHash": "sha256-xWzaTvmmACR/SRWtABgI/Z97lcqwJAeoSd5QW1KdK1s=",
+        "lastModified": 1773507054,
+        "narHash": "sha256-Q8U5VXgrcxmCxPtCCJCIZkcAX3FCZwGh1GNVIXxMND0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e38213b91d3786389a446dfce4ff5a8aaf6012f2",
+        "rev": "e80236013dc8b77aa49ca90e7a12d86f5d8d64c9",
         "type": "github"
       },
       "original": {
@@ -483,11 +483,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1772963539,
-        "narHash": "sha256-9jVDGZnvCckTGdYT53d/EfznygLskyLQXYwJLKMPsZs=",
+        "lastModified": 1773579282,
+        "narHash": "sha256-LWvZj9Bvm1EuoO6zbX4yjZebwnZNfeTbmCJGS7RGQ3Y=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9dcb002ca1690658be4a04645215baea8b95f31d",
+        "rev": "5a88de74db0e948139be4b46f9a94d64aa11391c",
         "type": "github"
       },
       "original": {
@@ -500,11 +500,11 @@
     "plugins-base46-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1773491679,
-        "narHash": "sha256-oJkbSuuTlQkh74MTBlgjwfzu5ybelWjHUpr6EfIAeA4=",
+        "lastModified": 1773606507,
+        "narHash": "sha256-JfhmtphN4n9UHPV2gHuj8igaYNq8GUTO0SMxwYVGzwk=",
         "owner": "AvengeMedia",
         "repo": "base46",
-        "rev": "b242464654a42310a1b76efe522ddbfb74c4847f",
+        "rev": "358dba7d0fb10af5671cf3427178e8057102bc6c",
         "type": "github"
       },
       "original": {
@@ -516,11 +516,11 @@
     "plugins-lze": {
       "flake": false,
       "locked": {
-        "lastModified": 1772949858,
-        "narHash": "sha256-skLhmn/MvxOZbrBiceF/xiLRRmmEs6ZQS2sGrBrUyLU=",
+        "lastModified": 1773555725,
+        "narHash": "sha256-Ii/mrCHw8kw1IN0GIROm7O0NSz1jtDligb/qDNq1P3U=",
         "owner": "BirdeeHub",
         "repo": "lze",
-        "rev": "a3ba1a2d469d4ab26acb629aba8c7d70a6cbe558",
+        "rev": "1d05835370e841c1605ec88d0541195c9410c34e",
         "type": "github"
       },
       "original": {
@@ -532,11 +532,11 @@
     "plugins-lzextras": {
       "flake": false,
       "locked": {
-        "lastModified": 1772949841,
-        "narHash": "sha256-MQ1h2R5axM3u6mLNTDzXF/40o8+U0JOWb48UTQO9jfc=",
+        "lastModified": 1773555737,
+        "narHash": "sha256-fG8glvgoeFRHU6fgfBTb5GUxY+2YY3QfqzVYERa7ogs=",
         "owner": "BirdeeHub",
         "repo": "lzextras",
-        "rev": "a6ac9a7bee380881af2dfbfd238ccb1697d677d7",
+        "rev": "88f70fe95e3a6c4dc841ebed3b23c1f92c5cde42",
         "type": "github"
       },
       "original": {
@@ -548,11 +548,11 @@
     "plugins-neogit": {
       "flake": false,
       "locked": {
-        "lastModified": 1772820817,
-        "narHash": "sha256-dELzsOqSIvQvfl3fXTQg2ZkIILmlRWVWb+ogqeoJDYE=",
+        "lastModified": 1773501204,
+        "narHash": "sha256-bGU2buVzYRAJZFQhNoOOux6oSAT8k6uCm3c/wu3NxDg=",
         "owner": "NeogitOrg",
         "repo": "neogit",
-        "rev": "8fd90675caf8b847280ca56f464b66030adad876",
+        "rev": "d3890fc3cdf0859845a86b2be306bba01458df1a",
         "type": "github"
       },
       "original": {
@@ -564,11 +564,11 @@
     "plugins-opencode-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1772989697,
-        "narHash": "sha256-xxB6TKn0Nv9GoYc7Mz+rhAUX8OXaHSkD3zZzFgSSHkQ=",
+        "lastModified": 1773339883,
+        "narHash": "sha256-N80LTAsWds4cmnHJkn18boo+zcBRj3jNPHABOyczoBM=",
         "owner": "NickvanDyke",
         "repo": "opencode.nvim",
-        "rev": "47f92ab676bf1c3d00a40100429c7b089f81a5fc",
+        "rev": "8804ffb81f9784dcd0e9af43a2068fb55282c4dd",
         "type": "github"
       },
       "original": {
@@ -640,11 +640,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1773096132,
-        "narHash": "sha256-M3zEnq9OElB7zqc+mjgPlByPm1O5t2fbUrH3t/Hm5Ag=",
+        "lastModified": 1773550941,
+        "narHash": "sha256-wa/++bL2QeMUreNFBZEWluQfOYB0MnQIeGNMuaX9sfs=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "d1ff3b1034d5bab5d7d8086a7803c5a5968cd784",
+        "rev": "c469b6885f0dcd5c7c56bd935a0f08dbcd9e79e1",
         "type": "github"
       },
       "original": {
@@ -692,11 +692,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772685307,
-        "narHash": "sha256-5xthZHeqwBeXNhnRIlxnCuaZLky0SZ6vQsxtd+eqhTU=",
+        "lastModified": 1773290160,
+        "narHash": "sha256-u09eF4Oafi+OIbTtKe/EWil26q1glcTATiSA7dF1oCI=",
         "owner": "youwen5",
         "repo": "zen-browser-flake",
-        "rev": "dc92d88524ee83308795bc90f6a9f1d965265aaa",
+        "rev": "c7cb51b30960757ed9fb8eb28567b32585d0a688",
         "type": "github"
       },
       "original": {
diff --git a/hosts/common.nix b/hosts/common.nix
index 8db2ecf..b92e9ec 100644
--- a/hosts/common.nix
+++ b/hosts/common.nix
@@ -184,7 +184,7 @@
 
   fonts.fontDir.enable = true;
   fonts.packages = with pkgs; [
-    ioskeley-mono
+    # ioskeley-mono
     # maple-mono.NF
     nerd-fonts.symbols-only
     nerd-fonts.jetbrains-mono