From 3105575c382b2474d8bea95824088343aed82475 Mon Sep 17 00:00:00 2001
From: Jacob Bachmann <jacob.bachmann@posteo.de>
Date: Fri, 5 Apr 2024 16:22:46 +0200
Subject: [PATCH] feat: add flaresolvarr, switch to podman, add alacritty
 padding

---
 modules/default.nix                           |  2 +-
 modules/jackett.nix                           |  7 -----
 modules/rr.nix                                | 26 +++++++++++++++++++
 modules/syncthing.nix                         |  1 +
 modules/virtualisation.nix                    | 11 +++++---
 .../modules/gui/programs/alacritty.nix        |  6 +++++
 6 files changed, 41 insertions(+), 12 deletions(-)
 delete mode 100644 modules/jackett.nix
 create mode 100644 modules/rr.nix

diff --git a/modules/default.nix b/modules/default.nix
index 74fdaea..2436586 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -61,7 +61,6 @@
     ./greetd.nix
     ./gstreamer.nix
     ./i18n.nix
-    ./jackett.nix
     ./kdeconnect.nix
     ./keyd.nix
     ./man.nix
@@ -75,6 +74,7 @@
     ./power.nix
     ./packages.nix
     ./printing.nix
+    ./rr.nix
     ./security.nix
     ./shell.nix
     ./steam.nix
diff --git a/modules/jackett.nix b/modules/jackett.nix
deleted file mode 100644
index 48946e3..0000000
--- a/modules/jackett.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-
-  services.jackett = {
-    enable = true;
-  };
-
-}
diff --git a/modules/rr.nix b/modules/rr.nix
new file mode 100644
index 0000000..6266759
--- /dev/null
+++ b/modules/rr.nix
@@ -0,0 +1,26 @@
+{
+
+  services.jackett = {
+    enable = true;
+  };
+
+  virtualisation = {
+    oci-containers = {
+      backend = "podman";
+      containers = {
+        flare-solvarr = {
+          image = "ghcr.io/flaresolverr/flaresolverr:latest";
+          autoStart = true;
+          ports = ["127.0.0.1:8191:8191"];
+          environment = {
+            LOG_LEVEL = "info";
+            LOG_HTML = "false";
+            CAPTCHA_SOLVER = "hcaptcha-solver";
+            TZ="Europe/Berlin";
+          };
+        };
+      };
+    };
+  };
+
+}
diff --git a/modules/syncthing.nix b/modules/syncthing.nix
index 9bfb16c..4dd3256 100644
--- a/modules/syncthing.nix
+++ b/modules/syncthing.nix
@@ -67,6 +67,7 @@
     };
 
     user = "gandalf";
+    group = "users";
     dataDir = "/home/gandalf";
 
   };
diff --git a/modules/virtualisation.nix b/modules/virtualisation.nix
index 4ad6c80..bb87cd7 100644
--- a/modules/virtualisation.nix
+++ b/modules/virtualisation.nix
@@ -2,11 +2,14 @@
 
   # virt-manager
   virtualisation = {
-    docker = {
-      enable = true;
-      storageDriver = "btrfs";
-    };
     libvirtd.enable = true;
+    podman = {
+      enable = true;
+      # create a `docker` alias for podman, to use it as a drop-in replacement
+      dockerCompat = true;
+      # required for containers under podman-compose to be able to talk to each other.
+      defaultNetwork.settings.dns_enabled = true;
+    };
   };
   programs = {
     dconf.enable = true;
diff --git a/users/gandalf/modules/gui/programs/alacritty.nix b/users/gandalf/modules/gui/programs/alacritty.nix
index 10d1995..165fcb4 100644
--- a/users/gandalf/modules/gui/programs/alacritty.nix
+++ b/users/gandalf/modules/gui/programs/alacritty.nix
@@ -21,6 +21,12 @@ in
       };
       scrolling.multiplier = 5;
       selection.save_to_clipboard = true;
+      window = {
+        padding = {
+          x = 5;
+          y = 5;
+        };
+      };
     };
   };
 }