resolve conflict

2023-03-23 18:07:43 -07:00 · 2023-03-23 18:07:43 -07:00 · e8f48e2cee
commit e8f48e2cee
parent a20ddd638f f80a3163d6
3 changed files with 9 additions and 13 deletions
--- a/flake.lock
+++ b/flake.lock
@ -8,11 +8,11 @@
        "utils": "utils"
      },
      "locked": {
-        "lastModified": 1679265143,
-        "narHash": "sha256-5RDMW+O4owjdPz7t4K4YxH2fOHCNOcyVmSiKRUikiv0=",
+        "lastModified": 1679480702,
+        "narHash": "sha256-npuRD61YmxUPitI1TqKwlxLrU6iGl5E+BPT196LgUDo=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "1b8bf5c3270386a1b6850bd77d79dbdbaf0d7a7c",
+        "rev": "363c46b2480f1b73ec37cf68caac61f5daa82a2e",
        "type": "github"
      },
      "original": {
@ -23,11 +23,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1679172431,
-        "narHash": "sha256-XEh5gIt5otaUbEAPUY5DILUTyWe1goAyeqQtmwaFPyI=",
+        "lastModified": 1679437018,
+        "narHash": "sha256-vOuiDPLHSEo/7NkiWtxpHpHgoXoNmrm+wkXZ6a072Fc=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "1603d11595a232205f03d46e635d919d1e1ec5b9",
+        "rev": "19cf008bb18e47b6e3b4e16e32a9a4bdd4b45f7e",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -29,7 +29,7 @@
        ./systems/aurora.nix
        ./users/jsutter.nix
        ./modules/plasma.nix
-	      ./modules/ml.nix
+        ./modules/dev.nix
        ./modules/virtualization.nix
        ];
      };
--- a/modules/ml.nix
+++ b/modules/ml.nix
@ -1,4 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-}