Update

Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
2025-06-08 15:46:38 +01:00
parent 8b23486d4a
commit 090ae66aa6
17 changed files with 80 additions and 167 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -31,11 +31,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1748845209,
-        "narHash": "sha256-fWfMFjKNxzGjqW2XZHDg6cSyHcir8rk8ev9DHo2YkTA=",
+        "lastModified": 1749307245,
+        "narHash": "sha256-dkNXh5EtuwlEqWuct2D6uvZFmzDqZ77Jowr8FCQYERY=",
        "owner": "aylur",
        "repo": "astal",
-        "rev": "7f2292f0792ffc9b127d4788b3dd3f104b5374b2",
+        "rev": "6d809a701f68dceaf451842e858b6cd566b14c94",
        "type": "github"
      },
      "original": {
@@ -52,11 +52,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1748832438,
-        "narHash": "sha256-/CtyLVfNaFP7PrOPrTEuGOJBIhcBKVQ91KiEbtXJi0A=",
+        "lastModified": 1749200714,
+        "narHash": "sha256-W8KiJIrVwmf43JOPbbTu5lzq+cmdtRqaNbOsZigjioY=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "58d6e5a83fff9982d57e0a0a994d4e5c0af441e4",
+        "rev": "17d08c65c241b1d65b3ddf79e3fac1ddc870b0f6",
        "type": "github"
      },
      "original": {
@@ -115,11 +115,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1748939465,
-        "narHash": "sha256-fOiTgpPr066aliyPWQvP3ckvH1pvUFx660U4GVysYyM=",
+        "lastModified": 1749388797,
+        "narHash": "sha256-zdrCX8aZ2pR6OOD2GETQIwJC/tSRZHwIG7yc5dv0uiA=",
        "owner": "karaolidis",
        "repo": "home-manager",
-        "rev": "9168d85abbf984b7f0891095405841212dfd3f8b",
+        "rev": "fcda314e910a6afcd932d5d836934d3011fa195d",
        "type": "github"
      },
      "original": {
@@ -131,11 +131,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1748939429,
-        "narHash": "sha256-IrdLwKWucb9xj1dOpbXHuaV1GzHYx51ZGF4wbl5NPwU=",
+        "lastModified": 1749390405,
+        "narHash": "sha256-o7D6AM4Zf+gsK/vK45KPqbot5Kx0Ha3i1eluq06ognI=",
        "owner": "karaolidis",
        "repo": "nixpkgs",
-        "rev": "7b041169050f5a7b6a15bacdb68a935cee995fe7",
+        "rev": "e00baa7bbdde781acf8d3bb65f36ec7a043fc12e",
        "type": "github"
      },
      "original": {
@@ -156,11 +156,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1748935843,
-        "narHash": "sha256-ZTbwljoJXgkGAPlYz0GIcNiXQNfPFHe2A0Dqe9KDyPA=",
+        "lastModified": 1749388083,
+        "narHash": "sha256-WVbICtwfjwr/dPeWjvJkPpI6kaE2Aeg+nDM6faRKZME=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "032af0a65aa867a6209718033995f5ba73fee543",
+        "rev": "7502ee791dfee0ed3f32382eaabb4d73451f472b",
        "type": "github"
      },
      "original": {
@@ -172,11 +172,11 @@
    },
    "quadlet-nix": {
      "locked": {
-        "lastModified": 1748295604,
-        "narHash": "sha256-GDqEYNafnb4kpz3OUhfrpS7ys5r8QR/t1t7fPA6XLRQ=",
+        "lastModified": 1749099346,
+        "narHash": "sha256-5gi/YaLVsFztGvVH45eB6jsBmZf+HnvDeSA9RXUqbcY=",
        "owner": "SEIAROTg",
        "repo": "quadlet-nix",
-        "rev": "5f4bc5934584eb2b6f0b8e3e13041fe76f2947b6",
+        "rev": "d4119a3423f938427252ba8bbdbe8ce040751864",
        "type": "github"
      },
      "original": {
@@ -233,11 +233,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1748752728,
-        "narHash": "sha256-en008ncPUQjVx2i3PbM4RWeZkD9DNbJwIy0epppXe2o=",
+        "lastModified": 1749357231,
+        "narHash": "sha256-AbrPgGFVYR45TlYLHYTppayG0xzOG9XXhi+1j3Klbw8=",
        "owner": "Gerg-L",
        "repo": "spicetify-nix",
-        "rev": "0e03de40d5128eb2ad600c98f57cf5db2cdf3240",
+        "rev": "03783416f7416715c52166d4e8ba0492a7149397",
        "type": "github"
      },
      "original": {
@@ -270,11 +270,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1748243702,
-        "narHash": "sha256-9YzfeN8CB6SzNPyPm2XjRRqSixDopTapaRsnTpXUEY8=",
+        "lastModified": 1749194973,
+        "narHash": "sha256-eEy8cuS0mZ2j/r/FE0/LYBSBcIs/MKOIVakwHVuqTfk=",
        "owner": "numtide",
        "repo": "treefmt-nix",
-        "rev": "1f3f7b784643d488ba4bf315638b2b0a4c5fb007",
+        "rev": "a05be418a1af1198ca0f63facb13c985db4cb3c5",
        "type": "github"
      },
      "original": {
--- a/hosts/common/configs/system/docker/default.nix
+++ b/hosts/common/configs/system/docker/default.nix
@@ -1,29 +0,0 @@
-{ config, pkgs, ... }:
-{
-  virtualisation.docker = {
-    enable = true;
-    enableOnBoot = false;
-    storageDriver = "btrfs";
-
-    daemon.settings = {
-      experimental = true;
-      ipv6 = true;
-      fixed-cidr-v6 = "fd00::/80";
-    };
-
-    autoPrune = {
-      enable = true;
-      flags = [ "--all" ];
-    };
-  };
-
-  environment = {
-    persistence."/persist/state"."/var/lib/docker".create = "directory";
-    systemPackages = with pkgs; [ docker-compose ];
-  };
-
-  systemd = {
-    services.docker.after = [ config.environment.persistence."/persist/state"."/var/lib/docker".mount ];
-    sockets.docker.after = [ config.environment.persistence."/persist/state"."/var/lib/docker".mount ];
-  };
-}
--- a/hosts/common/configs/user/console/dive/default.nix
+++ b/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"; }; };
  };
 }
