From c9e27b621d284b813b023721d1b1854344ba4729 Mon Sep 17 00:00:00 2001
From: natto1784 <natto@weirdnatto.in>
Date: Thu, 3 Feb 2022 12:23:24 +0530
Subject: [PATCH] flake.nix: add old channel, Marisa: downgrade to cgroupv1

---
 flake.lock                  | 17 +++++++++++++++++
 flake.nix                   |  9 ++++++---
 hosts/marisa/networking.nix |  2 +-
 hosts/marisa/services.nix   |  4 +++-
 modules/min-pkgs.nix        |  2 +-
 5 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/flake.lock b/flake.lock
index f1d0e24..ab52c04 100644
--- a/flake.lock
+++ b/flake.lock
@@ -461,6 +461,22 @@
         "type": "github"
       }
     },
+    "old": {
+      "locked": {
+        "lastModified": 1642244250,
+        "narHash": "sha256-vWpUEqQdVP4srj+/YLJRTN9vjpTs4je0cdWKXPbDItc=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "0fd9ee1aa36ce865ad273f4f07fdc093adeb5c00",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-21.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "agenix": "agenix",
@@ -474,6 +490,7 @@
         "nixpkgs": "nixpkgs_7",
         "nur": "nur",
         "nvim": "nvim",
+        "old": "old",
         "rust": "rust",
         "stable": "stable",
         "utils": "utils_4"
diff --git a/flake.nix b/flake.nix
index 8962fa7..a3033f8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,6 +1,7 @@
 { 
   inputs = {
     stable.url = github:nixos/nixpkgs/nixos-21.11;
+    old.url = github:nixos/nixpkgs/nixos-21.05;
     nixpkgs.url = github:nixos/nixpkgs/nixpkgs-unstable;
     master.url = github:nixos/nixpkgs/master;
     home-manager.url = github:nix-community/home-manager;
@@ -16,7 +17,7 @@
     rust.url = github:oxalica/rust-overlay;
   };
 
-  outputs = inputs@{self, nixpkgs, stable, master,  ... }:
+  outputs = inputs@{self, nixpkgs, stable, master, old, ... }:
   inputs.utils.lib.eachDefaultSystem (system: 
   let
     mkPkgs = channel: system: import channel {
@@ -27,6 +28,7 @@
       stable   = mkPkgs stable  prev.system;
       unstable = mkPkgs nixpkgs prev.system;
       master   = mkPkgs master  prev.system;
+      old      = mkPkgs old     prev.system;
     };
     overlays = [
       (import ./overlays/overridesandshit.nix)
@@ -64,10 +66,10 @@
       ./modules/vault-agent.nix
     ];
     serverModules = [
-      ./modules/builder.nix
       ./modules/min-pkgs.nix
       ./modules/min-stuff.nix
     ];
+    builder = [ ./modules/builder.nix ];
   in
   {
     hm-configs = {
@@ -131,7 +133,8 @@
           }
         ]
         ++ commonModules
-        ++ serverModules;
+        ++ serverModules
+        ++ builder;
       };
     };
   });
diff --git a/hosts/marisa/networking.nix b/hosts/marisa/networking.nix
index 4ce9a6b..9f9236e 100755
--- a/hosts/marisa/networking.nix
+++ b/hosts/marisa/networking.nix
@@ -3,7 +3,7 @@
   networking = {
     hostName = "Marisa";
     firewall = {
-      allowedTCPPorts = [ 22 80 6060 5001 8800 7777 4444 4646 8500 8888 22001 ];
+      allowedTCPPorts = [ 22 80 6060 5001 8800 5555 4444 4646 8500 22001 ];
       allowedUDPPorts = [ 17840 ];
     };
     wireless = {
diff --git a/hosts/marisa/services.nix b/hosts/marisa/services.nix
index 7f9eef4..c09c913 100755
--- a/hosts/marisa/services.nix
+++ b/hosts/marisa/services.nix
@@ -2,6 +2,7 @@
 {
 
   # Add secrets to nomad, consul and vault
+  systemd.enableUnifiedCgroupHierarchy = false;
   systemd.tmpfiles.rules = lib.singleton "d /run/vault - vault vault 1h";
   systemd.services.vault.preStart =
     let
@@ -11,7 +12,7 @@
           path = "vault";
           token = "+++vault_consul_token+++";
         };
-        api_addr = "https://127.0.0.1:8800";
+        api_addr = "https://10.55.0.2:8800";
         ui = true;
       });
     in
@@ -216,6 +217,7 @@
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPX1HDzWpoaOcU8GDEGuDzXgxkCpyeqxRR6gLs/8JgHw"
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOSQnDNrNP69tIK7U2D7qaMjycfIjpgx0at4U2D5Ufib"
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK5V/hdkTTQSkDLXaEwY8xb/T8+sWtw5c6UjYOPaTrO8"
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKFyKi0HYfkgvEDvjzmDRGwAq2z2KOkfv7scTVSnonBh"
   ];
   security.pki.certificateFiles = [ ../../cert.pem ../../consul-agent-ca.pem ];
 
diff --git a/modules/min-pkgs.nix b/modules/min-pkgs.nix
index 69eb6b2..1b43b30 100755
--- a/modules/min-pkgs.nix
+++ b/modules/min-pkgs.nix
@@ -1,4 +1,4 @@
-{lib, config, pkgs, ...}:
+{ lib, config, pkgs, ... }:
 {
   environment.systemPackages = with pkgs; [
     git