Update ankaa

flake.lock

@@ -43,11 +43,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1742234739,
-        "narHash": "sha256-zFL6zsf/5OztR1NSNQF33dvS1fL/BzVUjabZq4qrtY4=",
+        "lastModified": 1743808813,
+        "narHash": "sha256-2lDQBOmlz9ggPxcS7/GvcVdzXMIiT+PpMao6FbLJSr0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "f6af7280a3390e65c2ad8fd059cdc303426cbd59",
+        "rev": "a9f8b3db211b4609ddd83683f9db89796c7f6ac6",
         "type": "github"
       },
       "original": {
@@ -64,11 +64,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1742416832,
-        "narHash": "sha256-ycok0eJJcoknqaibdv/TEEEOUqovC42XCqbfLDYmnoQ=",
+        "lastModified": 1743869639,
+        "narHash": "sha256-Xhe3whfRW/Ay05z9m1EZ1/AkbV1yo0tm1CbgjtCi4rQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "eb0f617aecbaf1eff5bacec789891e775af2f5a3",
+        "rev": "d094c6763c6ddb860580e7d3b4201f8f496a6836",
         "type": "github"
       },
       "original": {
@@ -83,11 +83,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1742414517,
-        "narHash": "sha256-CLrAbosJgI1dCsX5ReGJ/mgD64wAU5+Z0WLJpMZKp20=",
+        "lastModified": 1743869043,
+        "narHash": "sha256-dOvdvxR3HHzuuhDWiCk/+Ly0u8WnfjyWfg3eOVfDWmQ=",
         "owner": "ggerganov",
         "repo": "llama.cpp",
-        "rev": "568013d0cd3d5add37c376b3d5e959809b711fc7",
+        "rev": "6bf28f0111ff9f21b3c1b1eace20c590281e7ba6",
         "type": "github"
       },
       "original": {
@@ -126,11 +126,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1742268799,
-        "narHash": "sha256-IhnK4LhkBlf14/F8THvUy3xi/TxSQkp9hikfDZRD4Ic=",
+        "lastModified": 1743703532,
+        "narHash": "sha256-s1KLDALEeqy+ttrvqV3jx9mBZEvmthQErTVOAzbjHZs=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "da044451c6a70518db5b730fe277b70f494188f1",
+        "rev": "bdb91860de2f719b57eef819b5617762f7120c70",
         "type": "github"
       },
       "original": {
@@ -142,11 +142,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1742288794,
-        "narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=",
+        "lastModified": 1743583204,
+        "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42",
+        "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434",
         "type": "github"
       },
       "original": {
@@ -158,11 +158,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1741865919,
-        "narHash": "sha256-4thdbnP6dlbdq+qZWTsm4ffAwoS8Tiq1YResB+RP6WE=",
+        "lastModified": 1743441817,
+        "narHash": "sha256-+OE03P3u0FRwhS+Ah6EYiwxdS1rcIYlXheuXGM3wP3Q=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "573c650e8a14b2faa0041645ab18aed7e60f0c9a",
+        "rev": "3eeaa42ef4c19447b48d1c676fe59077dfd0846e",
         "type": "github"
       },
       "original": {
@@ -188,11 +188,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1742406979,
-        "narHash": "sha256-r0aq70/3bmfjTP+JZs4+XV5SgmCtk1BLU4CQPWGtA7o=",
+        "lastModified": 1743756170,
+        "narHash": "sha256-2b11EYa08oqDmF3zEBLkG1AoNn9rB1k39ew/T/mSvbU=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "1770be8ad89e41f1ed5a60ce628dd10877cb3609",
+        "rev": "cff8437c5fe8c68fc3a840a21bf1f4dc801da40d",
         "type": "github"
       },
       "original": {

flake.nix

@@ -113,6 +113,7 @@
                             enable = true;
                             lutris.enable = true;
                             minecraft.enable = true;
+                            ps4.enable = true;
                         };
 
                         common.nil.enable = true;
