From afc98ce47e5a6239da7aaed92a9e2a77585d8627 Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Wed, 17 May 2023 12:48:09 -0400
Subject: [PATCH] Remove configuration.nix

Not needed anymore since we know how to use nix modules.
---
 configuration.nix            | 110 -----------------------------------
 flake.nix                    |  41 ++++++++++++-
 modules/packages/default.nix |  68 ++++++++++++++++++++++
 3 files changed, 108 insertions(+), 111 deletions(-)
 delete mode 100644 configuration.nix
 create mode 100644 modules/packages/default.nix

diff --git a/configuration.nix b/configuration.nix
deleted file mode 100644
index 2c48313e..00000000
--- a/configuration.nix
+++ /dev/null
@@ -1,110 +0,0 @@
-{ pkgs, ... }:
-
-{
-  imports = [
-    ./laptop.nix
-    ./modules/starship.nix
-    ./modules/fish.nix
-    ./modules/fonts.nix
-    ./modules/stylix
-    ./modules/htop.nix
-    ./modules/dual-function-keys.nix
-    ./modules/tlp.nix
-    ./modules/osu
-    ./modules/srb2
-    ./modules/mullvad
-    ./modules/pipewire
-    ./modules/networking
-    ./modules/virtualization
-    ./modules/xserver
-    ./modules/systemd
-    ./modules/vnstat
-    ./modules/locale
-    ./modules/firejail
-    ./modules/timezone
-    ./modules/nix
-    ./modules/npm
-    ./modules/home-manager
-    ./modules/piper
-  ];
-
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
-  environment.sessionVariables = {
-    EDITOR = "nvim";
-    VISUAL = "nvim";
-    GIT_DISCOVERY_ACROSS_FILESYSTEM = "1";
-    FZF_DEFAULT_OPTS = "--height 40% --reverse --border --color=16";
-    NODE_OPTIONS = "--max_old_space_size=16384";
-  };
-
-  environment.systemPackages = with pkgs; [
-    pinentry-curses
-    wget
-    grim
-    slurp
-    mullvad-browser
-    papirus-icon-theme
-    mediainfo
-    pywal
-    mpc-cli
-    neofetch
-    tectonic
-    fdupes
-    anki
-    logseq
-    yt-dlp
-    gurk-rs
-    wl-clipboard
-    ffmpeg
-    siege
-    ponysay
-    lolcat
-    wev
-    figlet
-    gcc
-    httpie
-    cmatrix
-    sox
-    spek
-    p7zip
-    ripgrep
-    rsync
-    jq
-    keepassxc
-    exa
-    fd
-    fzf
-    unar
-    audacity
-    gimp
-    typespeed
-    slade
-    gdu
-    nixfmt
-    whois
-    lnch
-    dwt1-shell-color-scripts
-    dig
-    trashy
-    swaybg
-    brightnessctl
-    killall
-    nixos-generators
-    litemdview
-    nodejs
-    yarn
-    deno
-    crystal
-    shards
-    rustc
-    rustfmt
-    cargo
-    genact
-  ];
-
-  environment.defaultPackages = [ ];
-
-  system.stateVersion = "22.11";
-}
diff --git a/flake.nix b/flake.nix
index 7909f128..3f19744a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -26,11 +26,50 @@
       system = "x86_64-linux";
       specialArgs = attrs;
       modules = [
-        ./configuration.nix
         ./home-manager
         hyprland.nixosModules.default
         stylix.nixosModules.stylix
         home-manager.nixosModules.home-manager
+        ./laptop.nix
+        ./modules/starship.nix
+        ./modules/fish.nix
+        ./modules/fonts.nix
+        ./modules/stylix
+        ./modules/htop.nix
+        ./modules/dual-function-keys.nix
+        ./modules/tlp.nix
+        ./modules/osu
+        ./modules/srb2
+        ./modules/mullvad
+        ./modules/pipewire
+        ./modules/networking
+        ./modules/virtualization
+        ./modules/xserver
+        ./modules/systemd
+        ./modules/vnstat
+        ./modules/locale
+        ./modules/firejail
+        ./modules/timezone
+        ./modules/nix
+        ./modules/npm
+        ./modules/home-manager
+        ./modules/piper
+        ./modules/packages
+        {
+          boot.loader.systemd-boot.enable = true;
+          boot.loader.efi.canTouchEfiVariables = true;
+
+          environment.sessionVariables = {
+            EDITOR = "nvim";
+            VISUAL = "nvim";
+            GIT_DISCOVERY_ACROSS_FILESYSTEM = "1";
+            FZF_DEFAULT_OPTS = "--height 40% --reverse --border --color=16";
+            NODE_OPTIONS = "--max_old_space_size=16384";
+          };
+
+          environment.defaultPackages = [ ];
+          system.stateVersion = "22.11";
+        }
       ];
     };
   };
diff --git a/modules/packages/default.nix b/modules/packages/default.nix
new file mode 100644
index 00000000..b444662e
--- /dev/null
+++ b/modules/packages/default.nix
@@ -0,0 +1,68 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    pinentry-curses
+    wget
+    grim
+    slurp
+    mullvad-browser
+    papirus-icon-theme
+    mediainfo
+    pywal
+    mpc-cli
+    neofetch
+    tectonic
+    fdupes
+    anki
+    logseq
+    yt-dlp
+    gurk-rs
+    wl-clipboard
+    ffmpeg
+    siege
+    ponysay
+    lolcat
+    wev
+    figlet
+    gcc
+    httpie
+    cmatrix
+    sox
+    spek
+    p7zip
+    ripgrep
+    rsync
+    jq
+    keepassxc
+    exa
+    fd
+    fzf
+    unar
+    audacity
+    gimp
+    typespeed
+    slade
+    gdu
+    nixfmt
+    whois
+    lnch
+    dwt1-shell-color-scripts
+    dig
+    trashy
+    swaybg
+    brightnessctl
+    killall
+    nixos-generators
+    litemdview
+    nodejs
+    yarn
+    deno
+    crystal
+    shards
+    rustc
+    rustfmt
+    cargo
+    genact
+  ];
+}