diff --git a/machines/Wayland-VM/default.nix b/machines/Wayland-VM/default.nix index b6e2f0a..8806786 100644 --- a/machines/Wayland-VM/default.nix +++ b/machines/Wayland-VM/default.nix @@ -86,18 +86,13 @@ rev = "d8eaf667220c5ef72519280354d373a149e041a3"; sha256 = "1m15x87c7pc7ag624zccjjb19ixki01c0pfr78myc8nbavi56lfz"; }; - - buildInputs = [ - py - super.lzip - super.sqlite - super.util-linux - ]; + nativeBuildInputs = [ super.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 : ${with super; lib.makeBinPath [ lzip sqlite util-linux ]} ''; }; }) diff --git a/machines/Wayland-VM/imports/qemu-vm.nix b/machines/Wayland-VM/imports/qemu-vm.nix index c6324b7..91acc4b 100644 --- a/machines/Wayland-VM/imports/qemu-vm.nix +++ b/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; diff --git a/profiles/applications/steam.nix b/profiles/applications/steam.nix index dd6e60a..431c41c 100644 --- a/profiles/applications/steam.nix +++ b/profiles/applications/steam.nix @@ -6,23 +6,13 @@ "${pkgs.steam}/bin/steam" ]; - home-manager.users.alukard.wayland.windowManager.sway.config = { - assigns = { - "0" = [ - { class = "^Steam$"; } - ]; - }; - window.commands = ( - map (title: { command = "floating enable"; criteria = { class = "^Steam$"; inherit title; }; }) - [ - "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$"; }; - } - ]; + systemd.user.services.x11-ownership = rec { + # serviceConfig.Type = "oneshot"; + script = '' + chown alukard /tmp/.X11-unix + ''; + after = [ "graphical-session.target" ]; + wants = after; + wantedBy = [ "multi-user.target" ]; }; -} \ No newline at end of file +} diff --git a/profiles/applications/vscode/default.nix b/profiles/applications/vscode/default.nix index 3016cc4..1a6f640 100644 --- a/profiles/applications/vscode/default.nix +++ b/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; diff --git a/profiles/applications/waydroid.nix b/profiles/applications/waydroid.nix index 146dbf4..43f574c 100644 --- a/profiles/applications/waydroid.nix +++ b/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 ]; }; -} \ No newline at end of file +} diff --git a/profiles/hardware.nix b/profiles/hardware.nix index 640283d..262fd76 100644 --- a/profiles/hardware.nix +++ b/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 [ diff --git a/profiles/overlay.nix b/profiles/overlay.nix index d975610..e1d87d8 100644 --- a/profiles/overlay.nix +++ b/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"; diff --git a/profiles/packages/seadrive-fuse.nix b/profiles/packages/seadrive-fuse.nix index 0fbaae2..11e3f43 100644 --- a/profiles/packages/seadrive-fuse.nix +++ b/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 @@ -61,4 +61,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; maintainers = with maintainers; []; }; -} \ No newline at end of file +} diff --git a/profiles/packages/waydroid-script.nix b/profiles/packages/waydroid-script.nix new file mode 100644 index 0000000..f1652ce --- /dev/null +++ b/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 ]} + ''; +} \ No newline at end of file diff --git a/profiles/themes.nix b/profiles/themes.nix index 261cb02..afc8637 100644 --- a/profiles/themes.nix +++ b/profiles/themes.nix @@ -23,7 +23,7 @@ size = 12; }; powerline = { - family = "IBM Plex Mono for Powerline"; + family = "IBM Plex Mono"; size = 12; }; icon = { diff --git a/profiles/workspace/copyq.nix b/profiles/workspace/copyq.nix index 5603528..be09730 100644 --- a/profiles/workspace/copyq.nix +++ b/profiles/workspace/copyq.nix @@ -1,19 +1,10 @@ { config, pkgs, ... }: { environment.systemPackages = [ pkgs.copyq ]; home-manager.users.alukard = { - wayland.windowManager.sway.config = { - window.commands = [ - { - criteria = { title = ".*CopyQ"; }; - command = "floating enable"; - } - { - criteria = { title = ".*CopyQ"; }; - command = "move position mouse"; - } - ]; - startup = [{ command = "${pkgs.copyq}/bin/copyq"; }]; - }; - + wayland.windowManager.hyprland.extraConfig = '' + windowrule=float,title=(.*CopyQ) + ''; + # command = "move position mouse"; }; + startupApplications = [ "${pkgs.copyq}/bin/copyq" ]; } \ No newline at end of file diff --git a/profiles/workspace/fonts.nix b/profiles/workspace/fonts.nix index 8c841e2..f4bf49b 100644 --- a/profiles/workspace/fonts.nix +++ b/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 @@ -26,4 +26,4 @@ in }; enableDefaultFonts = true; }; -} \ No newline at end of file +} diff --git a/profiles/workspace/git.nix b/profiles/workspace/git.nix index d58b30b..68c577f 100644 --- a/profiles/workspace/git.nix +++ b/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 = { diff --git a/profiles/workspace/hyprland/default.nix b/profiles/workspace/hyprland/default.nix index 647a5a3..4c2e9af 100644 --- a/profiles/workspace/hyprland/default.nix +++ b/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 diff --git a/profiles/workspace/locale.nix b/profiles/workspace/locale.nix index 88bc44c..dbc1806 100644 --- a/profiles/workspace/locale.nix +++ b/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"; diff --git a/profiles/workspace/print-scan.nix b/profiles/workspace/print-scan.nix index ce635df..6cf6b87 100644 --- a/profiles/workspace/print-scan.nix +++ b/profiles/workspace/print-scan.nix @@ -8,5 +8,5 @@ hardware.sane.enable = true; services.saned.enable = true; - environment.systemPackages = [ pkgs.gnome3.simple-scan ]; -} \ No newline at end of file + environment.systemPackages = [ pkgs.gnome.simple-scan ]; +} diff --git a/roles/desktop.nix b/roles/desktop.nix index 8383a17..72d1f15 100644 --- a/roles/desktop.nix +++ b/roles/desktop.nix @@ -30,7 +30,6 @@ rofi spotify steam - syncthing # vivaldi vscode waydroid