diff --git a/flake.lock b/flake.lock
index c4ca65a..69b3722 100644
--- a/flake.lock
+++ b/flake.lock
@@ -123,16 +123,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1764177491,
-        "narHash": "sha256-dhX2abFWxeXab3Aad4Pg1xGtn9W84/qetNXfmYUwktw=",
+        "lastModified": 1758463745,
+        "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2217780c39169a9c77915200137550c2ef0fa974",
+        "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-25.11",
+        "ref": "release-25.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -160,32 +160,48 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1764020296,
-        "narHash": "sha256-6zddwDs2n+n01l+1TG6PlyokDdXzu/oBmEejcH5L5+A=",
+        "lastModified": 1761597516,
+        "narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "a320ce8e6e2cc6b4397eef214d202a50a4583829",
+        "rev": "daf6dc47aa4b44791372d6139ab7b25269184d55",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-25.11",
+        "ref": "nixos-25.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-25_05": {
+      "locked": {
+        "lastModified": 1747610100,
+        "narHash": "sha256-rpR5ZPMkWzcnCcYYo3lScqfuzEw5Uyfh+R0EKZfroAc=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "ca49c4304acf0973078db0a9d200fd2bae75676d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-25.05",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1764192966,
-        "narHash": "sha256-gGwJNJTb4p90y3VG0QbgnpCi6RFm0p+QFMp+jGqXj+A=",
+        "lastModified": 1747179050,
+        "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "dcab162b6c4416f205dfb8c3603c76f2245644e2",
+        "rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-25.11-small",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -221,19 +237,20 @@
         "blobs": "blobs",
         "flake-compat": "flake-compat",
         "git-hooks": "git-hooks",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs_2",
+        "nixpkgs-25_05": "nixpkgs-25_05"
       },
       "locked": {
-        "lastModified": 1764185122,
-        "narHash": "sha256-+HUOwSIFLoyett2cvRjuFIbhobpHallfP9J2cia1apo=",
+        "lastModified": 1755110674,
+        "narHash": "sha256-PigqTAGkdBYXVFWsJnqcirrLeFqRFN4PFigLA8FzxeI=",
         "owner": "simple-nixos-mailserver",
         "repo": "nixos-mailserver",
-        "rev": "a14fe3b293ec2720e5b7fc72ad136d22967e12ba",
+        "rev": "f5936247dbdb8501221978562ab0b302dd75456c",
         "type": "gitlab"
       },
       "original": {
         "owner": "simple-nixos-mailserver",
-        "ref": "nixos-25.11",
+        "ref": "nixos-25.05",
         "repo": "nixos-mailserver",
         "type": "gitlab"
       }
diff --git a/flake.nix b/flake.nix
index ecaf906..d6aa1fa 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,10 +2,10 @@
   description = "Configuration for my homes & OSs";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
     unstable.url = "github:nixos/nixpkgs/nixos-unstable";
     home-manager = {
-      url = "github:nix-community/home-manager/release-25.11";
+      url = "github:nix-community/home-manager/release-25.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nixgl = {
@@ -13,7 +13,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     st-flexipatch.url = "https://git.antoinevaure.fr/ant/st-flexipatch/archive/master.zip";
-    simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-25.11";
+    simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-25.05";
   };
 
   outputs =
@@ -97,7 +97,7 @@
       nixosConfigurations.hs = osConfig "hs";
       nixosConfigurations.ks = osConfig "ks";
 
-      build-all = pkgs.runCommand "build-all" {
+      build-all = pkgs.runCommandNoCC "build-all" {
         buildInputs = 
           let osDerivation = name: self.nixosConfigurations.${name}.config.system.build.toplevel; in
           let homeDerivation = name: self.homeConfigurations.${name}.activationPackage; in
diff --git a/home/basado.nix b/home/basado.nix
index ea9b7fb..4da42df 100644
--- a/home/basado.nix
+++ b/home/basado.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }: {
   wayland.windowManager.hyprland = {
     extraConfig = ''
-      monitor=,3440x1440@100,auto,1
+      monitor=,highrr,auto,1
     '';
   };
 
diff --git a/home/base.nix b/home/base.nix
index 92bec9d..c23b4f2 100644
--- a/home/base.nix
+++ b/home/base.nix
@@ -69,18 +69,14 @@
 
   programs.git = {
     enable = true;
-    settings = {
-      aliases = {
-        co = "checkout";
-      };
-      extraConfig = {
-        pull.rebase = true;
-      };
-      user = {
-        name = config.home.username;
-        email = "${config.home.username}@domain.xyz";
-      };
+    aliases = {
+      co = "checkout";
     };
+    extraConfig = {
+      pull.rebase = true;
+    };
+    userName = config.home.username;
+    userEmail = "${config.home.username}@domain.xyz";
   };
 
   programs.direnv = {
diff --git a/home/bin/runmenu b/home/bin/runmenu
new file mode 100755
index 0000000..0a1cf11
--- /dev/null
+++ b/home/bin/runmenu
@@ -0,0 +1 @@
+${pkgs.rofi-wayland}/bin/rofi -matching normal -sort -show run
diff --git a/home/bin/screenshot.nix b/home/bin/screenshot.nix
index 9447064..c38dae9 100755
--- a/home/bin/screenshot.nix
+++ b/home/bin/screenshot.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
 pkgs.writers.writePython3 "screenshot" {  flakeIgnore = [ "E501" ];} ''
 import subprocess
 import re
@@ -13,7 +13,7 @@ full screen
 viewer
 """
 
-cmd = '${config.programs.rofi.package}/bin/rofi -dmenu -location 2 -l 7 -i -p "Screenshot which area?"'
+cmd = '${pkgs.rofi-wayland}/bin/rofi -dmenu -location 2 -l 7 -i -p "Screenshot which area?"'
 result = subprocess.run(cmd,
                         input=options,
                         stdout=subprocess.PIPE,
diff --git a/home/gui-software.nix b/home/gui-software.nix
index 022aa15..5c46b80 100644
--- a/home/gui-software.nix
+++ b/home/gui-software.nix
@@ -9,7 +9,7 @@
     libreoffice
     keepassxc
     thunderbird
-    # vieb
+    vieb
     gimp
     signal-desktop
     open-in-mpv
diff --git a/home/hyprland.nix b/home/hyprland.nix
index 6f53bea..bbe08ca 100644
--- a/home/hyprland.nix
+++ b/home/hyprland.nix
@@ -61,7 +61,7 @@
 
       animations = {
         enabled = true;
-        bezier = "myBezier, 0, 0, 0.58, 1";
+        bezier = "myBezier, 0, 0, .58, 1";
         animation = "global, 1, 1, myBezier";
       };
 
@@ -72,6 +72,10 @@
         # no_gaps_when_only = true;
       };
 
+      gestures = {
+        workspace_swipe = "off";
+      };
+
       misc = {
         enable_anr_dialog = false;
         disable_hyprland_logo = true;
diff --git a/home/ui.nix b/home/ui.nix
index 3ebe7b4..ebc0fbd 100644
--- a/home/ui.nix
+++ b/home/ui.nix
@@ -30,7 +30,7 @@ in
       nerd-fonts.caskaydia-cove
       cascadia-code
       inter
-      joypixels
+      emojione
 
       bluetuith
       keepmenu
@@ -54,12 +54,6 @@ in
       })
     ];
 
-    nixpkgs.config.allowUnfreePredicate = pkg:
-      builtins.elem (lib.getName pkg) [
-        "joypixels"
-      ];
-    nixpkgs.config.joypixels.acceptLicense = true;
-
     home.file = {
       ".config/kitty/light.conf".source = dotfiles/kitty/light.conf;
       ".config/kitty/dark.conf".source = dotfiles/kitty/dark.conf;
@@ -93,52 +87,7 @@ in
             subprocess.call(cmd, shell=True)
         '';
 
-      ".bin/screenshot".source = pkgs.writers.writePython3 "screenshot" {  flakeIgnore = [ "E501" ];} ''
-        import subprocess
-        import re
-
-        options = """\
-        a selected area (copy)
-        current window (copy)
-        full screen (copy)
-        a selected area
-        current window
-        full screen
-        viewer
-        """
-
-        cmd = '${config.programs.rofi.package}/bin/rofi -dmenu -location 2 -l 7 -i -p "Screenshot which area?"'
-        result = subprocess.run(cmd,
-                                input=options,
-                                stdout=subprocess.PIPE,
-                                stderr=subprocess.PIPE,
-                                shell=True,
-                                text=True)
-
-        if result.returncode != 0:
-            exit(1)
-
-        choice = result.stdout.strip()
-        cmd = "${pkgs.pkgs.sway-contrib.grimshot}/bin/grimshot "
-        if choice == "viewer":
-            filename = subprocess.getoutput("mktemp")
-            cmd += f"save area {filename}"
-        else:
-            cmd += "copy " if re.match(".*(copy)", choice) else "save "
-
-        for k, v in {"a selected area.*": "area ",
-                     "current window.*": "active ",
-                     "current screen.*": "output ",
-                     "all screens.*": "screen "}.items():
-            if re.match(k, choice):
-                cmd += v
-
-        subprocess.call(cmd,
-                        shell=True)
-
-        if choice == "viewer":
-            subprocess.run(f"nsxiv -b {filename}", shell=True)
-      '';
+      ".bin/screenshot".source = (import ./bin/screenshot.nix) pkgs;
 
       ".bin/ocrzone".source = pkgs.writers.writeBash "ocrzone" ''
         ${pkgs.pkgs.sway-contrib.grimshot}/bin/grimshot save area - | \
@@ -350,6 +299,7 @@ in
 
     programs.rofi = {
       enable = true;
+      package = pkgs.rofi-wayland;
       plugins = [ pkgs.rofi-calc pkgs.rofi-emoji ];
       theme = "theme.rasi";
     };
diff --git a/os/basado/configuration.nix b/os/basado/configuration.nix
index 8249e45..fb96c85 100644
--- a/os/basado/configuration.nix
+++ b/os/basado/configuration.nix
@@ -104,9 +104,9 @@ in
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
   system.stateVersion = "24.05"; # Did you read the comment?
 
-  # services.udev.packages = [
-  #   pkgs.android-udev-rules
-  # ];
+  services.udev.packages = [
+    pkgs.android-udev-rules
+  ];
 
   nix.distributedBuilds = true;
   nix.settings.builders-use-substitutes = true;
diff --git a/os/common-graphics.nix b/os/common-graphics.nix
index 1ba582a..4544144 100644
--- a/os/common-graphics.nix
+++ b/os/common-graphics.nix
@@ -13,8 +13,15 @@
       enable = false;
       user = "ant";
     };
-    ly = {
+    sddm = {
       enable = true;
+      wayland.enable = true;
+      package = pkgs.kdePackages.sddm;
+      extraPackages = with pkgs; [
+        where-is-my-sddm-theme
+        kdePackages.qt5compat
+      ];
+      theme = "where_is_my_sddm_theme";
     };
   };
 
diff --git a/os/forgejo.nix b/os/forgejo.nix
index f414d15..1883fda 100644
--- a/os/forgejo.nix
+++ b/os/forgejo.nix
@@ -53,7 +53,7 @@ let utils = import ./utils.nix; in
   };
 
   services.gitea-actions-runner = {
-    package = pkgs.forgejo-runner;
+    package = pkgs.forgejo-actions-runner;
     instances.default = {
       enable = true;
       name = "monolith";
diff --git a/os/ks/configuration.nix b/os/ks/configuration.nix
index cfbc689..afa2af2 100644
--- a/os/ks/configuration.nix
+++ b/os/ks/configuration.nix
@@ -50,7 +50,6 @@ in {
   };
 
   mailserver = {
-    stateVersion = 1;
     enable = true;
     fqdn = "mail.${domain}";
     domains = [ domain domainAlex ];
diff --git a/os/moon/configuration.nix b/os/moon/configuration.nix
index ab69bd8..cbe7e4f 100644
--- a/os/moon/configuration.nix
+++ b/os/moon/configuration.nix
@@ -18,6 +18,8 @@
   services.xserver.videoDrivers = [ "amdgpu" ];
   hardware.graphics = {
     enable = true;
+    extraPackages = [ pkgs.amdvlk ];
+    extraPackages32 = [ pkgs.driversi686Linux.amdvlk ];
   };
 
   programs.steam.enable = true;