Johan Rong 1 ヶ月 前
コミット
70ee998572

+ 9 - 182
flake.lock

@@ -1,99 +1,5 @@
 {
   "nodes": {
-    "caelestia-cli": {
-      "inputs": {
-        "caelestia-shell": "caelestia-shell",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1784258467,
-        "narHash": "sha256-xCbcAPJGqIho9+y+EZuDTzGEkey2RCg5EnMKNKYlzP4=",
-        "owner": "caelestia-dots",
-        "repo": "cli",
-        "rev": "a4b4ccdf165540aa1eacd7fa588ecfca261b74dc",
-        "type": "github"
-      },
-      "original": {
-        "owner": "caelestia-dots",
-        "repo": "cli",
-        "type": "github"
-      }
-    },
-    "caelestia-cli_2": {
-      "inputs": {
-        "caelestia-shell": [
-          "caelestia-shell"
-        ],
-        "nixpkgs": [
-          "caelestia-shell",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1783740617,
-        "narHash": "sha256-PpiT7xNxRbgwid42rPGQJnLZYpyPaqwPAqLwYl7O3U8=",
-        "owner": "caelestia-dots",
-        "repo": "cli",
-        "rev": "d2aaa733bebe5feec6cc44173a5d10c7e4e09a17",
-        "type": "github"
-      },
-      "original": {
-        "owner": "caelestia-dots",
-        "repo": "cli",
-        "type": "github"
-      }
-    },
-    "caelestia-shell": {
-      "inputs": {
-        "caelestia-cli": [
-          "caelestia-cli"
-        ],
-        "m3shapes": "m3shapes",
-        "nixpkgs": [
-          "caelestia-cli",
-          "nixpkgs"
-        ],
-        "quickshell": "quickshell"
-      },
-      "locked": {
-        "lastModified": 1784192483,
-        "narHash": "sha256-IFcEO0a3PAHmzuAbrzlAW4mMgguvhVgJiX/xMiPLuIU=",
-        "owner": "caelestia-dots",
-        "repo": "shell",
-        "rev": "dbb6d6c029021145422255dee6cd7ba607be3a20",
-        "type": "github"
-      },
-      "original": {
-        "owner": "caelestia-dots",
-        "repo": "shell",
-        "type": "github"
-      }
-    },
-    "caelestia-shell_2": {
-      "inputs": {
-        "caelestia-cli": "caelestia-cli_2",
-        "m3shapes": "m3shapes_2",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "quickshell": "quickshell_2"
-      },
-      "locked": {
-        "lastModified": 1784276245,
-        "narHash": "sha256-o8CfkVnvQitc2VGb/UnN7ixmeTFSnt4j7cxyeKaICZM=",
-        "owner": "caelestia-dots",
-        "repo": "shell",
-        "rev": "00b2a0f5d6b4a3953a1c00e48c59639858abc154",
-        "type": "github"
-      },
-      "original": {
-        "owner": "caelestia-dots",
-        "repo": "shell",
-        "type": "github"
-      }
-    },
     "dms": {
       "inputs": {
         "flake-compat": "flake-compat",
@@ -102,11 +8,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1784143977,
-        "narHash": "sha256-4UyLqRVtDVQIn+Z1prs5gUUkp2quD1aZq2qNePKls2c=",
+        "lastModified": 1784341117,
+        "narHash": "sha256-7VjoVZu+8PC41ZDQ3umi/EXsU3sCLNyRfxZrfJKHy+E=",
         "owner": "AvengeMedia",
         "repo": "DankMaterialShell",
-        "rev": "6306bc7aa2cae7450ad0dc9fc9392ad61b860711",
+        "rev": "74896fb87cb9e4bb866dbabcfd754e3e649ad0c7",
         "type": "github"
       },
       "original": {
@@ -139,11 +45,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1783740085,
-        "narHash": "sha256-qajyHfZY29G2oEQk+uHxmsJcRoBUBXP9maTpFlwP/dI=",
+        "lastModified": 1784350909,
+        "narHash": "sha256-ZWyzLbS1yKUTeFJLmdVuWNnHttL333/ldJbEE+KzCrM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "3cd22efe6471dc7365c822bd9ad73a21e55f38fb",
+        "rev": "4ce190229c73d44536caa7072f6308fb2d8feeb3",
         "type": "github"
       },
       "original": {
@@ -153,40 +59,6 @@
         "type": "github"
       }
     },
-    "m3shapes": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1781017666,
-        "narHash": "sha256-kfHyzZaPHgqZML48OA+5JwBOsLdQJ2ci/aGPShvUB4Y=",
-        "owner": "soramanew",
-        "repo": "m3shapes",
-        "rev": "bdc327b29f95394a732baf3c9b19658ba23755b6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "soramanew",
-        "repo": "m3shapes",
-        "rev": "bdc327b29f95394a732baf3c9b19658ba23755b6",
-        "type": "github"
-      }
-    },
-    "m3shapes_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1781017666,
-        "narHash": "sha256-kfHyzZaPHgqZML48OA+5JwBOsLdQJ2ci/aGPShvUB4Y=",
-        "owner": "soramanew",
-        "repo": "m3shapes",
-        "rev": "bdc327b29f95394a732baf3c9b19658ba23755b6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "soramanew",
-        "repo": "m3shapes",
-        "rev": "bdc327b29f95394a732baf3c9b19658ba23755b6",
-        "type": "github"
-      }
-    },
     "nix-flatpak": {
       "locked": {
         "lastModified": 1767983141,
@@ -205,11 +77,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1784160687,
-        "narHash": "sha256-iYL/bixrb6FlHFu/gIuBYzq6c6lM5AAXsXNSWXtIgQc=",
+        "lastModified": 1784432872,
+        "narHash": "sha256-n3gKTBIV4ZA5VQpUakffBe3KGu4+mhPoA34rrqS0GkA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4382ed2b7a6839d4280a9b386db49cbc5907414d",
+        "rev": "fd1462031fdee08f65fd0b4c6b64e22239a77870",
         "type": "github"
       },
       "original": {
@@ -219,53 +91,8 @@
         "type": "github"
       }
     },
