From bf581d1e9c19df13ff30ab7c0ff8330cefdd3626 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Sun, 14 Aug 2022 14:23:37 +0200
Subject: [PATCH] nix-dram: remove nix-dram as default nix binary

nix-dram as default nix binary isn't worth the
maintenance work anymore, CI builds started
failing because of it:
https://ci.b12f.io/pub-solar/os/533/1/2

Automatic builds still happen each night and can be
checked in our fork of nix-dram:
https://github.com/pub-solar/nix-dram/actions

Users of nix-dram can continue to use it via devshells
or nix run github:dramforever/nix-dram -- --version
---
 flake.nix                 | 7 +------
 modules/x-os/nix.nix      | 2 --
 overlays/overrides.nix    | 1 +
 profiles/dram/default.nix | 5 -----
 shell/devos.nix           | 2 +-
 5 files changed, 3 insertions(+), 14 deletions(-)
 delete mode 100644 profiles/dram/default.nix

diff --git a/flake.nix b/flake.nix
index 5bb7a948..4ed511d5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -42,10 +42,6 @@
       nixos-hardware.url = "github:nixos/nixos-hardware";
 
       nixos-generators.url = "github:nix-community/nixos-generators";
-
-      # PubSolarOS additions
-      nix-dram.url = "github:dramforever/nix-dram";
-      nix-dram.inputs.nixpkgs.follows = "latest";
     };
 
   outputs =
@@ -59,7 +55,6 @@
     , agenix
     , nvfetcher
     , deploy
-    , nix-dram
     , ...
     } @ inputs:
     digga.lib.mkFlake
@@ -120,7 +115,7 @@
             suites = with profiles; rec {
               base = [ core users.pub-solar users.root ];
               iso = base ++ [ base-user graphical pub-solar-iso ];
-              pubsolaros = [ core dram full-install base-user users.root ];
+              pubsolaros = [ core full-install base-user users.root ];
               anonymous = [ pubsolaros users.pub-solar ];
             };
           };
diff --git a/modules/x-os/nix.nix b/modules/x-os/nix.nix
index 56b677da..38b70cfc 100644
--- a/modules/x-os/nix.nix
+++ b/modules/x-os/nix.nix
@@ -18,8 +18,6 @@
       keep-outputs = true
       keep-derivations = true
       fallback = true
-      # used by nix-dram
-      default-flake = flake:nixpkgs
     '';
   };
 }
diff --git a/overlays/overrides.nix b/overlays/overrides.nix
index df75736d..fd0b836f 100644
--- a/overlays/overrides.nix
+++ b/overlays/overrides.nix
@@ -13,6 +13,7 @@ channels: final: prev: {
     signal-desktop
     starship
     deploy-rs
+    nix
 
     tdesktop
     arduino
diff --git a/profiles/dram/default.nix b/profiles/dram/default.nix
deleted file mode 100644
index 0b7fc3ee..00000000
--- a/profiles/dram/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ self, config, lib, pkgs, inputs, ... }:
-
-{
-  nix.package = inputs.nix-dram.packages.${pkgs.system}.nix-dram;
-}
diff --git a/shell/devos.nix b/shell/devos.nix
index f799ca03..2198052f 100644
--- a/shell/devos.nix
+++ b/shell/devos.nix
@@ -34,7 +34,7 @@ in
   '');
 
   commands = with pkgs; [
-    (devos nixUnstable)
+    (devos nix)
     (devos agenix)
     {
       category = "devos";