added and moved

home-manager/cobray.nix

@@ -25,10 +25,10 @@
     ./modules/mpv.nix
     ./modules/ani-cli.nix
     ./modules/quickshell.nix
-    #./modules/hyprspace.nix
     ./modules/cava.nix
     ./modules/rgb.nix
-    ./modules/anyrun.nix
+    ./modules/imagemagick.nix
+    inputs.dankMaterialShell.homeModules.dankMaterialShell.default
   ];
 
   home.username = "${config.theme.user}";
@@ -40,8 +40,6 @@
 
   # TODO: move these somewhere else; undecided
   home.packages = with pkgs; [
-    btop
-    nvtopPackages.full
     kdePackages.dolphin
     voicevox
   ];

home-manager/init.nix

@@ -11,11 +11,12 @@
     umask 022
     repo=${lib.escapeShellArg hyprlanddots}
     nvimrepo=${lib.escapeShellArg nvimDotfiles}
+    dmsConfig="${pkgs.dankMaterialShell}/etc/xdg/quickshell/dms"
     mkdir -p "${config.xdg.configHome}"
     copy_dir() {
-      src="$1"; dest="$2"
+      src="$1"; dest="$2"; skip="''${3:-true}"
       [ -d "$src" ] || return 0
-      [ -e "$dest" ] && return 0
+      [ "$skip" = "true" ] && [ -e "$dest" ] && return 0
       mkdir -p "$dest"
       if [ -x ${pkgs.rsync}/bin/rsync ]; then
         ${pkgs.rsync}/bin/rsync -rlD \
@@ -26,12 +27,11 @@
       fi
       chmod -R u+rwX "$dest"
     }
-
     copy_dir "$repo/fish"       "${config.xdg.configHome}/fish"
     copy_dir "$repo/hypr"       "${config.xdg.configHome}/hypr"
     copy_dir "$repo/cava"       "${config.xdg.configHome}/cava"
     copy_dir "$nvimrepo"        "${config.xdg.configHome}/nvim"
-
+    copy_dir "$dmsConfig"       "${config.xdg.configHome}/quickshell" "false"
     if [ -f "$repo/starship.toml" ] && [ ! -e "${config.xdg.configHome}/starship.toml" ]; then
       install -Dm0644 "$repo/starship.toml" "${config.xdg.configHome}/starship.toml"
     fi

home-manager/modules/discord.nix

@@ -1,5 +1,6 @@
 {pkgs, ...}: {
   home.packages = with pkgs; [
     vesktop
+    discord
   ];
 }

home-manager/modules/fish.nix

@@ -2,11 +2,13 @@
   home.packages = with pkgs; [
     fish
     fzf
+    ripgrep
     bat
     eza
-    fd
     ugrep
     yazi
     chafa
+    btop
+    nvtopPackages.full
   ];
 }

home-manager/modules/godot.nix

@@ -0,0 +1,5 @@
+{pkgs, ...}: {
+  home.packages = with pkgs; [
+    godot
+  ];
+}

home-manager/modules/imagemagick.nix

@@ -0,0 +1,6 @@
+{pkgs, ...}:
+{
+  home.packages = with pkgs; [
+    imagemagick
+  ];
+}

home-manager/modules/quickshell.nix

@@ -6,8 +6,7 @@
 }: {
   home.packages = with pkgs; [
     quickshell
-    DMShell
-    dms-cli
+    dmsCli
     dgop
     ddcutil
     cliphist