refactor: move nix files into dirs if they exist

Author: laksith19

modules/ocf/graphical.nix modules/ocf/graphical/graphical.nixmodules/ocf/graphical.nix renamed to modules/ocf/graphical/graphical.nix

@@ -45,8 +45,8 @@ in
     };
 
     environment.etc = {
-      skel.source = ./graphical/skel;
-      ocf-assets.source = ./graphical/assets;
+      skel.source = ./skel;
+      ocf-assets.source = ./assets;
     };
 
     programs.steam.enable = true;

modules/ocf/kubernetes.nix modules/ocf/kubernetes/kubernetes.nixmodules/ocf/kubernetes.nix renamed to modules/ocf/kubernetes/kubernetes.nix

@@ -26,8 +26,8 @@ in
 
   config = lib.mkIf config.services.ocfKubernetes.enable {
     environment.etc = {
-      "kubernetes/manifests/kubevip.yaml" = lib.mkIf config.services.ocfKubernetes.isLeader { source = ./kubernetes/kubevip.yaml; };
-      "kubernetes/kubeadm.yaml".source = ./kubernetes/kubeadm.yaml;
+      "kubernetes/manifests/kubevip.yaml" = lib.mkIf config.services.ocfKubernetes.isLeader { source = ./kubevip.yaml; };
+      "kubernetes/kubeadm.yaml".source = ./kubeadm.yaml;
     };
 
     # From an OCF alumni, some of these might be unnecessary.
@@ -131,7 +131,7 @@ in
     # <https://github.com/rook/rook/issues/11474#issuecomment-1365523469>
     boot.kernelPatches = [{
       name = "ceph-hack";
-      patch = ./kubernetes/ceph-hack.patch;
+      patch = ./ceph-hack.patch;
     }];
 
     virtualisation.cri-o.enable = true;

modules/ocf/network.nix modules/ocf/network/network.nixmodules/ocf/network.nix renamed to modules/ocf/network/network.nix

@@ -4,7 +4,7 @@ let
   cfg = config.ocf.network;
 in
 {
-  imports = [ ./network/bond.nix ];
+  imports = [ ./bond.nix ];
 
   options.ocf.network = {
     enable = lib.mkEnableOption "Enable OCF network configuration";

modules/ocf/shell.nix modules/ocf/shell/shell.nixmodules/ocf/shell.nix renamed to modules/ocf/shell/shell.nix

@@ -11,7 +11,7 @@ in
   config = lib.mkIf cfg.enable {
     environment = {
       enableAllTerminfo = true;
-      etc."p10k.zsh".source = ./shell/p10k.zsh;
+      etc."p10k.zsh".source = ./p10k.zsh;
 
       systemPackages = with pkgs; [
         bash