-    "quickshell": {
-      "inputs": {
-        "nixpkgs": [
-          "caelestia-cli",
-          "caelestia-shell",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1783673918,
-        "narHash": "sha256-cFG5vnmjJcZRVCSUaqQLOdwkX6iqF6bY8IvvmBSGSRs=",
-        "ref": "refs/heads/master",
-        "rev": "4df562dfb2475a9057f0f33a8db75808efad8670",
-        "revCount": 830,
-        "type": "git",
-        "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
-      }
-    },
-    "quickshell_2": {
-      "inputs": {
-        "nixpkgs": [
-          "caelestia-shell",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1783673918,
-        "narHash": "sha256-cFG5vnmjJcZRVCSUaqQLOdwkX6iqF6bY8IvvmBSGSRs=",
-        "ref": "refs/heads/master",
-        "rev": "4df562dfb2475a9057f0f33a8db75808efad8670",
-        "revCount": 830,
-        "type": "git",
-        "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
-      }
-    },
     "root": {
       "inputs": {
-        "caelestia-cli": "caelestia-cli",
-        "caelestia-shell": "caelestia-shell_2",
         "dms": "dms",
         "home-manager": "home-manager",
         "nix-flatpak": "nix-flatpak",

+ 0 - 21
flake.nix

@@ -8,26 +8,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.7.0";
-
-    #mango = {
-    #  url = "github:mangowm/mango";
-    #  inputs.nixpkgs.follows = "nixpkgs";
-    #};
-
-    #moose = {
-    #  url = "github:johron/moose";
-    #  inputs.nixpkgs.follows = "nixpkgs";
-    #};
-
-    caelestia-shell = {
-      #url = "github:anarion80/caelestia-shell/topbar";
-      url = "github:caelestia-dots/shell";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    caelestia-cli = {
-      url = "github:caelestia-dots/cli";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     dms = {
       url = "github:AvengeMedia/DankMaterialShell/stable";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -38,7 +18,6 @@
     {
       self,
       nix-flatpak,
-      #mango,
       ...
     }@inputs:
 

+ 2 - 0
home/features/desktop/hyprland/hypr/modules/keybindings.lua

@@ -19,6 +19,8 @@ hl.bind(secMod .. " + S",  hl.dsp.exec_cmd("spotify"))
 hl.bind(secMod .. " + D",  hl.dsp.exec_cmd("vesktop"))
 hl.bind(secMod .. " + SHIFT + C", hl.dsp.exec_cmd("hyprpicker --autocopy"))
 
+hl.bind(mainMod .. " + CONTROL + A", hl.dsp.exec_cmd("amixer set Capture toggle"))
+hl.bind(mainMod .. " + CONTROL + S", hl.dsp.exec_cmd("amixer set Master toggle"))
 
 -- Move focus with mainMod + arrow keys
 hl.bind(mainMod .. " + left",  hl.dsp.focus({ direction = "left" }))

+ 0 - 50
home/features/desktop/hyprland/shells/caelestia/default.nix

@@ -1,50 +0,0 @@
-{ config, pkgs, lib, inputs, ... }:
-
-{
-  home.packages = [
-    inputs.caelestia-shell.packages.${pkgs.system}.default
-    inputs.caelestia-cli.packages.${pkgs.system}.default
-  ];
-
-  home.file.".config/caelestia/shell.json".source = ./shell.json;
-  home.file.".config/caelestia/shell-tokens.json".source = ./shell-tokens.json;
-
-  custom.hyprExtras = {
-    shell = ''
-      mainMod = "ALT"
-      secMod = "SUPER"
-
-      hl.on("hyprland.start", function ()
-        hl.exec_cmd("caelestia shell")
-        hl.exec_cmd("caelestia shell wallpaper set ~/Pictures/shell-imgs/bg.png")
-        hl.exec_cmd("caelestia scheme set --name dynamic --mode dark")
-        hl.exec_cmd("wl-paste --watch cliphist store")
-      end)
-
-      hl.bind(mainMod .. " + E",  hl.dsp.exec_cmd("caelestia shell drawers toggle sidebar"))
-      hl.bind(mainMod .. " + SHIFT + E", hl.dsp.exec_cmd("caelestia shell drawers toggle session"))
-      hl.bind("CONTROL + ALT + DELETE", hl.dsp.exec_cmd("caelestia shell drawers toggle session"))
-      hl.bind(secMod .. " + V", hl.dsp.exec_cmd("caelestia clipboard"))
-      hl.bind(secMod .. " + L",  hl.dsp.exec_cmd("caelestia shell lock lock"))
-
-      hl.bind(secMod .. " + SHIFT + S", hl.dsp.exec_cmd([[
-        #!/bin/bash
-        OLD=$(wl-paste)
-        caelestia shell picker openFreezeClip
-
-        for i in {1..20}; do
-          NEW=$(wl-paste)
-          
-          if [ "$NEW" != "$OLD" ]; then
-            wl-paste --type image/png > ~/Pictures/Screenshots/$(date +%Y-%m-%d_%H-%M-%S).png
-            exit 0
-          fi
-
-          sleep 0.1
-        done
-
-        exit 1
-      ]]))
-    '';
-  };
-}

+ 0 - 7
home/features/desktop/hyprland/shells/caelestia/shell-tokens.json

@@ -1,7 +0,0 @@
-{
-    "sizes": {
-        "bar": {
-            "innerHeight": 30
-        }
-    }
-}

+ 0 - 706
home/features/desktop/hyprland/shells/caelestia/shell.json

@@ -1,706 +0,0 @@
-{
-    "appearance": {
-        "anim": {
-            "durations": {
-                "scale": 1
-            }
-        },
-        "deformScale": 1,
-        "font": {
-            "body": {
-                "family": "GoogleSansFlex",
-                "large": {
-                    "italic": false,
-                    "size": 16,
-                    "vaxes": {
-                        "ROND": 25
-                    },
-                    "weight": 400
-                },
-                "medium": {
-                    "italic": false,
-                    "size": 14,
-                    "vaxes": {
-                        "ROND": 25
-                    },
-                    "weight": 400
-                },
-                "small": {
-                    "italic": false,
-                    "size": 12,
-                    "vaxes": {
-                        "ROND": 25
-                    },
-                    "weight": 400
-                }
-            },
-            "clock": "Rubik",
-            "headline": {
-                "family": "GoogleSansFlex",
-                "large": {
-                    "italic": false,
-                    "size": 32,
-                    "vaxes": {
-                        "ROND": 25
-                    },
-                    "weight": 500
-                },
-                "medium": {
-                    "italic": false,
-                    "size": 28,
-                    "vaxes": {
-                        "ROND": 25
-                    },
-                    "weight": 500
-                },
-                "small": {
-                    "italic": false,
-                    "size": 24,
-                    "vaxes": {
-                        "ROND": 25
-                    },
-                    "weight": 500
-                }
-            },
-            "icon": {
-                "extraLarge": {
-                    "italic": false,
-                    "size": 36,
-                    "vaxes": {
-                    },
-                    "weight": 400
-                },
-                "family": "Material Symbols Rounded",
-                "large": {
-                    "italic": false,
-                    "size": 24,
-                    "vaxes": {
-                    },
-                    "weight": 400
-                },
-                "medium": {
-                    "italic": false,
-                    "size": 18,
-                    "vaxes": {
-                    },
-                    "weight": 400
-                },
-                "small": {
-                    "italic": false,
-                    "size": 15,
-                    "vaxes": {
-                    },
-                    "weight": 400
-                }
-            },
-            "label": {
-                "family": "GoogleSansFlex",
-                "large": {
-                    "italic": false,
-                    "size": 14,
-                    "vaxes": {
-                        "ROND": 25
-                    },
-                    "weight": 500
-                },
-                "medium": {
-                    "italic": false,
-                    "size": 12,
-                    "vaxes": {
-                        "ROND": 25
-                    },
-                    "weight": 500
-                },
-                "small": {
-                    "italic": false,
-                    "size": 11,
-                    "vaxes": {
-                        "ROND": 25
-                    },
-                    "weight": 400
-                }
-            },
-            "mono": {
-                "family": "CaskaydiaCove NF",
-                "large": {
-                    "italic": false,
-                    "size": 16,
-                    "vaxes": {
-                    },
-                    "weight": 400
-                },
-                "medium": {
-                    "italic": false,
-                    "size": 14,
-                    "vaxes": {
-                    },
-                    "weight": 400
-                },
-                "small": {
-                    "italic": false,
-                    "size": 12,
-                    "vaxes": {
-                    },
-                    "weight": 400
-                }
-            },
-            "scale": 1,
-            "title": {
-                "family": "GoogleSansFlex",
-                "large": {
-                    "italic": false,
-                    "size": 22,
-                    "vaxes": {
-                        "ROND": 25
-                    },
-                    "weight": 500
-                },
-                "medium": {
-                    "italic": false,
-                    "size": 16,
-                    "vaxes": {
-                        "ROND": 25
-                    },
-                    "weight": 500
-                },
-                "small": {
-                    "italic": false,
-                    "size": 14,
-                    "vaxes": {
-                        "ROND": 25
-                    },
-                    "weight": 500
-                }
-            },
-            "workspaces": "Rubik"
-        },
-        "padding": {
-            "scale": 1
-        },
-        "rounding": {
-            "scale": 1
-        },
-        "spacing": {
-            "scale": 1
-        },
-        "transparency": {
-            "base": 0.85,
-            "enabled": false,
-            "layers": 0.4
-        }
-    },
-    "background": {
-        "desktopClock": {
-            "background": {
-                "blur": true,
-                "enabled": false,
-                "opacity": 0.7
-            },
-            "enabled": false,
-            "invertColors": false,
-            "position": "bottom-right",
-            "scale": 1,
-            "shadow": {
-                "blur": 0.4,
-                "enabled": true,
-                "opacity": 0.7
-            }
-        },
-        "enabled": true,
-        "visualiser": {
-            "autoHide": true,
-            "blur": false,
-            "enabled": false,
-            "rounding": 1,
-            "spacing": 1
-        },
-        "wallpaperEnabled": true
-    },
-    "bar": {
-        "activeWindow": {
-            "compact": false,
-            "inverted": false,
-            "showOnHover": true
-        },
-        "clock": {
-            "background": true,
-            "showDate": true,
-            "showIcon": true
-        },
-        "dragThreshold": 20,
-        "entries": [
-            {
-                "enabled": false,
-                "id": "logo"
-            },
-            {
-                "enabled": true,
-                "id": "workspaces"
-            },
-            {
-                "enabled": true,
-                "id": "spacer"
-            },
-            {
-                "enabled": false,
-                "id": "activeWindow"
-            },
-            {
-                "enabled": true,
-                "id": "spacer"
-            },
-            {
-                "enabled": true,
-                "id": "tray"
-            },
-            {
-                "enabled": true,
-                "id": "clock"
-            },
-            {
-                "enabled": true,
-                "id": "statusIcons"
-            },
-            {
-                "enabled": true,
-                "id": "power"
-            }
-        ],
-        "excludedScreens": [
-        ],
-        "persistent": true,
-        "popouts": {
-            "activeWindow": true,
-            "statusIcons": true,
-            "tray": true
-        },
-        "scrollActions": {
-            "brightness": true,
-            "volume": true,
-            "workspaces": true
-        },
-        "showOnHover": true,
-        "status": {
-            "showAudio": true,
-            "showBattery": true,
-            "showBluetooth": true,
-            "showKbLayout": false,
-            "showLockStatus": true,
-            "showMicrophone": false,
-            "showNetwork": true,
-            "showWifi": true
-        },
-        "tray": {
-            "background": true,
-            "compact": true,
-            "hiddenIcons": [
-            ],
-            "iconSubs": [
-            ],
-            "recolour": false
-        },
-        "workspaces": {
-            "activeIndicator": true,
-            "activeLabel": "",
-            "activeTrail": false,
-            "capitalisation": "preserve",
-            "label": "",
-            "maxWindowIcons": 5,
-            "occupiedBg": false,
-            "occupiedLabel": "",
-            "perMonitorWorkspaces": true,
-            "showWindows": true,
-            "showWindowsOnSpecialWorkspaces": true,
-            "shown": 10,
-            "specialWorkspaceIcons": [
-                {
-                    "icon": "sports_esports",
-                    "name": "steam"
-                }
-            ],
-            "windowIcons": [
-                {
-                    "icon": "sports_esports",
-                    "regex": "steam(_app_(default|[0-9]+))?"
-                }
-            ]
-        }
-    },
-    "border": {
-        "rounding": 25,
-        "smoothing": 20,
-        "thickness": 10
-    },
-    "dashboard": {
-        "dragThreshold": 50,
-        "enabled": true,
-        "mediaUpdateInterval": 500,
-        "performance": {
-            "showBattery": true,
-            "showCpu": true,
-            "showGpu": true,
-            "showMemory": true,
-            "showNetwork": true,
-            "showStorage": true
-        },
-        "resourceUpdateInterval": 1000,
-        "showDashboard": true,
-        "showMedia": true,
-        "showOnHover": true,
-        "showPerformance": true,
-        "showWeather": true
-    },
-    "enabled": true,
-    "general": {
-        "apps": {
-            "audio": [
-                "pavucontrol"
-            ],
-            "explorer": [
-                "dolphin"
-            ],
-            "playback": [
-                "vlc"
-            ],
-            "terminal": [
-                "alacritty"
-            ]
-        },
-        "battery": {
-            "criticalLevel": 3,
-            "warnLevels": [
-                {
-                    "icon": "battery_android_frame_2",
-                    "level": 20,
-                    "message": "You might want to plug in a charger",
-                    "title": "Low battery"
-                },
-                {
-                    "icon": "battery_android_frame_1",
-                    "level": 10,
-                    "message": "You should probably plug in a charger <b>now</b>",
-                    "title": "Did you see the previous message?"
-                },
-                {
-                    "critical": true,
-                    "icon": "battery_android_alert",
-                    "level": 5,
-                    "message": "PLUG THE CHARGER RIGHT NOW!!",
-                    "title": "Critical battery level"
-                }
-            ]
-        },
-        "idle": {
-            "inhibitWhenAudio": true,
-            "lockBeforeSleep": true,
-            "timeouts": [
-                {
-                    "idleAction": "lock",
-                    "timeout": 180
-                },
-                {
-                    "idleAction": "dpms off",
-                    "returnAction": "dpms on",
-                    "timeout": 300
-                },
-                {
-                    "idleAction": [
-                        "systemctl",
-                        "suspend-then-hibernate"
-                    ],
-                    "timeout": 600
-                }
-            ]
-        },
-        "logo": "",
-        "mediaGifSpeedAdjustment": 300,
-        "sessionGifSpeed": 0.7,
-        "showOverFullscreen": false
-    },
-    "launcher": {
-        "actionPrefix": "#",
-        "actions": [
-            {
-                "command": [
-                    "autocomplete",
-                    "calc"
-                ],
-                "dangerous": false,
-                "description": "Do simple math equations (powered by Qalc)",
-                "enabled": true,
-                "icon": "calculate",
-                "name": "Calculator"
-            },
-            {
-                "command": [
-                    "autocomplete",
-                    "scheme"
-                ],
-                "dangerous": false,
-                "description": "Change the current colour scheme",
-                "enabled": true,
-                "icon": "palette",
-                "name": "Scheme"
-            },
-            {
-                "command": [
-                    "autocomplete",
-                    "wallpaper"
-                ],
-                "dangerous": false,
-                "description": "Change the current wallpaper",
-                "enabled": true,
-                "icon": "image",
-                "name": "Wallpaper"
-            },
-            {
-                "command": [
-                    "autocomplete",
-                    "variant"
-                ],
-                "dangerous": false,
-                "description": "Change the current scheme variant",
-                "enabled": true,
-                "icon": "colors",
-                "name": "Variant"
-            },
-            {
-                "command": [
-                    "systemctl",
-                    "poweroff"
-                ],
-                "dangerous": true,
-                "description": "Shutdown the system",
-                "enabled": true,
-                "icon": "power_settings_new",
-                "name": "Shutdown"
-            },
-            {
-                "command": [
-                    "systemctl",
-                    "reboot"
-                ],
-                "dangerous": true,
-                "description": "Reboot the system",
-                "enabled": true,
-                "icon": "cached",
-                "name": "Reboot"
-            },
-            {
-                "command": [
-                    "loginctl",
-                    "terminate-user",
-                    ""
-                ],
-                "dangerous": true,
-                "description": "Log out of the current session",
-                "enabled": true,
-                "icon": "exit_to_app",
-                "name": "Logout"
-            },
-            {
-                "command": [
-                    "loginctl",
-                    "lock-session"
-                ],
-                "dangerous": false,
-                "description": "Lock the current session",
-                "enabled": true,
-                "icon": "lock",
-                "name": "Lock"
-            },
-            {
-                "command": [
-                    "systemctl",
-                    "suspend-then-hibernate"
-                ],
-                "dangerous": false,
-                "description": "Suspend then hibernate",
-                "enabled": true,
-                "icon": "bedtime",
-                "name": "Sleep"
-            },
-            {
-                "command": [
-                    "caelestia",
-                    "shell",
-                    "nexus",
-                    "open"
-                ],
-                "dangerous": false,
-                "description": "Configure the shell",
-                "enabled": true,
-                "icon": "settings",
-                "name": "Settings"
-            }
-        ],
-        "dragThreshold": 50,
-        "enableDangerousActions": true,
-        "enabled": true,
-        "favouriteApps": [
-        ],
-        "hiddenApps": [
-        ],
-        "maxShown": 7,
-        "maxWallpapers": 9,
-        "showOnHover": false,
-        "specialPrefix": "@",
-        "useFuzzy": {
-            "actions": false,
-            "apps": false,
-            "schemes": false,
-            "variants": false,
-            "wallpapers": false
-        },
-        "vimKeybinds": false
-    },
-    "lock": {
-        "enableFprint": true,
-        "hideNotifs": false,
-        "maxFprintTries": 3,
-        "recolourLogo": true
-    },
-    "nexus": {
-        "networkRescanInterval": 15000,
-        "wallpapersPerRow": 4
-    },
-    "notifs": {
-        "actionOnClick": false,
-        "clearThreshold": 0.3,
-        "defaultExpireTimeout": 5000,
-        "expandThreshold": 20,
-        "expire": true,
-        "fullscreen": "on",
-        "fullscreenExpireTimeout": 2000,
-        "groupPreviewNum": 3,
-        "openExpanded": false
-    },
-    "osd": {
-        "enableBrightness": true,
-        "enableMicrophone": false,
-        "enabled": true,
-        "hideDelay": 2000
-    },
-    "paths": {
-        "lockNoNotifsPic": "root:/assets/dino.png",
-        "lyricsDir": "~/Music/lyrics/",
-        "mediaGif": "~/.config/caelestia/img/tux-race.gif",
-        "noNotifsPic": "root:/assets/dino.png",
-        "sessionGif": "~/.config/caelestia/img/tux-fly.gif",
-        "wallpaperDir": "~/Pictures/Wallpapers"
-    },
-    "services": {
-        "audioIncrement": 0.1,
-        "brightnessIncrement": 0.1,
-        "defaultPlayer": "Spotify",
-        "gpuType": "",
-        "lyricsBackend": "Auto",
-        "maxVolume": 1,
-        "playerAliases": [
-            {
-                "from": "com.github.th_ch.youtube_music",
-                "to": "YT Music"
-            }
-        ],
-        "smartScheme": true,
-        "useFahrenheit": false,
-        "useFahrenheitPerformance": false,
-        "useTwelveHourClock": false,
-        "visualiserBars": 60,
-        "weatherLocation": ""
-    },
-    "session": {
-        "commands": {
-            "hibernate": [
-                "systemctl",
-                "hibernate"
-            ],
-            "logout": [
-                "loginctl",
-                "terminate-user",
-                ""
-            ],
-            "reboot": [
-                "systemctl",
-                "reboot"
-            ],
-            "shutdown": [
-                "systemctl",
-                "poweroff"
-            ]
-        },
-        "dragThreshold": 30,
-        "enabled": true,
-        "icons": {
-            "hibernate": "downloading",
-            "logout": "logout",
-            "reboot": "cached",
-            "shutdown": "power_settings_new"
-        },
-        "vimKeybinds": false
-    },
-    "sidebar": {
-        "dragThreshold": 80,
-        "enabled": true
-    },
-    "utilities": {
-        "enabled": true,
-        "maxToasts": 4,
-        "quickToggles": [
-            {
-                "enabled": true,
-                "id": "wifi"
-            },
-            {
-                "enabled": true,
-                "id": "bluetooth"
-            },
-            {
-                "enabled": true,
-                "id": "mic"
-            },
-            {
-                "enabled": true,
-                "id": "settings"
-            },
-            {
-                "enabled": true,
-                "id": "gameMode"
-            },
-            {
-                "enabled": true,
-                "id": "dnd"
-            },
-            {
-                "enabled": true,
-                "id": "vpn"
-            }
-        ],
-        "toasts": {
-            "audioInputChanged": true,
-            "audioOutputChanged": true,
-            "capsLockChanged": true,
-            "chargingChanged": true,
-            "configLoaded": true,
-            "dndChanged": true,
-            "fullscreen": "off",
-            "gameModeChanged": true,
-            "kbLayoutChanged": true,
-            "kbLimit": true,
-            "nowPlaying": false,
-            "numLockChanged": true,
-            "vpnChanged": true
-        },
-        "vpn": {
-            "enabled": true,
-            "provider": [
-                {
-                    "displayName": "Wireguard (Your VPN)",
-                    "enabled": false,
-                    "interface": "your-connection-name",
-                    "name": "wireguard"
-                }
-            ]
-        }
-    }
-}

+ 14 - 5
home/features/desktop/hyprland/shells/dankmaterialshell/settings.json

@@ -39,7 +39,7 @@
   "firstDayOfWeek": -1,
   "showWeekNumber": false,
   "calendarBackend": "auto",
-  "use24HourClock": true,
+  "clockFormat": "24h",
   "showSeconds": false,
   "padHours12Hour": false,
   "useFahrenheit": false,
@@ -67,6 +67,7 @@
   "blurEnabled": false,
   "blurForegroundLayers": true,
   "blurLayerOutlineOpacity": 0.12,
+  "blurBorderEnabled": true,
   "blurBorderColor": "outline",
   "blurBorderCustomColor": "#ffffff",
   "blurBorderOpacity": 0.35,
@@ -207,6 +208,7 @@
   "scrollTitleEnabled": true,
   "mediaAdaptiveWidthEnabled": true,
   "audioVisualizerEnabled": true,
+  "mediaUseAlbumArtAccent": false,
   "audioScrollMode": "volume",
   "audioWheelScrollAmount": 5,
   "audioDeviceScrollVolumeEnabled": false,
@@ -243,12 +245,10 @@
   "greeterEnableFprint": false,
   "greeterEnableU2f": true,
   "greeterWallpaperPath": "/home/johron/Pictures/shell-imgs/bg.png",
-  "greeterUse24HourClock": true,
-  "greeterShowSeconds": false,
-  "greeterPadHours12Hour": false,
   "greeterLockDateFormat": "",
   "greeterFontFamily": "",
   "greeterWallpaperFillMode": "",
+  "greeterPamExternallyManaged": false,
   "greeterSyncPending": false,
   "greeterSyncBaseline": {},
   "mediaSize": 1,
@@ -266,6 +266,7 @@
   "spotlightSectionViewModes": {},
   "appDrawerSectionViewModes": {},
   "niriOverviewOverlayEnabled": true,
+  "niriOverviewLauncherStyle": "full",
   "dankLauncherV2Size": "compact",
   "dankLauncherV2ShowSourceBadges": true,
   "dankLauncherV2BorderEnabled": false,
@@ -468,6 +469,7 @@
   "notificationOverlayEnabled": false,
   "notificationPopupShadowEnabled": true,
   "notificationPopupPrivacyMode": false,
+  "notificationForegroundLayers": true,
   "modalDarkenBackground": true,
   "lockScreenShowPowerActions": true,
   "lockScreenShowSystemIcons": true,
@@ -482,6 +484,11 @@
   "maxFprintTries": 15,
   "enableU2f": false,
   "u2fMode": "or",
+  "lockPamPath": "",
+  "lockPamInlineFprint": false,
+  "lockPamInlineU2f": false,
+  "lockPamExternallyManaged": false,
+  "lockU2fPamPath": "",
   "lockScreenInactiveColor": "#000000",
   "lockScreenNotificationMode": 0,
   "lockScreenVideoEnabled": false,
@@ -546,6 +553,7 @@
   "updaterIntervalSeconds": 1800,
   "updaterIncludeFlatpak": true,
   "updaterAllowAUR": true,
+  "updaterIgnoredPackages": [],
   "displayNameMode": "system",
   "screenPreferences": {
     "dock": [],
@@ -616,7 +624,8 @@
           "showAudioPercent": false,
           "showBrightnessIcon": true,
           "showBrightnessPercent": false,
-          "showMicIcon": false,
+          "showMicIcon": true,
+          "showMicPercent": false,
           "showBatteryIcon": false,
           "showPrinterIcon": false,
           "showScreenSharingIcon": true

+ 1 - 1
hosts/nixstation/configuration.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, pkgs, lib, inputs, ... }:
 
 let 
   hosts = import ../../config/hosts.nix;

+ 3 - 3
nixos/flavors/application/development/default.nix

@@ -1,9 +1,9 @@
 { pkgs, lib, ... }:
 {
   environment.systemPackages = with pkgs; [
-    jetbrains.idea
-    jetbrains.rust-rover
-    jetbrains.rider
+    #jetbrains.idea
+    #jetbrains.rust-rover
+    #jetbrains.rider
     vscode
     gdb
     onefetch