From dd10f39317884775eb1282cc89bb8c60e562b9a0 Mon Sep 17 00:00:00 2001
From: Stefan Ellmauthaler <stefan.ellmauthaler@tu-dresden.de>
Date: Mon, 23 May 2022 14:14:06 +0200
Subject: [PATCH] Remove comma

---
 baseconfiguration.nix |  2 +-
 default.nix           | 11 +++---
 flake.lock            | 79 +------------------------------------------
 flake.nix             |  8 ++---
 4 files changed, 13 insertions(+), 87 deletions(-)

diff --git a/baseconfiguration.nix b/baseconfiguration.nix
index 71f3ef4..3188e59 100644
--- a/baseconfiguration.nix
+++ b/baseconfiguration.nix
@@ -74,7 +74,7 @@
       clang
       rnix-lsp
       procs
-      comma.comma
+      #comma.comma
     ];
     sessionVariables = rec {
       XDG_CACHE_HOME  = "\${HOME}/.cache";
diff --git a/default.nix b/default.nix
index 5712ca4..4ed5330 100644
--- a/default.nix
+++ b/default.nix
@@ -5,7 +5,10 @@ let
       name = if builtins.isString args then args else args.name;
       system = if args ? system then args.system else "x86_64-linux";
       extraModules = if args ? extraModules then args.extraModules else [ ];
-      extraOverlays = if args ? extraOverlays then args.extraOverlays else [ overlay-unstable overlay-comma ];
+      extraOverlays = if args ? extraOverlays then args.extraOverlays else [
+        overlay-unstable
+        # overlay-comma
+      ];
       pkgs = flakes.nixpkgs;
       configuration = if args ? configuration then args.configuration else import ./baseconfiguration.nix  {inherit extraOverlays system pkgs name flakes flakeOutputs;} ;
       overlay-unstable = final: prev: {
@@ -15,9 +18,9 @@ let
         };
       };
 
-      overlay-comma = final: prev: {
-        comma = flakes.comma.packages."${system}";
-      };
+      # overlay-comma = final: prev: {
+      #   comma = flakes.comma.packages."${system}";
+      # };
     in
       {
         inherit name;
diff --git a/flake.lock b/flake.lock
index e6db719..f900ce4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -16,29 +16,6 @@
         "type": "gitlab"
       }
     },
-    "comma": {
-      "inputs": {
-        "flake-compat": "flake-compat",
-        "naersk": "naersk",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "utils": "utils"
-      },
-      "locked": {
-        "lastModified": 1650481854,
-        "narHash": "sha256-CZQLigKovJbMoTbPuWT3SBSMymjD58m72O/oy+HilQg=",
-        "owner": "nix-community",
-        "repo": "comma",
-        "rev": "034a9ca440370fc1eccbed43ff345fb6ea1f0d27",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "comma",
-        "type": "github"
-      }
-    },
     "emacs-overlay": {
       "inputs": {
         "flake-utils": "flake-utils",
@@ -58,22 +35,6 @@
         "type": "github"
       }
     },
-    "flake-compat": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1648199409,
-        "narHash": "sha256-JwPKdC2PoVBkG6E+eWw3j6BMR6sL3COpYWfif7RVb8Y=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "64a525ee38886ab9028e6f61790de0832aa3ef03",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
     "flake-utils": {
       "locked": {
         "lastModified": 1652776076,
@@ -110,28 +71,6 @@
         "type": "github"
       }
     },
-    "naersk": {
-      "inputs": {
-        "nixpkgs": [
-          "comma",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1650101877,
-        "narHash": "sha256-IYxYc5Z1ZHQDTQbTWsOZ9HlZepsVjgV5oZwmbKzxSJs=",
-        "owner": "nix-community",
-        "repo": "naersk",
-        "rev": "8cc379478819e6a22ce7595a761fe1e17c8d7458",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "ref": "master",
-        "repo": "naersk",
-        "type": "github"
-      }
-    },
     "nixos-hardware": {
       "locked": {
         "lastModified": 1653145312,
@@ -256,7 +195,6 @@
     },
     "root": {
       "inputs": {
-        "comma": "comma",
         "emacs-overlay": "emacs-overlay",
         "home-manager": "home-manager",
         "nixos-hardware": "nixos-hardware",
@@ -272,7 +210,7 @@
         "nixpkgs": "nixpkgs_3",
         "nixpkgs-21_05": "nixpkgs-21_05",
         "nixpkgs-21_11": "nixpkgs-21_11",
-        "utils": "utils_2"
+        "utils": "utils"
       },
       "locked": {
         "lastModified": 1638911354,
@@ -312,21 +250,6 @@
       }
     },
     "utils": {
-      "locked": {
-        "lastModified": 1649676176,
-        "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "utils_2": {
       "locked": {
         "lastModified": 1605370193,
         "narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=",
diff --git a/flake.nix b/flake.nix
index 064fcb1..8a7d74b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,10 +11,10 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    comma = {
-      url = "github:nix-community/comma";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    # comma = {
+    #   url = "github:nix-community/comma";
+    #   inputs.nixpkgs.follows = "nixpkgs";
+    # };
 
     home-manager = {
       url = "github:nix-community/home-manager/release-21.11";