From 02817098e005de516a266b70d344d3b525e9deea Mon Sep 17 00:00:00 2001
From: Mx Kookie <kookie@spacekookie.de>
Date: Wed, 23 Dec 2020 13:44:24 +0100
Subject: [PATCH] libkookie: add podman, and install additional modules to
 tempest set

---
 .../workstation/devel/default.nix             | 33 +++++++++++++++++++
 infra/libkookie/roots/tempest.nix             | 25 ++++++++++++--
 2 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/infra/libkookie/configuration/workstation/devel/default.nix b/infra/libkookie/configuration/workstation/devel/default.nix
index 968387a9b84..337767245f6 100644
--- a/infra/libkookie/configuration/workstation/devel/default.nix
+++ b/infra/libkookie/configuration/workstation/devel/default.nix
@@ -19,7 +19,40 @@ in
 
     # Direnv is used to trigger lorri env
     direnv
+
+    # Configure userspace container runner
+    podman
   ];
 
+  xdg.configFile."podman/containers/libpod.conf" = {
+    text = ''
+      runtime_path = ["${pkgs.runc}/bin/runc"]
+      conmon_path = ["${pkgs.conmon}/bin/conmon"]
+    '';
+  };
+
+  xdg.configFile."podman/containers/policy.json" = {
+    text = builtins.toJSON {
+      default = [ { type = "insecureAcceptAnything"; } ];
+    };
+  };
+
+  xdg.configFile."podman/containers/registries.conf" = {
+    text = ''
+      [registries.search]
+      registries = ['docker.io']
+    '';
+  };
+
+  xdg.configFile."podman/containers/storage.conf" = {
+    text = ''
+      [storage]
+      driver = "zfs"
+      runroot = "/tmp/1000"
+      graphroot = "/home/.local/podman
+    '';
+  };
+
+  # Enable lorri service to build project environments
   services.lorri.enable = true;
 }
diff --git a/infra/libkookie/roots/tempest.nix b/infra/libkookie/roots/tempest.nix
index 61128d23d8f..67f67f363d5 100644
--- a/infra/libkookie/roots/tempest.nix
+++ b/infra/libkookie/roots/tempest.nix
@@ -44,6 +44,11 @@ in
 
     # Development tools
     (loadModule <configuration/workstation/devel> "default")
+
+    # Various other graphical tools
+    (loadModule <configuration/workstation/pass> "default")
+    (loadModule <configuration/workstation/chat> "default")
+    (loadModule <configuration/workstation/creative> "default")
   ];
 
   # Configure i3 with the amdgpu driver
@@ -62,6 +67,14 @@ in
   #
   #
   ###################################################################
+
+  ###################################################################
+  #                    NixOS base system options
+  #
+  #
+  #
+
+
   
   # Use the GRUB 2 boot loader.
   boot.loader.grub = {
@@ -109,8 +122,8 @@ in
   # networking.firewall.allowedTCPPorts = [ 9000 ]; ?????
   
   networking.useDHCP = false;
-  networking.interfaces.enp8s0.useDHCP = true;
-  #networking.interfaces.eth0.useDHCP = true;
+  #networking.interfaces.enp8s0.useDHCP = true;
+  networking.interfaces.eth0.useDHCP = true;
   
   # Select internationalisation properties.
   i18n.defaultLocale = "en_GB.UTF-8";
@@ -122,6 +135,14 @@ in
   programs.gnupg.agent = { enable = true; enableSSHSupport = true; };
   services.openssh.enable = true;
 
+  #
+  #
+  #
+  #
+  ###################################################################
+
+  # This setting is not really relevant on this desktop machine, so
+  # just update it when new stable NixOS releases are branched off
   system.stateVersion = "20.09";
   
   # Set a static password for this user