update system

modules/nixos/default.nix

@@ -11,7 +11,6 @@
     ./fonts/nerd-fonts.nix
     ./fonts/open-dyslexic.nix
 
-    ./hardware/hid-fanatecff.nix
     ./hardware/astro-a50.nix
     ./hardware/audio.nix
     ./hardware/gbmonctl.nix

modules/nixos/hardware/hid-fanatecff-pkg.nix

@@ -1,60 +0,0 @@
-{
-  lib,
-  stdenv,
-  kernel,
-  fetchFromGitHub,
-  linuxConsoleTools,
-  bash,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "hid-fanatecff";
-  version = "0.2.1";
-
-  src = fetchFromGitHub {
-    owner = "gotzl";
-    repo = "hid-fanatecff";
-    rev = version;
-    hash = "sha256-M2jm8pyxHRiswV4iJEawo57GkJ2XOclIo3NxEFgK+q0=";
-  };
-
-  nativeBuildInputs = kernel.moduleBuildDependencies;
-
-  makeFlags = kernel.makeFlags ++ [
-    "KVERSION=${kernel.modDirVersion}"
-    "KERNEL_SRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
-    "KBUILD_OUTPUT=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
-  ];
-
-  patchPhase = ''
-    runHook prePatch
-
-    substituteInPlace fanatec.rules \
-      --replace-fail "/bin/sh" "${bash}/bin/sh"
-    substituteInPlace fanatec.rules \
-      --replace-fail "/usr/bin/evdev-joystick" "${linuxConsoleTools}/bin/evdev-joystick"
-
-    runHook postPatch
-  '';
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/etc/udev/rules.d
-    cp fanatec.rules $out/etc/udev/rules.d/99-fanatec.rules
-
-    mkdir -p $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/hid
-    cp hid-fanatec.ko $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/hid
-
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    description = "Driver to support FANATEC input devices, in particular ForceFeedback of various wheel-bases";
-    homepage = "https://github.com/gotzl/hid-fanatecff";
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [ theaninova ];
-    platforms = platforms.linux;
-    broken = stdenv.isAarch64;
-  };
-}

modules/nixos/hardware/hid-fanatecff.nix

@@ -1,29 +0,0 @@
-{
-  pkgs,
-  lib,
-  config,
-  ...
-}:
-
-let
-  cfg = config.hardware.hid-fanatecff;
-  kernelPackage = pkgs.callPackage ./hid-fanatecff-pkg.nix {
-    kernel = config.boot.kernelPackages.kernel;
-  };
-in
-{
-  options.hardware.hid-fanatecff.enable = lib.mkEnableOption "the Linux kernel drivers for Fanatec wheel bases";
-
-  config = lib.mkIf cfg.enable {
-    boot = {
-      extraModulePackages = [ kernelPackage ];
-      kernelModules = [ "hid-fanatec" ];
-    };
-    services.udev.packages = [ kernelPackage ];
-    users.groups.games = { };
-  };
-
-  meta = {
-    maintainers = with lib.maintainers; [ theaninova ];
-  };
-}

modules/nixos/shell/flameshot.nix

@@ -21,9 +21,13 @@ in
           bind = [
             "SUPER_SHIFT,V,exec,XDG_CURRENT_DESKTOP=sway uwsm app -- flameshot gui --clipboard"
           ];
-          windowrulev2 = [
-            "float,class:^(flameshot)$"
-            "animation fade,class:^(flameshot)$"
+          windowrule = [
+            {
+              name = "Flameshot";
+              "match:class" = "^(flameshot)$";
+              animation = "fade";
+              float = true;
+            }
           ];
         };
       };

modules/nixos/shell/gnome-keyring.nix

@@ -16,11 +16,15 @@ in
 
   config = lib.mkIf cfg.enable {
     home-manager.users.${username} = {
-      wayland.windowManager.hyprland.settings.windowrulev2 = [
-        "dimaround,class:^(gcr-prompter)$"
-        "noborder,class:^(gcr-prompter)$"
-        "rounding 10,class:^(gcr-prompter)$"
-        "animation slide,class:^(gcr-prompter)$"
+      wayland.windowManager.hyprland.settings.windowrule = [
+        {
+          name = "Gnome Keyring";
+          "match:class" = "^(gcr-prompter)$";
+          border_size = 0;
+          rounding = 10;
+          animation = "slide";
+          dim_around = true;
+        }
       ];
       home.packages = with pkgs; [
         polkit_gnome

modules/nixos/shell/walker.nix

@@ -8,7 +8,6 @@
 
 let
   cfg = config.shell.components.walker;
-  hmConfig = config.home-manager.users.${username};
 in
 {
   options.shell.components.walker = {
@@ -29,27 +28,14 @@ in
       };
       programs.niri.settings.binds."Mod+Space".action.spawn = [ (lib.getExe pkgs.walker) ];
       home.packages = with pkgs; [
-        walker
         wl-clipboard
       ];
-
-      xdg.configFile."walker/config.toml".source = (pkgs.formats.toml { }).generate "walker-config.toml" {
-        app_launch_prefix = "uwsm app -- ";
-        close_when_open = true;
-        force_keyboard_focus = true;
-      };
-      systemd.user.services.walker = {
-        Unit = {
-          Description = "Walker - Application Runner";
-          X-Restart-Triggers = [
-            "${hmConfig.xdg.configFile."walker/config.toml".source}"
-          ];
-          After = [ "graphical-session.target" ];
-        };
-        Install.WantedBy = [ "graphical-session.target" ];
-        Service = {
-          ExecStart = "${lib.getExe pkgs.walker} --gapplication-service";
-          Restart = "always";
+      programs.walker = {
+        enable = true;
+        runAsService = true;
+        config = {
+          close_when_open = true;
+          force_keyboard_focus = true;
         };
       };
     };