small fixes everywhere

machines/Wayland-VM/default.nix

@@ -86,18 +86,13 @@
             rev = "d8eaf667220c5ef72519280354d373a149e041a3";
             sha256 = "1m15x87c7pc7ag624zccjjb19ixki01c0pfr78myc8nbavi56lfz";
           };
-
+          nativeBuildInputs = [ super.makeBinaryWrapper ];
-          buildInputs = [
-            py
-            super.lzip
-            super.sqlite
-            super.util-linux
-          ];
           installPhase = ''
             mkdir -p $out/bin
             cp waydroid_extras.py $out/bin/waydroid-script
             chmod +x $out/bin/waydroid-script
             sed -i '1i #!${py}/bin/python' $out/bin/waydroid-script
+            wrapProgram $out/bin/waydroid-script --prefix PATH : ${with super; lib.makeBinPath [ lzip sqlite util-linux ]}
           '';
         };
       })

machines/Wayland-VM/imports/qemu-vm.nix

@@ -8,7 +8,7 @@
     memorySize = 6044;
     msize = 131072;
     diskSize = 20480;
-    diskImage = "./vm-images/${config.device}.qcow2";
+    diskImage = "/media/libvirt/vm-images/${config.device}.qcow2";
     # resolution = { x = 1920; y = 1080; };
 
     useNixStoreImage = true;

profiles/applications/steam.nix

@@ -6,23 +6,13 @@
     "${pkgs.steam}/bin/steam"
   ];
 
-  home-manager.users.alukard.wayland.windowManager.sway.config = {
+  systemd.user.services.x11-ownership = rec {
-    assigns = {
+    # serviceConfig.Type = "oneshot";
-      "0" = [
+    script = ''
-        { class = "^Steam$"; }
+      chown alukard /tmp/.X11-unix
-      ];
+    '';
-    };
+    after = [ "graphical-session.target" ];
-    window.commands = (
+    wants = after;
-      map (title: { command = "floating enable"; criteria = { class = "^Steam$"; inherit title; }; })
+    wantedBy = [ "multi-user.target" ];
-      [
-        "Steam - News" ".* - Chat" "^Settings$" ".* - event started" ".* CD key" "^Steam - Self Updater$"
-        "^Screenshot Uploader$" "^Steam Guard - Computer Authorization Required$"
-      ]
-    ) ++ [
-      {
-        command = "floating enable";
-        criteria = { title = "^Steam Keyboard$"; };
-      }
-    ];
   };
 }

profiles/applications/vscode/default.nix

@@ -79,7 +79,7 @@ in
         "dart.debugSdkLibraries" = true;
         "dart.checkForSdkUpdates" = false;
         "window.menuBarVisibility" = "toggle";
-        "terminal.integrated.fontFamily" = "IBM Plex Mono for Powerline";
+        "terminal.integrated.fontFamily" = "IBM Plex Mono";
         "terminal.integrated.fontWeight" = "500";
         "files.watcherExclude" = {
             "**/.direnv" = true;

profiles/applications/waydroid.nix

@@ -19,6 +19,7 @@ in {
     environment.etc."gbinder.d/waydroid.conf".source = lib.mkForce waydroidGbinderConf;
     # environment.etc."gbinder.d/anbox.conf".source = lib.mkForce anboxGbinderConf;
     virtualisation.waydroid.enable = true;
-    virtualisation.lxd.enable = true;
+    # virtualisation.lxd.enable = true;
+    home-manager.users.alukard.home.packages = [ pkgs.waydroid-script ];
   };
 }

profiles/hardware.nix

@@ -23,10 +23,12 @@ with config.deviceSpecific; {
       pkgs.driversi686Linux.amdvlk
     ];
   };
-  environment.sessionVariables = lib.mkIf (devInfo.gpu.vendor == "intel") {
+  environment.sessionVariables = if (devInfo.gpu.vendor == "intel") then {
     GST_VAAPI_ALL_DRIVERS = "1";
     LIBVA_DRIVER_NAME = "iHD";
-  };
+  } else if (devInfo.gpu.vendor == "amd") then {
+    AMD_VULKAN_ICD = "RADV";
+  } else {};
   boot.initrd.kernelModules = if devInfo.gpu.vendor == "amd" then [
     "amdgpu"
   ] else if devInfo.gpu.vendor == "intel" then [

profiles/overlay.nix

@@ -27,7 +27,7 @@ with lib; {
         bibata-cursors-tokyonight = pkgs.callPackage ./packages/bibata-cursors-tokyonight.nix { };
         ceserver = pkgs.callPackage ./packages/ceserver.nix { };
         hyprpaper = pkgs.callPackage ./packages/hyprpaper.nix { src = inputs.hyprpaper; };
-        ibm-plex-powerline = pkgs.callPackage ./packages/ibm-plex-powerline.nix { };
+#         ibm-plex-powerline = pkgs.callPackage ./packages/ibm-plex-powerline.nix { };
         kitti3 = pkgs.python3Packages.callPackage ./packages/kitti3.nix { };
         microbin = pkgs.callPackage ./packages/microbin-pkg { };
         mpris-ctl = pkgs.callPackage ./packages/mpris-ctl.nix { };
@@ -51,6 +51,7 @@ with lib; {
             "-Dexperimental=true"
           ];
         });
