cleanup and rename

modules/home/core/apps.nix

@@ -1,43 +1,67 @@
 { pkgs, ... }: {
   nixpkgs.config.allowUnfree = true;
 
+  xdg = {
+    autostart.enable = true;
+    mimeApps = {
+      enable = true;
+      defaultApplications = {
+        "text/plain" = "nvim.desktop";
+        "text/html" = "brave-browser.desktop";
+        "application/pdf" = "brave-browser.desktop";
+        "x-scheme-handler/http" = "brave-browser.desktop";
+        "x-scheme-handler/https" = "brave-browser.desktop";
+        "x-terminal-emulator" = "kitty.desktop";
+        "inode/directory" = "pcmanfm-qt.desktop";
+        "audio/mpeg" = "vlc.desktop";
+        "audio/mp3" = "vlc.desktop";
+        "audio/wav" = "vlc.desktop";
+        "audio/flac" = "vlc.desktop";
+        "video/mp4" = "vlc.desktop";
+        "video/x-matroska" = "vlc.desktop";
+        "video/webm" = "vlc.desktop";
+        "video/x-msvideo" = "vlc.desktop";
+      };
+    };
+  };
+  
   home.packages = with pkgs; [
-      zed-editor
+    zed-editor
-      # kicad-small
+    # kicad-small
-      # arduino-ide
+    # arduino-ide
 
-      slack
+    slack
-      discord
+    discord
-      # protonmail-desktop # https://www.reddit.com/r/NixOS/comments/1rm9alf/protonmail_in_nixos/
+    # protonmail-desktop # https://www.reddit.com/r/NixOS/comments/1rm9alf/protonmail_in_nixos/
     
-      vlc
+    vlc
-      brave
+    brave
-      libreoffice
+    libreoffice
-      appimage-run
+    appimage-run
-      # keepassxc
+    # keepassxc
 
-      virt-manager
+    virt-manager
-      # winboat
+    # winboat
     
-      remmina
+    remmina
-      moonlight-qt
+    moonlight-qt
-      # rustdesk
+    # rustdesk
     
     
-      # inkscape
+    # inkscape
-      # davinci-resolve
+    # davinci-resolve
-      # kdePackages.kdenlive
+    # kdePackages.kdenlive
-      (wrapOBS {
+    (wrapOBS {
-        plugins = with obs-studio-plugins; [
+      plugins = with obs-studio-plugins; [
-          wlrobs
+        wlrobs
-          obs-backgroundremoval
+        obs-backgroundremoval
-          obs-pipewire-audio-capture
+        obs-pipewire-audio-capture
-        ];
+      ];
-      })
+    })
 
-      ferium
+    ferium
-      portablemc
+    portablemc
-      steamguard-cli
+    steamguard-cli
-      # modrinth-app
+    # modrinth-app
-    ];
+  ];
 }

modules/home/core/xdg.nix

@@ -1,25 +0,0 @@
-{ ... }: {
-  xdg = {
-    autostart.enable = true;
-    mimeApps = {
-      enable = true;
-      defaultApplications = {
-        "text/plain" = "nvim.desktop";
-        "text/html" = "brave-browser.desktop";
-        "application/pdf" = "brave-browser.desktop";
-        "x-scheme-handler/http" = "brave-browser.desktop";
-        "x-scheme-handler/https" = "brave-browser.desktop";
-        "x-terminal-emulator" = "kitty.desktop";
-        "inode/directory" = "pcmanfm-qt.desktop";
-        "audio/mpeg" = "vlc.desktop";
-        "audio/mp3" = "vlc.desktop";
-        "audio/wav" = "vlc.desktop";
-        "audio/flac" = "vlc.desktop";
-        "video/mp4" = "vlc.desktop";
-        "video/x-matroska" = "vlc.desktop";
-        "video/webm" = "vlc.desktop";
-        "video/x-msvideo" = "vlc.desktop";
-      };
-    };
-  };
-}

modules/home/default.nix

@@ -1,7 +1,7 @@
 { username, ... }: {
   imports = [
+    ./core/shell.nix
     ./core/cli.nix
-    ./core/zsh.nix
   ];
 
   home = {

modules/home/desktop.nix

@@ -1,20 +1,19 @@
 { pkgs, ... }: {
   imports = [
-    ./rice/hyprland.nix
+    ./rice/compositor.nix
-    ./rice/hyprlock.nix
+    ./rice/lockscreen.nix
-    ./rice/waybar.nix
+    ./rice/keybinds.nix
-    ./rice/rofi.nix
+    ./rice/logout.nix
-    ./rice/wlogout.nix
+    ./rice/notifs.nix
-    ./rice/hypridle.nix
-    ./rice/dunst.nix
     ./rice/cursor.nix
     ./rice/theme.nix
-    ./rice/keybinds.nix
+    ./rice/menu.nix
-    ./misc/scheme-handlers.nix
+    ./rice/idle.nix
-    ./misc/kde-connect.nix
+    ./rice/bar.nix
+    ./misc/handlers.nix
+    ./misc/phone.nix
     ./core/apps.nix
-    ./core/zed.nix
+    ./core/code.nix
-    ./core/xdg.nix
   ];
 
   services = {