From c75acbf95ebad3c9c65748ddb9c274fe01778fbd Mon Sep 17 00:00:00 2001
From: mtgmonkey <mtgmonkey@nixos>
Date: Mon, 2 Jun 2025 15:06:43 -0400
Subject: [PATCH] fix flake ig

---
 flake.lock | 26 ++++++++++++++++++++++++++
 flake.nix  | 33 ---------------------------------
 2 files changed, 26 insertions(+), 33 deletions(-)
 create mode 100644 flake.lock

diff --git a/flake.lock b/flake.lock
new file mode 100644
index 0000000..190eaf7
--- /dev/null
+++ b/flake.lock
@@ -0,0 +1,26 @@
+{
+  "nodes": {
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1748708770,
+        "narHash": "sha256-q8jG2HJWgooWa9H0iatZqBPF3bp0504e05MevFmnFLY=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "a59eb7800787c926045d51b70982ae285faa2346",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "ref": "nixos-25.05",
+        "type": "indirect"
+      }
+    },
+    "root": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/flake.nix b/flake.nix
index e6a7b17..37f3282 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,5 +1,4 @@
 {
-<<<<<<< HEAD
   inputs = {
     nixpkgs.url = "nixpkgs/nixos-25.05";
   };
@@ -9,38 +8,6 @@
   in {
     packages.${system} = {
       default = pkgs.callPackage ./package.nix {};
-      frontend = pkgs.callPackage ./elmskell-frontend.nix {};
-=======
-  description = "elmskell";
-  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
-  };
-  outputs = inputs @ {...}: let
-    utilities = [
-      pkgs.httpie
-    ];
-    deps = [
-      pkgs.cowsay
-      pkgs.just
-      pkgs.elmPackages.elm
-      pkgs.elmPackages.elm-format
-      pkgs.esbuild
-      pkgs.stack
-    ];
-    pkgs = import inputs.nixpkgs {
-      system = "x86_64-linux";
-    };
-  in {
-    devShell.x86_64-linux = pkgs.mkShell {
-      packages = [
-        utilities
-        deps
-      ];
-      shellHook = ''
-        export PS1='\h@\[\e[30;48;5;202;1m\]elmskell\[\e[0m\]|\w\\$ ' &&
-        cowsay "Welcome to elmskell! Run 'just' to build!"
-      '';
->>>>>>> master
     };
   };
 }