@@ -228,7 +229,7 @@
 
                     pkgs = import nixpkgs {
                         inherit system;
-                        overlays = with overlays; [ printrun citrix ];
+                        overlays = with overlays; [ printrun citrix shadps4 ];
                         config = {
                           allowUnfree = true;
                           permittedInsecurePackages = [
@@ -241,6 +242,7 @@
                             kickoff-dot-desktop = pkgs.callPackage ./pkgs/kickoff-dot-desktop.nix {};
                             jhelioviewer = pkgs.callPackage ./pkgs/jhelioviewer.nix {};
                             llama-cpp = llama-cpp.packages.${system}.rocm;
+                            shadps4 = pkgs.callPackage ./pkgs/shadps4.nix {};
                         }
                     );
 

hosts/shared/dotfiles/nvim/lua/config/keymaps.lua

@@ -10,6 +10,9 @@ vim.keymap.set('n', '<leader>ff', ':FzfLua files<CR>')
 vim.keymap.set('n', '<leader>fb', ':FzfLua buffers<CR>')
 vim.keymap.set('n', '<leader>rg', ':FzfLua grep_project<CR>')
 
+vim.keymap.set('n', 'ga', '<Plug>(EasyAlign)')
+vim.keymap.set('x', 'ga', '<Plug>(EasyAlign)')
+
 
 
 vim.keymap.set('i', '<S-Tab>', '<C-d>')

modules/home/sway.nix

@@ -109,7 +109,7 @@ in
                         "${modifier}+Shift+0" = "move container to workspace 10";
                         "${modifier}+Shift+e" = "exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -B 'Yes, exit sway' 'swaymsg exit'";
                         "${modifier}+Shift+c" = "reload";
-                        "${modifier}+Shift+s" = "exec ${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp)\" \"/home/eesim/Pictures/$(date +'%s_grim.png')\"";
+                        "${modifier}+Shift+s" = "exec ${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp)\" \"/home/eesim/Pictures/$(${pkgs.zenity}/bin/zenity --entry).png\"";
                         "${modifier}+Shift+q" = "kill";
                         "${modifier}+p" = "focus mode_toggle";
                         "XF86AudioPause" = "exec playerctl play-pause";

modules/nix/games.nix

@@ -9,11 +9,12 @@ with lib; let
 in
 {
     config = mkIf cfg.enable {
-        environment.systemPackages = with pkgs; with localPackages.x86_64-linux; []
+        environment.systemPackages = with pkgs; []
             ++ optional cfg.protonup.enable protonup-qt
             ++ optional cfg.gamescope.enable gamescope
             ++ optional cfg.discord.enable vesktop
             ++ optional cfg.minecraft.enable prismlauncher
+            ++ optional cfg.ps4.enable localPackages.x86_64-linux.shadps4
             ++ optionals cfg.lutris.enable [ lutris wine ];
 
         programs.steam = mkIf cfg.steam.enable {

modules/options/games.nix

@@ -40,6 +40,12 @@ in
             default = false;
         };
 
+        ps4.enable = mkOption {
+          description = "Whether to install ps4 emulator";
+          type = types.bool;
+          default = false;
+        };
+
         gamescope.enable = mkOption {
             description = "Whether to install gamescope";
             type = types.bool;

overlays/default.nix

@@ -4,4 +4,5 @@
     llama-cpp = import ./llama-cpp.nix { inherit inputs; };
     printrun = import ./printrun.nix { inherit inputs; };
     citrix = import ./citrix.nix;
+    shadps4 = import ./shadps4.nix;
 }

overlays/shadps4.nix

@@ -0,0 +1,15 @@
+final: prev: {
+  shadps4 = prev.shadps4.overrideAttrs (old: {
+    version = "0.6.0";
+    
+    src = prev.fetchFromGitHub {
+      owner = "shadps4-emu";
+      repo = "shadps4";
+      rev = "15d10e47ea272b1b4c8bf97f2b3bbb406d34b213";
+      fetchSubmodules = true;
+      hash = "sha256-ksIKmijWcRMhCDEi/dodZHiEoIO3CB0BkGn698J7jxI=";
+    };
+
+    patches = [];
+  });
+}

pkgs/kickoff-dot-desktop.nix

@@ -11,7 +11,8 @@ rustPlatform.buildRustPackage {
             hash = "sha256-exMmqOkDKuyAEdda8gG/uF3+tnQzhJnOJK+sEtZbsZc=";
     };
 
-    cargoHash = "sha256-z3apcltBKNovwo+yOHxvzn53PPefr2lEzkGst25fGsM=";
+    useFetchCargoVendor = true;
+    cargoHash = "sha256-4x9kEBnYPhhYej0mNmV7jibw6sH8SxVau9tIkIVTen8=";
 
     meta = with lib; {
             description = "Smol program to read in relevant desktop files and print them in a kickoff compatible format";

pkgs/shadps4.nix

@@ -0,0 +1,109 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, llvmPackages_18
+, cmake
+, pkg-config
+, git
+, qt6
+, alsa-lib
+, libpulseaudio
+, openal
+, openssl
+, zlib
+, libedit
+, udev
+, libevdev
+, SDL2
+, jack2
+, sndio
+, vulkan-headers
+, vulkan-utility-libraries
+, vulkan-tools
+, ffmpeg
+, fmt
+, glslang
+, libxkbcommon
+, wayland
+, xorg
+, sdl3
+, stb
+, wayland-protocols
+, libpng
+}: 
+stdenv.mkDerivation {
+  pname = "shadps4";
+  version = "0.6.0";
+
+  src = fetchFromGitHub {
+    owner = "shadps4-emu"; 
+    repo = "shadPS4";
+    rev = "9061028ce588037fa6f467cd2c0740d10ed725ed";
+    hash = "sha256-XhfJx1sDFz+RwhwcBA8W6WV6y1rDDvpyQe3v3NaSu2I=";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [
+      llvmPackages_18.clang
+      cmake
+      pkg-config
+      git
+      qt6.wrapQtAppsHook
+  ];
+
+  buildInputs = [
+      alsa-lib
+      libpulseaudio
+      openal
+      openssl
+      zlib
+      libedit
+      udev
+      libevdev
+      SDL2
+      jack2
+      sndio
+      qt6.qtbase
+      qt6.qttools
+      qt6.qtmultimedia
+
+      vulkan-headers
+      vulkan-utility-libraries
+      vulkan-tools
+
+      ffmpeg
+      fmt
+      glslang
+      libxkbcommon
+      wayland
+      xorg.libxcb
+      xorg.xcbutil
+      xorg.xcbutilkeysyms
+      xorg.xcbutilwm
+      sdl3
+      stb
+      qt6.qtwayland
+      wayland-protocols
+      libpng
+  ];
+
+  cmakeFlags = [
+    (lib.cmakeBool "ENABLE_QT_GUI" true)
+    (lib.cmakeBool "ENABLE_UPDATER" false)
+  ];
+
+  cmakeBuildType = "RelWithDebugInfo";
+  dontStrip = true;
+
+  installPhase = ''
+  runHook preInstall
+
+  install -D -t $out/bin shadps4
+  install -Dm644 $src/.github/shadps4.png $out/share/icons/hicolor/512x512/apps/net.shadps4.shadPS4.png
+  install -Dm644 -t $out/share/applications $src/dist/net.shadps4.shadPS4.desktop
+  install -Dm644 -t $out/share/metainfo $src/dist/net.shadps4.shadPS4.metainfo.xml
+
+  runHook postInstall
+  '';
+
+}