Merge remote-tracking branch 'refs/remotes/origin/main'

hosts/muon/configuration.nix

@@ -27,6 +27,7 @@ in {
   mods.server.astral.enable = false;
   mods.server.astral.autoStart = false;
 
+  mods.docker.enable = true;
   mods.docker.media.enable = false;
 
   mods.server.sync.enable = true;

modules/home/desktop/media.nix

@@ -13,6 +13,9 @@
 
       # Podcasts
       gpodder
+
+      # Interactive
+      bottles
     ];
     programs.mpv.enable = true;
   };

modules/home/terminal/development.nix

@@ -53,10 +53,12 @@ in {
 
     programs.helix = {
       enable = true;
+      package = pkgs.evil-helix;
 
       settings = {
         keys.normal = {
           "esc" = [ "collapse_selection" "keep_primary_selection" ];
+          "V" = [ "select_mode" "extend_to_line_bounds" ];
         };
         editor = {
           line-number = "relative";

modules/nixos/server/docker/default.nix

@@ -1,7 +1,5 @@
 { pkgs, lib, config, ... }: {
-  imports = [
-    ./media.nix
-  ];
+  imports = [ ./media.nix ];
 
   options.mods.docker = {
     enable = lib.mkEnableOption {
@@ -21,10 +19,10 @@
 
     # Arion works with Docker, but for NixOS-based containers, you need Podman
     # since NixOS 21.05.
-    virtualisation.docker.enable = false;
-    virtualisation.podman.enable = true;
-    virtualisation.podman.dockerSocket.enable = true;
-    virtualisation.podman.defaultNetwork.dnsname.enable = true;
+    virtualisation.docker.enable = true;
+    # virtualisation.podman.enable = true;
+    # virtualisation.podman.dockerSocket.enable = true;
+    # virtualisation.podman.defaultNetwork.dnsname.enable = true;
 
     # Use your username instead of `myuser`
     users.extraUsers.${config.mods.user.name}.extraGroups = [ "podman" ];

modules/nixos/server/git.nix

@@ -12,5 +12,17 @@ in with lib; {
     };
   };
 
-  config = mkIf cfg.enable { services.forgejo = { enable = true; }; };
+  config = mkIf cfg.enable {
+    services.forgejo = {
+      enable = true;
+      stateDir = "/srv/forgejo";
+      lfs.enable = true;
+      settings.server = {
+        HTTP_ADDR = "0.0.0.0";
+        HTTP_PORT = port;
+        SSH_PORT = 91722;
+        DOMAIN = "git.muon.host";
+      };
+    };
+  };
 }