flake.lock: Update

Flake lock file updates: • Updated input 'colmena': 'github:zhaofengli/colmena/c84ccd0a7a712475e861c2b111574472b1a8d0cd?narHash=sha256-QQKQ6r3CID8aXn2ZXZ79ZJxdCOeVP%2BJTnOctDALErOw%3D' (2024-01-29) → 'github:zhaofengli/colmena/cd65ef7a25cdc75052fbd04b120aeb066c3881db?narHash=sha256-gWEpb8Hybnoqb4O4tmpohGZk6%2BaerAbJpywKcFIiMlg%3D' (2024-03-25) • Updated input 'disko': 'github:nix-community/disko/a8c966ee117c278a5aabc6f00b00ef62eb7e28f6?narHash=sha256-pvjqjx4L2Hx/NP3RWcwLjk%2BABtMODAJ9%2BrgreU6fP6I%3D' (2024-03-21) → 'github:nix-community/disko/a6717b1afee7ae955c61eefdf0ce8f864ef78115?narHash=sha256-3wKGpHy9Kyh98DrziqC/s//60Q0pE17NgbY93L0uWng%3D' (2024-03-26) • Updated input 'emacs-overlay': 'github:nix-community/emacs-overlay/cad98a253dc7b22fb12db42ccac3d04402e63dd0?narHash=sha256-9SmpbzwNL5m3pIqWrT%2B7PnQDfYBQAp8EoKcJCFyRITI%3D' (2024-03-22) → 'github:nix-community/emacs-overlay/81d4eb044fac45daf51281a046d413a40f05d103?narHash=sha256-jPEUYELo7ACEiFU7jKDdQ%2ByC5OkqG2UcHk1/N%2BN7f3E%3D' (2024-03-26) • Updated input 'emacs-overlay/nixpkgs-stable': 'github:NixOS/nixpkgs/f091af045dff8347d66d186a62d42aceff159456?narHash=sha256-FOOBJ3DQenLpTNdxMHR2CpGZmYuctb92gF0lpiirZ30%3D' (2024-03-20) → 'github:NixOS/nixpkgs/56528ee42526794d413d6f244648aaee4a7b56c0?narHash=sha256-l0zlN/3CiodvWDtfBOVxeTwYSRz93muVbXWSpaMjXxM%3D' (2024-03-22) • Updated input 'home-manager': 'github:nix-community/home-manager/1c2acec99933f9835cc7ad47e35303de92d923a4?narHash=sha256-jZpdsypecYTOO9l12Vy77otGmh9uz8tGzcguifA30Vs%3D' (2024-03-20) → 'github:nix-community/home-manager/1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb?narHash=sha256-WJOahf%2B6115%2BGMl3wUfURu8fszuNeJLv9qAWFQl3Vmo%3D' (2024-03-22) • Updated input 'microvm': 'github:astro/microvm.nix/d5283b0c83df3475ca967aa1ca9496d3e387084a?narHash=sha256-4Uya0uqALYubEvHcqYY/3x%2BMaM%2Bop0x0djGhj%2BTh6Mk%3D' (2024-03-21) → 'github:astro/microvm.nix/d31f7c7d3194c51372134832a3a2a256773c161a?narHash=sha256-nwl2Cygq7NrV9QcebJE/T/vXv7w%2BzLERD7ygHz0F5g8%3D' (2024-03-23) • Updated input 'nix-ld-rs': 'github:nix-community/nix-ld-rs/5806f307048a9ae9e3e88cc48006d4d0b2df4410?narHash=sha256-l8OMloSbDyjIb9yVeD10M7aK7qDCVMt3huBztihrbwM%3D' (2023-11-12) → 'github:nix-community/nix-ld-rs/76999cac5abefc7862b19daeef0ef91d4270fb17?narHash=sha256-j0yUDFX7cyoM5r9afQ45tfu8wqUk0dRicOb79%2BK81JI%3D' (2024-03-25) • Updated input 'nix-ld-rs/flake-utils': 'github:numtide/flake-utils/ff7b65b44d01cf9ba6a71320833626af21126384?narHash=sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt%2BxmY%3D' (2023-09-12) → 'github:numtide/flake-utils/b1d9ab70662946ef0850d488da1c9019f3a9752a?narHash=sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ%3D' (2024-03-11) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/1e679b9a9970780cd5d4dfe755a74a8f96d33388?narHash=sha256-eIsfu3c9JUBgm3cURSKTXLEI9Dlk1azo%2BMWKZVqrmkc%3D' (2024-03-18) → 'github:NixOS/nixos-hardware/9a763a7acc4cfbb8603bb0231fec3eda864f81c0?narHash=sha256-luvqik%2Bi3HTvCbXQZgB6uggvEcxI9uae0nmrgtXJ17U%3D' (2024-03-25) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/b06025f1533a1e07b6db3e75151caa155d1c7eb3?narHash=sha256-qrxvLS888pNJFwJdK%2Bhf1wpRCSQcqA6W5%2BOx202NDa0%3D' (2024-03-19) → 'github:nixos/nixpkgs/44d0940ea560dee511026a53f0e2e2cde489b4d4?narHash=sha256-YN/Ciidm%2BA0fmJPWlHBGvVkcarYWSC%2Bs3NTPk/P%2Bq3c%3D' (2024-03-23) • Updated input 'pre-commit-hooks': 'github:cachix/pre-commit-hooks.nix/e611897ddfdde3ed3eaac4758635d7177ff78673?narHash=sha256-6hOpUiuxuwpXXc/xfJsBUJeqqgGI%2BJMJuLo45aG3cKc%3D' (2024-03-20) → 'github:cachix/pre-commit-hooks.nix/db656fc3e34907000df26e8bc5cc3c94fb27f353?narHash=sha256-%2BrTCra8TY4vuSNTtQ0tcex1syCRPoKyb8vyHmoxkga4%3D' (2024-03-25) • Updated input 'rust-overlay': 'github:oxalica/rust-overlay/eec55ba9fcde6be4c63942827247e42afef7fafe?narHash=sha256-PpNb4xq7U5Q/DdX40qe7CijUsqhVVM3VZrhN0%2Bc6Lcw%3D' (2024-03-22) → 'github:oxalica/rust-overlay/4c11d2f698ff1149f76b69e72852d5d75f492d0c?narHash=sha256-%2B5M/czgYGqs/jKmi8bvYC%2BJUYboUKNTfkRiesXopeXQ%3D' (2024-03-26) • Updated input 'sops': 'github:Mic92/sops-nix/83b68a0e8c94b72cdd0a6e547a14ca7eb1c03616?narHash=sha256-RquCuzxfy4Nr8DPbdp3D/AsbYep21JgQzG8aMH9jJ4A%3D' (2024-03-17) → 'github:Mic92/sops-nix/405987a66cce9a4a82f321f11b205982a7127c88?narHash=sha256-N%2BPp3/8H%2Brd7cO71VNV/ovV/Kwt%2BXNeUHNhsmyTabdM%3D' (2024-03-24) • Updated input 'sops/nixpkgs-stable': 'github:NixOS/nixpkgs/6dc11d9859d6a18ab0c5e5829a5b8e4810658de3?narHash=sha256-y%2Bl3eH53UlENaYa1lmnCBHusZb1kxBEFd2/c7lDsGpw%3D' (2024-03-16) → 'github:NixOS/nixpkgs/ac6bdf6181666ebb4f90dd20f31e2fa66ede6b68?narHash=sha256-eEu5y4J145BYDw9o/YEmeJyqh8blgnZwuz9k234zuWc%3D' (2024-03-23)
sway: Make package configurable
2024-03-26 16:52:03 +01:00 · 2024-03-26 16:50:56 +01:00 · 2024-03-26 16:50:55 +01:00
8 changed files with 105 additions and 72 deletions
--- a/flake.lock
+++ b/flake.lock
@ -76,11 +76,11 @@
        "stable": "stable"
      },
      "locked": {
-        "lastModified": 1706509311,
-        "narHash": "sha256-QQKQ6r3CID8aXn2ZXZ79ZJxdCOeVP+JTnOctDALErOw=",
+        "lastModified": 1711386353,
+        "narHash": "sha256-gWEpb8Hybnoqb4O4tmpohGZk6+aerAbJpywKcFIiMlg=",
        "owner": "zhaofengli",
        "repo": "colmena",
-        "rev": "c84ccd0a7a712475e861c2b111574472b1a8d0cd",
+        "rev": "cd65ef7a25cdc75052fbd04b120aeb066c3881db",
        "type": "github"
      },
      "original": {
@ -147,11 +147,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1711006105,
-        "narHash": "sha256-pvjqjx4L2Hx/NP3RWcwLjk+ABtMODAJ9+rgreU6fP6I=",
+        "lastModified": 1711462743,
+        "narHash": "sha256-3wKGpHy9Kyh98DrziqC/s//60Q0pE17NgbY93L0uWng=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "a8c966ee117c278a5aabc6f00b00ef62eb7e28f6",
+        "rev": "a6717b1afee7ae955c61eefdf0ce8f864ef78115",
        "type": "github"
      },
      "original": {
@ -171,11 +171,11 @@
        "nixpkgs-stable": "nixpkgs-stable_2"
      },
      "locked": {
-        "lastModified": 1711071818,
-        "narHash": "sha256-9SmpbzwNL5m3pIqWrT+7PnQDfYBQAp8EoKcJCFyRITI=",
+        "lastModified": 1711443855,
+        "narHash": "sha256-jPEUYELo7ACEiFU7jKDdQ+yC5OkqG2UcHk1/N+N7f3E=",
        "owner": "nix-community",
        "repo": "emacs-overlay",
-        "rev": "cad98a253dc7b22fb12db42ccac3d04402e63dd0",
+        "rev": "81d4eb044fac45daf51281a046d413a40f05d103",
        "type": "github"
      },
      "original": {
@ -396,11 +396,11 @@
        "systems": "systems_2"
      },
      "locked": {
-        "lastModified": 1694529238,
-        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
        "type": "github"
      },
      "original": {
@ -468,11 +468,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1710974515,
-        "narHash": "sha256-jZpdsypecYTOO9l12Vy77otGmh9uz8tGzcguifA30Vs=",
+        "lastModified": 1711133180,
+        "narHash": "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "1c2acec99933f9835cc7ad47e35303de92d923a4",
+        "rev": "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb",
        "type": "github"
      },
      "original": {
@ -492,11 +492,11 @@
        "spectrum": "spectrum"
      },
      "locked": {
-        "lastModified": 1711058497,
-        "narHash": "sha256-4Uya0uqALYubEvHcqYY/3x+MaM+op0x0djGhj+Th6Mk=",
+        "lastModified": 1711159783,
+        "narHash": "sha256-nwl2Cygq7NrV9QcebJE/T/vXv7w+zLERD7ygHz0F5g8=",
        "owner": "astro",
        "repo": "microvm.nix",
-        "rev": "d5283b0c83df3475ca967aa1ca9496d3e387084a",
+        "rev": "d31f7c7d3194c51372134832a3a2a256773c161a",
        "type": "github"
      },
      "original": {
@ -560,11 +560,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1699781621,
-        "narHash": "sha256-l8OMloSbDyjIb9yVeD10M7aK7qDCVMt3huBztihrbwM=",
+        "lastModified": 1711333167,
+        "narHash": "sha256-j0yUDFX7cyoM5r9afQ45tfu8wqUk0dRicOb79+K81JI=",
        "owner": "nix-community",
        "repo": "nix-ld-rs",
-        "rev": "5806f307048a9ae9e3e88cc48006d4d0b2df4410",
+        "rev": "76999cac5abefc7862b19daeef0ef91d4270fb17",
        "type": "github"
      },
      "original": {
@ -575,11 +575,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1710783728,
-        "narHash": "sha256-eIsfu3c9JUBgm3cURSKTXLEI9Dlk1azo+MWKZVqrmkc=",
+        "lastModified": 1711352745,
+        "narHash": "sha256-luvqik+i3HTvCbXQZgB6uggvEcxI9uae0nmrgtXJ17U=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "1e679b9a9970780cd5d4dfe755a74a8f96d33388",
+        "rev": "9a763a7acc4cfbb8603bb0231fec3eda864f81c0",
        "type": "github"
      },
      "original": {
@ -640,11 +640,11 @@
    },
    "nixpkgs-stable_2": {
      "locked": {
-        "lastModified": 1710951922,
-        "narHash": "sha256-FOOBJ3DQenLpTNdxMHR2CpGZmYuctb92gF0lpiirZ30=",
+        "lastModified": 1711124224,
+        "narHash": "sha256-l0zlN/3CiodvWDtfBOVxeTwYSRz93muVbXWSpaMjXxM=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "f091af045dff8347d66d186a62d42aceff159456",
+        "rev": "56528ee42526794d413d6f244648aaee4a7b56c0",
        "type": "github"
      },
      "original": {
@ -672,11 +672,11 @@
    },
    "nixpkgs-stable_4": {
      "locked": {
-        "lastModified": 1710628718,
-        "narHash": "sha256-y+l3eH53UlENaYa1lmnCBHusZb1kxBEFd2/c7lDsGpw=",
+        "lastModified": 1711233294,
+        "narHash": "sha256-eEu5y4J145BYDw9o/YEmeJyqh8blgnZwuz9k234zuWc=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "6dc11d9859d6a18ab0c5e5829a5b8e4810658de3",
+        "rev": "ac6bdf6181666ebb4f90dd20f31e2fa66ede6b68",
        "type": "github"
      },
      "original": {
@ -688,11 +688,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1710806803,
-        "narHash": "sha256-qrxvLS888pNJFwJdK+hf1wpRCSQcqA6W5+Ox202NDa0=",
+        "lastModified": 1711163522,
+        "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "b06025f1533a1e07b6db3e75151caa155d1c7eb3",
+        "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4",
        "type": "github"
      },
      "original": {
@ -743,11 +743,11 @@
        "nixpkgs-stable": "nixpkgs-stable_3"
      },
      "locked": {
-        "lastModified": 1710923068,
-        "narHash": "sha256-6hOpUiuxuwpXXc/xfJsBUJeqqgGI+JMJuLo45aG3cKc=",
+        "lastModified": 1711409088,
+        "narHash": "sha256-+rTCra8TY4vuSNTtQ0tcex1syCRPoKyb8vyHmoxkga4=",
        "owner": "cachix",
        "repo": "pre-commit-hooks.nix",
-        "rev": "e611897ddfdde3ed3eaac4758635d7177ff78673",
+        "rev": "db656fc3e34907000df26e8bc5cc3c94fb27f353",
        "type": "github"
      },
      "original": {
@ -817,11 +817,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1711073443,
-        "narHash": "sha256-PpNb4xq7U5Q/DdX40qe7CijUsqhVVM3VZrhN0+c6Lcw=",
+        "lastModified": 1711419061,
+        "narHash": "sha256-+5M/czgYGqs/jKmi8bvYC+JUYboUKNTfkRiesXopeXQ=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "eec55ba9fcde6be4c63942827247e42afef7fafe",
+        "rev": "4c11d2f698ff1149f76b69e72852d5d75f492d0c",
        "type": "github"
      },
      "original": {
@ -838,11 +838,11 @@
        "nixpkgs-stable": "nixpkgs-stable_4"
      },
      "locked": {
-        "lastModified": 1710644594,
-        "narHash": "sha256-RquCuzxfy4Nr8DPbdp3D/AsbYep21JgQzG8aMH9jJ4A=",
+        "lastModified": 1711249319,
+        "narHash": "sha256-N+Pp3/8H+rd7cO71VNV/ovV/Kwt+XNeUHNhsmyTabdM=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "83b68a0e8c94b72cdd0a6e547a14ca7eb1c03616",
+        "rev": "405987a66cce9a4a82f321f11b205982a7127c88",
        "type": "github"
      },
      "original": {
--- a/home-manager/modules/sway/default.nix
+++ b/home-manager/modules/sway/default.nix
@ -19,6 +19,7 @@ in
  options.eboskma.programs.sway = {
    enable = mkEnableOption "sway";
    wayvnc = mkEnableOption "wayvnc";
+    package = mkPackageOption pkgs "sway" { };

    lock-wallpaper = mkOption {
      description = "Wallpaper to use for the lockscreen";
@ -85,6 +86,8 @@ in
  config = mkIf cfg.enable {
    wayland.windowManager.sway = {
      enable = true;
+      package = cfg.package;
+
      config = {
        modifier = mod;

@ -160,7 +163,7 @@ in

        gaps = {
          inner = 10;
-          outer = 5;
+          # outer = 5;
          smartBorders = "on";
        };

@ -244,8 +247,8 @@ in

          "${mod}+c" = mkIf config.eboskma.programs.emacs.enable "exec ${config.programs.emacs.package}/bin/emacsclient -c";

-          "${mod}+Print" = "exec ${pkgs.grim}/bin/grim -o $(${pkgs.sway}/bin/swaymsg -t get_outputs | ${pkgs.jaq}/bin/jaq -r '.[] | select(.focused) | .name')";
-          "${mod}+Shift+Print" = ''exec ${pkgs.grim}/bin/grim -o $(${pkgs.sway}/bin/swaymsg -t get_outputs | ${pkgs.jaq}/bin/jaq -r '.[] | select(.focused) | .name') - | ${pkgs.wl-clipboard}/bin/wl-copy -t "image/png" -f'';
+          "${mod}+Print" = "exec ${pkgs.grim}/bin/grim -o $(${cfg.package}/bin/swaymsg -t get_outputs | ${pkgs.jaq}/bin/jaq -r '.[] | select(.focused) | .name')";
+          "${mod}+Shift+Print" = ''exec ${pkgs.grim}/bin/grim -o $(${cfg.package}/bin/swaymsg -t get_outputs | ${pkgs.jaq}/bin/jaq -r '.[] | select(.focused) | .name') - | ${pkgs.wl-clipboard}/bin/wl-copy -t "image/png" -f'';
          "${mod}+Shift+Ctrl+Print" = ''exec ${pkgs.grim}/bin/grim -g "$(${pkgs.slurp}/bin/slurp)" - | ${pkgs.wl-clipboard}/bin/wl-copy -t "image/png" -f'';
          "${mod}+Shift+Alt+Print" = ''exec ${pkgs.grim}/bin/grim -g "$(${pkgs.slurp}/bin/slurp)"'';

@ -288,6 +291,16 @@ in
        for_window [shell="xwayland"] title_format "%title [XWayland]"
        for_window [app_id="^.*iwgtk$"] floating enable

+        blur enable
+        blur_xray disable
+
+        shadows enable
+
+        default_dim_inactive 0.2
+
+        corner_radius 10
+
+
        include /etc/sway/config.d/*
      '';
      # exec --no-startup-id ${pkgs.swaynotificationcenter}/bin/swaync
@ -345,8 +358,8 @@ in
            }
            {
              timeout = 1200;
-              command = "${pkgs.sway}/bin/swaymsg 'output * power off'";
-              resumeCommand = "${pkgs.sway}/bin/swaymsg '${resumeMessages}'";
+              command = "${cfg.package}/bin/swaymsg 'output * power off'";
+              resumeCommand = "${cfg.package}/bin/swaymsg '${resumeMessages}'";
            }
          ];
      };
--- a/machines/loki/configuration.nix
+++ b/machines/loki/configuration.nix
@ -121,7 +121,7 @@
    kernelParams = [ "amd_pstate.shared_mem=1" ];
    extraModulePackages = with config.boot.kernelPackages; [
      cpupower
-      rtl88x2bu
+      # rtl88x2bu
      zenpower
    ];

@ -226,6 +226,14 @@
      enable = true;
    };
    sudo.enable = false;
+    pam.services.swaylock = {
+      unixAuth = true;
+      setLoginUid = true;
+      enableGnomeKeyring = true;
+      allowNullPassword = true;
+      updateWtmp = true;
+      startSession = true;
+    };
  };

  systemd = {
@ -384,6 +392,18 @@
  };

  programs = {
+    sway = {
+      enable = true;
+      package = pkgs.swayfx;
+      wrapperFeatures = {
+        gtk = true;
+        base = true;
+      };
+      extraPackages = with pkgs; [
+        swaylock
+        swayidle
+      ];
+    };
    gnome-disks.enable = true;
    # ssh.startAgent = true;

--- a/machines/mimir/configuration.nix
+++ b/machines/mimir/configuration.nix
@ -230,6 +230,14 @@
    apparmor = {
      enable = true;
    };
+    pam.services.swaylock = {
+      unixAuth = true;
+      setLoginUid = true;
+      enableGnomeKeyring = true;
+      allowNullPassword = true;
+      updateWtmp = true;
+      startSession = true;
+    };
  };

  systemd.network = {
@ -308,6 +316,17 @@

  # programs.ssh.startAgent = true;
  programs = {
+    sway = {
+      enable = true;
+      wrapperFeatures = {
+        gtk = true;
+        base = true;
+      };
+      extraPackages = with pkgs; [
+        swaylock
+        swayidle
+      ];
+    };
    gnome-disks.enable = true;
    nix-ld = {
      enable = true;
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@ -25,18 +25,6 @@ in
      fuse.userAllowOther = true;

      seahorse.enable = true;
-
-      sway = mkIf cfg.wayland {
-        enable = true;
-        wrapperFeatures = {
-          gtk = true;
-          base = true;
-        };
-        extraPackages = with pkgs; [
-          swaylock
-          swayidle
-        ];
-      };
    };

    xdg = {
@ -61,14 +49,6 @@ in
    };

    security = {
-      pam.services.swaylock = {
-        unixAuth = true;
-        setLoginUid = true;
-        enableGnomeKeyring = true;
-        allowNullPassword = true;
-        updateWtmp = true;
-        startSession = true;
-      };
      pki.certificates = [ (builtins.readFile ./horus-ca.pem) ];
      wrappers = {
        fusermount.source = "${pkgs.fuse}/bin/fusermount";
--- a/modules/greetd/default.nix
+++ b/modules/greetd/default.nix
@ -12,7 +12,7 @@ let
  style = builtins.readFile ./greetd.css;

  swaySession = pkgs.writeShellScript "sway-session" ''
-    ${pkgs.sway}/bin/sway --unsupported-gpu
+    ${config.programs.sway.package}/bin/sway --unsupported-gpu
  '';

  steam-gamescope =
--- a/modules/keycloak/phasetwo-admin-ui.nix
+++ b/modules/keycloak/phasetwo-admin-ui.nix
@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 let
-  version = "23.0.7.1709589021";
-  jarVersion = "23.0.1";
+  version = "24.0.0.1711026409";
+  jarVersion = "24.0.0";
 in
 stdenv.mkDerivation {
  inherit version;
@ -11,7 +11,7 @@ stdenv.mkDerivation {
    owner = "p2-inc";
    repo = "phasetwo-containers";
    rev = "v${version}";
-    sha256 = "nsyFSD7uRm4X6n+4601HatnGzmV46FUIlc7ZPYXalJo=";
+    sha256 = "gwD/wHd/zmDKtie7PfCvDJi+QjeQqDlgOj7DGV531go=";
    # sha256 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
  };

--- a/users/erwin/home.nix
+++ b/users/erwin/home.nix
@ -118,6 +118,7 @@ in
          starship.enable = true;
          sway = {
            enable = true;
+            package = pkgs.swayfx;
            lock-wallpaper = "${homeCfg.home.homeDirectory}/.wallpapers/river-2560.png";
            output = {
              "DP-2" = {