Ŝanĝu al flake

.gitignore

@@ -1,3 +1,4 @@
 node_modules
 target
 *.db
+.direnv

flake.lock

@@ -0,0 +1,73 @@
+{
+  "nodes": {
+    "flake-utils": {
+      "locked": {
+        "lastModified": 1637014545,
+        "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1648648646,
+        "narHash": "sha256-pHAq/GvsP7zRHkUTCs+4d31C0IEtTIuC6/TFASIA+zg=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "efea022d6fe0da84aa6613d4ddeafb80de713457",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "ref": "nixos-21.11",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1637453606,
+        "narHash": "sha256-Gy6cwUswft9xqsjWxFYEnx/63/qzaFUwatcbV5GF/GQ=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "8afc4e543663ca0a6a4f496262cd05233737e732",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "oxalica": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs_2"
+      },
+      "locked": {
+        "narHash": "sha256-PLhquuUzdO9jjtAEwhP0Q2efsumX2Ayh/mdNFtJtgM0=",
+        "type": "tarball",
+        "url": "https://github.com/oxalica/rust-overlay/archive/master.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://github.com/oxalica/rust-overlay/archive/master.tar.gz"
+      }
+    },
+    "root": {
+      "inputs": {
+        "nixpkgs": "nixpkgs",
+        "oxalica": "oxalica"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

flake.nix

@@ -1,5 +1,5 @@
 {
-  description = "demo Tauri application";
+  description = "Kampanja Kontrolado";
 
   inputs = {
     nixpkgs.url = "nixpkgs/nixos-21.11";
@@ -21,15 +21,16 @@
           };
         in
         pkgs.mkShell {
-          name = "tauri-demo-shell";
+          name = "kampanja-kontrolada";
           buildInputs = [
-            rust
-            pkgs.nodejs
             pkgs.gtk3
-            pkgs.webkit
             pkgs.libappindicator
-            pkgs.pkg-config
+            pkgs.nodejs
             pkgs.openssl
+            pkgs.pkg-config
+            pkgs.sqlite
+            pkgs.webkit
+            rust
           ];
         };
     };

shell.nix

@@ -1,24 +0,0 @@
-let
-    rust_overlay = import (builtins.fetchTarball "https://github.com/oxalica/rust-overlay/archive/master.tar.gz");
-    pkgs = import <pkgs-21.11> { overlays = [ rust_overlay ]; };
-    unstable = import <unstable> {};
-    rust = pkgs.rust-bin.stable."1.59.0".default.override {
-      extensions = [ "rust-src" ];
-    };
-
-in pkgs.mkShell {
-    name = "kampanja-kontrolado";
-
-    nativeBuildInputs = [
-      pkgs.glib
-      pkgs.gtk3
-      pkgs.libpng
-      pkgs.nodejs
-      pkgs.openssl
-      pkgs.pkg-config
-      pkgs.sqlite
-      pkgs.wrapGAppsHook
-      rust
-      unstable.rust-analyzer
-    ];
-}