From 47b5ac0d7d0ea4eefa291fd6181002ae90c3c7f2 Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Thu, 8 Jun 2023 17:23:09 -0400
Subject: [PATCH] nix: Remove logic from modules/default.nix

For simplicity, the first-level default.nix should be used to import all
the other modules.
---
 modules/default.nix | 126 --------------------------------------------
 src/main.nix        | 121 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 121 insertions(+), 126 deletions(-)

diff --git a/modules/default.nix b/modules/default.nix
index dceef351..3616bad9 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -30,130 +30,4 @@ in {
     ./waybar
     ./xdg-user-dirs
   ];
-
-  virtualisation.vmware.host = {
-    enable = true;
-    extraConfig = ''
-      # Enable 3D acceleration on the host
-      mks.gl.allowUnsupportedDrivers = "TRUE"
-      mks.vk.allowUnsupportedDevices = "TRUE"
-    '';
-  };
-
-  environment.systemPackages = with pkgs; [
-    audacity
-    gimp
-    anki
-    logseq
-    mullvad-browser
-    spek
-    keepassxc
-    libreoffice
-
-    wget
-    jq
-    exa
-    fd
-    fzf
-    gdu
-    fdupes
-    mediainfo
-    ponysay
-    lolcat
-    cmatrix
-    sox
-    httpie
-    p7zip
-    ripgrep
-    rsync
-    unar
-    genact
-    ffmpeg
-    killall
-    trashy
-    whois
-    dwt1-shell-color-scripts
-    dig
-    yt-dlp
-    neofetch
-    pywal
-    brightnessctl
-    zellij
-    librespeed-cli
-    wiki-tui
-    hexyl
-    nb
-    jpegoptim
-    playerctl
-    recode
-    rmlint
-    sd
-    shards
-    smartmontools
-    sqlitebrowser
-    visidata
-    scc
-    hwinfo
-    stress
-    choose
-    gum
-    hdparm
-    imagemagick
-    onefetch
-    restic
-    wails
-    watchexec
-    memento
-    mpvpaper
-    timg
-    kanjidraw
-    ventoy
-    wf-recorder
-    mdcat
-    mdbook
-    zola
-    file
-    tessen
-    wtype
-    mtr
-
-    grim
-    slurp
-    wl-clipboard
-    lnch
-    wev
-    swww
-    kickoff
-    greetd.tuigreet
-    (pkgs.callPackage ../packages/hyprland-autoname-workspaces {})
-  ];
-
-  home-manager.sharedModules = [
-    {
-      programs.bat.enable = true;
-    }
-  ];
-
-  programs.htop = {
-    enable = true;
-    package = pkgs."htop-vim";
-    settings = {tree_view = 1;};
-  };
-
-  services.greetd = {
-    enable = true;
-    restart = false;
-    settings = {
-      default_session = {
-        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd Hyprland";
-        user = "greeter";
-      };
-      initial_session = {
-        command = "${pkgs.hyprland}/bin/Hyprland";
-        user = VARIABLES.username;
-      };
-    };
-  };
-
-  zramSwap.enable = true;
 }
diff --git a/src/main.nix b/src/main.nix
index 4f39ca55..3c6fdb74 100644
--- a/src/main.nix
+++ b/src/main.nix
@@ -95,6 +95,93 @@ in {
     cargo
     rust-analyzer
     bacon
+
+    # other
+    audacity
+    gimp
+    anki
+    logseq
+    mullvad-browser
+    spek
+    keepassxc
+    libreoffice
+
+    wget
+    jq
+    exa
+    fd
+    fzf
+    gdu
+    fdupes
+    mediainfo
+    ponysay
+    lolcat
+    cmatrix
+    sox
+    httpie
+    p7zip
+    ripgrep
+    rsync
+    unar
+    genact
+    ffmpeg
+    killall
+    trashy
+    whois
+    dwt1-shell-color-scripts
+    dig
+    yt-dlp
+    neofetch
+    pywal
+    brightnessctl
+    zellij
+    librespeed-cli
+    wiki-tui
+    hexyl
+    nb
+    jpegoptim
+    playerctl
+    recode
+    rmlint
+    sd
+    shards
+    smartmontools
+    sqlitebrowser
+    visidata
+    scc
+    hwinfo
+    stress
+    choose
+    gum
+    hdparm
+    imagemagick
+    onefetch
+    restic
+    wails
+    watchexec
+    memento
+    mpvpaper
+    timg
+    kanjidraw
+    ventoy
+    wf-recorder
+    mdcat
+    mdbook
+    zola
+    file
+    tessen
+    wtype
+    mtr
+
+    grim
+    slurp
+    wl-clipboard
+    lnch
+    wev
+    swww
+    kickoff
+    greetd.tuigreet
+    (pkgs.callPackage ../packages/hyprland-autoname-workspaces {})
   ];
 
   nixpkgs.config.allowUnfreePredicate = pkg:
@@ -159,6 +246,8 @@ in {
             };
           };
         };
+
+        programs.bat.enable = true;
       }
     ];
   };
@@ -251,4 +340,36 @@ in {
       ];
     };
   };
+
+  virtualisation.vmware.host = {
+    enable = true;
+    extraConfig = ''
+      # Enable 3D acceleration on the host
+      mks.gl.allowUnsupportedDrivers = "TRUE"
+      mks.vk.allowUnsupportedDevices = "TRUE"
+    '';
+  };
+
+  programs.htop = {
+    enable = true;
+    package = pkgs."htop-vim";
+    settings = {tree_view = 1;};
+  };
+
+  services.greetd = {
+    enable = true;
+    restart = false;
+    settings = {
+      default_session = {
+        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd Hyprland";
+        user = "greeter";
+      };
+      initial_session = {
+        command = "${pkgs.hyprland}/bin/Hyprland";
+        user = VARIABLES.username;
+      };
+    };
+  };
+
+  zramSwap.enable = true;
 }