+        waydroid-script = pkgs.callPackage ./packages/waydroid-script.nix { };
         wine = super.wineWowPackages.staging;
         qbittorrent = super.qbittorrent.overrideAttrs (old: rec {
           version = "enchanced-edition";

profiles/packages/seadrive-fuse.nix

@@ -1,5 +1,5 @@
 { fetchFromGitHub
-, pkgconfig
+, pkg-config
 , stdenv
 , autoreconfHook
 , lib
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     autoreconfHook
-    pkgconfig
+    pkg-config
   ];
   buildInputs = [
     libsearpc

profiles/packages/waydroid-script.nix

@@ -0,0 +1,26 @@
+{ stdenv, lib, fetchFromGitHub, python3, lzip, sqlite, util-linux, makeBinaryWrapper }:
+let
+  py = python3.withPackages (pythonPackages: with pythonPackages; [
+    tqdm
+    requests
+  ]);
+in stdenv.mkDerivation {
+  name = "myscript";
+  version = "git";
+
+  src = fetchFromGitHub {
+    repo = "waydroid_script";
+    owner = "AlukardBF";
+    rev = "d8eaf667220c5ef72519280354d373a149e041a3";
+    sha256 = "1m15x87c7pc7ag624zccjjb19ixki01c0pfr78myc8nbavi56lfz";
+  };
+
+  nativeBuildInputs = [ makeBinaryWrapper ];
+  installPhase = ''
+    mkdir -p $out/bin
+    cp waydroid_extras.py $out/bin/waydroid-script
+    chmod +x $out/bin/waydroid-script
+    sed -i '1i #!${py}/bin/python' $out/bin/waydroid-script
+    wrapProgram $out/bin/waydroid-script --prefix PATH : ${lib.makeBinPath [ lzip sqlite util-linux ]}
+  '';
+}

profiles/themes.nix

@@ -23,7 +23,7 @@
           size = 12;
         };
         powerline = {
-          family = "IBM Plex Mono for Powerline";
+          family = "IBM Plex Mono";
           size = 12;
         };
         icon = {

profiles/workspace/copyq.nix

@@ -1,19 +1,10 @@
 { config, pkgs, ... }: {
   environment.systemPackages = [ pkgs.copyq ];
   home-manager.users.alukard = {
-    wayland.windowManager.sway.config = {
+    wayland.windowManager.hyprland.extraConfig = ''
-      window.commands = [
+      windowrule=float,title=(.*CopyQ)
-        {
+    '';
-          criteria = { title = ".*CopyQ"; };
+    # command = "move position mouse";
-          command = "floating enable";
-        }
-        {
-          criteria = { title = ".*CopyQ"; };
-          command = "move position mouse";
-        }
-      ];
-      startup = [{ command = "${pkgs.copyq}/bin/copyq"; }];
-    };
-
   };
+  startupApplications = [ "${pkgs.copyq}/bin/copyq" ];
 }

profiles/workspace/fonts.nix

@@ -6,7 +6,7 @@ in
   fonts = {
     fonts = with pkgs; [
       ibm-plex
-      ibm-plex-powerline
+#       ibm-plex-powerline
       fira-code
       roboto
       roboto-mono

profiles/workspace/git.nix

@@ -2,6 +2,7 @@
   home-manager.users.alukard = {
     programs.git = {
       enable = true;
+      lfs.enable = true;
       userEmail = "AlukardBF@users.noreply.github.com";
       userName = "Dmitriy Kholkin";
       signing = {

profiles/workspace/hyprland/default.nix

@@ -27,7 +27,6 @@ in with config.deviceSpecific; with lib; {
   };
 
   xdg.portal = {
-    # extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
     wlr = {
       enable = true;
       settings = {
@@ -44,6 +43,8 @@ in with config.deviceSpecific; with lib; {
       inputs.hyprland.homeManagerModules.default
     ];
 
+    home.packages = [ pkgs.wl-clipboard ];
+
     programs.zsh.loginExtra = let
       initScript = pkgs.writeShellScriptBin "wrappedHypr" ''
         export _JAVA_AWT_WM_NONREPARENTING=1

profiles/workspace/locale.nix

@@ -3,7 +3,7 @@ with config.deviceSpecific; {
   i18n.defaultLocale = "en_GB.utf8";
 
   console.font = "cyr-sun16";
-  console.keyMap = "ruwin_cplk-UTF-8";
+  # console.keyMap = "ruwin_cplk-UTF-8";
 
   environment.sessionVariables = {
     XKB_DEFAULT_LAYOUT = "us,ru";

profiles/workspace/print-scan.nix

@@ -8,5 +8,5 @@
   hardware.sane.enable = true;
   services.saned.enable = true;
 
-  environment.systemPackages = [ pkgs.gnome3.simple-scan ];
+  environment.systemPackages = [ pkgs.gnome.simple-scan ];
 }

roles/desktop.nix

@@ -30,7 +30,6 @@
     rofi
     spotify
     steam
-    syncthing
     # vivaldi
     vscode
     waydroid