From a33d2cc90e96ff794dbdf3066223253e20d7fccf Mon Sep 17 00:00:00 2001
From: Charlie Root <charlie@charlieroot.dev>
Date: Sat, 31 Aug 2024 13:06:42 +0200
Subject: [PATCH] parts/templates: fix quickshell template

---
 parts/templates/default.nix              |  2 +-
 parts/templates/quickshell/.envrc        |  3 ++
 parts/templates/quickshell/.gitignore    |  1 +
 parts/templates/quickshell/flake.lock    | 48 ++++++++++++++++++++++++
 parts/templates/quickshell/flake.nix     | 37 ++++++++++++------
 parts/templates/quickshell/src/shell.qml |  6 +++
 6 files changed, 84 insertions(+), 13 deletions(-)
 create mode 100644 parts/templates/quickshell/.envrc
 create mode 100644 parts/templates/quickshell/.gitignore
 create mode 100644 parts/templates/quickshell/flake.lock
 create mode 100644 parts/templates/quickshell/src/shell.qml

diff --git a/parts/templates/default.nix b/parts/templates/default.nix
index efc07c1..dca41c5 100644
--- a/parts/templates/default.nix
+++ b/parts/templates/default.nix
@@ -1,6 +1,6 @@
 _: {
   flake.templates = {
-    qs = {
+    quickshell = {
       path = ./quickshell;
       description = "QuickShell developement flake";
     };
diff --git a/parts/templates/quickshell/.envrc b/parts/templates/quickshell/.envrc
new file mode 100644
index 0000000..faf57b6
--- /dev/null
+++ b/parts/templates/quickshell/.envrc
@@ -0,0 +1,3 @@
+watch_file flake.nix
+
+use flake
diff --git a/parts/templates/quickshell/.gitignore b/parts/templates/quickshell/.gitignore
new file mode 100644
index 0000000..7ad6275
--- /dev/null
+++ b/parts/templates/quickshell/.gitignore
@@ -0,0 +1 @@
+/.direnv
diff --git a/parts/templates/quickshell/flake.lock b/parts/templates/quickshell/flake.lock
new file mode 100644
index 0000000..63b4588
--- /dev/null
+++ b/parts/templates/quickshell/flake.lock
@@ -0,0 +1,48 @@
+{
+  "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
index 1f586c0..e253072 100644
--- a/parts/templates/quickshell/flake.nix
+++ b/parts/templates/quickshell/flake.nix
@@ -1,7 +1,8 @@
 {
-  description = "NixOS presentation";
+  description = "Quickshell tinkering";
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+
     quickshell = {
       url = "git+https://git.outfoxxed.me/outfoxxed/quickshell";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -15,22 +16,34 @@
   }: let
     systems = ["x86_64-linux" "aarch64-linux"];
     forEachSystem = nixpkgs.lib.genAttrs systems;
-
-    pkgsForEach = nixpkgs.legacyPackages;
   in {
     devShells = forEachSystem (system: {
-      default = pkgsForEach.${system}.mkShellNoCC {
-        packages = [
-          (quickshell.packages.${system}.default.override
+      default = nixpkgs.legacyPackages.${system}.mkShell {
+        packages = with nixpkgs.legacyPackages.${system}; [
+          (
+            quickshell.packages.${system}.default.override
             {
-              withJemalloc = true;
-              withQtSvg = true;
+              withJemalloc = false;
+              withQtSvg = false;
               withWayland = true;
               withX11 = false;
               withPipewire = true;
-              withPam = true;
-              withHyprland = 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
new file mode 100644
index 0000000..61a55a3
--- /dev/null
+++ b/parts/templates/quickshell/src/shell.qml
@@ -0,0 +1,6 @@
+
+import Quickshell
+
+ShellRoot {
+	// Do some funny stuff here <3
+}