From 47486140c1fdf9531b4e6445a2b2fe1cd7e89305 Mon Sep 17 00:00:00 2001
From: EinEtwas <ein@etwas.me>
Date: Wed, 16 Oct 2024 13:24:02 +0200
Subject: [PATCH] refactor: remove unneeded imports, modularize, add catpuccin
 input

---
 flake.lock                | 16 ++++++++++++++++
 flake.nix                 | 10 +++-------
 modules/configuration.nix |  3 +--
 modules/default.nix       | 10 ++++++++++
 4 files changed, 30 insertions(+), 9 deletions(-)
 create mode 100644 modules/default.nix

diff --git a/flake.lock b/flake.lock
index 3cecae4..4432c87 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,20 @@
 {
   "nodes": {
+    "catppuccin": {
+      "locked": {
+        "lastModified": 1728407414,
+        "narHash": "sha256-B8LaxUP93eh+it8RW1pGq4SsU2kj7f0ipzFuhBvpON8=",
+        "owner": "catppuccin",
+        "repo": "nix",
+        "rev": "96cf8b4a05fb23a53c027621b1147b5cf9e5439f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "catppuccin",
+        "repo": "nix",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -54,6 +69,7 @@
     },
     "root": {
       "inputs": {
+        "catppuccin": "catppuccin",
         "home-manager": "home-manager",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs"
diff --git a/flake.nix b/flake.nix
index 0879617..9106fd3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,24 +8,20 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
+    catppuccin.url = "github:catppuccin/nix";
  };
 
   outputs = { self, nixpkgs, nixos-hardware, ... } @ inputs: {
     nixosConfigurations.rhea-laptop = nixpkgs.lib.nixosSystem {
       specialArgs = { inherit inputs; };
 
-      system = "x86_64-linux";      
+      system = "x86_64-linux";
 
       # List all Modules to load
       modules = [
         nixos-hardware.nixosModules.framework-13-7040-amd
-        ./modules/configuration.nix
-        ./modules/hardware-configuration.nix
-        ./modules/shell.nix
-        ./modules/wayland.nix
-        ./modules/fingerprint.nix
+        ./modules
         ./home
-        # ./modules/hyprland.nix
       ];
     };
   };
diff --git a/modules/configuration.nix b/modules/configuration.nix
index 6d04bc1..f6657b3 100644
--- a/modules/configuration.nix
+++ b/modules/configuration.nix
@@ -2,7 +2,7 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ config, pkgs, ... }:
+{ pkgs, ... }:
 
 {
   # Bootloader.
@@ -68,7 +68,6 @@
   #  wget
     google-chrome
     fprintd
-    #home-manager
   ];
 
   environment.sessionVariables = { 
diff --git a/modules/default.nix b/modules/default.nix
new file mode 100644
index 0000000..1b72b53
--- /dev/null
+++ b/modules/default.nix
@@ -0,0 +1,10 @@
+{
+  imports = [
+    ./configuration.nix
+    ./hardware-configuration.nix
+    ./fingerprint.nix
+    ./hyprland.nix
+    ./shell.nix
+    ./wayland.nix
+  ];
+}
\ No newline at end of file