--- a/hosts/common/configs/user/console/docker/default.nix
+++ b/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" ]; })
-]
--- a/hosts/common/configs/user/gui/astal/config/widget/components/Launcher.tsx
+++ b/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" />;
--- a/hosts/common/configs/user/gui/hyprpicker/default.nix
+++ b/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" ];
  };
 }
--- a/hosts/common/configs/user/gui/vscode/langs/docker/default.nix
+++ b/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
-  ];
-}
--- a/hosts/common/configs/user/gui/vscode/langs/podman/default.nix
+++ b/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";
+    };
+  };
+}
--- a/hosts/common/configs/user/gui/vscode/options.nix
+++ b/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
--- a/hosts/elara/users/nikara/configs/gui/vscode/default.nix
+++ b/hosts/elara/users/nikara/configs/gui/vscode/default.nix
@@ -4,10 +4,7 @@
 }:
 { ... }:
 {
-  home-manager.users.${user}.programs.vscode = {
-    copilot.enable = true;
-
-    languages = {
+  home-manager.users.${user}.programs.vscode.languages = {
    c.enable = true;
    go.enable = true;
    java.enable = true;
@@ -15,6 +12,7 @@
    lua.enable = true;
    markdown.enable = true;
    nix.enable = true;
+    podman.enable = true;
    python.enable = true;
    rest.enable = true;
    rust.enable = true;
@@ -23,5 +21,4 @@
    typescript.enable = true;
    yaml.enable = true;
  };
-  };
 }
--- a/hosts/himalia/hardware/default.nix
+++ b/hosts/himalia/hardware/default.nix
@@ -45,11 +45,8 @@
      ];
    };

