From 84af6079e431e53889e86448266705103fb0ff04 Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Mon, 5 Jun 2023 12:00:13 -0400
Subject: [PATCH] nix: Abstract logic outside of flake

Now flake.nix does *not* need to be edited when adjusting the
configuration unless actual changes need to be done to the inputs.
---
 common.nix | 43 ++++++++++++++++++++++++++++++++++++++++++-
 flake.nix  | 39 ---------------------------------------
 2 files changed, 42 insertions(+), 40 deletions(-)

diff --git a/common.nix b/common.nix
index e676e91..421e91d 100644
--- a/common.nix
+++ b/common.nix
@@ -1,6 +1,17 @@
-{ pkgs, ... }:
+{ pkgs, hypr-contrib, nix-gaming, ... }:
 
 {
+  imports = [
+    ./modules
+    ./user.nix
+    ./desktop
+    ./dev
+    ./games.nix
+    ./host
+    ./containers/rar.nix
+    ./containers/wine.nix
+  ];
+
   # locale
   i18n.defaultLocale = "ja_JP.UTF-8";
   i18n.supportedLocales =
@@ -14,6 +25,36 @@
     };
   };
 
+  hardware.opengl.driSupport32Bit = true;
+
+  boot.loader = {
+    systemd-boot = {
+      enable = true;
+      editor = false;
+    };
+
+    timeout = 0;
+    efi.canTouchEfiVariables = true;
+  };
+
+  boot.tmp.useTmpfs = true;
+
+  environment.systemPackages = [
+    hypr-contrib.packages."x86_64-linux".grimblast
+    nix-gaming.packages."x86_64-linux".osu-stable
+  ];
+
+  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";
+
   # home-manager
   home-manager = {
     useGlobalPkgs = true;
diff --git a/flake.nix b/flake.nix
index a6480e0..d06e59d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -42,46 +42,7 @@
         hyprland.nixosModules.default
         stylix.nixosModules.stylix
         nix-gaming.nixosModules.pipewireLowLatency
-        ./applications
         ./common.nix
-        ./user.nix
-        ./desktop
-        ./dev
-        ./games.nix
-        ./host
-        ./terminal
-        ./containers/rar.nix
-        {
-          hardware.opengl.driSupport32Bit = true;
-
-          boot.loader = {
-            systemd-boot = {
-              enable = true;
-              editor = false;
-            };
-
-            timeout = 0;
-            efi.canTouchEfiVariables = true;
-          };
-
-          boot.tmp.useTmpfs = true;
-
-          environment.systemPackages = [
-            hypr-contrib.packages."x86_64-linux".grimblast
-            nix-gaming.packages."x86_64-linux".osu-stable
-          ];
-
-          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";
-        }
       ];
     };
   };