chore: simplify flake

flake.lock

@@ -39,41 +39,7 @@
     "root": {
       "inputs": {
         "nixpkgs": "nixpkgs",
-        "quickshell": "quickshell",
+        "quickshell": "quickshell"
-        "utils": "utils"
-      }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1726560853,
-        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
       }
     }
   },

flake.nix

@@ -3,7 +3,6 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
-    utils.url = "github:numtide/flake-utils";
 
     quickshell = {
       url = "git+https://git.outfoxxed.me/outfoxxed/quickshell";
@@ -12,33 +11,24 @@
   };
 
   outputs =
-    { nixpkgs, utils, ... }@inputs:
+    { self, nixpkgs, ... }@inputs:
-    utils.lib.eachDefaultSystem (
+    let
-      system:
+      systems = [ "x86_64-linux" ];
-      let
+      forEachSystem = nixpkgs.lib.genAttrs systems;
-        pkgs = nixpkgs.legacyPackages.${system};
+      pkgsForEach = nixpkgs.legacyPackages;
-        quickshell = inputs.quickshell.packages.${system}.default.override { withQMLLib = true; };
+    in
-      in
+    {
-      {
+      packages = forEachSystem (system: {
-        devShell = pkgs.mkShell {
+        default = self.packages.${system}.nysh;
-          buildInputs = [
+        nysh = pkgsForEach.${system}.callPackage ./nix/package.nix {
-            quickshell
+          quickshell = inputs.quickshell.packages.${system}.default;
-            pkgs.kdePackages.qtdeclarative
+        };
-            pkgs.pre-commit
+      });
-            pkgs.typos
 
-          ];
+      devShells = forEachSystem (system: {
-          shellHook = ''
+        default = pkgsForEach.${system}.callPackage ./nix/shell.nix {
-            # Required for qmlls to find the correct type declarations
+          quickshell = inputs.quickshell.packages.${system}.default;
-            # Sadly Quickshell doesn't export some types declaratively
-            export QMLLS_BUILD_DIRS=${pkgs.kdePackages.qtdeclarative}/lib/qt-6/qml/:${quickshell}/lib/qt-6/qml/
-            ${pkgs.pre-commit}/bin/pre-commit install -f
-          '';
         };
-        defaultPackage = import ./nix/package.nix {
+      });
-          inherit (pkgs) stdenv;
+    };
-          inherit quickshell;
-        };
-      }
-    );
 }

nix/shell.nix

@@ -0,0 +1,16 @@
+{ pkgs, quickshell, ... }:
+pkgs.mkShell {
+  buildInputs = [
+    quickshell
+    pkgs.kdePackages.qtdeclarative
+    pkgs.pre-commit
+    pkgs.typos
+
+  ];
+  shellHook = ''
+    # Required for qmlls to find the correct type declarations
+    # Sadly Quickshell doesn't export some types declaratively
+    export QMLLS_BUILD_DIRS=${pkgs.kdePackages.qtdeclarative}/lib/qt-6/qml/:${quickshell}/lib/qt-6/qml/
+    ${pkgs.pre-commit}/bin/pre-commit install -f
+  '';
+}