-    nvidia-container-toolkit.enable = (
-      config.virtualisation.containerd.enable
-      || config.virtualisation.docker.enable
-      || config.virtualisation.podman.enable
-    );
+    nvidia-container-toolkit.enable =
+      config.virtualisation.containerd.enable || config.virtualisation.podman.enable;
  };

  boot = {
@@ -124,15 +121,14 @@

  environment.persistence."/persist/state"."/etc/asusd/aura_19b6.ron" = { };

-  programs.gamescope.env = {
-    __NV_PRIME_RENDER_OFFLOAD = "1";
-    __VK_LAYER_NV_optimus = "NVIDIA_only";
-    __GLX_VENDOR_LIBRARY_NAME = "nvidia";
-  };
-
  home-manager.sharedModules = [
    {
-      wayland.windowManager.hyprland.settings.env = [ "AQ_DRM_DEVICES,/dev/dri/card0:/dev/dri/card1" ];
+      wayland.windowManager.hyprland.settings.env = [
+        "AQ_DRM_DEVICES,/dev/dri/card0:/dev/dri/card1"
+        "__NV_PRIME_RENDER_OFFLOAD,1"
+        "__VK_LAYER_NV_optimus,NVIDIA_only"
+        "__GLX_VENDOR_LIBRARY_NAME,nvidia"
+      ];

      theme = {
        template.".config/asusctl/keyboard".source =
--- a/hosts/himalia/users/nick/configs/gui/vscode/default.nix
+++ b/hosts/himalia/users/nick/configs/gui/vscode/default.nix
@@ -11,6 +11,7 @@
    lua.enable = true;
    markdown.enable = true;
    nix.enable = true;
+    podman.enable = true;
    python.enable = true;
    rest.enable = true;
    rust.enable = true;
--- a/hosts/jupiter/hardware/default.nix
+++ b/hosts/jupiter/hardware/default.nix
@@ -41,11 +41,8 @@
      ];
    };

-    nvidia-container-toolkit.enable = (
-      config.virtualisation.containerd.enable
-      || config.virtualisation.docker.enable
-      || config.virtualisation.podman.enable
-    );
+    nvidia-container-toolkit.enable =
+      config.virtualisation.containerd.enable || config.virtualisation.docker.enable;
  };

  boot = {
--- a/packages/darktable/lua-scripts/default.nix
+++ b/packages/darktable/lua-scripts/default.nix
@@ -2,13 +2,13 @@
 # AUTO-UPDATE: nix-update --flake --version=branch=master darktable-lua-scripts
 pkgs.stdenv.mkDerivation rec {
  pname = "darktable-lua-scripts";
-  version = "release-2.0.0-unstable-2025-05-02";
+  version = "release-2.0.0-unstable-2025-06-01";

  src = pkgs.fetchFromGitHub {
    owner = "darktable-org";
    repo = "lua-scripts";
-    rev = "62e932990e702a28daefb892583820ad0f9aba7a";
-    hash = "sha256-Dmhmq0Ybp8olxg8zoixgHiTwUiLtm/ZkgjevbylsSKY=";
+    rev = "453d744b6938f1bab652bae9745731bfe413d90b";
+    hash = "sha256-gTbp7cExUnh4CVviaiYZ1eqVhlXwzX/DHKIFgWJe+UE=";
  };

  installPhase = ''
--- a/packages/prometheus-podman-exporter/default.nix
+++ b/packages/prometheus-podman-exporter/default.nix
@@ -2,13 +2,13 @@
 # AUTO-UPDATE: nix-update --flake prometheus-podman-exporter
 pkgs.buildGoModule rec {
  pname = "prometheus-podman-exporter";
-  version = "1.15.0";
+  version = "1.17.1";

  src = pkgs.fetchFromGitHub {
    owner = "containers";
    repo = "prometheus-podman-exporter";
    rev = "v${version}";
-    hash = "sha256-eXuLiJx0WsPlPAN5ZwQIp89thXiNS6AGE9p3aqjD+K8=";
+    hash = "sha256-5+1rGe9xv0ZVkmLr7pCteuN1DA+oozi/GSyQlQikrWA=";
  };

  vendorHash = null;
--- a/submodules/home-manager
+++ b/submodules/home-manager
--- a/submodules/nixpkgs
+++ b/submodules/nixpkgs