Update

Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>

hosts/common/configs/user/console/dive/default.nix

@@ -16,8 +16,7 @@ in
     home.packages = with pkgs; [ dive ];
 
     xdg.configFile."dive/config.yaml" = lib.mkIf (
-      (config.virtualisation.podman.enable || hmConfig.services.podman.enable)
-      && !(config.virtualisation.docker.enable || config.virtualisation.docker.rootless.enable)
+      config.virtualisation.podman.enable || hmConfig.services.podman.enable
     ) { source = (pkgs.formats.yaml { }).generate "config.yaml" { container-engine = "podman"; }; };
   };
 }

hosts/common/configs/user/console/docker/default.nix

@@ -1,52 +0,0 @@
-{
-  user ? throw "user argument is required",
-  home ? throw "home argument is required",
-  rootless ? true,
-}:
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-lib.mkMerge [
-  {
-    virtualisation.docker.rootless = {
-      enable = rootless;
-      setSocketVariable = true;
-      enableOnBoot = false;
-      storageDriver = "btrfs";
-
-      daemon.settings = {
-        experimental = true;
-        ipv6 = true;
-        fixed-cidr-v6 = "fd00::/80";
-      };
-
-      autoPrune = {
-        enable = true;
-        flags = [ "--all" ];
-      };
-    };
-
-    home-manager.users.${user} = {
-      home = {
-        packages = with pkgs; [ docker-compose ];
-        sessionVariables.DOCKER_CONFIG = "${home}/.config/docker";
-      };
-    };
-  }
-  (lib.mkIf rootless {
-    environment.persistence."/persist/state"."${home}/.local/share/docker".create = "directory";
-
-    systemd.user = {
-      services.docker.after = [
-        config.environment.persistence."/persist/state"."${home}/.local/share/docker".mount
-      ];
-      sockets.docker.after = [
-        config.environment.persistence."/persist/state"."${home}/.local/share/docker".mount
-      ];
-    };
-  })
-  (lib.mkIf (!rootless) { users.users.${user}.extraGroups = [ "docker" ]; })
-]

hosts/common/configs/user/gui/astal/config/widget/components/Launcher.tsx

@@ -4,7 +4,9 @@ export default () => (
   <button
     className="launcher"
     onClickRelease={() =>
-      execAsync('bash -c "rofi -cache-dir $XDG_CACHE_HOME/rofi -show drun -run-command \"uwsm app -- {cmd}\""')
+      execAsync(
+        'bash -c "rofi -cache-dir $XDG_CACHE_HOME/rofi -show drun -run-command \"uwsm app -- {cmd}\""',
+      )
     }
   >
     <icon className="icon" icon="nix-snowflake-symbolic" />;

hosts/common/configs/user/gui/hyprpicker/default.nix

@@ -11,8 +11,6 @@
       let
         hyprpicker = lib.meta.getExe pkgs.hyprpicker;
       in
-      [
-        "$mod_Shift, C, exec, uwsm app -- ${hyprpicker} -anrql"
-      ];
+      [ "$mod_Shift, C, exec, uwsm app -- ${hyprpicker} -anrql" ];
   };
 }

hosts/common/configs/user/gui/vscode/langs/docker/default.nix

@@ -1,11 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-lib.mkIf config.programs.vscode.languages.docker.enable {
-  programs.vscode.profiles.default.extensions = with pkgs.vscode-extensions; [
-    ms-azuretools.vscode-docker
-  ];
-}

hosts/common/configs/user/gui/vscode/langs/podman/default.nix

@@ -0,0 +1,15 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+lib.mkIf config.programs.vscode.languages.podman.enable {
+  programs.vscode.profiles.default = {
+    extensions = with pkgs.vscode-extensions; [ ms-azuretools.vscode-containers ];
+
+    userSettings = {
+      "containers.containerClient" = "com.microsoft.visualstudio.containers.podman";
+    };
+  };
+}

hosts/common/configs/user/gui/vscode/options.nix

@@ -11,13 +11,13 @@ in
   options.programs.vscode = with lib; {
     languages = {
       c.enable = mkEnableOption "C";
-      docker.enable = mkEnableOption "Docker";
       go.enable = mkEnableOption "Go";
       java.enable = mkEnableOption "Java";
       jinja.enable = mkEnableOption "Jinja";
       lua.enable = mkEnableOption "Lua";
       markdown.enable = mkEnableOption "Markdown";
       nix.enable = mkEnableOption "Nix";
+      podman.enable = mkEnableOption "Podman";
       python.enable = mkEnableOption "Python";
       rest.enable = mkEnableOption "REST";
       rust.enable = mkEnableOption "Rust";
@@ -33,13 +33,13 @@ in
 
   imports = [
     ./langs/c
-    ./langs/docker
     ./langs/go
     ./langs/java
     ./langs/jinja
     ./langs/lua
     ./langs/markdown
     ./langs/nix
+    ./langs/podman
     ./langs/python
     ./langs/rest
     ./langs/rust