From 4c978d8119538349182f1199a2880edd2ca72a1f Mon Sep 17 00:00:00 2001
From: Charlie Root <charlie@charlieroot.dev>
Date: Mon, 30 Sep 2024 21:49:04 +0200
Subject: [PATCH] flake: cleanup

Remove quickshell template and hardware/cpu
---
 modules/system/hardware/cpu/default.nix  |  0
 modules/system/hardware/cpu/module.nix   |  3 ++
 modules/system/hardware/gpu/amd.nix      |  0
 modules/system/hardware/gpu/default.nix  |  0
 modules/system/hardware/gpu/nvidia.nix   |  0
 parts/templates/quickshell/.envrc        |  3 --
 parts/templates/quickshell/.gitignore    |  1 -
 parts/templates/quickshell/flake.lock    | 48 ----------------------
 parts/templates/quickshell/flake.nix     | 51 ------------------------
 parts/templates/quickshell/src/shell.qml |  6 ---
 10 files changed, 3 insertions(+), 109 deletions(-)
 delete mode 100644 modules/system/hardware/cpu/default.nix
 create mode 100644 modules/system/hardware/cpu/module.nix
 delete mode 100644 modules/system/hardware/gpu/amd.nix
 delete mode 100644 modules/system/hardware/gpu/default.nix
 delete mode 100644 modules/system/hardware/gpu/nvidia.nix
 delete mode 100644 parts/templates/quickshell/.envrc
 delete mode 100644 parts/templates/quickshell/.gitignore
 delete mode 100644 parts/templates/quickshell/flake.lock
 delete mode 100644 parts/templates/quickshell/flake.nix
 delete mode 100644 parts/templates/quickshell/src/shell.qml

diff --git a/modules/system/hardware/cpu/default.nix b/modules/system/hardware/cpu/default.nix
deleted file mode 100644
index e69de29..0000000
diff --git a/modules/system/hardware/cpu/module.nix b/modules/system/hardware/cpu/module.nix
new file mode 100644
index 0000000..9b5284e
--- /dev/null
+++ b/modules/system/hardware/cpu/module.nix
@@ -0,0 +1,3 @@
+_: {
+  imports = [./intel.nix];
+}
diff --git a/modules/system/hardware/gpu/amd.nix b/modules/system/hardware/gpu/amd.nix
deleted file mode 100644
index e69de29..0000000
diff --git a/modules/system/hardware/gpu/default.nix b/modules/system/hardware/gpu/default.nix
deleted file mode 100644
index e69de29..0000000
diff --git a/modules/system/hardware/gpu/nvidia.nix b/modules/system/hardware/gpu/nvidia.nix
deleted file mode 100644
index e69de29..0000000
diff --git a/parts/templates/quickshell/.envrc b/parts/templates/quickshell/.envrc
deleted file mode 100644
index faf57b6..0000000
--- a/parts/templates/quickshell/.envrc
+++ /dev/null
@@ -1,3 +0,0 @@
-watch_file flake.nix
-
-use flake
diff --git a/parts/templates/quickshell/.gitignore b/parts/templates/quickshell/.gitignore
deleted file mode 100644
index 7ad6275..0000000
--- a/parts/templates/quickshell/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/.direnv
diff --git a/parts/templates/quickshell/flake.lock b/parts/templates/quickshell/flake.lock
deleted file mode 100644
index 63b4588..0000000
--- a/parts/templates/quickshell/flake.lock
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "nodes": {
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1724224976,
-        "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "c374d94f1536013ca8e92341b540eba4c22f9c62",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "quickshell": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1724197264,
-        "narHash": "sha256-kw8zZyskszCECn8Di6z7WSquBiP7UGCb3SNN5EAF6BE=",
-        "ref": "refs/heads/master",
-        "rev": "f95e7dbaf61b9868acc912896e65126bb1ee048c",
-        "revCount": 304,
-        "type": "git",
-        "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
-      }
-    },
-    "root": {
-      "inputs": {
-        "nixpkgs": "nixpkgs",
-        "quickshell": "quickshell"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}
diff --git a/parts/templates/quickshell/flake.nix b/parts/templates/quickshell/flake.nix
deleted file mode 100644
index e253072..0000000
--- a/parts/templates/quickshell/flake.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  description = "Quickshell tinkering";
-  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-
-    quickshell = {
-      url = "git+https://git.outfoxxed.me/outfoxxed/quickshell";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-  };
-
-  outputs = {
-    nixpkgs,
-    quickshell,
-    ...
-  }: let
-    systems = ["x86_64-linux" "aarch64-linux"];
-    forEachSystem = nixpkgs.lib.genAttrs systems;
-  in {
-    devShells = forEachSystem (system: {
-      default = nixpkgs.legacyPackages.${system}.mkShell {
-        packages = with nixpkgs.legacyPackages.${system}; [
-          (
-            quickshell.packages.${system}.default.override
-            {
-              withJemalloc = false;
-              withQtSvg = false;
-              withWayland = true;
-              withX11 = false;
-              withPipewire = true;
-              withPam = false;
-              withHyprland = false;
-            }
-          )
-          # dependencies
-          cli11
-          cmake
-          jemalloc
-          kdePackages.wayland
-          wayland
-          wayland-protocols
-          wayland-scanner
-          pkg-config
-          pipewire
-          qt6Packages.qtbase
-          qt6.qtdeclarative
-        ];
-      };
-    });
-  };
-}
diff --git a/parts/templates/quickshell/src/shell.qml b/parts/templates/quickshell/src/shell.qml
deleted file mode 100644
index 61a55a3..0000000
--- a/parts/templates/quickshell/src/shell.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-import Quickshell
-
-ShellRoot {
-	// Do some funny stuff here <3
-}